2009-07-08 13:19:16 -07:00
|
|
|
|
/*
|
flow: Avoid unsafe comparison of minimasks.
The following, run inside the OVS sandbox, caused OVS to abort when
Address Sanitizer was used:
ovs-vsctl add-br br-int
ovs-ofctl add-flow br-int "table=0,cookie=0x1234,priority=10000,icmp,actions=drop"
ovs-ofctl --strict del-flows br-int "table=0,cookie=0x1234/-1,priority=10000"
Sample report from Address Sanitizer:
==3029==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x603000043260 at pc 0x7f6b09c2459b bp 0x7ffcb67e7540 sp 0x7ffcb67e6cf0
READ of size 40 at 0x603000043260 thread T0
#0 0x7f6b09c2459a (/lib/x86_64-linux-gnu/libasan.so.5+0xb859a)
#1 0x565110a748a5 in minimask_equal ../lib/flow.c:3510
#2 0x565110a9ea41 in minimatch_equal ../lib/match.c:1821
#3 0x56511091e864 in collect_rules_strict ../ofproto/ofproto.c:4516
#4 0x56511093d526 in delete_flow_start_strict ../ofproto/ofproto.c:5959
#5 0x56511093d526 in ofproto_flow_mod_start ../ofproto/ofproto.c:7949
#6 0x56511093d77b in handle_flow_mod__ ../ofproto/ofproto.c:6122
#7 0x56511093db71 in handle_flow_mod ../ofproto/ofproto.c:6099
#8 0x5651109407f6 in handle_single_part_openflow ../ofproto/ofproto.c:8406
#9 0x5651109407f6 in handle_openflow ../ofproto/ofproto.c:8587
#10 0x5651109e40da in ofconn_run ../ofproto/connmgr.c:1318
#11 0x5651109e40da in connmgr_run ../ofproto/connmgr.c:355
#12 0x56511092b129 in ofproto_run ../ofproto/ofproto.c:1826
#13 0x5651108f23cd in bridge_run__ ../vswitchd/bridge.c:2965
#14 0x565110904887 in bridge_run ../vswitchd/bridge.c:3023
#15 0x5651108e659c in main ../vswitchd/ovs-vswitchd.c:127
#16 0x7f6b093b709a in __libc_start_main ../csu/libc-start.c:308
#17 0x5651108e9009 in _start (/home/blp/nicira/ovs/_build/vswitchd/ovs-vswitchd+0x11d009)
This fixes the problem, which although largely theoretical could crop up
with odd implementations of memcmp(), perhaps ones optimized in various
"clever" ways. All in all, it seems best to avoid the theoretical problem.
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2019-07-17 10:55:16 -07:00
|
|
|
|
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2019 Nicira, Inc.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* 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:
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* 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.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*/
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include "flow.h"
|
2010-12-29 19:03:46 -08:00
|
|
|
|
#include <errno.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include <inttypes.h>
|
2012-09-04 12:43:53 -07:00
|
|
|
|
#include <limits.h>
|
2018-10-18 21:43:12 +05:30
|
|
|
|
#include <net/if.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include <netinet/in.h>
|
2010-12-29 19:03:46 -08:00
|
|
|
|
#include <netinet/icmp6.h>
|
|
|
|
|
#include <netinet/ip6.h>
|
2012-09-04 12:43:53 -07:00
|
|
|
|
#include <stdint.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
2010-10-28 17:13:18 -07:00
|
|
|
|
#include "byte-order.h"
|
2016-03-02 15:56:19 +01:00
|
|
|
|
#include "colors.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include "coverage.h"
|
2012-08-02 16:11:58 -07:00
|
|
|
|
#include "csum.h"
|
2016-03-03 10:20:46 -08:00
|
|
|
|
#include "openvswitch/dynamic-string.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include "hash.h"
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
#include "jhash.h"
|
2016-04-04 21:32:06 -04:00
|
|
|
|
#include "openvswitch/match.h"
|
2015-02-22 03:21:09 -08:00
|
|
|
|
#include "dp-packet.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include "openflow/openflow.h"
|
|
|
|
|
#include "packets.h"
|
2014-02-26 18:08:04 -08:00
|
|
|
|
#include "odp-util.h"
|
2013-10-17 14:28:20 -07:00
|
|
|
|
#include "random.h"
|
2010-05-07 11:43:18 -07:00
|
|
|
|
#include "unaligned.h"
|
2016-07-12 16:37:34 -05:00
|
|
|
|
#include "util.h"
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
#include "openvswitch/nsh.h"
|
2018-10-18 21:43:12 +05:30
|
|
|
|
#include "ovs-router.h"
|
|
|
|
|
#include "lib/netdev-provider.h"
|
2021-04-16 14:06:31 +02:00
|
|
|
|
#include "openvswitch/vlog.h"
|
|
|
|
|
|
|
|
|
|
VLOG_DEFINE_THIS_MODULE(flow);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
coverage: Make the coverage counters catalog program-specific.
Until now, the collection of coverage counters supported by a given OVS
program was not specific to that program. That means that, for example,
even though ovs-dpctl does not have anything to do with mac_learning, it
still has a coverage counter for it. This is confusing, at best.
This commit fixes the problem on some systems, in particular on ones that
use GCC and the GNU linker. It uses the feature of the GNU linker
described in its manual as:
If an orphaned section's name is representable as a C identifier then
the linker will automatically see PROVIDE two symbols: __start_SECNAME
and __end_SECNAME, where SECNAME is the name of the section. These
indicate the start address and end address of the orphaned section
respectively.
Systems that don't support these features retain the earlier behavior.
This commit also fixes the annoyance that files that include coverage
counters must be listed on COVERAGE_FILES in lib/automake.mk.
This commit also fixes the annoyance that modifying any source file that
includes a coverage counter caused all programs that link against
libopenvswitch.a to relink, even programs that the source file was not
linked into. For example, modifying ofproto/ofproto.c (which includes
coverage counters) caused tests/test-aes128 to relink, even though
test-aes128 does not link again ofproto.o.
2010-11-01 14:14:27 -07:00
|
|
|
|
COVERAGE_DEFINE(flow_extract);
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_DEFINE(miniflow_extract_ipv4_pkt_len_error);
|
|
|
|
|
COVERAGE_DEFINE(miniflow_extract_ipv4_pkt_too_short);
|
|
|
|
|
COVERAGE_DEFINE(miniflow_extract_ipv6_pkt_len_error);
|
|
|
|
|
COVERAGE_DEFINE(miniflow_extract_ipv6_pkt_too_short);
|
2012-09-04 12:43:53 -07:00
|
|
|
|
COVERAGE_DEFINE(miniflow_malloc);
|
coverage: Make the coverage counters catalog program-specific.
Until now, the collection of coverage counters supported by a given OVS
program was not specific to that program. That means that, for example,
even though ovs-dpctl does not have anything to do with mac_learning, it
still has a coverage counter for it. This is confusing, at best.
This commit fixes the problem on some systems, in particular on ones that
use GCC and the GNU linker. It uses the feature of the GNU linker
described in its manual as:
If an orphaned section's name is representable as a C identifier then
the linker will automatically see PROVIDE two symbols: __start_SECNAME
and __end_SECNAME, where SECNAME is the name of the section. These
indicate the start address and end address of the orphaned section
respectively.
Systems that don't support these features retain the earlier behavior.
This commit also fixes the annoyance that files that include coverage
counters must be listed on COVERAGE_FILES in lib/automake.mk.
This commit also fixes the annoyance that modifying any source file that
includes a coverage counter caused all programs that link against
libopenvswitch.a to relink, even programs that the source file was not
linked into. For example, modifying ofproto/ofproto.c (which includes
coverage counters) caused tests/test-aes128 to relink, even though
test-aes128 does not link again ofproto.o.
2010-11-01 14:14:27 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* U64 indices for segmented flow classification. */
|
|
|
|
|
const uint8_t flow_segment_u64s[4] = {
|
|
|
|
|
FLOW_SEGMENT_1_ENDS_AT / sizeof(uint64_t),
|
|
|
|
|
FLOW_SEGMENT_2_ENDS_AT / sizeof(uint64_t),
|
|
|
|
|
FLOW_SEGMENT_3_ENDS_AT / sizeof(uint64_t),
|
|
|
|
|
FLOW_U64S
|
2013-11-19 17:31:29 -08:00
|
|
|
|
};
|
|
|
|
|
|
2017-03-01 17:47:59 -05:00
|
|
|
|
int flow_vlan_limit = FLOW_MAX_VLAN_HEADERS;
|
|
|
|
|
|
2015-06-09 11:32:24 -07:00
|
|
|
|
/* Asserts that field 'f1' follows immediately after 'f0' in struct flow,
|
|
|
|
|
* without any intervening padding. */
|
|
|
|
|
#define ASSERT_SEQUENTIAL(f0, f1) \
|
|
|
|
|
BUILD_ASSERT_DECL(offsetof(struct flow, f0) \
|
|
|
|
|
+ MEMBER_SIZEOF(struct flow, f0) \
|
|
|
|
|
== offsetof(struct flow, f1))
|
|
|
|
|
|
|
|
|
|
/* Asserts that fields 'f0' and 'f1' are in the same 32-bit aligned word within
|
|
|
|
|
* struct flow. */
|
|
|
|
|
#define ASSERT_SAME_WORD(f0, f1) \
|
|
|
|
|
BUILD_ASSERT_DECL(offsetof(struct flow, f0) / 4 \
|
|
|
|
|
== offsetof(struct flow, f1) / 4)
|
|
|
|
|
|
|
|
|
|
/* Asserts that 'f0' and 'f1' are both sequential and within the same 32-bit
|
|
|
|
|
* aligned word in struct flow. */
|
|
|
|
|
#define ASSERT_SEQUENTIAL_SAME_WORD(f0, f1) \
|
|
|
|
|
ASSERT_SEQUENTIAL(f0, f1); \
|
|
|
|
|
ASSERT_SAME_WORD(f0, f1)
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* miniflow_extract() assumes the following to be true to optimize the
|
|
|
|
|
* extraction process. */
|
2015-06-09 11:32:24 -07:00
|
|
|
|
ASSERT_SEQUENTIAL_SAME_WORD(nw_frag, nw_tos);
|
|
|
|
|
ASSERT_SEQUENTIAL_SAME_WORD(nw_tos, nw_ttl);
|
|
|
|
|
ASSERT_SEQUENTIAL_SAME_WORD(nw_ttl, nw_proto);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* TCP flags in the middle of a BE64, zeroes in the other half. */
|
|
|
|
|
BUILD_ASSERT_DECL(offsetof(struct flow, tcp_flags) % 8 == 4);
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
#if WORDS_BIGENDIAN
|
|
|
|
|
#define TCP_FLAGS_BE32(tcp_ctl) ((OVS_FORCE ovs_be32)TCP_FLAGS_BE16(tcp_ctl) \
|
|
|
|
|
<< 16)
|
|
|
|
|
#else
|
|
|
|
|
#define TCP_FLAGS_BE32(tcp_ctl) ((OVS_FORCE ovs_be32)TCP_FLAGS_BE16(tcp_ctl))
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-06-09 11:32:24 -07:00
|
|
|
|
ASSERT_SEQUENTIAL_SAME_WORD(tp_src, tp_dst);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
/* Removes 'size' bytes from the head end of '*datap', of size '*sizep', which
|
|
|
|
|
* must contain at least 'size' bytes of data. Returns the first byte of data
|
|
|
|
|
* removed. */
|
|
|
|
|
static inline const void *
|
2015-06-08 13:16:07 -07:00
|
|
|
|
data_pull(const void **datap, size_t *sizep, size_t size)
|
2009-07-16 12:58:28 -07:00
|
|
|
|
{
|
2015-06-08 13:16:07 -07:00
|
|
|
|
const char *data = *datap;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
*datap = data + size;
|
|
|
|
|
*sizep -= size;
|
|
|
|
|
return data;
|
2009-07-16 12:58:28 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* If '*datap' has at least 'size' bytes of data, removes that many bytes from
|
|
|
|
|
* the head end of '*datap' and returns the first byte removed. Otherwise,
|
|
|
|
|
* returns a null pointer without modifying '*datap'. */
|
|
|
|
|
static inline const void *
|
2015-06-08 13:16:07 -07:00
|
|
|
|
data_try_pull(const void **datap, size_t *sizep, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2014-04-18 08:26:56 -07:00
|
|
|
|
return OVS_LIKELY(*sizep >= size) ? data_pull(datap, sizep, size) : NULL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* Context for pushing data to a miniflow. */
|
|
|
|
|
struct mf_ctx {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
struct flowmap map;
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t *data;
|
|
|
|
|
uint64_t * const end;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
};
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* miniflow_push_* macros allow filling in a miniflow data values in order.
|
|
|
|
|
* Assertions are needed only when the layout of the struct flow is modified.
|
|
|
|
|
* 'ofs' is a compile-time constant, which allows most of the code be optimized
|
2014-08-08 10:15:57 -07:00
|
|
|
|
* away. Some GCC versions gave warnings on ALWAYS_INLINE, so these are
|
2014-04-18 08:26:56 -07:00
|
|
|
|
* defined as macros. */
|
|
|
|
|
|
2019-11-25 11:19:23 -08:00
|
|
|
|
#if (FLOW_WC_SEQ != 42)
|
2014-04-18 08:26:56 -07:00
|
|
|
|
#define MINIFLOW_ASSERT(X) ovs_assert(X)
|
2014-08-29 16:08:11 -07:00
|
|
|
|
BUILD_MESSAGE("FLOW_WC_SEQ changed: miniflow_extract() will have runtime "
|
|
|
|
|
"assertions enabled. Consider updating FLOW_WC_SEQ after "
|
|
|
|
|
"testing")
|
2014-04-18 08:26:56 -07:00
|
|
|
|
#else
|
|
|
|
|
#define MINIFLOW_ASSERT(X)
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
/* True if 'IDX' and higher bits are not set. */
|
|
|
|
|
#define ASSERT_FLOWMAP_NOT_SET(FM, IDX) \
|
2015-08-12 16:00:48 -07:00
|
|
|
|
{ \
|
2015-08-25 13:55:03 -07:00
|
|
|
|
MINIFLOW_ASSERT(!((FM)->bits[(IDX) / MAP_T_BITS] & \
|
2016-01-11 14:00:25 +09:00
|
|
|
|
(MAP_MAX << ((IDX) % MAP_T_BITS)))); \
|
2015-08-25 13:55:03 -07:00
|
|
|
|
for (size_t i = (IDX) / MAP_T_BITS + 1; i < FLOWMAP_UNITS; i++) { \
|
|
|
|
|
MINIFLOW_ASSERT(!(FM)->bits[i]); \
|
2015-08-12 16:00:48 -07:00
|
|
|
|
} \
|
|
|
|
|
}
|
2015-07-17 15:18:43 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
#define miniflow_set_map(MF, OFS) \
|
|
|
|
|
{ \
|
|
|
|
|
ASSERT_FLOWMAP_NOT_SET(&MF.map, (OFS)); \
|
|
|
|
|
flowmap_set(&MF.map, (OFS), 1); \
|
2015-08-12 16:00:48 -07:00
|
|
|
|
}
|
2015-07-17 15:18:43 -07:00
|
|
|
|
|
2016-01-11 14:00:25 +09:00
|
|
|
|
#define miniflow_assert_in_map(MF, OFS) \
|
|
|
|
|
MINIFLOW_ASSERT(flowmap_is_set(&MF.map, (OFS))); \
|
2015-08-25 13:55:03 -07:00
|
|
|
|
ASSERT_FLOWMAP_NOT_SET(&MF.map, (OFS) + 1)
|
|
|
|
|
|
|
|
|
|
#define miniflow_push_uint64_(MF, OFS, VALUE) \
|
|
|
|
|
{ \
|
|
|
|
|
MINIFLOW_ASSERT(MF.data < MF.end && (OFS) % 8 == 0); \
|
|
|
|
|
*MF.data++ = VALUE; \
|
|
|
|
|
miniflow_set_map(MF, OFS / 8); \
|
2010-12-29 19:03:46 -08:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
#define miniflow_push_be64_(MF, OFS, VALUE) \
|
2015-01-06 11:10:42 -08:00
|
|
|
|
miniflow_push_uint64_(MF, OFS, (OVS_FORCE uint64_t)(VALUE))
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
#define miniflow_push_uint32_(MF, OFS, VALUE) \
|
|
|
|
|
{ \
|
|
|
|
|
MINIFLOW_ASSERT(MF.data < MF.end); \
|
|
|
|
|
\
|
|
|
|
|
if ((OFS) % 8 == 0) { \
|
|
|
|
|
miniflow_set_map(MF, OFS / 8); \
|
|
|
|
|
*(uint32_t *)MF.data = VALUE; \
|
|
|
|
|
} else if ((OFS) % 8 == 4) { \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
*((uint32_t *)MF.data + 1) = VALUE; \
|
|
|
|
|
MF.data++; \
|
|
|
|
|
} \
|
2015-01-06 11:10:42 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define miniflow_push_be32_(MF, OFS, VALUE) \
|
|
|
|
|
miniflow_push_uint32_(MF, OFS, (OVS_FORCE uint32_t)(VALUE))
|
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
#define miniflow_push_uint16_(MF, OFS, VALUE) \
|
|
|
|
|
{ \
|
|
|
|
|
MINIFLOW_ASSERT(MF.data < MF.end); \
|
|
|
|
|
\
|
|
|
|
|
if ((OFS) % 8 == 0) { \
|
|
|
|
|
miniflow_set_map(MF, OFS / 8); \
|
|
|
|
|
*(uint16_t *)MF.data = VALUE; \
|
|
|
|
|
} else if ((OFS) % 8 == 2) { \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
*((uint16_t *)MF.data + 1) = VALUE; \
|
|
|
|
|
} else if ((OFS) % 8 == 4) { \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
*((uint16_t *)MF.data + 2) = VALUE; \
|
|
|
|
|
} else if ((OFS) % 8 == 6) { \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
*((uint16_t *)MF.data + 3) = VALUE; \
|
|
|
|
|
MF.data++; \
|
|
|
|
|
} \
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-20 15:15:00 +09:00
|
|
|
|
#define miniflow_push_uint8_(MF, OFS, VALUE) \
|
|
|
|
|
{ \
|
|
|
|
|
MINIFLOW_ASSERT(MF.data < MF.end); \
|
|
|
|
|
\
|
|
|
|
|
if ((OFS) % 8 == 0) { \
|
|
|
|
|
miniflow_set_map(MF, OFS / 8); \
|
|
|
|
|
*(uint8_t *)MF.data = VALUE; \
|
|
|
|
|
} else if ((OFS) % 8 == 7) { \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
*((uint8_t *)MF.data + 7) = VALUE; \
|
|
|
|
|
MF.data++; \
|
|
|
|
|
} else { \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
*((uint8_t *)MF.data + ((OFS) % 8)) = VALUE; \
|
|
|
|
|
} \
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
#define miniflow_pad_to_64_(MF, OFS) \
|
|
|
|
|
{ \
|
|
|
|
|
MINIFLOW_ASSERT((OFS) % 8 != 0); \
|
|
|
|
|
miniflow_assert_in_map(MF, OFS / 8); \
|
|
|
|
|
\
|
|
|
|
|
memset((uint8_t *)MF.data + (OFS) % 8, 0, 8 - (OFS) % 8); \
|
|
|
|
|
MF.data++; \
|
2015-01-06 11:10:42 -08:00
|
|
|
|
}
|
|
|
|
|
|
2016-01-20 15:15:01 +09:00
|
|
|
|
#define miniflow_pad_from_64_(MF, OFS) \
|
|
|
|
|
{ \
|
|
|
|
|
MINIFLOW_ASSERT(MF.data < MF.end); \
|
|
|
|
|
\
|
|
|
|
|
MINIFLOW_ASSERT((OFS) % 8 != 0); \
|
|
|
|
|
miniflow_set_map(MF, OFS / 8); \
|
|
|
|
|
\
|
|
|
|
|
memset((uint8_t *)MF.data, 0, (OFS) % 8); \
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_push_be16_(MF, OFS, VALUE) \
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_uint16_(MF, OFS, (OVS_FORCE uint16_t)VALUE);
|
|
|
|
|
|
2016-01-20 15:15:00 +09:00
|
|
|
|
#define miniflow_push_be8_(MF, OFS, VALUE) \
|
|
|
|
|
miniflow_push_uint8_(MF, OFS, (OVS_FORCE uint8_t)VALUE);
|
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
#define miniflow_set_maps(MF, OFS, N_WORDS) \
|
|
|
|
|
{ \
|
|
|
|
|
size_t ofs = (OFS); \
|
|
|
|
|
size_t n_words = (N_WORDS); \
|
|
|
|
|
\
|
|
|
|
|
MINIFLOW_ASSERT(n_words && MF.data + n_words <= MF.end); \
|
|
|
|
|
ASSERT_FLOWMAP_NOT_SET(&MF.map, ofs); \
|
|
|
|
|
flowmap_set(&MF.map, ofs, n_words); \
|
2015-07-17 15:18:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* Data at 'valuep' may be unaligned. */
|
|
|
|
|
#define miniflow_push_words_(MF, OFS, VALUEP, N_WORDS) \
|
|
|
|
|
{ \
|
2015-07-17 15:18:43 -07:00
|
|
|
|
MINIFLOW_ASSERT((OFS) % 8 == 0); \
|
|
|
|
|
miniflow_set_maps(MF, (OFS) / 8, (N_WORDS)); \
|
|
|
|
|
memcpy(MF.data, (VALUEP), (N_WORDS) * sizeof *MF.data); \
|
|
|
|
|
MF.data += (N_WORDS); \
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* Push 32-bit words padded to 64-bits. */
|
|
|
|
|
#define miniflow_push_words_32_(MF, OFS, VALUEP, N_WORDS) \
|
|
|
|
|
{ \
|
2015-07-17 15:18:43 -07:00
|
|
|
|
miniflow_set_maps(MF, (OFS) / 8, DIV_ROUND_UP(N_WORDS, 2)); \
|
2015-01-06 11:10:42 -08:00
|
|
|
|
memcpy(MF.data, (VALUEP), (N_WORDS) * sizeof(uint32_t)); \
|
|
|
|
|
MF.data += DIV_ROUND_UP(N_WORDS, 2); \
|
|
|
|
|
if ((N_WORDS) & 1) { \
|
|
|
|
|
*((uint32_t *)MF.data - 1) = 0; \
|
|
|
|
|
} \
|
|
|
|
|
}
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* Data at 'valuep' may be unaligned. */
|
|
|
|
|
/* MACs start 64-aligned, and must be followed by other data or padding. */
|
|
|
|
|
#define miniflow_push_macs_(MF, OFS, VALUEP) \
|
|
|
|
|
{ \
|
2015-07-17 15:18:43 -07:00
|
|
|
|
miniflow_set_maps(MF, (OFS) / 8, 2); \
|
2015-01-06 11:10:42 -08:00
|
|
|
|
memcpy(MF.data, (VALUEP), 2 * ETH_ADDR_LEN); \
|
|
|
|
|
MF.data += 1; /* First word only. */ \
|
|
|
|
|
}
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_push_uint32(MF, FIELD, VALUE) \
|
|
|
|
|
miniflow_push_uint32_(MF, offsetof(struct flow, FIELD), VALUE)
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_push_be32(MF, FIELD, VALUE) \
|
|
|
|
|
miniflow_push_be32_(MF, offsetof(struct flow, FIELD), VALUE)
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_push_uint16(MF, FIELD, VALUE) \
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_uint16_(MF, offsetof(struct flow, FIELD), VALUE)
|
2013-02-08 15:29:57 -08:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_push_be16(MF, FIELD, VALUE) \
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_be16_(MF, offsetof(struct flow, FIELD), VALUE)
|
2013-02-08 15:29:57 -08:00
|
|
|
|
|
2016-01-20 15:15:00 +09:00
|
|
|
|
#define miniflow_push_uint8(MF, FIELD, VALUE) \
|
|
|
|
|
miniflow_push_uint8_(MF, offsetof(struct flow, FIELD), VALUE)
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_pad_to_64(MF, FIELD) \
|
2015-12-01 15:03:16 +09:00
|
|
|
|
miniflow_pad_to_64_(MF, OFFSETOFEND(struct flow, FIELD))
|
2015-01-06 11:10:42 -08:00
|
|
|
|
|
2016-01-20 15:15:01 +09:00
|
|
|
|
#define miniflow_pad_from_64(MF, FIELD) \
|
|
|
|
|
miniflow_pad_from_64_(MF, offsetof(struct flow, FIELD))
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
#define miniflow_push_words(MF, FIELD, VALUEP, N_WORDS) \
|
|
|
|
|
miniflow_push_words_(MF, offsetof(struct flow, FIELD), VALUEP, N_WORDS)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
#define miniflow_push_words_32(MF, FIELD, VALUEP, N_WORDS) \
|
|
|
|
|
miniflow_push_words_32_(MF, offsetof(struct flow, FIELD), VALUEP, N_WORDS)
|
|
|
|
|
|
|
|
|
|
#define miniflow_push_macs(MF, FIELD, VALUEP) \
|
|
|
|
|
miniflow_push_macs_(MF, offsetof(struct flow, FIELD), VALUEP)
|
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
/* Return the pointer to the miniflow data when called BEFORE the corresponding
|
|
|
|
|
* push. */
|
|
|
|
|
#define miniflow_pointer(MF, FIELD) \
|
|
|
|
|
(void *)((uint8_t *)MF.data + ((offsetof(struct flow, FIELD)) % 8))
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* Pulls the MPLS headers at '*datap' and returns the count of them. */
|
|
|
|
|
static inline int
|
2015-06-08 13:16:07 -07:00
|
|
|
|
parse_mpls(const void **datap, size_t *sizep)
|
2010-12-29 19:03:46 -08:00
|
|
|
|
{
|
2014-04-18 08:26:56 -07:00
|
|
|
|
const struct mpls_hdr *mh;
|
|
|
|
|
int count = 0;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
while ((mh = data_try_pull(datap, sizep, sizeof *mh))) {
|
|
|
|
|
count++;
|
|
|
|
|
if (mh->mpls_lse.lo & htons(1 << MPLS_BOS_SHIFT)) {
|
2010-12-29 19:03:46 -08:00
|
|
|
|
break;
|
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
2014-08-01 14:47:44 -07:00
|
|
|
|
return MIN(count, FLOW_MAX_MPLS_LABELS);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
2017-03-01 17:47:59 -05:00
|
|
|
|
/* passed vlan_hdrs arg must be at least size FLOW_MAX_VLAN_HEADERS. */
|
|
|
|
|
static inline ALWAYS_INLINE size_t
|
|
|
|
|
parse_vlan(const void **datap, size_t *sizep, union flow_vlan_hdr *vlan_hdrs)
|
2014-04-18 08:26:56 -07:00
|
|
|
|
{
|
2017-03-01 17:47:59 -05:00
|
|
|
|
const ovs_be16 *eth_type;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
data_pull(datap, sizep, ETH_ADDR_LEN * 2);
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
2017-03-01 17:47:59 -05:00
|
|
|
|
eth_type = *datap;
|
|
|
|
|
|
|
|
|
|
size_t n;
|
|
|
|
|
for (n = 0; eth_type_vlan(*eth_type) && n < flow_vlan_limit; n++) {
|
|
|
|
|
if (OVS_UNLIKELY(*sizep < sizeof(ovs_be32) + sizeof(ovs_be16))) {
|
|
|
|
|
break;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
|
2019-08-22 18:09:50 +08:00
|
|
|
|
memset(vlan_hdrs + n, 0, sizeof(union flow_vlan_hdr));
|
2017-03-01 17:47:59 -05:00
|
|
|
|
const ovs_16aligned_be32 *qp = data_pull(datap, sizep, sizeof *qp);
|
|
|
|
|
vlan_hdrs[n].qtag = get_16aligned_be32(qp);
|
|
|
|
|
vlan_hdrs[n].tci |= htons(VLAN_CFI);
|
|
|
|
|
eth_type = *datap;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
return n;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-15 22:07:25 -08:00
|
|
|
|
static inline ALWAYS_INLINE ovs_be16
|
2015-06-08 13:16:07 -07:00
|
|
|
|
parse_ethertype(const void **datap, size_t *sizep)
|
2011-03-02 15:12:48 -08:00
|
|
|
|
{
|
2014-04-18 08:26:56 -07:00
|
|
|
|
const struct llc_snap_header *llc;
|
|
|
|
|
ovs_be16 proto;
|
2014-03-25 15:26:23 -07:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
proto = *(ovs_be16 *) data_pull(datap, sizep, sizeof proto);
|
|
|
|
|
if (OVS_LIKELY(ntohs(proto) >= ETH_TYPE_MIN)) {
|
|
|
|
|
return proto;
|
2011-03-02 15:12:48 -08:00
|
|
|
|
}
|
2014-03-25 15:26:23 -07:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
if (OVS_UNLIKELY(*sizep < sizeof *llc)) {
|
|
|
|
|
return htons(FLOW_DL_TYPE_NONE);
|
2011-03-02 15:12:48 -08:00
|
|
|
|
}
|
2014-03-25 15:26:23 -07:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
llc = *datap;
|
|
|
|
|
if (OVS_UNLIKELY(llc->llc.llc_dsap != LLC_DSAP_SNAP
|
|
|
|
|
|| llc->llc.llc_ssap != LLC_SSAP_SNAP
|
|
|
|
|
|| llc->llc.llc_cntl != LLC_CNTL_SNAP
|
|
|
|
|
|| memcmp(llc->snap.snap_org, SNAP_ORG_ETHERNET,
|
|
|
|
|
sizeof llc->snap.snap_org))) {
|
|
|
|
|
return htons(FLOW_DL_TYPE_NONE);
|
2013-08-22 20:24:44 +12:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
data_pull(datap, sizep, sizeof *llc);
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
if (OVS_LIKELY(ntohs(llc->snap.snap_type) >= ETH_TYPE_MIN)) {
|
|
|
|
|
return llc->snap.snap_type;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
return htons(FLOW_DL_TYPE_NONE);
|
|
|
|
|
}
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
2025-02-08 22:12:24 +01:00
|
|
|
|
static inline bool
|
|
|
|
|
icmp6_is_nd(const struct icmp6_data_header *icmp6)
|
|
|
|
|
{
|
|
|
|
|
return (icmp6->icmp6_base.icmp6_code == 0 &&
|
|
|
|
|
(icmp6->icmp6_base.icmp6_type == ND_NEIGHBOR_SOLICIT ||
|
|
|
|
|
icmp6->icmp6_base.icmp6_type == ND_NEIGHBOR_ADVERT));
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
/* Returns 'true' if the packet is an ND packet. In that case the '*nd_target'
|
2019-01-28 11:41:06 +00:00
|
|
|
|
* and 'arp_buf[]' are filled in. If the packet is not an ND packet, 'false'
|
|
|
|
|
* is returned and no values are filled in on '*nd_target' or 'arp_buf[]'. */
|
2017-03-08 17:18:23 -08:00
|
|
|
|
static inline bool
|
2019-10-01 18:18:23 +03:00
|
|
|
|
parse_icmpv6(const void **datap, size_t *sizep,
|
|
|
|
|
const struct icmp6_data_header *icmp6,
|
2024-07-16 13:45:53 +02:00
|
|
|
|
ovs_be32 *rso_flags,
|
|
|
|
|
const union ovs_16aligned_in6_addr **nd_target,
|
2019-01-28 11:41:06 +00:00
|
|
|
|
struct eth_addr arp_buf[2], uint8_t *opt_type)
|
2014-04-18 08:26:56 -07:00
|
|
|
|
{
|
2025-02-08 22:12:24 +01:00
|
|
|
|
if (!icmp6_is_nd(icmp6)) {
|
2017-03-08 17:18:23 -08:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
arp_buf[0] = eth_addr_zero;
|
|
|
|
|
arp_buf[1] = eth_addr_zero;
|
2019-01-28 11:41:06 +00:00
|
|
|
|
*opt_type = 0;
|
|
|
|
|
|
2019-10-01 18:18:23 +03:00
|
|
|
|
*rso_flags = get_16aligned_be32(icmp6->icmp6_data.be32);
|
2019-01-28 11:41:06 +00:00
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
*nd_target = data_try_pull(datap, sizep, sizeof **nd_target);
|
|
|
|
|
if (OVS_UNLIKELY(!*nd_target)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
while (*sizep >= 8) {
|
|
|
|
|
/* The minimum size of an option is 8 bytes, which also is
|
|
|
|
|
* the size of Ethernet link-layer options. */
|
2017-05-04 20:42:54 +05:30
|
|
|
|
const struct ovs_nd_lla_opt *lla_opt = *datap;
|
|
|
|
|
int opt_len = lla_opt->len * ND_LLA_OPT_LEN;
|
2011-03-02 15:12:48 -08:00
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (!opt_len || opt_len > *sizep) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
/* Store the link layer address if the appropriate option is
|
|
|
|
|
* provided. It is considered an error if the same link
|
|
|
|
|
* layer option is specified twice. */
|
2017-05-04 20:42:54 +05:30
|
|
|
|
if (lla_opt->type == ND_OPT_SOURCE_LINKADDR && opt_len == 8) {
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (OVS_LIKELY(eth_addr_is_zero(arp_buf[0]))) {
|
2017-05-04 20:42:54 +05:30
|
|
|
|
arp_buf[0] = lla_opt->mac;
|
2019-01-28 11:41:06 +00:00
|
|
|
|
/* We use only first option type present in ND packet. */
|
|
|
|
|
if (*opt_type == 0) {
|
|
|
|
|
*opt_type = lla_opt->type;
|
|
|
|
|
}
|
2017-03-08 17:18:23 -08:00
|
|
|
|
} else {
|
|
|
|
|
goto invalid;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
}
|
2017-05-04 20:42:54 +05:30
|
|
|
|
} else if (lla_opt->type == ND_OPT_TARGET_LINKADDR && opt_len == 8) {
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (OVS_LIKELY(eth_addr_is_zero(arp_buf[1]))) {
|
2017-05-04 20:42:54 +05:30
|
|
|
|
arp_buf[1] = lla_opt->mac;
|
2019-01-28 11:41:06 +00:00
|
|
|
|
/* We use only first option type present in ND packet. */
|
|
|
|
|
if (*opt_type == 0) {
|
|
|
|
|
*opt_type = lla_opt->type;
|
|
|
|
|
}
|
2017-03-08 17:18:23 -08:00
|
|
|
|
} else {
|
|
|
|
|
goto invalid;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (OVS_UNLIKELY(!data_try_pull(datap, sizep, opt_len))) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
|
|
|
|
invalid:
|
2015-08-13 16:55:32 +09:00
|
|
|
|
*nd_target = NULL;
|
2015-08-28 14:55:11 -07:00
|
|
|
|
arp_buf[0] = eth_addr_zero;
|
|
|
|
|
arp_buf[1] = eth_addr_zero;
|
2017-03-08 17:18:23 -08:00
|
|
|
|
return true;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-15 22:07:25 -08:00
|
|
|
|
static inline bool
|
|
|
|
|
parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto,
|
2019-02-13 15:34:15 -08:00
|
|
|
|
uint8_t *nw_frag,
|
2023-03-29 14:51:16 +09:00
|
|
|
|
const struct ovs_16aligned_ip6_frag **frag_hdr,
|
|
|
|
|
const struct ip6_rt_hdr **rt_hdr)
|
2015-11-15 22:07:25 -08:00
|
|
|
|
{
|
2023-03-29 14:51:16 +09:00
|
|
|
|
if (frag_hdr) {
|
|
|
|
|
*frag_hdr = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (rt_hdr) {
|
|
|
|
|
*rt_hdr = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-15 22:07:25 -08:00
|
|
|
|
while (1) {
|
|
|
|
|
if (OVS_LIKELY((*nw_proto != IPPROTO_HOPOPTS)
|
|
|
|
|
&& (*nw_proto != IPPROTO_ROUTING)
|
|
|
|
|
&& (*nw_proto != IPPROTO_DSTOPTS)
|
|
|
|
|
&& (*nw_proto != IPPROTO_AH)
|
|
|
|
|
&& (*nw_proto != IPPROTO_FRAGMENT))) {
|
|
|
|
|
/* It's either a terminal header (e.g., TCP, UDP) or one we
|
|
|
|
|
* don't understand. In either case, we're done with the
|
|
|
|
|
* packet, so use it to fill in 'nw_proto'. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We only verify that at least 8 bytes of the next header are
|
|
|
|
|
* available, but many of these headers are longer. Ensure that
|
|
|
|
|
* accesses within the extension header are within those first 8
|
|
|
|
|
* bytes. All extension headers are required to be at least 8
|
|
|
|
|
* bytes. */
|
|
|
|
|
if (OVS_UNLIKELY(*sizep < 8)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((*nw_proto == IPPROTO_HOPOPTS)
|
|
|
|
|
|| (*nw_proto == IPPROTO_DSTOPTS)) {
|
|
|
|
|
/* These headers, while different, have the fields we care
|
|
|
|
|
* about in the same location and with the same
|
|
|
|
|
* interpretation. */
|
|
|
|
|
const struct ip6_ext *ext_hdr = *datap;
|
|
|
|
|
*nw_proto = ext_hdr->ip6e_nxt;
|
|
|
|
|
if (OVS_UNLIKELY(!data_try_pull(datap, sizep,
|
|
|
|
|
(ext_hdr->ip6e_len + 1) * 8))) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2023-03-29 14:51:16 +09:00
|
|
|
|
} else if (*nw_proto == IPPROTO_ROUTING) {
|
|
|
|
|
const struct ip6_rt_hdr *tmp;
|
|
|
|
|
if (!rt_hdr) {
|
|
|
|
|
rt_hdr = &tmp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*rt_hdr = *datap;
|
|
|
|
|
*nw_proto = (*rt_hdr)->nexthdr;
|
|
|
|
|
if (OVS_UNLIKELY(!data_try_pull(datap, sizep,
|
|
|
|
|
((*rt_hdr)->hdrlen + 1) * 8))) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2015-11-15 22:07:25 -08:00
|
|
|
|
} else if (*nw_proto == IPPROTO_AH) {
|
|
|
|
|
/* A standard AH definition isn't available, but the fields
|
|
|
|
|
* we care about are in the same location as the generic
|
|
|
|
|
* option header--only the header length is calculated
|
|
|
|
|
* differently. */
|
|
|
|
|
const struct ip6_ext *ext_hdr = *datap;
|
|
|
|
|
*nw_proto = ext_hdr->ip6e_nxt;
|
|
|
|
|
if (OVS_UNLIKELY(!data_try_pull(datap, sizep,
|
|
|
|
|
(ext_hdr->ip6e_len + 2) * 4))) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
} else if (*nw_proto == IPPROTO_FRAGMENT) {
|
2023-03-29 14:51:16 +09:00
|
|
|
|
const struct ovs_16aligned_ip6_frag *tmp;
|
|
|
|
|
if (!frag_hdr) {
|
|
|
|
|
frag_hdr = &tmp;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-13 15:34:15 -08:00
|
|
|
|
*frag_hdr = *datap;
|
2015-11-15 22:07:25 -08:00
|
|
|
|
|
2019-02-13 15:34:15 -08:00
|
|
|
|
*nw_proto = (*frag_hdr)->ip6f_nxt;
|
|
|
|
|
if (!data_try_pull(datap, sizep, sizeof **frag_hdr)) {
|
2015-11-15 22:07:25 -08:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We only process the first fragment. */
|
2019-02-13 15:34:15 -08:00
|
|
|
|
if ((*frag_hdr)->ip6f_offlg != htons(0)) {
|
2015-11-15 22:07:25 -08:00
|
|
|
|
*nw_frag = FLOW_NW_FRAG_ANY;
|
2019-02-13 15:34:15 -08:00
|
|
|
|
if (((*frag_hdr)->ip6f_offlg & IP6F_OFF_MASK) != htons(0)) {
|
2015-11-15 22:07:25 -08:00
|
|
|
|
*nw_frag |= FLOW_NW_FRAG_LATER;
|
|
|
|
|
*nw_proto = IPPROTO_FRAGMENT;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-13 15:34:15 -08:00
|
|
|
|
/* Parses IPv6 extension headers until a terminal header (or header we
|
|
|
|
|
* don't understand) is found. 'datap' points to the first extension
|
|
|
|
|
* header and advances as parsing occurs; 'sizep' is the remaining size
|
|
|
|
|
* and is decreased accordingly. 'nw_proto' starts as the first
|
|
|
|
|
* extension header to process and is updated as the extension headers
|
|
|
|
|
* are parsed.
|
|
|
|
|
*
|
|
|
|
|
* If a fragment header is found, '*frag_hdr' is set to the fragment
|
|
|
|
|
* header and otherwise set to NULL. If it is the first fragment,
|
|
|
|
|
* extension header parsing otherwise continues as usual. If it's not
|
|
|
|
|
* the first fragment, 'nw_proto' is set to IPPROTO_FRAGMENT and 'nw_frag'
|
|
|
|
|
* has FLOW_NW_FRAG_LATER set. Both first and later fragments have
|
|
|
|
|
* FLOW_NW_FRAG_ANY set in 'nw_frag'.
|
|
|
|
|
*
|
2023-03-29 14:51:16 +09:00
|
|
|
|
* If a routing header is found, '*rt_hdr' is set to the routing
|
|
|
|
|
* header and otherwise set to NULL.
|
|
|
|
|
*
|
2019-02-13 15:34:15 -08:00
|
|
|
|
* A return value of false indicates that there was a problem parsing
|
|
|
|
|
* the extension headers.*/
|
2015-11-15 22:07:25 -08:00
|
|
|
|
bool
|
|
|
|
|
parse_ipv6_ext_hdrs(const void **datap, size_t *sizep, uint8_t *nw_proto,
|
2019-02-13 15:34:15 -08:00
|
|
|
|
uint8_t *nw_frag,
|
2023-03-29 14:51:16 +09:00
|
|
|
|
const struct ovs_16aligned_ip6_frag **frag_hdr,
|
|
|
|
|
const struct ip6_rt_hdr **rt_hdr)
|
2015-11-15 22:07:25 -08:00
|
|
|
|
{
|
2019-02-13 15:34:15 -08:00
|
|
|
|
return parse_ipv6_ext_hdrs__(datap, sizep, nw_proto, nw_frag,
|
2023-03-29 14:51:16 +09:00
|
|
|
|
frag_hdr, rt_hdr);
|
2015-11-15 22:07:25 -08:00
|
|
|
|
}
|
|
|
|
|
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
bool
|
2018-01-11 13:24:01 +08:00
|
|
|
|
parse_nsh(const void **datap, size_t *sizep, struct ovs_key_nsh *key)
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
{
|
|
|
|
|
const struct nsh_hdr *nsh = (const struct nsh_hdr *) *datap;
|
2018-01-11 13:24:01 +08:00
|
|
|
|
uint8_t version, length, flags, ttl;
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
|
|
|
|
|
/* Check if it is long enough for NSH header, doesn't support
|
|
|
|
|
* MD type 2 yet
|
|
|
|
|
*/
|
2017-11-07 15:48:39 +01:00
|
|
|
|
if (OVS_UNLIKELY(*sizep < NSH_BASE_HDR_LEN)) {
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-06 13:47:51 +08:00
|
|
|
|
version = nsh_get_ver(nsh);
|
|
|
|
|
flags = nsh_get_flags(nsh);
|
|
|
|
|
length = nsh_hdr_len(nsh);
|
2018-01-11 13:24:01 +08:00
|
|
|
|
ttl = nsh_get_ttl(nsh);
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
|
2018-01-06 13:47:51 +08:00
|
|
|
|
if (OVS_UNLIKELY(length > *sizep || version != 0)) {
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
key->flags = flags;
|
2018-01-11 13:24:01 +08:00
|
|
|
|
key->ttl = ttl;
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
key->mdtype = nsh->md_type;
|
|
|
|
|
key->np = nsh->next_proto;
|
2018-01-11 13:24:01 +08:00
|
|
|
|
key->path_hdr = nsh_get_path_hdr(nsh);
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
|
|
|
|
|
switch (key->mdtype) {
|
|
|
|
|
case NSH_M_TYPE1:
|
2017-11-07 15:48:39 +01:00
|
|
|
|
if (length != NSH_M_TYPE1_LEN) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
for (size_t i = 0; i < 4; i++) {
|
2018-01-06 13:47:51 +08:00
|
|
|
|
key->context[i] = get_16aligned_be32(&nsh->md1.context[i]);
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case NSH_M_TYPE2:
|
2018-01-06 13:47:51 +08:00
|
|
|
|
/* Don't support MD type 2 metedata parsing yet */
|
|
|
|
|
if (length < NSH_BASE_HDR_LEN) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
memset(key->context, 0, sizeof(key->context));
|
|
|
|
|
break;
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
default:
|
2017-11-07 15:48:39 +01:00
|
|
|
|
/* We don't parse other context headers yet. */
|
2018-10-04 14:23:39 -07:00
|
|
|
|
memset(key->context, 0, sizeof(key->context));
|
2017-11-07 15:48:39 +01:00
|
|
|
|
break;
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data_pull(datap, sizep, length);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-28 09:49:01 -07:00
|
|
|
|
/* This does the same thing as miniflow_extract() with a full-size 'flow' as
|
|
|
|
|
* the destination. */
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
|
flow_extract(struct dp_packet *packet, struct flow *flow)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2014-04-29 15:50:39 -07:00
|
|
|
|
struct {
|
|
|
|
|
struct miniflow mf;
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t buf[FLOW_U64S];
|
2014-04-29 15:50:39 -07:00
|
|
|
|
} m;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
COVERAGE_INC(flow_extract);
|
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
miniflow_extract(packet, &m.mf);
|
2014-04-29 15:50:39 -07:00
|
|
|
|
miniflow_expand(&m.mf, flow);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
2012-09-13 20:11:08 -07:00
|
|
|
|
|
2018-06-25 16:21:04 +03:00
|
|
|
|
static inline bool
|
|
|
|
|
ipv4_sanity_check(const struct ip_header *nh, size_t size,
|
|
|
|
|
int *ip_lenp, uint16_t *tot_lenp)
|
|
|
|
|
{
|
|
|
|
|
int ip_len;
|
|
|
|
|
uint16_t tot_len;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(size < IP_HEADER_LEN)) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_INC(miniflow_extract_ipv4_pkt_too_short);
|
2018-06-25 16:21:04 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
ip_len = IP_IHL(nh->ip_ihl_ver) * 4;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(ip_len < IP_HEADER_LEN || size < ip_len)) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_INC(miniflow_extract_ipv4_pkt_len_error);
|
2018-06-25 16:21:04 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tot_len = ntohs(nh->ip_tot_len);
|
|
|
|
|
if (OVS_UNLIKELY(tot_len > size || ip_len > tot_len ||
|
2020-10-26 16:03:19 -03:00
|
|
|
|
size - tot_len > UINT16_MAX)) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_INC(miniflow_extract_ipv4_pkt_len_error);
|
2018-06-25 16:21:04 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*ip_lenp = ip_len;
|
|
|
|
|
*tot_lenp = tot_len;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint8_t
|
|
|
|
|
ipv4_get_nw_frag(const struct ip_header *nh)
|
|
|
|
|
{
|
|
|
|
|
uint8_t nw_frag = 0;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(IP_IS_FRAGMENT(nh->ip_frag_off))) {
|
|
|
|
|
nw_frag = FLOW_NW_FRAG_ANY;
|
|
|
|
|
if (nh->ip_frag_off & htons(IP_FRAG_OFF_MASK)) {
|
|
|
|
|
nw_frag |= FLOW_NW_FRAG_LATER;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nw_frag;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool
|
|
|
|
|
ipv6_sanity_check(const struct ovs_16aligned_ip6_hdr *nh, size_t size)
|
|
|
|
|
{
|
|
|
|
|
uint16_t plen;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(size < sizeof *nh)) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_INC(miniflow_extract_ipv6_pkt_too_short);
|
2018-06-25 16:21:04 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
plen = ntohs(nh->ip6_plen);
|
2018-07-09 13:04:03 -07:00
|
|
|
|
if (OVS_UNLIKELY(plen + IPV6_HEADER_LEN > size)) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_INC(miniflow_extract_ipv6_pkt_len_error);
|
2018-06-25 16:21:04 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2020-10-26 16:03:19 -03:00
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(size - (plen + IPV6_HEADER_LEN) > UINT16_MAX)) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
COVERAGE_INC(miniflow_extract_ipv6_pkt_len_error);
|
2018-06-25 16:21:04 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-16 14:06:31 +02:00
|
|
|
|
static void
|
|
|
|
|
dump_invalid_packet(struct dp_packet *packet, const char *reason)
|
|
|
|
|
{
|
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
|
|
if (VLOG_DROP_DBG(&rl)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
size = dp_packet_size(packet);
|
|
|
|
|
ds_put_hex_dump(&ds, dp_packet_data(packet), size, 0, false);
|
|
|
|
|
VLOG_DBG("invalid packet for %s: port %"PRIu32", size %"PRIuSIZE"\n%s",
|
|
|
|
|
reason, packet->md.in_port.odp_port, size, ds_cstr(&ds));
|
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-28 09:49:01 -07:00
|
|
|
|
/* Initializes 'dst' from 'packet' and 'md', taking the packet type into
|
|
|
|
|
* account. 'dst' must have enough space for FLOW_U64S * 8 bytes.
|
|
|
|
|
*
|
|
|
|
|
* Initializes the layer offsets as follows:
|
|
|
|
|
*
|
|
|
|
|
* - packet->l2_5_ofs to the
|
|
|
|
|
* * the start of the MPLS shim header. Can be zero, if the
|
|
|
|
|
* packet is of type (OFPHTN_ETHERTYPE, ETH_TYPE_MPLS).
|
|
|
|
|
* * UINT16_MAX when there is no MPLS shim header.
|
|
|
|
|
*
|
|
|
|
|
* - packet->l3_ofs is set to
|
|
|
|
|
* * zero if the packet_type is in name space OFPHTN_ETHERTYPE
|
|
|
|
|
* and there is no MPLS shim header.
|
|
|
|
|
* * just past the Ethernet header, or just past the vlan_header if
|
|
|
|
|
* one is present, to the first byte of the payload of the
|
|
|
|
|
* Ethernet frame if the packet type is Ethernet and there is
|
|
|
|
|
* no MPLS shim header.
|
|
|
|
|
* * just past the MPLS label stack to the first byte of the MPLS
|
|
|
|
|
* payload if there is at least one MPLS shim header.
|
|
|
|
|
* * UINT16_MAX if the packet type is Ethernet and the frame is
|
|
|
|
|
* too short to contain an Ethernet header.
|
|
|
|
|
*
|
|
|
|
|
* - packet->l4_ofs is set to just past the IPv4 or IPv6 header, if one is
|
|
|
|
|
* present and the packet has at least the content used for the fields
|
|
|
|
|
* of interest for the flow, otherwise UINT16_MAX.
|
|
|
|
|
*/
|
2014-04-18 08:26:56 -07:00
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
|
miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
|
2014-04-18 08:26:56 -07:00
|
|
|
|
{
|
2019-03-28 09:49:01 -07:00
|
|
|
|
/* Add code to this function (or its callees) to extract new fields. */
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2019-03-28 09:49:01 -07:00
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
const struct pkt_metadata *md = &packet->md;
|
2015-06-08 13:16:07 -07:00
|
|
|
|
const void *data = dp_packet_data(packet);
|
2015-02-22 03:21:09 -08:00
|
|
|
|
size_t size = dp_packet_size(packet);
|
2017-04-25 16:29:59 +00:00
|
|
|
|
ovs_be32 packet_type = packet->packet_type;
|
2015-07-16 17:42:24 -07:00
|
|
|
|
uint64_t *values = miniflow_values(dst);
|
2015-08-25 13:55:03 -07:00
|
|
|
|
struct mf_ctx mf = { FLOWMAP_EMPTY_INITIALIZER, values,
|
|
|
|
|
values + FLOW_U64S };
|
2017-04-25 16:29:59 +00:00
|
|
|
|
const char *frame;
|
|
|
|
|
ovs_be16 dl_type = OVS_BE16_MAX;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
uint8_t nw_frag, nw_tos, nw_ttl, nw_proto;
|
2017-03-08 17:18:23 -08:00
|
|
|
|
uint8_t *ct_nw_proto_p = NULL;
|
|
|
|
|
ovs_be16 ct_tp_src = 0, ct_tp_dst = 0;
|
2025-01-23 16:56:27 +01:00
|
|
|
|
bool tunneling;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
/* Metadata. */
|
2015-11-25 11:31:11 -02:00
|
|
|
|
if (flow_tnl_dst_is_set(&md->tunnel)) {
|
2015-02-22 03:21:09 -08:00
|
|
|
|
miniflow_push_words(mf, tunnel, &md->tunnel,
|
2015-06-12 12:49:23 -07:00
|
|
|
|
offsetof(struct flow_tnl, metadata) /
|
|
|
|
|
sizeof(uint64_t));
|
2015-06-29 18:01:59 -07:00
|
|
|
|
|
|
|
|
|
if (!(md->tunnel.flags & FLOW_TNL_F_UDPIF)) {
|
|
|
|
|
if (md->tunnel.metadata.present.map) {
|
|
|
|
|
miniflow_push_words(mf, tunnel.metadata, &md->tunnel.metadata,
|
|
|
|
|
sizeof md->tunnel.metadata /
|
|
|
|
|
sizeof(uint64_t));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (md->tunnel.metadata.present.len) {
|
|
|
|
|
miniflow_push_words(mf, tunnel.metadata.present,
|
|
|
|
|
&md->tunnel.metadata.present, 1);
|
|
|
|
|
miniflow_push_words(mf, tunnel.metadata.opts.gnv,
|
|
|
|
|
md->tunnel.metadata.opts.gnv,
|
|
|
|
|
DIV_ROUND_UP(md->tunnel.metadata.present.len,
|
|
|
|
|
sizeof(uint64_t)));
|
|
|
|
|
}
|
2015-06-12 12:49:23 -07:00
|
|
|
|
}
|
2015-02-22 03:21:09 -08:00
|
|
|
|
}
|
|
|
|
|
if (md->skb_priority || md->pkt_mark) {
|
|
|
|
|
miniflow_push_uint32(mf, skb_priority, md->skb_priority);
|
|
|
|
|
miniflow_push_uint32(mf, pkt_mark, md->pkt_mark);
|
|
|
|
|
}
|
|
|
|
|
miniflow_push_uint32(mf, dp_hash, md->dp_hash);
|
|
|
|
|
miniflow_push_uint32(mf, in_port, odp_to_u32(md->in_port.odp_port));
|
2017-06-05 06:34:33 -07:00
|
|
|
|
if (md->ct_state) {
|
2015-02-22 03:21:09 -08:00
|
|
|
|
miniflow_push_uint32(mf, recirc_id, md->recirc_id);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_push_uint8(mf, ct_state, md->ct_state);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
ct_nw_proto_p = miniflow_pointer(mf, ct_nw_proto);
|
|
|
|
|
miniflow_push_uint8(mf, ct_nw_proto, 0);
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
miniflow_push_uint16(mf, ct_zone, md->ct_zone);
|
Add connection tracking mark support.
This patch adds a new 32-bit metadata field to the connection tracking
interface. When a mark is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_mark" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a mark with those
connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_mark)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_mark=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-09-18 13:58:00 -07:00
|
|
|
|
miniflow_push_uint32(mf, ct_mark, md->ct_mark);
|
2017-04-25 16:29:59 +00:00
|
|
|
|
miniflow_push_be32(mf, packet_type, packet_type);
|
2016-05-03 18:20:51 -07:00
|
|
|
|
if (!ovs_u128_is_zero(md->ct_label)) {
|
Add connection tracking label support.
This patch adds a new 128-bit metadata field to the connection tracking
interface. When a label is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_label" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a label with
those connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_label)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_label=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-10-13 11:13:10 -07:00
|
|
|
|
miniflow_push_words(mf, ct_label, &md->ct_label,
|
|
|
|
|
sizeof md->ct_label / sizeof(uint64_t));
|
|
|
|
|
}
|
2017-04-25 16:29:59 +00:00
|
|
|
|
} else {
|
2019-08-27 13:21:08 -05:00
|
|
|
|
if (md->recirc_id) {
|
|
|
|
|
miniflow_push_uint32(mf, recirc_id, md->recirc_id);
|
|
|
|
|
miniflow_pad_to_64(mf, recirc_id);
|
|
|
|
|
}
|
2017-04-25 16:29:59 +00:00
|
|
|
|
miniflow_pad_from_64(mf, packet_type);
|
|
|
|
|
miniflow_push_be32(mf, packet_type, packet_type);
|
Add connection tracking mark support.
This patch adds a new 32-bit metadata field to the connection tracking
interface. When a mark is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_mark" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a mark with those
connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_mark)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_mark=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-09-18 13:58:00 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* Initialize packet's layer pointer and offsets. */
|
2017-04-25 16:29:59 +00:00
|
|
|
|
frame = data;
|
2025-01-23 16:56:27 +01:00
|
|
|
|
tunneling = dp_packet_hwol_is_tunnel(packet);
|
|
|
|
|
if (tunneling) {
|
|
|
|
|
/* Preserve inner offsets from previous circulation. */
|
|
|
|
|
dp_packet_reset_outer_offsets(packet);
|
|
|
|
|
} else {
|
|
|
|
|
dp_packet_reset_offsets(packet);
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2017-04-25 16:29:59 +00:00
|
|
|
|
if (packet_type == htonl(PT_ETH)) {
|
|
|
|
|
/* Must have full Ethernet header to proceed. */
|
|
|
|
|
if (OVS_UNLIKELY(size < sizeof(struct eth_header))) {
|
|
|
|
|
goto out;
|
|
|
|
|
} else {
|
|
|
|
|
/* Link layer. */
|
|
|
|
|
ASSERT_SEQUENTIAL(dl_dst, dl_src);
|
|
|
|
|
miniflow_push_macs(mf, dl_dst, data);
|
|
|
|
|
|
|
|
|
|
/* VLAN */
|
|
|
|
|
union flow_vlan_hdr vlans[FLOW_MAX_VLAN_HEADERS];
|
|
|
|
|
size_t num_vlans = parse_vlan(&data, &size, vlans);
|
|
|
|
|
|
|
|
|
|
dl_type = parse_ethertype(&data, &size);
|
|
|
|
|
miniflow_push_be16(mf, dl_type, dl_type);
|
|
|
|
|
miniflow_pad_to_64(mf, dl_type);
|
|
|
|
|
if (num_vlans > 0) {
|
|
|
|
|
miniflow_push_words_32(mf, vlans, vlans, num_vlans);
|
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
|
2017-04-25 16:29:59 +00:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
/* Take dl_type from packet_type. */
|
|
|
|
|
dl_type = pt_ns_type_be(packet_type);
|
|
|
|
|
miniflow_pad_from_64(mf, dl_type);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_be16(mf, dl_type, dl_type);
|
2017-04-25 16:29:59 +00:00
|
|
|
|
/* Do not push vlan_tci, pad instead */
|
2017-03-01 17:47:59 -05:00
|
|
|
|
miniflow_pad_to_64(mf, dl_type);
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* Parse mpls. */
|
|
|
|
|
if (OVS_UNLIKELY(eth_type_mpls(dl_type))) {
|
|
|
|
|
int count;
|
|
|
|
|
const void *mpls = data;
|
|
|
|
|
|
2017-04-25 16:29:59 +00:00
|
|
|
|
packet->l2_5_ofs = (char *)data - frame;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
count = parse_mpls(&data, &size);
|
2015-01-06 11:10:42 -08:00
|
|
|
|
miniflow_push_words_32(mf, mpls_lse, mpls, count);
|
2013-01-25 16:22:07 +09:00
|
|
|
|
}
|
|
|
|
|
|
2012-12-27 14:23:09 +09:00
|
|
|
|
/* Network layer. */
|
2017-04-25 16:29:59 +00:00
|
|
|
|
packet->l3_ofs = (char *)data - frame;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
nw_frag = 0;
|
|
|
|
|
if (OVS_LIKELY(dl_type == htons(ETH_TYPE_IP))) {
|
|
|
|
|
const struct ip_header *nh = data;
|
|
|
|
|
int ip_len;
|
2014-11-05 10:10:13 -08:00
|
|
|
|
uint16_t tot_len;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
2018-06-25 16:21:04 +03:00
|
|
|
|
if (OVS_UNLIKELY(!ipv4_sanity_check(nh, size, &ip_len, &tot_len))) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
if (OVS_UNLIKELY(VLOG_IS_DBG_ENABLED())) {
|
|
|
|
|
dump_invalid_packet(packet, "ipv4_sanity_check");
|
|
|
|
|
}
|
2014-11-05 10:10:13 -08:00
|
|
|
|
goto out;
|
|
|
|
|
}
|
2015-02-22 03:21:09 -08:00
|
|
|
|
dp_packet_set_l2_pad_size(packet, size - tot_len);
|
2014-11-05 10:10:13 -08:00
|
|
|
|
size = tot_len; /* Never pull padding. */
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
/* Push both source and destination address at once. */
|
2015-01-06 11:10:42 -08:00
|
|
|
|
miniflow_push_words(mf, nw_src, &nh->ip_src, 1);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (ct_nw_proto_p && !md->ct_orig_tuple_ipv6) {
|
|
|
|
|
*ct_nw_proto_p = md->ct_orig_tuple.ipv4.ipv4_proto;
|
|
|
|
|
if (*ct_nw_proto_p) {
|
|
|
|
|
miniflow_push_words(mf, ct_nw_src,
|
|
|
|
|
&md->ct_orig_tuple.ipv4.ipv4_src, 1);
|
|
|
|
|
ct_tp_src = md->ct_orig_tuple.ipv4.src_port;
|
|
|
|
|
ct_tp_dst = md->ct_orig_tuple.ipv4.dst_port;
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-01-06 11:10:42 -08:00
|
|
|
|
|
|
|
|
|
miniflow_push_be32(mf, ipv6_label, 0); /* Padding for IPv4. */
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
nw_tos = nh->ip_tos;
|
|
|
|
|
nw_ttl = nh->ip_ttl;
|
|
|
|
|
nw_proto = nh->ip_proto;
|
2018-06-25 16:21:04 +03:00
|
|
|
|
nw_frag = ipv4_get_nw_frag(nh);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
data_pull(&data, &size, ip_len);
|
2025-01-23 16:56:27 +01:00
|
|
|
|
if (tunneling) {
|
|
|
|
|
dp_packet_hwol_set_tx_outer_ipv4(packet);
|
|
|
|
|
if (dp_packet_ip_checksum_good(packet)) {
|
|
|
|
|
dp_packet_hwol_set_tx_outer_ipv4_csum(packet);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
dp_packet_hwol_set_tx_ipv4(packet);
|
|
|
|
|
if (dp_packet_ip_checksum_good(packet)) {
|
|
|
|
|
dp_packet_hwol_set_tx_ip_csum(packet);
|
|
|
|
|
}
|
2023-06-14 15:03:26 -04:00
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
|
2018-06-25 16:21:04 +03:00
|
|
|
|
const struct ovs_16aligned_ip6_hdr *nh = data;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
ovs_be32 tc_flow;
|
2014-11-05 10:10:13 -08:00
|
|
|
|
uint16_t plen;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
2018-06-25 16:21:04 +03:00
|
|
|
|
if (OVS_UNLIKELY(!ipv6_sanity_check(nh, size))) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
if (OVS_UNLIKELY(VLOG_IS_DBG_ENABLED())) {
|
|
|
|
|
dump_invalid_packet(packet, "ipv6_sanity_check");
|
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
goto out;
|
|
|
|
|
}
|
2018-06-25 16:21:04 +03:00
|
|
|
|
data_pull(&data, &size, sizeof *nh);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
2025-01-23 16:56:27 +01:00
|
|
|
|
if (tunneling) {
|
|
|
|
|
dp_packet_hwol_set_tx_outer_ipv6(packet);
|
|
|
|
|
} else {
|
|
|
|
|
dp_packet_hwol_set_tx_ipv6(packet);
|
|
|
|
|
}
|
2014-11-05 10:10:13 -08:00
|
|
|
|
plen = ntohs(nh->ip6_plen);
|
2015-02-22 03:21:09 -08:00
|
|
|
|
dp_packet_set_l2_pad_size(packet, size - plen);
|
2014-11-05 10:10:13 -08:00
|
|
|
|
size = plen; /* Never pull padding. */
|
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_words(mf, ipv6_src, &nh->ip6_src,
|
2015-01-06 11:10:42 -08:00
|
|
|
|
sizeof nh->ip6_src / 8);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_words(mf, ipv6_dst, &nh->ip6_dst,
|
2015-01-06 11:10:42 -08:00
|
|
|
|
sizeof nh->ip6_dst / 8);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (ct_nw_proto_p && md->ct_orig_tuple_ipv6) {
|
|
|
|
|
*ct_nw_proto_p = md->ct_orig_tuple.ipv6.ipv6_proto;
|
|
|
|
|
if (*ct_nw_proto_p) {
|
|
|
|
|
miniflow_push_words(mf, ct_ipv6_src,
|
|
|
|
|
&md->ct_orig_tuple.ipv6.ipv6_src,
|
|
|
|
|
2 *
|
|
|
|
|
sizeof md->ct_orig_tuple.ipv6.ipv6_src / 8);
|
|
|
|
|
ct_tp_src = md->ct_orig_tuple.ipv6.src_port;
|
|
|
|
|
ct_tp_dst = md->ct_orig_tuple.ipv6.dst_port;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
tc_flow = get_16aligned_be32(&nh->ip6_flow);
|
|
|
|
|
nw_tos = ntohl(tc_flow) >> 20;
|
|
|
|
|
nw_ttl = nh->ip6_hlim;
|
|
|
|
|
nw_proto = nh->ip6_nxt;
|
|
|
|
|
|
2023-03-29 14:51:16 +09:00
|
|
|
|
if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag,
|
|
|
|
|
NULL, NULL)) {
|
2015-11-15 22:07:25 -08:00
|
|
|
|
goto out;
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
}
|
2018-09-21 11:25:55 -07:00
|
|
|
|
|
|
|
|
|
/* This needs to be after the parse_ipv6_ext_hdrs__() call because it
|
|
|
|
|
* leaves the nw_frag word uninitialized. */
|
|
|
|
|
ASSERT_SEQUENTIAL(ipv6_label, nw_frag);
|
|
|
|
|
ovs_be32 label = tc_flow & htonl(IPV6_LABEL_MASK);
|
|
|
|
|
miniflow_push_be32(mf, ipv6_label, label);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
} else {
|
|
|
|
|
if (dl_type == htons(ETH_TYPE_ARP) ||
|
|
|
|
|
dl_type == htons(ETH_TYPE_RARP)) {
|
2015-08-28 14:55:11 -07:00
|
|
|
|
struct eth_addr arp_buf[2];
|
2014-04-18 08:26:56 -07:00
|
|
|
|
const struct arp_eth_header *arp = (const struct arp_eth_header *)
|
|
|
|
|
data_try_pull(&data, &size, ARP_ETH_HEADER_LEN);
|
|
|
|
|
|
|
|
|
|
if (OVS_LIKELY(arp) && OVS_LIKELY(arp->ar_hrd == htons(1))
|
|
|
|
|
&& OVS_LIKELY(arp->ar_pro == htons(ETH_TYPE_IP))
|
|
|
|
|
&& OVS_LIKELY(arp->ar_hln == ETH_ADDR_LEN)
|
|
|
|
|
&& OVS_LIKELY(arp->ar_pln == 4)) {
|
2015-01-06 11:10:42 -08:00
|
|
|
|
miniflow_push_be32(mf, nw_src,
|
|
|
|
|
get_16aligned_be32(&arp->ar_spa));
|
|
|
|
|
miniflow_push_be32(mf, nw_dst,
|
|
|
|
|
get_16aligned_be32(&arp->ar_tpa));
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
/* We only match on the lower 8 bits of the opcode. */
|
|
|
|
|
if (OVS_LIKELY(ntohs(arp->ar_op) <= 0xff)) {
|
2015-01-06 11:10:42 -08:00
|
|
|
|
miniflow_push_be32(mf, ipv6_label, 0); /* Pad with ARP. */
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_be32(mf, nw_frag, htonl(ntohs(arp->ar_op)));
|
|
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
2014-04-18 08:26:56 -07:00
|
|
|
|
/* Must be adjacent. */
|
2015-06-09 11:32:24 -07:00
|
|
|
|
ASSERT_SEQUENTIAL(arp_sha, arp_tha);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
2015-08-28 14:55:11 -07:00
|
|
|
|
arp_buf[0] = arp->ar_sha;
|
|
|
|
|
arp_buf[1] = arp->ar_tha;
|
2015-01-06 11:10:42 -08:00
|
|
|
|
miniflow_push_macs(mf, arp_sha, arp_buf);
|
2015-12-01 15:03:16 +09:00
|
|
|
|
miniflow_pad_to_64(mf, arp_tha);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_NSH)) {
|
2018-01-11 13:24:01 +08:00
|
|
|
|
struct ovs_key_nsh nsh;
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
|
|
|
|
|
if (OVS_LIKELY(parse_nsh(&data, &size, &nsh))) {
|
2018-01-06 13:47:51 +08:00
|
|
|
|
miniflow_push_words(mf, nsh, &nsh,
|
2018-01-11 13:24:01 +08:00
|
|
|
|
sizeof(struct ovs_key_nsh) /
|
2018-01-06 13:47:51 +08:00
|
|
|
|
sizeof(uint64_t));
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-25 16:29:59 +00:00
|
|
|
|
packet->l4_ofs = (char *)data - frame;
|
2014-04-18 08:26:56 -07:00
|
|
|
|
miniflow_push_be32(mf, nw_frag,
|
2017-06-12 21:51:14 -07:00
|
|
|
|
bytes_to_be32(nw_frag, nw_tos, nw_ttl, nw_proto));
|
2014-04-18 08:26:56 -07:00
|
|
|
|
|
|
|
|
|
if (OVS_LIKELY(!(nw_frag & FLOW_NW_FRAG_LATER))) {
|
|
|
|
|
if (OVS_LIKELY(nw_proto == IPPROTO_TCP)) {
|
|
|
|
|
if (OVS_LIKELY(size >= TCP_HEADER_LEN)) {
|
|
|
|
|
const struct tcp_header *tcp = data;
|
2021-11-21 23:21:38 +08:00
|
|
|
|
size_t tcp_hdr_len = TCP_OFFSET(tcp->tcp_ctl) * 4;
|
|
|
|
|
|
|
|
|
|
if (OVS_LIKELY(tcp_hdr_len >= TCP_HEADER_LEN)
|
|
|
|
|
&& OVS_LIKELY(size >= tcp_hdr_len)) {
|
2025-02-13 21:24:24 +01:00
|
|
|
|
/* tcp_flags are not at the beginning of the block. */
|
|
|
|
|
miniflow_pad_from_64(mf, tcp_flags);
|
2021-11-21 23:21:38 +08:00
|
|
|
|
miniflow_push_be32(mf, tcp_flags,
|
|
|
|
|
TCP_FLAGS_BE32(tcp->tcp_ctl));
|
|
|
|
|
miniflow_push_be16(mf, tp_src, tcp->tcp_src);
|
|
|
|
|
miniflow_push_be16(mf, tp_dst, tcp->tcp_dst);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
|
2022-04-12 19:23:08 +05:30
|
|
|
|
if (dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
dp_packet_update_rss_hash_ipv4_tcp_udp(packet);
|
2022-07-01 17:58:38 +05:30
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
|
2022-04-12 19:23:08 +05:30
|
|
|
|
}
|
2024-01-17 14:26:31 -05:00
|
|
|
|
dp_packet_ol_l4_csum_check_partial(packet);
|
2023-06-14 15:03:27 -04:00
|
|
|
|
if (dp_packet_l4_checksum_good(packet)
|
|
|
|
|
|| dp_packet_ol_l4_csum_partial(packet)) {
|
|
|
|
|
dp_packet_hwol_set_csum_tcp(packet);
|
|
|
|
|
}
|
2021-11-21 23:21:38 +08:00
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
|
|
|
|
} else if (OVS_LIKELY(nw_proto == IPPROTO_UDP)) {
|
|
|
|
|
if (OVS_LIKELY(size >= UDP_HEADER_LEN)) {
|
|
|
|
|
const struct udp_header *udp = data;
|
|
|
|
|
|
2015-02-02 18:06:50 -08:00
|
|
|
|
miniflow_push_be16(mf, tp_src, udp->udp_src);
|
|
|
|
|
miniflow_push_be16(mf, tp_dst, udp->udp_dst);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
|
2022-04-12 19:23:08 +05:30
|
|
|
|
if (dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
dp_packet_update_rss_hash_ipv4_tcp_udp(packet);
|
2022-07-01 17:58:38 +05:30
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
|
2022-04-12 19:23:08 +05:30
|
|
|
|
}
|
2024-01-17 14:26:31 -05:00
|
|
|
|
dp_packet_ol_l4_csum_check_partial(packet);
|
2023-06-14 15:03:27 -04:00
|
|
|
|
if (dp_packet_l4_checksum_good(packet)
|
|
|
|
|
|| dp_packet_ol_l4_csum_partial(packet)) {
|
2025-01-23 16:56:27 +01:00
|
|
|
|
if (tunneling) {
|
|
|
|
|
dp_packet_hwol_set_outer_udp_csum(packet);
|
|
|
|
|
} else {
|
|
|
|
|
dp_packet_hwol_set_csum_udp(packet);
|
|
|
|
|
}
|
2023-06-14 15:03:27 -04:00
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
} else if (OVS_LIKELY(nw_proto == IPPROTO_SCTP)) {
|
|
|
|
|
if (OVS_LIKELY(size >= SCTP_HEADER_LEN)) {
|
|
|
|
|
const struct sctp_header *sctp = data;
|
2009-07-16 12:58:28 -07:00
|
|
|
|
|
2015-02-02 18:06:50 -08:00
|
|
|
|
miniflow_push_be16(mf, tp_src, sctp->sctp_src);
|
|
|
|
|
miniflow_push_be16(mf, tp_dst, sctp->sctp_dst);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
|
2024-01-17 14:26:31 -05:00
|
|
|
|
dp_packet_ol_l4_csum_check_partial(packet);
|
2023-06-14 15:03:27 -04:00
|
|
|
|
if (dp_packet_l4_checksum_good(packet)
|
|
|
|
|
|| dp_packet_ol_l4_csum_partial(packet)) {
|
|
|
|
|
dp_packet_hwol_set_csum_sctp(packet);
|
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
|
|
|
|
} else if (OVS_LIKELY(nw_proto == IPPROTO_ICMP)) {
|
|
|
|
|
if (OVS_LIKELY(size >= ICMP_HEADER_LEN)) {
|
|
|
|
|
const struct icmp_header *icmp = data;
|
|
|
|
|
|
|
|
|
|
miniflow_push_be16(mf, tp_src, htons(icmp->icmp_type));
|
|
|
|
|
miniflow_push_be16(mf, tp_dst, htons(icmp->icmp_code));
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
2014-06-18 22:14:30 -03:00
|
|
|
|
} else if (OVS_LIKELY(nw_proto == IPPROTO_IGMP)) {
|
|
|
|
|
if (OVS_LIKELY(size >= IGMP_HEADER_LEN)) {
|
|
|
|
|
const struct igmp_header *igmp = data;
|
|
|
|
|
|
|
|
|
|
miniflow_push_be16(mf, tp_src, htons(igmp->igmp_type));
|
|
|
|
|
miniflow_push_be16(mf, tp_dst, htons(igmp->igmp_code));
|
2025-02-13 21:24:24 +01:00
|
|
|
|
/* ct_tp_src/dst are not extracted for IGMP. */
|
|
|
|
|
miniflow_pad_to_64(mf, tp_dst);
|
2014-06-18 22:14:30 -03:00
|
|
|
|
miniflow_push_be32(mf, igmp_group_ip4,
|
|
|
|
|
get_16aligned_be32(&igmp->group));
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_pad_to_64(mf, igmp_group_ip4);
|
2014-06-18 22:14:30 -03:00
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
} else if (OVS_LIKELY(nw_proto == IPPROTO_ICMPV6)) {
|
2019-10-01 18:18:23 +03:00
|
|
|
|
if (OVS_LIKELY(size >= sizeof(struct icmp6_data_header))) {
|
2024-07-16 13:45:53 +02:00
|
|
|
|
const union ovs_16aligned_in6_addr *nd_target;
|
2017-03-08 17:18:23 -08:00
|
|
|
|
struct eth_addr arp_buf[2];
|
2019-01-28 11:41:06 +00:00
|
|
|
|
/* This will populate whether we received Option 1
|
|
|
|
|
* or Option 2. */
|
|
|
|
|
uint8_t opt_type;
|
|
|
|
|
/* This holds the ND Reserved field. */
|
2019-10-01 18:18:23 +03:00
|
|
|
|
ovs_be32 rso_flags;
|
|
|
|
|
const struct icmp6_data_header *icmp6;
|
|
|
|
|
|
|
|
|
|
icmp6 = data_pull(&data, &size, sizeof *icmp6);
|
|
|
|
|
if (parse_icmpv6(&data, &size, icmp6,
|
2019-01-28 11:41:06 +00:00
|
|
|
|
&rso_flags, &nd_target, arp_buf, &opt_type)) {
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (nd_target) {
|
|
|
|
|
miniflow_push_words(mf, nd_target, nd_target,
|
|
|
|
|
sizeof *nd_target / sizeof(uint64_t));
|
|
|
|
|
}
|
|
|
|
|
miniflow_push_macs(mf, arp_sha, arp_buf);
|
2019-01-28 11:41:06 +00:00
|
|
|
|
/* Populate options field and set the padding
|
|
|
|
|
* accordingly. */
|
|
|
|
|
if (opt_type != 0) {
|
|
|
|
|
miniflow_push_be16(mf, tcp_flags, htons(opt_type));
|
|
|
|
|
/* Pad to align with 64 bits.
|
|
|
|
|
* This will zero out the pad3 field. */
|
|
|
|
|
miniflow_pad_to_64(mf, tcp_flags);
|
|
|
|
|
} else {
|
|
|
|
|
/* Pad to align with 64 bits.
|
|
|
|
|
* This will zero out the tcp_flags & pad3 field. */
|
|
|
|
|
miniflow_pad_to_64(mf, arp_tha);
|
|
|
|
|
}
|
2019-10-01 18:18:23 +03:00
|
|
|
|
miniflow_push_be16(mf, tp_src,
|
|
|
|
|
htons(icmp6->icmp6_base.icmp6_type));
|
|
|
|
|
miniflow_push_be16(mf, tp_dst,
|
|
|
|
|
htons(icmp6->icmp6_base.icmp6_code));
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_pad_to_64(mf, tp_dst);
|
2019-01-28 11:41:06 +00:00
|
|
|
|
/* Fill ND reserved field. */
|
2019-10-01 18:18:23 +03:00
|
|
|
|
miniflow_push_be32(mf, igmp_group_ip4, rso_flags);
|
2019-01-28 11:41:06 +00:00
|
|
|
|
miniflow_pad_to_64(mf, igmp_group_ip4);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
} else {
|
|
|
|
|
/* ICMPv6 but not ND. */
|
2019-10-01 18:18:23 +03:00
|
|
|
|
miniflow_push_be16(mf, tp_src,
|
|
|
|
|
htons(icmp6->icmp6_base.icmp6_type));
|
|
|
|
|
miniflow_push_be16(mf, tp_dst,
|
|
|
|
|
htons(icmp6->icmp6_base.icmp6_code));
|
2017-03-08 17:18:23 -08:00
|
|
|
|
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
|
2014-04-18 08:26:56 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2025-02-08 22:12:24 +01:00
|
|
|
|
} else if (ct_nw_proto_p &&
|
|
|
|
|
(*ct_nw_proto_p == IPPROTO_TCP ||
|
|
|
|
|
*ct_nw_proto_p == IPPROTO_UDP ||
|
|
|
|
|
*ct_nw_proto_p == IPPROTO_SCTP ||
|
|
|
|
|
*ct_nw_proto_p == IPPROTO_ICMP ||
|
|
|
|
|
(*ct_nw_proto_p == IPPROTO_ICMPV6 && !icmp6_is_nd(data)))) {
|
|
|
|
|
miniflow_pad_from_64(mf, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
|
|
|
|
|
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2014-04-18 08:26:56 -07:00
|
|
|
|
out:
|
2015-08-25 13:55:03 -07:00
|
|
|
|
dst->map = mf.map;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2019-10-23 22:26:52 +02:00
|
|
|
|
static ovs_be16
|
dpif-netdev: Forwarding optimization for flows with a simple match.
There are cases where users might want simple forwarding or drop rules
for all packets received from a specific port, e.g ::
"in_port=1,actions=2"
"in_port=2,actions=IN_PORT"
"in_port=3,vlan_tci=0x1234/0x1fff,actions=drop"
"in_port=4,actions=push_vlan:0x8100,set_field:4196->vlan_vid,output:3"
There are also cases where complex OpenFlow rules can be simplified
down to datapath flows with very simple match criteria.
In theory, for very simple forwarding, OVS doesn't need to parse
packets at all in order to follow these rules. "Simple match" lookup
optimization is intended to speed up packet forwarding in these cases.
Design:
Due to various implementation constraints userspace datapath has
following flow fields always in exact match (i.e. it's required to
match at least these fields of a packet even if the OF rule doesn't
need that):
- recirc_id
- in_port
- packet_type
- dl_type
- vlan_tci (CFI + VID) - in most cases
- nw_frag - for ip packets
Not all of these fields are related to packet itself. We already
know the current 'recirc_id' and the 'in_port' before starting the
packet processing. It also seems safe to assume that we're working
with Ethernet packets. So, for the simple OF rule we need to match
only on 'dl_type', 'vlan_tci' and 'nw_frag'.
'in_port', 'dl_type', 'nw_frag' and 13 bits of 'vlan_tci' can be
combined in a single 64bit integer (mark) that can be used as a
hash in hash map. We are using only VID and CFI form the 'vlan_tci',
flows that need to match on PCP will not qualify for the optimization.
Workaround for matching on non-existence of vlan updated to match on
CFI and VID only in order to qualify for the optimization. CFI is
always set by OVS if vlan is present in a packet, so there is no need
to match on PCP in this case. 'nw_frag' takes 2 bits of PCP inside
the simple match mark.
New per-PMD flow table 'simple_match_table' introduced to store
simple match flows only. 'dp_netdev_flow_add' adds flow to the
usual 'flow_table' and to the 'simple_match_table' if the flow
meets following constraints:
- 'recirc_id' in flow match is 0.
- 'packet_type' in flow match is Ethernet.
- Flow wildcards contains only minimal set of non-wildcarded fields
(listed above).
If the number of flows for current 'in_port' in a regular 'flow_table'
equals number of flows for current 'in_port' in a 'simple_match_table',
we may use simple match optimization, because all the flows we have
are simple match flows. This means that we only need to parse
'dl_type', 'vlan_tci' and 'nw_frag' to perform packet matching.
Now we make the unique flow mark from the 'in_port', 'dl_type',
'nw_frag' and 'vlan_tci' and looking for it in the 'simple_match_table'.
On successful lookup we don't need to run full 'miniflow_extract()'.
Unsuccessful lookup technically means that we have no suitable flow
in the datapath and upcall will be required. So, in this case EMC and
SMC lookups are disabled. We may optimize this path in the future by
bypassing the dpcls lookup too.
Performance improvement of this solution on a 'simple match' flows
should be comparable with partial HW offloading, because it parses same
packet fields and uses similar flow lookup scheme.
However, unlike partial HW offloading, it works for all port types
including virtual ones.
Performance results when compared to EMC:
Test setup:
virtio-user OVS virtio-user
Testpmd1 ------------> pmd1 ------------> Testpmd2
(txonly) x<------ pmd2 <------------ (mac swap)
Single stream of 64byte packets. Actions:
in_port=vhost0,actions=vhost1
in_port=vhost1,actions=vhost0
Stats collected from pmd1 and pmd2, so there are 2 scenarios:
Virt-to-Virt : Testpmd1 ------> pmd1 ------> Testpmd2.
Virt-to-NoCopy : Testpmd2 ------> pmd2 --->x Testpmd1.
Here the packet sent from pmd2 to Testpmd1 is always dropped, because
the virtqueue is full since Testpmd1 is in txonly mode and doesn't
receive any packets. This should be closer to the performance of a
VM-to-Phy scenario.
Test performed on machine with Intel Xeon CPU E5-2690 v4 @ 2.60GHz.
Table below represents improvement in throughput when compared to EMC.
+----------------+------------------------+------------------------+
| | Default (-g -O2) | "-Ofast -march=native" |
| Scenario +------------+-----------+------------+-----------+
| | GCC | Clang | GCC | Clang |
+----------------+------------+-----------+------------+-----------+
| Virt-to-Virt | +18.9% | +25.5% | +10.8% | +16.7% |
| Virt-to-NoCopy | +24.3% | +33.7% | +14.9% | +22.0% |
+----------------+------------+-----------+------------+-----------+
For Phy-to-Phy case performance improvement should be even higher, but
it's not the main use-case for this functionality. Performance
difference for the non-simple flows is within a margin of error.
Acked-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-08-09 14:57:52 +02:00
|
|
|
|
parse_dl_type(const void **datap, size_t *sizep, ovs_be16 *first_vlan_tci_p)
|
2015-11-15 22:07:25 -08:00
|
|
|
|
{
|
2017-03-01 17:47:59 -05:00
|
|
|
|
union flow_vlan_hdr vlans[FLOW_MAX_VLAN_HEADERS];
|
2015-11-15 22:07:25 -08:00
|
|
|
|
|
dpif-netdev: Forwarding optimization for flows with a simple match.
There are cases where users might want simple forwarding or drop rules
for all packets received from a specific port, e.g ::
"in_port=1,actions=2"
"in_port=2,actions=IN_PORT"
"in_port=3,vlan_tci=0x1234/0x1fff,actions=drop"
"in_port=4,actions=push_vlan:0x8100,set_field:4196->vlan_vid,output:3"
There are also cases where complex OpenFlow rules can be simplified
down to datapath flows with very simple match criteria.
In theory, for very simple forwarding, OVS doesn't need to parse
packets at all in order to follow these rules. "Simple match" lookup
optimization is intended to speed up packet forwarding in these cases.
Design:
Due to various implementation constraints userspace datapath has
following flow fields always in exact match (i.e. it's required to
match at least these fields of a packet even if the OF rule doesn't
need that):
- recirc_id
- in_port
- packet_type
- dl_type
- vlan_tci (CFI + VID) - in most cases
- nw_frag - for ip packets
Not all of these fields are related to packet itself. We already
know the current 'recirc_id' and the 'in_port' before starting the
packet processing. It also seems safe to assume that we're working
with Ethernet packets. So, for the simple OF rule we need to match
only on 'dl_type', 'vlan_tci' and 'nw_frag'.
'in_port', 'dl_type', 'nw_frag' and 13 bits of 'vlan_tci' can be
combined in a single 64bit integer (mark) that can be used as a
hash in hash map. We are using only VID and CFI form the 'vlan_tci',
flows that need to match on PCP will not qualify for the optimization.
Workaround for matching on non-existence of vlan updated to match on
CFI and VID only in order to qualify for the optimization. CFI is
always set by OVS if vlan is present in a packet, so there is no need
to match on PCP in this case. 'nw_frag' takes 2 bits of PCP inside
the simple match mark.
New per-PMD flow table 'simple_match_table' introduced to store
simple match flows only. 'dp_netdev_flow_add' adds flow to the
usual 'flow_table' and to the 'simple_match_table' if the flow
meets following constraints:
- 'recirc_id' in flow match is 0.
- 'packet_type' in flow match is Ethernet.
- Flow wildcards contains only minimal set of non-wildcarded fields
(listed above).
If the number of flows for current 'in_port' in a regular 'flow_table'
equals number of flows for current 'in_port' in a 'simple_match_table',
we may use simple match optimization, because all the flows we have
are simple match flows. This means that we only need to parse
'dl_type', 'vlan_tci' and 'nw_frag' to perform packet matching.
Now we make the unique flow mark from the 'in_port', 'dl_type',
'nw_frag' and 'vlan_tci' and looking for it in the 'simple_match_table'.
On successful lookup we don't need to run full 'miniflow_extract()'.
Unsuccessful lookup technically means that we have no suitable flow
in the datapath and upcall will be required. So, in this case EMC and
SMC lookups are disabled. We may optimize this path in the future by
bypassing the dpcls lookup too.
Performance improvement of this solution on a 'simple match' flows
should be comparable with partial HW offloading, because it parses same
packet fields and uses similar flow lookup scheme.
However, unlike partial HW offloading, it works for all port types
including virtual ones.
Performance results when compared to EMC:
Test setup:
virtio-user OVS virtio-user
Testpmd1 ------------> pmd1 ------------> Testpmd2
(txonly) x<------ pmd2 <------------ (mac swap)
Single stream of 64byte packets. Actions:
in_port=vhost0,actions=vhost1
in_port=vhost1,actions=vhost0
Stats collected from pmd1 and pmd2, so there are 2 scenarios:
Virt-to-Virt : Testpmd1 ------> pmd1 ------> Testpmd2.
Virt-to-NoCopy : Testpmd2 ------> pmd2 --->x Testpmd1.
Here the packet sent from pmd2 to Testpmd1 is always dropped, because
the virtqueue is full since Testpmd1 is in txonly mode and doesn't
receive any packets. This should be closer to the performance of a
VM-to-Phy scenario.
Test performed on machine with Intel Xeon CPU E5-2690 v4 @ 2.60GHz.
Table below represents improvement in throughput when compared to EMC.
+----------------+------------------------+------------------------+
| | Default (-g -O2) | "-Ofast -march=native" |
| Scenario +------------+-----------+------------+-----------+
| | GCC | Clang | GCC | Clang |
+----------------+------------+-----------+------------+-----------+
| Virt-to-Virt | +18.9% | +25.5% | +10.8% | +16.7% |
| Virt-to-NoCopy | +24.3% | +33.7% | +14.9% | +22.0% |
+----------------+------------+-----------+------------+-----------+
For Phy-to-Phy case performance improvement should be even higher, but
it's not the main use-case for this functionality. Performance
difference for the non-simple flows is within a margin of error.
Acked-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-08-09 14:57:52 +02:00
|
|
|
|
if (parse_vlan(datap, sizep, vlans) && first_vlan_tci_p) {
|
|
|
|
|
*first_vlan_tci_p = vlans[0].tci;
|
|
|
|
|
}
|
2015-11-15 22:07:25 -08:00
|
|
|
|
|
2019-10-23 22:26:52 +02:00
|
|
|
|
return parse_ethertype(datap, sizep);
|
2015-11-15 22:07:25 -08:00
|
|
|
|
}
|
|
|
|
|
|
2018-09-07 10:03:08 -07:00
|
|
|
|
/* Parses and return the TCP flags in 'packet', converted to host byte order.
|
|
|
|
|
* If 'packet' is not an Ethernet packet embedding TCP, returns 0.
|
dpif-netdev: Forwarding optimization for flows with a simple match.
There are cases where users might want simple forwarding or drop rules
for all packets received from a specific port, e.g ::
"in_port=1,actions=2"
"in_port=2,actions=IN_PORT"
"in_port=3,vlan_tci=0x1234/0x1fff,actions=drop"
"in_port=4,actions=push_vlan:0x8100,set_field:4196->vlan_vid,output:3"
There are also cases where complex OpenFlow rules can be simplified
down to datapath flows with very simple match criteria.
In theory, for very simple forwarding, OVS doesn't need to parse
packets at all in order to follow these rules. "Simple match" lookup
optimization is intended to speed up packet forwarding in these cases.
Design:
Due to various implementation constraints userspace datapath has
following flow fields always in exact match (i.e. it's required to
match at least these fields of a packet even if the OF rule doesn't
need that):
- recirc_id
- in_port
- packet_type
- dl_type
- vlan_tci (CFI + VID) - in most cases
- nw_frag - for ip packets
Not all of these fields are related to packet itself. We already
know the current 'recirc_id' and the 'in_port' before starting the
packet processing. It also seems safe to assume that we're working
with Ethernet packets. So, for the simple OF rule we need to match
only on 'dl_type', 'vlan_tci' and 'nw_frag'.
'in_port', 'dl_type', 'nw_frag' and 13 bits of 'vlan_tci' can be
combined in a single 64bit integer (mark) that can be used as a
hash in hash map. We are using only VID and CFI form the 'vlan_tci',
flows that need to match on PCP will not qualify for the optimization.
Workaround for matching on non-existence of vlan updated to match on
CFI and VID only in order to qualify for the optimization. CFI is
always set by OVS if vlan is present in a packet, so there is no need
to match on PCP in this case. 'nw_frag' takes 2 bits of PCP inside
the simple match mark.
New per-PMD flow table 'simple_match_table' introduced to store
simple match flows only. 'dp_netdev_flow_add' adds flow to the
usual 'flow_table' and to the 'simple_match_table' if the flow
meets following constraints:
- 'recirc_id' in flow match is 0.
- 'packet_type' in flow match is Ethernet.
- Flow wildcards contains only minimal set of non-wildcarded fields
(listed above).
If the number of flows for current 'in_port' in a regular 'flow_table'
equals number of flows for current 'in_port' in a 'simple_match_table',
we may use simple match optimization, because all the flows we have
are simple match flows. This means that we only need to parse
'dl_type', 'vlan_tci' and 'nw_frag' to perform packet matching.
Now we make the unique flow mark from the 'in_port', 'dl_type',
'nw_frag' and 'vlan_tci' and looking for it in the 'simple_match_table'.
On successful lookup we don't need to run full 'miniflow_extract()'.
Unsuccessful lookup technically means that we have no suitable flow
in the datapath and upcall will be required. So, in this case EMC and
SMC lookups are disabled. We may optimize this path in the future by
bypassing the dpcls lookup too.
Performance improvement of this solution on a 'simple match' flows
should be comparable with partial HW offloading, because it parses same
packet fields and uses similar flow lookup scheme.
However, unlike partial HW offloading, it works for all port types
including virtual ones.
Performance results when compared to EMC:
Test setup:
virtio-user OVS virtio-user
Testpmd1 ------------> pmd1 ------------> Testpmd2
(txonly) x<------ pmd2 <------------ (mac swap)
Single stream of 64byte packets. Actions:
in_port=vhost0,actions=vhost1
in_port=vhost1,actions=vhost0
Stats collected from pmd1 and pmd2, so there are 2 scenarios:
Virt-to-Virt : Testpmd1 ------> pmd1 ------> Testpmd2.
Virt-to-NoCopy : Testpmd2 ------> pmd2 --->x Testpmd1.
Here the packet sent from pmd2 to Testpmd1 is always dropped, because
the virtqueue is full since Testpmd1 is in txonly mode and doesn't
receive any packets. This should be closer to the performance of a
VM-to-Phy scenario.
Test performed on machine with Intel Xeon CPU E5-2690 v4 @ 2.60GHz.
Table below represents improvement in throughput when compared to EMC.
+----------------+------------------------+------------------------+
| | Default (-g -O2) | "-Ofast -march=native" |
| Scenario +------------+-----------+------------+-----------+
| | GCC | Clang | GCC | Clang |
+----------------+------------+-----------+------------+-----------+
| Virt-to-Virt | +18.9% | +25.5% | +10.8% | +16.7% |
| Virt-to-NoCopy | +24.3% | +33.7% | +14.9% | +22.0% |
+----------------+------------+-----------+------------+-----------+
For Phy-to-Phy case performance improvement should be even higher, but
it's not the main use-case for this functionality. Performance
difference for the non-simple flows is within a margin of error.
Acked-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-08-09 14:57:52 +02:00
|
|
|
|
* 'dl_type_p' will be set only if the 'packet' is an Ethernet packet.
|
|
|
|
|
* 'nw_frag_p' will be set only if the 'packet' is an IP packet.
|
2025-01-13 15:52:03 +08:00
|
|
|
|
* 'first_vlan_tci_p' will be set only if the 'packet' contains vlan header.
|
2018-09-07 10:03:08 -07:00
|
|
|
|
*
|
|
|
|
|
* The caller must ensure that 'packet' is at least ETH_HEADER_LEN bytes
|
|
|
|
|
* long.'*/
|
2018-06-25 16:21:05 +03:00
|
|
|
|
uint16_t
|
dpif-netdev: Forwarding optimization for flows with a simple match.
There are cases where users might want simple forwarding or drop rules
for all packets received from a specific port, e.g ::
"in_port=1,actions=2"
"in_port=2,actions=IN_PORT"
"in_port=3,vlan_tci=0x1234/0x1fff,actions=drop"
"in_port=4,actions=push_vlan:0x8100,set_field:4196->vlan_vid,output:3"
There are also cases where complex OpenFlow rules can be simplified
down to datapath flows with very simple match criteria.
In theory, for very simple forwarding, OVS doesn't need to parse
packets at all in order to follow these rules. "Simple match" lookup
optimization is intended to speed up packet forwarding in these cases.
Design:
Due to various implementation constraints userspace datapath has
following flow fields always in exact match (i.e. it's required to
match at least these fields of a packet even if the OF rule doesn't
need that):
- recirc_id
- in_port
- packet_type
- dl_type
- vlan_tci (CFI + VID) - in most cases
- nw_frag - for ip packets
Not all of these fields are related to packet itself. We already
know the current 'recirc_id' and the 'in_port' before starting the
packet processing. It also seems safe to assume that we're working
with Ethernet packets. So, for the simple OF rule we need to match
only on 'dl_type', 'vlan_tci' and 'nw_frag'.
'in_port', 'dl_type', 'nw_frag' and 13 bits of 'vlan_tci' can be
combined in a single 64bit integer (mark) that can be used as a
hash in hash map. We are using only VID and CFI form the 'vlan_tci',
flows that need to match on PCP will not qualify for the optimization.
Workaround for matching on non-existence of vlan updated to match on
CFI and VID only in order to qualify for the optimization. CFI is
always set by OVS if vlan is present in a packet, so there is no need
to match on PCP in this case. 'nw_frag' takes 2 bits of PCP inside
the simple match mark.
New per-PMD flow table 'simple_match_table' introduced to store
simple match flows only. 'dp_netdev_flow_add' adds flow to the
usual 'flow_table' and to the 'simple_match_table' if the flow
meets following constraints:
- 'recirc_id' in flow match is 0.
- 'packet_type' in flow match is Ethernet.
- Flow wildcards contains only minimal set of non-wildcarded fields
(listed above).
If the number of flows for current 'in_port' in a regular 'flow_table'
equals number of flows for current 'in_port' in a 'simple_match_table',
we may use simple match optimization, because all the flows we have
are simple match flows. This means that we only need to parse
'dl_type', 'vlan_tci' and 'nw_frag' to perform packet matching.
Now we make the unique flow mark from the 'in_port', 'dl_type',
'nw_frag' and 'vlan_tci' and looking for it in the 'simple_match_table'.
On successful lookup we don't need to run full 'miniflow_extract()'.
Unsuccessful lookup technically means that we have no suitable flow
in the datapath and upcall will be required. So, in this case EMC and
SMC lookups are disabled. We may optimize this path in the future by
bypassing the dpcls lookup too.
Performance improvement of this solution on a 'simple match' flows
should be comparable with partial HW offloading, because it parses same
packet fields and uses similar flow lookup scheme.
However, unlike partial HW offloading, it works for all port types
including virtual ones.
Performance results when compared to EMC:
Test setup:
virtio-user OVS virtio-user
Testpmd1 ------------> pmd1 ------------> Testpmd2
(txonly) x<------ pmd2 <------------ (mac swap)
Single stream of 64byte packets. Actions:
in_port=vhost0,actions=vhost1
in_port=vhost1,actions=vhost0
Stats collected from pmd1 and pmd2, so there are 2 scenarios:
Virt-to-Virt : Testpmd1 ------> pmd1 ------> Testpmd2.
Virt-to-NoCopy : Testpmd2 ------> pmd2 --->x Testpmd1.
Here the packet sent from pmd2 to Testpmd1 is always dropped, because
the virtqueue is full since Testpmd1 is in txonly mode and doesn't
receive any packets. This should be closer to the performance of a
VM-to-Phy scenario.
Test performed on machine with Intel Xeon CPU E5-2690 v4 @ 2.60GHz.
Table below represents improvement in throughput when compared to EMC.
+----------------+------------------------+------------------------+
| | Default (-g -O2) | "-Ofast -march=native" |
| Scenario +------------+-----------+------------+-----------+
| | GCC | Clang | GCC | Clang |
+----------------+------------+-----------+------------+-----------+
| Virt-to-Virt | +18.9% | +25.5% | +10.8% | +16.7% |
| Virt-to-NoCopy | +24.3% | +33.7% | +14.9% | +22.0% |
+----------------+------------+-----------+------------+-----------+
For Phy-to-Phy case performance improvement should be even higher, but
it's not the main use-case for this functionality. Performance
difference for the non-simple flows is within a margin of error.
Acked-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-08-09 14:57:52 +02:00
|
|
|
|
parse_tcp_flags(struct dp_packet *packet,
|
|
|
|
|
ovs_be16 *dl_type_p, uint8_t *nw_frag_p,
|
|
|
|
|
ovs_be16 *first_vlan_tci_p)
|
2018-06-25 16:21:05 +03:00
|
|
|
|
{
|
|
|
|
|
const void *data = dp_packet_data(packet);
|
|
|
|
|
const char *frame = (const char *)data;
|
|
|
|
|
size_t size = dp_packet_size(packet);
|
|
|
|
|
ovs_be16 dl_type;
|
|
|
|
|
uint8_t nw_frag = 0, nw_proto = 0;
|
|
|
|
|
|
2019-09-01 15:10:05 +02:00
|
|
|
|
if (!dp_packet_is_eth(packet)) {
|
2018-06-25 16:21:05 +03:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dp_packet_reset_offsets(packet);
|
|
|
|
|
|
dpif-netdev: Forwarding optimization for flows with a simple match.
There are cases where users might want simple forwarding or drop rules
for all packets received from a specific port, e.g ::
"in_port=1,actions=2"
"in_port=2,actions=IN_PORT"
"in_port=3,vlan_tci=0x1234/0x1fff,actions=drop"
"in_port=4,actions=push_vlan:0x8100,set_field:4196->vlan_vid,output:3"
There are also cases where complex OpenFlow rules can be simplified
down to datapath flows with very simple match criteria.
In theory, for very simple forwarding, OVS doesn't need to parse
packets at all in order to follow these rules. "Simple match" lookup
optimization is intended to speed up packet forwarding in these cases.
Design:
Due to various implementation constraints userspace datapath has
following flow fields always in exact match (i.e. it's required to
match at least these fields of a packet even if the OF rule doesn't
need that):
- recirc_id
- in_port
- packet_type
- dl_type
- vlan_tci (CFI + VID) - in most cases
- nw_frag - for ip packets
Not all of these fields are related to packet itself. We already
know the current 'recirc_id' and the 'in_port' before starting the
packet processing. It also seems safe to assume that we're working
with Ethernet packets. So, for the simple OF rule we need to match
only on 'dl_type', 'vlan_tci' and 'nw_frag'.
'in_port', 'dl_type', 'nw_frag' and 13 bits of 'vlan_tci' can be
combined in a single 64bit integer (mark) that can be used as a
hash in hash map. We are using only VID and CFI form the 'vlan_tci',
flows that need to match on PCP will not qualify for the optimization.
Workaround for matching on non-existence of vlan updated to match on
CFI and VID only in order to qualify for the optimization. CFI is
always set by OVS if vlan is present in a packet, so there is no need
to match on PCP in this case. 'nw_frag' takes 2 bits of PCP inside
the simple match mark.
New per-PMD flow table 'simple_match_table' introduced to store
simple match flows only. 'dp_netdev_flow_add' adds flow to the
usual 'flow_table' and to the 'simple_match_table' if the flow
meets following constraints:
- 'recirc_id' in flow match is 0.
- 'packet_type' in flow match is Ethernet.
- Flow wildcards contains only minimal set of non-wildcarded fields
(listed above).
If the number of flows for current 'in_port' in a regular 'flow_table'
equals number of flows for current 'in_port' in a 'simple_match_table',
we may use simple match optimization, because all the flows we have
are simple match flows. This means that we only need to parse
'dl_type', 'vlan_tci' and 'nw_frag' to perform packet matching.
Now we make the unique flow mark from the 'in_port', 'dl_type',
'nw_frag' and 'vlan_tci' and looking for it in the 'simple_match_table'.
On successful lookup we don't need to run full 'miniflow_extract()'.
Unsuccessful lookup technically means that we have no suitable flow
in the datapath and upcall will be required. So, in this case EMC and
SMC lookups are disabled. We may optimize this path in the future by
bypassing the dpcls lookup too.
Performance improvement of this solution on a 'simple match' flows
should be comparable with partial HW offloading, because it parses same
packet fields and uses similar flow lookup scheme.
However, unlike partial HW offloading, it works for all port types
including virtual ones.
Performance results when compared to EMC:
Test setup:
virtio-user OVS virtio-user
Testpmd1 ------------> pmd1 ------------> Testpmd2
(txonly) x<------ pmd2 <------------ (mac swap)
Single stream of 64byte packets. Actions:
in_port=vhost0,actions=vhost1
in_port=vhost1,actions=vhost0
Stats collected from pmd1 and pmd2, so there are 2 scenarios:
Virt-to-Virt : Testpmd1 ------> pmd1 ------> Testpmd2.
Virt-to-NoCopy : Testpmd2 ------> pmd2 --->x Testpmd1.
Here the packet sent from pmd2 to Testpmd1 is always dropped, because
the virtqueue is full since Testpmd1 is in txonly mode and doesn't
receive any packets. This should be closer to the performance of a
VM-to-Phy scenario.
Test performed on machine with Intel Xeon CPU E5-2690 v4 @ 2.60GHz.
Table below represents improvement in throughput when compared to EMC.
+----------------+------------------------+------------------------+
| | Default (-g -O2) | "-Ofast -march=native" |
| Scenario +------------+-----------+------------+-----------+
| | GCC | Clang | GCC | Clang |
+----------------+------------+-----------+------------+-----------+
| Virt-to-Virt | +18.9% | +25.5% | +10.8% | +16.7% |
| Virt-to-NoCopy | +24.3% | +33.7% | +14.9% | +22.0% |
+----------------+------------+-----------+------------+-----------+
For Phy-to-Phy case performance improvement should be even higher, but
it's not the main use-case for this functionality. Performance
difference for the non-simple flows is within a margin of error.
Acked-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-08-09 14:57:52 +02:00
|
|
|
|
dl_type = parse_dl_type(&data, &size, first_vlan_tci_p);
|
|
|
|
|
if (dl_type_p) {
|
|
|
|
|
*dl_type_p = dl_type;
|
|
|
|
|
}
|
2018-06-25 16:21:05 +03:00
|
|
|
|
if (OVS_UNLIKELY(eth_type_mpls(dl_type))) {
|
|
|
|
|
packet->l2_5_ofs = (char *)data - frame;
|
|
|
|
|
}
|
2020-01-14 13:21:15 +00:00
|
|
|
|
packet->l3_ofs = (char *)data - frame;
|
2018-06-25 16:21:05 +03:00
|
|
|
|
if (OVS_LIKELY(dl_type == htons(ETH_TYPE_IP))) {
|
|
|
|
|
const struct ip_header *nh = data;
|
|
|
|
|
int ip_len;
|
|
|
|
|
uint16_t tot_len;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(!ipv4_sanity_check(nh, size, &ip_len, &tot_len))) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
if (OVS_UNLIKELY(VLOG_IS_DBG_ENABLED())) {
|
|
|
|
|
dump_invalid_packet(packet, "ipv4_sanity_check");
|
|
|
|
|
}
|
2018-06-25 16:21:05 +03:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
dp_packet_set_l2_pad_size(packet, size - tot_len);
|
|
|
|
|
nw_proto = nh->ip_proto;
|
|
|
|
|
nw_frag = ipv4_get_nw_frag(nh);
|
|
|
|
|
|
|
|
|
|
size = tot_len; /* Never pull padding. */
|
|
|
|
|
data_pull(&data, &size, ip_len);
|
2025-03-13 13:43:36 +01:00
|
|
|
|
dp_packet_hwol_set_tx_ipv4(packet);
|
|
|
|
|
if (dp_packet_ip_checksum_good(packet)) {
|
|
|
|
|
dp_packet_hwol_set_tx_ip_csum(packet);
|
|
|
|
|
}
|
2018-06-25 16:21:05 +03:00
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
const struct ovs_16aligned_ip6_hdr *nh = data;
|
|
|
|
|
uint16_t plen;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(!ipv6_sanity_check(nh, size))) {
|
2021-04-16 14:06:31 +02:00
|
|
|
|
if (OVS_UNLIKELY(VLOG_IS_DBG_ENABLED())) {
|
|
|
|
|
dump_invalid_packet(packet, "ipv6_sanity_check");
|
|
|
|
|
}
|
2018-06-25 16:21:05 +03:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
data_pull(&data, &size, sizeof *nh);
|
|
|
|
|
|
2025-03-13 13:43:36 +01:00
|
|
|
|
dp_packet_hwol_set_tx_ipv6(packet);
|
2018-06-25 16:21:05 +03:00
|
|
|
|
plen = ntohs(nh->ip6_plen); /* Never pull padding. */
|
|
|
|
|
dp_packet_set_l2_pad_size(packet, size - plen);
|
|
|
|
|
size = plen;
|
2019-11-08 17:02:44 +08:00
|
|
|
|
nw_proto = nh->ip6_nxt;
|
2023-03-29 14:51:16 +09:00
|
|
|
|
if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag,
|
|
|
|
|
NULL, NULL)) {
|
2018-06-25 16:21:05 +03:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
dpif-netdev: Forwarding optimization for flows with a simple match.
There are cases where users might want simple forwarding or drop rules
for all packets received from a specific port, e.g ::
"in_port=1,actions=2"
"in_port=2,actions=IN_PORT"
"in_port=3,vlan_tci=0x1234/0x1fff,actions=drop"
"in_port=4,actions=push_vlan:0x8100,set_field:4196->vlan_vid,output:3"
There are also cases where complex OpenFlow rules can be simplified
down to datapath flows with very simple match criteria.
In theory, for very simple forwarding, OVS doesn't need to parse
packets at all in order to follow these rules. "Simple match" lookup
optimization is intended to speed up packet forwarding in these cases.
Design:
Due to various implementation constraints userspace datapath has
following flow fields always in exact match (i.e. it's required to
match at least these fields of a packet even if the OF rule doesn't
need that):
- recirc_id
- in_port
- packet_type
- dl_type
- vlan_tci (CFI + VID) - in most cases
- nw_frag - for ip packets
Not all of these fields are related to packet itself. We already
know the current 'recirc_id' and the 'in_port' before starting the
packet processing. It also seems safe to assume that we're working
with Ethernet packets. So, for the simple OF rule we need to match
only on 'dl_type', 'vlan_tci' and 'nw_frag'.
'in_port', 'dl_type', 'nw_frag' and 13 bits of 'vlan_tci' can be
combined in a single 64bit integer (mark) that can be used as a
hash in hash map. We are using only VID and CFI form the 'vlan_tci',
flows that need to match on PCP will not qualify for the optimization.
Workaround for matching on non-existence of vlan updated to match on
CFI and VID only in order to qualify for the optimization. CFI is
always set by OVS if vlan is present in a packet, so there is no need
to match on PCP in this case. 'nw_frag' takes 2 bits of PCP inside
the simple match mark.
New per-PMD flow table 'simple_match_table' introduced to store
simple match flows only. 'dp_netdev_flow_add' adds flow to the
usual 'flow_table' and to the 'simple_match_table' if the flow
meets following constraints:
- 'recirc_id' in flow match is 0.
- 'packet_type' in flow match is Ethernet.
- Flow wildcards contains only minimal set of non-wildcarded fields
(listed above).
If the number of flows for current 'in_port' in a regular 'flow_table'
equals number of flows for current 'in_port' in a 'simple_match_table',
we may use simple match optimization, because all the flows we have
are simple match flows. This means that we only need to parse
'dl_type', 'vlan_tci' and 'nw_frag' to perform packet matching.
Now we make the unique flow mark from the 'in_port', 'dl_type',
'nw_frag' and 'vlan_tci' and looking for it in the 'simple_match_table'.
On successful lookup we don't need to run full 'miniflow_extract()'.
Unsuccessful lookup technically means that we have no suitable flow
in the datapath and upcall will be required. So, in this case EMC and
SMC lookups are disabled. We may optimize this path in the future by
bypassing the dpcls lookup too.
Performance improvement of this solution on a 'simple match' flows
should be comparable with partial HW offloading, because it parses same
packet fields and uses similar flow lookup scheme.
However, unlike partial HW offloading, it works for all port types
including virtual ones.
Performance results when compared to EMC:
Test setup:
virtio-user OVS virtio-user
Testpmd1 ------------> pmd1 ------------> Testpmd2
(txonly) x<------ pmd2 <------------ (mac swap)
Single stream of 64byte packets. Actions:
in_port=vhost0,actions=vhost1
in_port=vhost1,actions=vhost0
Stats collected from pmd1 and pmd2, so there are 2 scenarios:
Virt-to-Virt : Testpmd1 ------> pmd1 ------> Testpmd2.
Virt-to-NoCopy : Testpmd2 ------> pmd2 --->x Testpmd1.
Here the packet sent from pmd2 to Testpmd1 is always dropped, because
the virtqueue is full since Testpmd1 is in txonly mode and doesn't
receive any packets. This should be closer to the performance of a
VM-to-Phy scenario.
Test performed on machine with Intel Xeon CPU E5-2690 v4 @ 2.60GHz.
Table below represents improvement in throughput when compared to EMC.
+----------------+------------------------+------------------------+
| | Default (-g -O2) | "-Ofast -march=native" |
| Scenario +------------+-----------+------------+-----------+
| | GCC | Clang | GCC | Clang |
+----------------+------------+-----------+------------+-----------+
| Virt-to-Virt | +18.9% | +25.5% | +10.8% | +16.7% |
| Virt-to-NoCopy | +24.3% | +33.7% | +14.9% | +22.0% |
+----------------+------------+-----------+------------+-----------+
For Phy-to-Phy case performance improvement should be even higher, but
it's not the main use-case for this functionality. Performance
difference for the non-simple flows is within a margin of error.
Acked-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-08-09 14:57:52 +02:00
|
|
|
|
if (nw_frag_p) {
|
|
|
|
|
*nw_frag_p = nw_frag;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-25 16:21:05 +03:00
|
|
|
|
packet->l4_ofs = (uint16_t)((char *)data - frame);
|
2025-03-13 13:43:36 +01:00
|
|
|
|
if (!(nw_frag & FLOW_NW_FRAG_LATER)) {
|
|
|
|
|
if (nw_proto == IPPROTO_TCP && size >= TCP_HEADER_LEN) {
|
|
|
|
|
const struct tcp_header *tcp = data;
|
|
|
|
|
|
|
|
|
|
dp_packet_ol_l4_csum_check_partial(packet);
|
|
|
|
|
if (dp_packet_l4_checksum_good(packet)
|
|
|
|
|
|| dp_packet_ol_l4_csum_partial(packet)) {
|
|
|
|
|
dp_packet_hwol_set_csum_tcp(packet);
|
|
|
|
|
}
|
|
|
|
|
return TCP_FLAGS(tcp->tcp_ctl);
|
|
|
|
|
} else if (nw_proto == IPPROTO_UDP && size >= UDP_HEADER_LEN) {
|
|
|
|
|
dp_packet_ol_l4_csum_check_partial(packet);
|
|
|
|
|
if (dp_packet_l4_checksum_good(packet)
|
|
|
|
|
|| dp_packet_ol_l4_csum_partial(packet)) {
|
|
|
|
|
dp_packet_hwol_set_csum_udp(packet);
|
|
|
|
|
}
|
|
|
|
|
} else if (nw_proto == IPPROTO_SCTP && size >= SCTP_HEADER_LEN) {
|
|
|
|
|
dp_packet_ol_l4_csum_check_partial(packet);
|
|
|
|
|
if (dp_packet_l4_checksum_good(packet)
|
|
|
|
|
|| dp_packet_ol_l4_csum_partial(packet)) {
|
|
|
|
|
dp_packet_hwol_set_csum_sctp(packet);
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-25 16:21:05 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-19 09:39:16 -07:00
|
|
|
|
/* For every bit of a field that is wildcarded in 'wildcards', sets the
|
|
|
|
|
* corresponding bit in 'flow' to zero. */
|
|
|
|
|
void
|
|
|
|
|
flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
|
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t *flow_u64 = (uint64_t *) flow;
|
|
|
|
|
const uint64_t *wc_u64 = (const uint64_t *) &wildcards->masks;
|
2012-08-07 13:43:18 -07:00
|
|
|
|
size_t i;
|
2011-08-19 09:39:16 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
flow_u64[i] &= wc_u64[i];
|
2012-08-07 13:38:38 -07:00
|
|
|
|
}
|
2011-08-19 09:39:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-12-06 18:53:12 -08:00
|
|
|
|
void
|
|
|
|
|
flow_unwildcard_tp_ports(const struct flow *flow, struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
if (flow->nw_proto != IPPROTO_ICMP) {
|
|
|
|
|
memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
|
|
|
|
|
memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
|
|
|
|
|
} else {
|
|
|
|
|
wc->masks.tp_src = htons(0xff);
|
|
|
|
|
wc->masks.tp_dst = htons(0xff);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-05-15 17:03:17 -07:00
|
|
|
|
/* Initializes 'flow_metadata' with the metadata found in 'flow'. */
|
2012-01-04 16:40:13 -08:00
|
|
|
|
void
|
2015-05-15 17:03:17 -07:00
|
|
|
|
flow_get_metadata(const struct flow *flow, struct match *flow_metadata)
|
2012-01-04 16:40:13 -08:00
|
|
|
|
{
|
2015-05-15 17:03:17 -07:00
|
|
|
|
int i;
|
|
|
|
|
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2012-03-08 14:44:54 -08:00
|
|
|
|
|
2015-05-15 17:03:17 -07:00
|
|
|
|
match_init_catchall(flow_metadata);
|
|
|
|
|
if (flow->tunnel.tun_id != htonll(0)) {
|
|
|
|
|
match_set_tun_id(flow_metadata, flow->tunnel.tun_id);
|
|
|
|
|
}
|
2015-07-08 16:02:30 -07:00
|
|
|
|
if (flow->tunnel.flags & FLOW_TNL_PUB_F_MASK) {
|
|
|
|
|
match_set_tun_flags(flow_metadata,
|
|
|
|
|
flow->tunnel.flags & FLOW_TNL_PUB_F_MASK);
|
|
|
|
|
}
|
2015-11-25 11:31:11 -02:00
|
|
|
|
if (flow->tunnel.ip_src) {
|
2015-05-15 17:03:17 -07:00
|
|
|
|
match_set_tun_src(flow_metadata, flow->tunnel.ip_src);
|
|
|
|
|
}
|
2015-11-25 11:31:11 -02:00
|
|
|
|
if (flow->tunnel.ip_dst) {
|
2015-05-15 17:03:17 -07:00
|
|
|
|
match_set_tun_dst(flow_metadata, flow->tunnel.ip_dst);
|
|
|
|
|
}
|
2015-11-25 11:31:11 -02:00
|
|
|
|
if (ipv6_addr_is_set(&flow->tunnel.ipv6_src)) {
|
|
|
|
|
match_set_tun_ipv6_src(flow_metadata, &flow->tunnel.ipv6_src);
|
|
|
|
|
}
|
|
|
|
|
if (ipv6_addr_is_set(&flow->tunnel.ipv6_dst)) {
|
|
|
|
|
match_set_tun_ipv6_dst(flow_metadata, &flow->tunnel.ipv6_dst);
|
|
|
|
|
}
|
2015-05-15 17:03:17 -07:00
|
|
|
|
if (flow->tunnel.gbp_id != htons(0)) {
|
|
|
|
|
match_set_tun_gbp_id(flow_metadata, flow->tunnel.gbp_id);
|
|
|
|
|
}
|
|
|
|
|
if (flow->tunnel.gbp_flags) {
|
|
|
|
|
match_set_tun_gbp_flags(flow_metadata, flow->tunnel.gbp_flags);
|
|
|
|
|
}
|
2018-05-15 16:10:48 -04:00
|
|
|
|
if (flow->tunnel.erspan_ver) {
|
|
|
|
|
match_set_tun_erspan_ver(flow_metadata, flow->tunnel.erspan_ver);
|
|
|
|
|
}
|
|
|
|
|
if (flow->tunnel.erspan_idx) {
|
|
|
|
|
match_set_tun_erspan_idx(flow_metadata, flow->tunnel.erspan_idx);
|
|
|
|
|
}
|
|
|
|
|
if (flow->tunnel.erspan_dir) {
|
|
|
|
|
match_set_tun_erspan_dir(flow_metadata, flow->tunnel.erspan_dir);
|
|
|
|
|
}
|
|
|
|
|
if (flow->tunnel.erspan_hwid) {
|
|
|
|
|
match_set_tun_erspan_hwid(flow_metadata, flow->tunnel.erspan_hwid);
|
|
|
|
|
}
|
2019-11-25 11:19:23 -08:00
|
|
|
|
if (flow->tunnel.gtpu_flags) {
|
|
|
|
|
match_set_tun_gtpu_flags(flow_metadata, flow->tunnel.gtpu_flags);
|
|
|
|
|
}
|
|
|
|
|
if (flow->tunnel.gtpu_msgtype) {
|
|
|
|
|
match_set_tun_gtpu_msgtype(flow_metadata, flow->tunnel.gtpu_msgtype);
|
|
|
|
|
}
|
2015-06-29 18:01:59 -07:00
|
|
|
|
tun_metadata_get_fmd(&flow->tunnel, flow_metadata);
|
2015-05-15 17:03:17 -07:00
|
|
|
|
if (flow->metadata != htonll(0)) {
|
|
|
|
|
match_set_metadata(flow_metadata, flow->metadata);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < FLOW_N_REGS; i++) {
|
|
|
|
|
if (flow->regs[i]) {
|
|
|
|
|
match_set_reg(flow_metadata, i, flow->regs[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flow->pkt_mark != 0) {
|
|
|
|
|
match_set_pkt_mark(flow_metadata, flow->pkt_mark);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
match_set_in_port(flow_metadata, flow->in_port.ofp_port);
|
2017-06-23 16:48:38 +00:00
|
|
|
|
if (flow->packet_type != htonl(PT_ETH)) {
|
|
|
|
|
match_set_packet_type(flow_metadata, flow->packet_type);
|
|
|
|
|
}
|
|
|
|
|
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
if (flow->ct_state != 0) {
|
|
|
|
|
match_set_ct_state(flow_metadata, flow->ct_state);
|
2017-10-26 14:52:22 +02:00
|
|
|
|
/* Match dl_type since it is required for the later interpretation of
|
|
|
|
|
* the conntrack metadata. */
|
|
|
|
|
match_set_dl_type(flow_metadata, flow->dl_type);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (is_ct_valid(flow, NULL, NULL) && flow->ct_nw_proto != 0) {
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
match_set_ct_nw_src(flow_metadata, flow->ct_nw_src);
|
|
|
|
|
match_set_ct_nw_dst(flow_metadata, flow->ct_nw_dst);
|
|
|
|
|
match_set_ct_nw_proto(flow_metadata, flow->ct_nw_proto);
|
|
|
|
|
match_set_ct_tp_src(flow_metadata, flow->ct_tp_src);
|
|
|
|
|
match_set_ct_tp_dst(flow_metadata, flow->ct_tp_dst);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
match_set_ct_ipv6_src(flow_metadata, &flow->ct_ipv6_src);
|
|
|
|
|
match_set_ct_ipv6_dst(flow_metadata, &flow->ct_ipv6_dst);
|
|
|
|
|
match_set_ct_nw_proto(flow_metadata, flow->ct_nw_proto);
|
|
|
|
|
match_set_ct_tp_src(flow_metadata, flow->ct_tp_src);
|
|
|
|
|
match_set_ct_tp_dst(flow_metadata, flow->ct_tp_dst);
|
|
|
|
|
}
|
|
|
|
|
}
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
}
|
|
|
|
|
if (flow->ct_zone != 0) {
|
|
|
|
|
match_set_ct_zone(flow_metadata, flow->ct_zone);
|
|
|
|
|
}
|
Add connection tracking mark support.
This patch adds a new 32-bit metadata field to the connection tracking
interface. When a mark is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_mark" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a mark with those
connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_mark)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_mark=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-09-18 13:58:00 -07:00
|
|
|
|
if (flow->ct_mark != 0) {
|
|
|
|
|
match_set_ct_mark(flow_metadata, flow->ct_mark);
|
|
|
|
|
}
|
2016-05-03 18:20:51 -07:00
|
|
|
|
if (!ovs_u128_is_zero(flow->ct_label)) {
|
Add connection tracking label support.
This patch adds a new 128-bit metadata field to the connection tracking
interface. When a label is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_label" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a label with
those connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_label)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_label=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-10-13 11:13:10 -07:00
|
|
|
|
match_set_ct_label(flow_metadata, flow->ct_label);
|
|
|
|
|
}
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-17 16:06:35 -07:00
|
|
|
|
const char *
|
|
|
|
|
ct_state_to_string(uint32_t state)
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
{
|
|
|
|
|
switch (state) {
|
2017-04-17 13:43:48 -07:00
|
|
|
|
#define CS_STATE(ENUM, INDEX, NAME) case CS_##ENUM: return NAME;
|
|
|
|
|
CS_STATES
|
|
|
|
|
#undef CS_STATE
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2012-01-04 16:40:13 -08:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-17 16:06:35 -07:00
|
|
|
|
uint32_t
|
|
|
|
|
ct_state_from_string(const char *s)
|
|
|
|
|
{
|
|
|
|
|
#define CS_STATE(ENUM, INDEX, NAME) \
|
|
|
|
|
if (!strcmp(s, NAME)) { \
|
|
|
|
|
return CS_##ENUM; \
|
|
|
|
|
}
|
|
|
|
|
CS_STATES
|
|
|
|
|
#undef CS_STATE
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-27 11:11:32 -07:00
|
|
|
|
/* Parses conntrack state from 'state_str'. If it is parsed successfully,
|
|
|
|
|
* stores the parsed ct_state in 'ct_state', and returns true. Otherwise,
|
|
|
|
|
* returns false, and reports error message in 'ds'. */
|
|
|
|
|
bool
|
|
|
|
|
parse_ct_state(const char *state_str, uint32_t default_state,
|
|
|
|
|
uint32_t *ct_state, struct ds *ds)
|
|
|
|
|
{
|
|
|
|
|
uint32_t state = default_state;
|
|
|
|
|
char *state_s = xstrdup(state_str);
|
|
|
|
|
char *save_ptr = NULL;
|
|
|
|
|
|
|
|
|
|
for (char *cs = strtok_r(state_s, ", ", &save_ptr); cs;
|
|
|
|
|
cs = strtok_r(NULL, ", ", &save_ptr)) {
|
|
|
|
|
uint32_t bit = ct_state_from_string(cs);
|
|
|
|
|
if (!bit) {
|
|
|
|
|
ds_put_format(ds, "%s: unknown connection tracking state flag",
|
|
|
|
|
cs);
|
2019-01-28 13:49:09 +08:00
|
|
|
|
free(state_s);
|
2017-06-27 11:11:32 -07:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
state |= bit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*ct_state = state;
|
|
|
|
|
free(state_s);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Checks the given conntrack state 'state' according to the constraints
|
|
|
|
|
* listed in ovs-fields (7). Returns true if it is valid. Otherwise, returns
|
|
|
|
|
* false, and reports error in 'ds'. */
|
|
|
|
|
bool
|
|
|
|
|
validate_ct_state(uint32_t state, struct ds *ds)
|
|
|
|
|
{
|
|
|
|
|
bool valid_ct_state = true;
|
|
|
|
|
struct ds d_str = DS_EMPTY_INITIALIZER;
|
|
|
|
|
|
|
|
|
|
format_flags(&d_str, ct_state_to_string, state, '|');
|
|
|
|
|
|
|
|
|
|
if (state && !(state & CS_TRACKED)) {
|
|
|
|
|
ds_put_format(ds, "%s: invalid connection state: "
|
|
|
|
|
"If \"trk\" is unset, no other flags are set\n",
|
|
|
|
|
ds_cstr(&d_str));
|
|
|
|
|
valid_ct_state = false;
|
|
|
|
|
}
|
|
|
|
|
if (state & CS_INVALID && state & ~(CS_TRACKED | CS_INVALID)) {
|
|
|
|
|
ds_put_format(ds, "%s: invalid connection state: "
|
|
|
|
|
"when \"inv\" is set, only \"trk\" may also be set\n",
|
|
|
|
|
ds_cstr(&d_str));
|
|
|
|
|
valid_ct_state = false;
|
|
|
|
|
}
|
|
|
|
|
if (state & CS_NEW && state & CS_ESTABLISHED) {
|
|
|
|
|
ds_put_format(ds, "%s: invalid connection state: "
|
|
|
|
|
"\"new\" and \"est\" are mutually exclusive\n",
|
|
|
|
|
ds_cstr(&d_str));
|
|
|
|
|
valid_ct_state = false;
|
|
|
|
|
}
|
|
|
|
|
if (state & CS_NEW && state & CS_REPLY_DIR) {
|
|
|
|
|
ds_put_format(ds, "%s: invalid connection state: "
|
|
|
|
|
"\"new\" and \"rpy\" are mutually exclusive\n",
|
|
|
|
|
ds_cstr(&d_str));
|
|
|
|
|
valid_ct_state = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ds_destroy(&d_str);
|
|
|
|
|
return valid_ct_state;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-18 11:22:05 -07:00
|
|
|
|
/* Clears the fields in 'flow' associated with connection tracking. */
|
|
|
|
|
void
|
|
|
|
|
flow_clear_conntrack(struct flow *flow)
|
|
|
|
|
{
|
|
|
|
|
flow->ct_state = 0;
|
|
|
|
|
flow->ct_zone = 0;
|
|
|
|
|
flow->ct_mark = 0;
|
|
|
|
|
flow->ct_label = OVS_U128_ZERO;
|
|
|
|
|
|
|
|
|
|
flow->ct_nw_proto = 0;
|
|
|
|
|
flow->ct_tp_src = 0;
|
|
|
|
|
flow->ct_tp_dst = 0;
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
flow->ct_nw_src = 0;
|
|
|
|
|
flow->ct_nw_dst = 0;
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
memset(&flow->ct_ipv6_src, 0, sizeof flow->ct_ipv6_src);
|
|
|
|
|
memset(&flow->ct_ipv6_dst, 0, sizeof flow->ct_ipv6_dst);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
char *
|
2017-05-31 16:06:12 -07:00
|
|
|
|
flow_to_string(const struct flow *flow,
|
|
|
|
|
const struct ofputil_port_map *port_map)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
2017-05-31 16:06:12 -07:00
|
|
|
|
flow_format(&ds, flow, port_map);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
return ds_cstr(&ds);
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-21 18:51:36 -08:00
|
|
|
|
const char *
|
|
|
|
|
flow_tun_flag_to_string(uint32_t flags)
|
|
|
|
|
{
|
|
|
|
|
switch (flags) {
|
|
|
|
|
case FLOW_TNL_F_DONT_FRAGMENT:
|
|
|
|
|
return "df";
|
|
|
|
|
case FLOW_TNL_F_CSUM:
|
|
|
|
|
return "csum";
|
|
|
|
|
case FLOW_TNL_F_KEY:
|
|
|
|
|
return "key";
|
2014-05-27 21:50:35 -07:00
|
|
|
|
case FLOW_TNL_F_OAM:
|
|
|
|
|
return "oam";
|
2012-11-21 18:51:36 -08:00
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
format_flags(struct ds *ds, const char *(*bit_to_string)(uint32_t),
|
|
|
|
|
uint32_t flags, char del)
|
|
|
|
|
{
|
|
|
|
|
uint32_t bad = 0;
|
|
|
|
|
|
|
|
|
|
if (!flags) {
|
2015-07-11 20:48:29 -07:00
|
|
|
|
ds_put_char(ds, '0');
|
2012-11-21 18:51:36 -08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
while (flags) {
|
|
|
|
|
uint32_t bit = rightmost_1bit(flags);
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
s = bit_to_string(bit);
|
|
|
|
|
if (s) {
|
|
|
|
|
ds_put_format(ds, "%s%c", s, del);
|
|
|
|
|
} else {
|
|
|
|
|
bad |= bit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flags &= ~bit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bad) {
|
|
|
|
|
ds_put_format(ds, "0x%"PRIx32"%c", bad, del);
|
|
|
|
|
}
|
|
|
|
|
ds_chomp(ds, del);
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-02 15:14:09 -08:00
|
|
|
|
void
|
|
|
|
|
format_flags_masked(struct ds *ds, const char *name,
|
|
|
|
|
const char *(*bit_to_string)(uint32_t), uint32_t flags,
|
2015-07-11 20:48:29 -07:00
|
|
|
|
uint32_t mask, uint32_t max_mask)
|
2013-12-02 15:14:09 -08:00
|
|
|
|
{
|
|
|
|
|
if (name) {
|
2016-03-02 15:56:19 +01:00
|
|
|
|
ds_put_format(ds, "%s%s=%s", colors.param, name, colors.end);
|
2013-12-02 15:14:09 -08:00
|
|
|
|
}
|
2015-07-11 20:48:29 -07:00
|
|
|
|
|
|
|
|
|
if (mask == max_mask) {
|
|
|
|
|
format_flags(ds, bit_to_string, flags, '|');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!mask) {
|
|
|
|
|
ds_put_cstr(ds, "0/0");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-02 15:14:09 -08:00
|
|
|
|
while (mask) {
|
|
|
|
|
uint32_t bit = rightmost_1bit(mask);
|
|
|
|
|
const char *s = bit_to_string(bit);
|
|
|
|
|
|
|
|
|
|
ds_put_format(ds, "%s%s", (flags & bit) ? "+" : "-",
|
|
|
|
|
s ? s : "[Unknown]");
|
|
|
|
|
mask &= ~bit;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-23 16:47:57 +00:00
|
|
|
|
static void
|
|
|
|
|
put_u16_masked(struct ds *s, uint16_t value, uint16_t mask)
|
|
|
|
|
{
|
|
|
|
|
if (!mask) {
|
|
|
|
|
ds_put_char(s, '*');
|
|
|
|
|
} else {
|
|
|
|
|
if (value > 9) {
|
|
|
|
|
ds_put_format(s, "0x%"PRIx16, value);
|
|
|
|
|
} else {
|
|
|
|
|
ds_put_format(s, "%"PRIu16, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mask != UINT16_MAX) {
|
|
|
|
|
ds_put_format(s, "/0x%"PRIx16, mask);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
format_packet_type_masked(struct ds *s, ovs_be32 value, ovs_be32 mask)
|
|
|
|
|
{
|
|
|
|
|
if (value == htonl(PT_ETH) && mask == OVS_BE32_MAX) {
|
|
|
|
|
ds_put_cstr(s, "eth");
|
|
|
|
|
} else {
|
|
|
|
|
ds_put_cstr(s, "packet_type=(");
|
|
|
|
|
put_u16_masked(s, pt_ns(value), pt_ns(mask));
|
|
|
|
|
ds_put_char(s, ',');
|
|
|
|
|
put_u16_masked(s, pt_ns_type(value), pt_ns_type(mask));
|
|
|
|
|
ds_put_char(s, ')');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-11 20:48:29 -07:00
|
|
|
|
/* Scans a string 's' of flags to determine their numerical value and
|
|
|
|
|
* returns the number of characters parsed using 'bit_to_string' to
|
|
|
|
|
* lookup flag names. Scanning continues until the character 'end' is
|
|
|
|
|
* reached.
|
|
|
|
|
*
|
|
|
|
|
* In the event of a failure, a negative error code will be returned. In
|
|
|
|
|
* addition, if 'res_string' is non-NULL then a descriptive string will
|
|
|
|
|
* be returned incorporating the identifying string 'field_name'. This
|
|
|
|
|
* error string must be freed by the caller.
|
|
|
|
|
*
|
|
|
|
|
* Upon success, the flag values will be stored in 'res_flags' and
|
|
|
|
|
* optionally 'res_mask', if it is non-NULL (if it is NULL then any masks
|
|
|
|
|
* present in the original string will be considered an error). The
|
|
|
|
|
* caller may restrict the acceptable set of values through the mask
|
|
|
|
|
* 'allowed'. */
|
|
|
|
|
int
|
|
|
|
|
parse_flags(const char *s, const char *(*bit_to_string)(uint32_t),
|
|
|
|
|
char end, const char *field_name, char **res_string,
|
|
|
|
|
uint32_t *res_flags, uint32_t allowed, uint32_t *res_mask)
|
|
|
|
|
{
|
|
|
|
|
uint32_t result = 0;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
/* Parse masked flags in numeric format? */
|
|
|
|
|
if (res_mask && ovs_scan(s, "%"SCNi32"/%"SCNi32"%n",
|
|
|
|
|
res_flags, res_mask, &n) && n > 0) {
|
|
|
|
|
if (*res_flags & ~allowed || *res_mask & ~allowed) {
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
|
|
|
|
|
|
if (res_mask && (*s == '+' || *s == '-')) {
|
|
|
|
|
uint32_t flags = 0, mask = 0;
|
|
|
|
|
|
|
|
|
|
/* Parse masked flags. */
|
|
|
|
|
while (s[0] != end) {
|
|
|
|
|
bool set;
|
|
|
|
|
uint32_t bit;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
if (s[0] == '+') {
|
|
|
|
|
set = true;
|
|
|
|
|
} else if (s[0] == '-') {
|
|
|
|
|
set = false;
|
|
|
|
|
} else {
|
|
|
|
|
if (res_string) {
|
|
|
|
|
*res_string = xasprintf("%s: %s must be preceded by '+' "
|
|
|
|
|
"(for SET) or '-' (NOT SET)", s,
|
|
|
|
|
field_name);
|
|
|
|
|
}
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
s++;
|
|
|
|
|
n++;
|
|
|
|
|
|
|
|
|
|
for (bit = 1; bit; bit <<= 1) {
|
|
|
|
|
const char *fname = bit_to_string(bit);
|
|
|
|
|
|
|
|
|
|
if (!fname) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = strlen(fname);
|
|
|
|
|
if (strncmp(s, fname, len) ||
|
|
|
|
|
(s[len] != '+' && s[len] != '-' && s[len] != end)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mask & bit) {
|
|
|
|
|
/* bit already set. */
|
|
|
|
|
if (res_string) {
|
|
|
|
|
*res_string = xasprintf("%s: Each %s flag can be "
|
|
|
|
|
"specified only once", s,
|
|
|
|
|
field_name);
|
|
|
|
|
}
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
if (!(bit & allowed)) {
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
if (set) {
|
|
|
|
|
flags |= bit;
|
|
|
|
|
}
|
|
|
|
|
mask |= bit;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!bit) {
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
s += len;
|
|
|
|
|
n += len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*res_flags = flags;
|
|
|
|
|
*res_mask = mask;
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse unmasked flags. If a flag is present, it is set, otherwise
|
|
|
|
|
* it is not set. */
|
|
|
|
|
while (s[n] != end) {
|
|
|
|
|
unsigned long long int flags;
|
|
|
|
|
uint32_t bit;
|
|
|
|
|
int n0;
|
|
|
|
|
|
|
|
|
|
if (ovs_scan(&s[n], "%lli%n", &flags, &n0)) {
|
|
|
|
|
if (flags & ~allowed) {
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
n += n0 + (s[n + n0] == '|');
|
|
|
|
|
result |= flags;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (bit = 1; bit; bit <<= 1) {
|
|
|
|
|
const char *name = bit_to_string(bit);
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
if (!name) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = strlen(name);
|
|
|
|
|
if (!strncmp(s + n, name, len) &&
|
|
|
|
|
(s[n + len] == '|' || s[n + len] == end)) {
|
|
|
|
|
if (!(bit & allowed)) {
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
result |= bit;
|
|
|
|
|
n += len + (s[n + len] == '|');
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!bit) {
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*res_flags = result;
|
|
|
|
|
if (res_mask) {
|
|
|
|
|
*res_mask = UINT32_MAX;
|
|
|
|
|
}
|
|
|
|
|
if (res_string) {
|
|
|
|
|
*res_string = NULL;
|
|
|
|
|
}
|
|
|
|
|
return n;
|
|
|
|
|
|
|
|
|
|
unknown:
|
|
|
|
|
if (res_string) {
|
|
|
|
|
*res_string = xasprintf("%s: unknown %s flag(s)", s, field_name);
|
|
|
|
|
}
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
void
|
2017-05-31 16:06:12 -07:00
|
|
|
|
flow_format(struct ds *ds,
|
|
|
|
|
const struct flow *flow, const struct ofputil_port_map *port_map)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-10-22 14:00:35 -07:00
|
|
|
|
struct match match;
|
2014-10-01 15:35:45 -07:00
|
|
|
|
struct flow_wildcards *wc = &match.wc;
|
2012-09-13 20:11:08 -07:00
|
|
|
|
|
2012-10-22 14:00:35 -07:00
|
|
|
|
match_wc_init(&match, flow);
|
2014-10-01 15:35:45 -07:00
|
|
|
|
|
|
|
|
|
/* As this function is most often used for formatting a packet in a
|
|
|
|
|
* packet-in message, skip formatting the packet context fields that are
|
2015-03-26 15:32:45 -07:00
|
|
|
|
* all-zeroes to make the print-out easier on the eyes. This means that a
|
|
|
|
|
* missing context field implies a zero value for that field. This is
|
|
|
|
|
* similar to OpenFlow encoding of these fields, as the specification
|
|
|
|
|
* states that all-zeroes context fields should not be encoded in the
|
|
|
|
|
* packet-in messages. */
|
|
|
|
|
if (!flow->in_port.ofp_port) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, in_port);
|
|
|
|
|
}
|
2014-10-01 15:35:45 -07:00
|
|
|
|
if (!flow->skb_priority) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, skb_priority);
|
|
|
|
|
}
|
|
|
|
|
if (!flow->pkt_mark) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, pkt_mark);
|
|
|
|
|
}
|
|
|
|
|
if (!flow->recirc_id) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, recirc_id);
|
|
|
|
|
}
|
2015-03-13 12:22:51 -07:00
|
|
|
|
if (!flow->dp_hash) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, dp_hash);
|
|
|
|
|
}
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
if (!flow->ct_state) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_state);
|
|
|
|
|
}
|
|
|
|
|
if (!flow->ct_zone) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_zone);
|
|
|
|
|
}
|
Add connection tracking mark support.
This patch adds a new 32-bit metadata field to the connection tracking
interface. When a mark is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_mark" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a mark with those
connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_mark)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_mark=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-09-18 13:58:00 -07:00
|
|
|
|
if (!flow->ct_mark) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_mark);
|
|
|
|
|
}
|
2016-05-03 18:20:51 -07:00
|
|
|
|
if (ovs_u128_is_zero(flow->ct_label)) {
|
Add connection tracking label support.
This patch adds a new 128-bit metadata field to the connection tracking
interface. When a label is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_label" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a label with
those connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_label)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_label=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-10-13 11:13:10 -07:00
|
|
|
|
WC_UNMASK_FIELD(wc, ct_label);
|
|
|
|
|
}
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (!is_ct_valid(flow, &match.wc, NULL) || !flow->ct_nw_proto) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_nw_proto);
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_tp_src);
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_tp_dst);
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_nw_src);
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_nw_dst);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_ipv6_src);
|
|
|
|
|
WC_UNMASK_FIELD(wc, ct_ipv6_dst);
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-10-01 15:35:45 -07:00
|
|
|
|
for (int i = 0; i < FLOW_N_REGS; i++) {
|
|
|
|
|
if (!flow->regs[i]) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, regs[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!flow->metadata) {
|
|
|
|
|
WC_UNMASK_FIELD(wc, metadata);
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-31 16:06:12 -07:00
|
|
|
|
match_format(&match, port_map, ds, OFP_DEFAULT_PRIORITY);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2017-05-31 16:06:12 -07:00
|
|
|
|
flow_print(FILE *stream,
|
|
|
|
|
const struct flow *flow, const struct ofputil_port_map *port_map)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2017-05-31 16:06:12 -07:00
|
|
|
|
char *s = flow_to_string(flow, port_map);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
fputs(s, stream);
|
|
|
|
|
free(s);
|
|
|
|
|
}
|
2010-10-20 16:33:10 -07:00
|
|
|
|
|
|
|
|
|
/* flow_wildcards functions. */
|
|
|
|
|
|
2010-11-10 14:39:54 -08:00
|
|
|
|
/* Initializes 'wc' as a set of wildcards that matches every packet. */
|
2010-10-20 16:33:10 -07:00
|
|
|
|
void
|
2010-11-10 14:39:54 -08:00
|
|
|
|
flow_wildcards_init_catchall(struct flow_wildcards *wc)
|
2010-10-20 16:33:10 -07:00
|
|
|
|
{
|
2012-08-07 13:43:18 -07:00
|
|
|
|
memset(&wc->masks, 0, sizeof wc->masks);
|
2010-10-20 16:33:10 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-01 15:35:45 -07:00
|
|
|
|
/* Converts a flow into flow wildcards. It sets the wildcard masks based on
|
|
|
|
|
* the packet headers extracted to 'flow'. It will not set the mask for fields
|
|
|
|
|
* that do not make sense for the packet type. OpenFlow-only metadata is
|
|
|
|
|
* wildcarded, but other metadata is unconditionally exact-matched. */
|
2017-03-01 17:47:59 -05:00
|
|
|
|
void
|
|
|
|
|
flow_wildcards_init_for_packet(struct flow_wildcards *wc,
|
|
|
|
|
const struct flow *flow)
|
2014-10-01 15:35:45 -07:00
|
|
|
|
{
|
2017-06-23 16:48:47 +00:00
|
|
|
|
ovs_be16 dl_type = OVS_BE16_MAX;
|
|
|
|
|
|
2014-10-01 15:35:45 -07:00
|
|
|
|
memset(&wc->masks, 0x0, sizeof wc->masks);
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* Update this function whenever struct flow changes. */
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
2015-11-25 11:31:11 -02:00
|
|
|
|
if (flow_tnl_dst_is_set(&flow->tunnel)) {
|
2014-10-01 15:35:45 -07:00
|
|
|
|
if (flow->tunnel.flags & FLOW_TNL_F_KEY) {
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.tun_id);
|
|
|
|
|
}
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.ip_src);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.ip_dst);
|
2015-11-25 11:31:11 -02:00
|
|
|
|
WC_MASK_FIELD(wc, tunnel.ipv6_src);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.ipv6_dst);
|
2014-10-01 15:35:45 -07:00
|
|
|
|
WC_MASK_FIELD(wc, tunnel.flags);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.ip_tos);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.ip_ttl);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.tp_src);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.tp_dst);
|
2015-02-14 15:13:17 +01:00
|
|
|
|
WC_MASK_FIELD(wc, tunnel.gbp_id);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.gbp_flags);
|
2018-05-15 16:10:48 -04:00
|
|
|
|
WC_MASK_FIELD(wc, tunnel.erspan_ver);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.erspan_idx);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.erspan_dir);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.erspan_hwid);
|
2019-11-25 11:19:23 -08:00
|
|
|
|
WC_MASK_FIELD(wc, tunnel.gtpu_flags);
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.gtpu_msgtype);
|
tunnel: Geneve TLV handling support for OpenFlow.
The current support for Geneve in OVS is exactly equivalent to VXLAN:
it is possible to set and match on the VNI but not on any options
contained in the header. This patch enables the use of options.
The goal for Geneve support is not to add support for any particular option
but to allow end users or controllers to specify what they would like to
match. That is, the full range of Geneve's capabilities should be exposed
without modifying the code (the one exception being options that require
per-packet computation in the fast path).
The main issue with supporting Geneve options is how to integrate the
fields into the existing OpenFlow pipeline. All existing operations
are referred to by their NXM/OXM field name - matches, action generation,
arithmetic operations (i.e. tranfer to a register). However, the Geneve
option space is exactly the same as the OXM space, so a direct mapping
is not feasible. Instead, we create a pool of 64 NXMs that are then
dynamically mapped on Geneve option TLVs using OpenFlow. Once mapped,
these fields become first-class citizens in the OpenFlow pipeline.
An example of how to use Geneve options:
ovs-ofctl add-geneve-map br0 {class=0xffff,type=0,len=4}->tun_metadata0
ovs-ofctl add-flow br0 in_port=LOCAL,actions=set_field:0xffffffff->tun_metadata0,1
This will add a 4 bytes option (filled will all 1's) to all packets
coming from the LOCAL port and then send then out to port 1.
A limitation of this patch is that although the option table is specified
for a particular switch over OpenFlow, it is currently global to all
switches. This will be addressed in a future patch.
Based on work originally done by Madhu Challa. Ben Pfaff also significantly
improved the comments.
Signed-off-by: Madhu Challa <challa@noironetworks.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-04-30 18:09:57 -07:00
|
|
|
|
|
2015-06-29 18:01:59 -07:00
|
|
|
|
if (!(flow->tunnel.flags & FLOW_TNL_F_UDPIF)) {
|
|
|
|
|
if (flow->tunnel.metadata.present.map) {
|
|
|
|
|
wc->masks.tunnel.metadata.present.map =
|
|
|
|
|
flow->tunnel.metadata.present.map;
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.metadata.opts.u8);
|
2016-04-19 18:36:04 -07:00
|
|
|
|
WC_MASK_FIELD(wc, tunnel.metadata.tab);
|
2015-06-29 18:01:59 -07:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.metadata.present.len);
|
|
|
|
|
memset(wc->masks.tunnel.metadata.opts.gnv, 0xff,
|
|
|
|
|
flow->tunnel.metadata.present.len);
|
tunnel: Geneve TLV handling support for OpenFlow.
The current support for Geneve in OVS is exactly equivalent to VXLAN:
it is possible to set and match on the VNI but not on any options
contained in the header. This patch enables the use of options.
The goal for Geneve support is not to add support for any particular option
but to allow end users or controllers to specify what they would like to
match. That is, the full range of Geneve's capabilities should be exposed
without modifying the code (the one exception being options that require
per-packet computation in the fast path).
The main issue with supporting Geneve options is how to integrate the
fields into the existing OpenFlow pipeline. All existing operations
are referred to by their NXM/OXM field name - matches, action generation,
arithmetic operations (i.e. tranfer to a register). However, the Geneve
option space is exactly the same as the OXM space, so a direct mapping
is not feasible. Instead, we create a pool of 64 NXMs that are then
dynamically mapped on Geneve option TLVs using OpenFlow. Once mapped,
these fields become first-class citizens in the OpenFlow pipeline.
An example of how to use Geneve options:
ovs-ofctl add-geneve-map br0 {class=0xffff,type=0,len=4}->tun_metadata0
ovs-ofctl add-flow br0 in_port=LOCAL,actions=set_field:0xffffffff->tun_metadata0,1
This will add a 4 bytes option (filled will all 1's) to all packets
coming from the LOCAL port and then send then out to port 1.
A limitation of this patch is that although the option table is specified
for a particular switch over OpenFlow, it is currently global to all
switches. This will be addressed in a future patch.
Based on work originally done by Madhu Challa. Ben Pfaff also significantly
improved the comments.
Signed-off-by: Madhu Challa <challa@noironetworks.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-04-30 18:09:57 -07:00
|
|
|
|
}
|
2014-10-01 15:35:45 -07:00
|
|
|
|
} else if (flow->tunnel.tun_id) {
|
|
|
|
|
WC_MASK_FIELD(wc, tunnel.tun_id);
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-11 13:25:24 -08:00
|
|
|
|
/* metadata, regs, and conj_id wildcarded. */
|
2014-10-01 15:35:45 -07:00
|
|
|
|
|
|
|
|
|
WC_MASK_FIELD(wc, skb_priority);
|
|
|
|
|
WC_MASK_FIELD(wc, pkt_mark);
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
WC_MASK_FIELD(wc, ct_state);
|
|
|
|
|
WC_MASK_FIELD(wc, ct_zone);
|
Add connection tracking mark support.
This patch adds a new 32-bit metadata field to the connection tracking
interface. When a mark is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_mark" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a mark with those
connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_mark)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_mark=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-09-18 13:58:00 -07:00
|
|
|
|
WC_MASK_FIELD(wc, ct_mark);
|
Add connection tracking label support.
This patch adds a new 128-bit metadata field to the connection tracking
interface. When a label is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_label" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a label with
those connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_label)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_label=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-10-13 11:13:10 -07:00
|
|
|
|
WC_MASK_FIELD(wc, ct_label);
|
2014-10-01 15:35:45 -07:00
|
|
|
|
WC_MASK_FIELD(wc, recirc_id);
|
|
|
|
|
WC_MASK_FIELD(wc, dp_hash);
|
|
|
|
|
WC_MASK_FIELD(wc, in_port);
|
|
|
|
|
|
2014-11-03 14:24:01 -08:00
|
|
|
|
/* actset_output wildcarded. */
|
|
|
|
|
|
2017-06-23 16:47:57 +00:00
|
|
|
|
WC_MASK_FIELD(wc, packet_type);
|
2017-06-23 16:48:47 +00:00
|
|
|
|
if (flow->packet_type == htonl(PT_ETH)) {
|
|
|
|
|
WC_MASK_FIELD(wc, dl_dst);
|
|
|
|
|
WC_MASK_FIELD(wc, dl_src);
|
|
|
|
|
WC_MASK_FIELD(wc, dl_type);
|
|
|
|
|
/* No need to set mask of inner VLANs that don't exist. */
|
|
|
|
|
for (int i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
|
|
|
|
|
/* Always show the first zero VLAN. */
|
|
|
|
|
WC_MASK_FIELD(wc, vlans[i]);
|
|
|
|
|
if (flow->vlans[i].tci == htons(0)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
2017-06-23 16:48:47 +00:00
|
|
|
|
dl_type = flow->dl_type;
|
|
|
|
|
} else {
|
|
|
|
|
dl_type = pt_ns_type_be(flow->packet_type);
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
2014-10-01 15:35:45 -07:00
|
|
|
|
|
2017-06-23 16:48:47 +00:00
|
|
|
|
if (dl_type == htons(ETH_TYPE_IP)) {
|
2014-10-01 15:35:45 -07:00
|
|
|
|
WC_MASK_FIELD(wc, nw_src);
|
|
|
|
|
WC_MASK_FIELD(wc, nw_dst);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
WC_MASK_FIELD(wc, ct_nw_src);
|
|
|
|
|
WC_MASK_FIELD(wc, ct_nw_dst);
|
2017-06-23 16:48:47 +00:00
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
|
2014-10-01 15:35:45 -07:00
|
|
|
|
WC_MASK_FIELD(wc, ipv6_src);
|
|
|
|
|
WC_MASK_FIELD(wc, ipv6_dst);
|
|
|
|
|
WC_MASK_FIELD(wc, ipv6_label);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (is_nd(flow, wc)) {
|
|
|
|
|
WC_MASK_FIELD(wc, arp_sha);
|
|
|
|
|
WC_MASK_FIELD(wc, arp_tha);
|
|
|
|
|
WC_MASK_FIELD(wc, nd_target);
|
|
|
|
|
} else {
|
|
|
|
|
WC_MASK_FIELD(wc, ct_ipv6_src);
|
|
|
|
|
WC_MASK_FIELD(wc, ct_ipv6_dst);
|
|
|
|
|
}
|
2017-06-23 16:48:47 +00:00
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_ARP) ||
|
|
|
|
|
dl_type == htons(ETH_TYPE_RARP)) {
|
2014-10-01 15:35:45 -07:00
|
|
|
|
WC_MASK_FIELD(wc, nw_src);
|
|
|
|
|
WC_MASK_FIELD(wc, nw_dst);
|
|
|
|
|
WC_MASK_FIELD(wc, nw_proto);
|
|
|
|
|
WC_MASK_FIELD(wc, arp_sha);
|
|
|
|
|
WC_MASK_FIELD(wc, arp_tha);
|
|
|
|
|
return;
|
2017-06-23 16:48:47 +00:00
|
|
|
|
} else if (eth_type_mpls(dl_type)) {
|
2014-10-01 15:35:45 -07:00
|
|
|
|
for (int i = 0; i < FLOW_MAX_MPLS_LABELS; i++) {
|
|
|
|
|
WC_MASK_FIELD(wc, mpls_lse[i]);
|
|
|
|
|
if (flow->mpls_lse[i] & htonl(MPLS_BOS_MASK)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return;
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_NSH)) {
|
|
|
|
|
WC_MASK_FIELD(wc, nsh.flags);
|
2018-01-11 13:24:01 +08:00
|
|
|
|
WC_MASK_FIELD(wc, nsh.ttl);
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
WC_MASK_FIELD(wc, nsh.mdtype);
|
|
|
|
|
WC_MASK_FIELD(wc, nsh.np);
|
2018-01-11 13:24:01 +08:00
|
|
|
|
WC_MASK_FIELD(wc, nsh.path_hdr);
|
2018-01-06 13:47:51 +08:00
|
|
|
|
WC_MASK_FIELD(wc, nsh.context);
|
2014-10-01 15:35:45 -07:00
|
|
|
|
} else {
|
|
|
|
|
return; /* Unknown ethertype. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* IPv4 or IPv6. */
|
2022-07-08 16:51:25 -04:00
|
|
|
|
WC_MASK_FIELD_MASK(wc, nw_frag, FLOW_NW_FRAG_MASK);
|
2014-10-01 15:35:45 -07:00
|
|
|
|
WC_MASK_FIELD(wc, nw_tos);
|
|
|
|
|
WC_MASK_FIELD(wc, nw_ttl);
|
|
|
|
|
WC_MASK_FIELD(wc, nw_proto);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
WC_MASK_FIELD(wc, ct_nw_proto);
|
|
|
|
|
WC_MASK_FIELD(wc, ct_tp_src);
|
|
|
|
|
WC_MASK_FIELD(wc, ct_tp_dst);
|
2014-10-01 15:35:45 -07:00
|
|
|
|
|
|
|
|
|
/* No transport layer header in later fragments. */
|
|
|
|
|
if (!(flow->nw_frag & FLOW_NW_FRAG_LATER) &&
|
|
|
|
|
(flow->nw_proto == IPPROTO_ICMP ||
|
|
|
|
|
flow->nw_proto == IPPROTO_ICMPV6 ||
|
|
|
|
|
flow->nw_proto == IPPROTO_TCP ||
|
|
|
|
|
flow->nw_proto == IPPROTO_UDP ||
|
|
|
|
|
flow->nw_proto == IPPROTO_SCTP ||
|
|
|
|
|
flow->nw_proto == IPPROTO_IGMP)) {
|
|
|
|
|
WC_MASK_FIELD(wc, tp_src);
|
|
|
|
|
WC_MASK_FIELD(wc, tp_dst);
|
|
|
|
|
|
|
|
|
|
if (flow->nw_proto == IPPROTO_TCP) {
|
|
|
|
|
WC_MASK_FIELD(wc, tcp_flags);
|
|
|
|
|
} else if (flow->nw_proto == IPPROTO_IGMP) {
|
|
|
|
|
WC_MASK_FIELD(wc, igmp_group_ip4);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* Return a map of possible fields for a packet of the same type as 'flow'.
|
|
|
|
|
* Including extra bits in the returned mask is not wrong, it is just less
|
|
|
|
|
* optimal.
|
|
|
|
|
*
|
|
|
|
|
* This is a less precise version of flow_wildcards_init_for_packet() above. */
|
2015-07-17 15:18:43 -07:00
|
|
|
|
void
|
2015-08-25 13:55:03 -07:00
|
|
|
|
flow_wc_map(const struct flow *flow, struct flowmap *map)
|
2014-10-17 09:37:11 -07:00
|
|
|
|
{
|
|
|
|
|
/* Update this function whenever struct flow changes. */
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
flowmap_init(map);
|
|
|
|
|
|
2015-11-25 11:31:11 -02:00
|
|
|
|
if (flow_tnl_dst_is_set(&flow->tunnel)) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET__(map, tunnel, offsetof(struct flow_tnl, metadata));
|
2015-06-29 18:01:59 -07:00
|
|
|
|
if (!(flow->tunnel.flags & FLOW_TNL_F_UDPIF)) {
|
|
|
|
|
if (flow->tunnel.metadata.present.map) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, tunnel.metadata);
|
2015-06-29 18:01:59 -07:00
|
|
|
|
}
|
|
|
|
|
} else {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, tunnel.metadata.present.len);
|
|
|
|
|
FLOWMAP_SET__(map, tunnel.metadata.opts.gnv,
|
|
|
|
|
flow->tunnel.metadata.present.len);
|
2015-07-17 15:18:43 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
/* Metadata fields that can appear on packet input. */
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, skb_priority);
|
|
|
|
|
FLOWMAP_SET(map, pkt_mark);
|
|
|
|
|
FLOWMAP_SET(map, recirc_id);
|
|
|
|
|
FLOWMAP_SET(map, dp_hash);
|
|
|
|
|
FLOWMAP_SET(map, in_port);
|
|
|
|
|
FLOWMAP_SET(map, dl_dst);
|
|
|
|
|
FLOWMAP_SET(map, dl_src);
|
|
|
|
|
FLOWMAP_SET(map, dl_type);
|
2017-03-01 17:47:59 -05:00
|
|
|
|
FLOWMAP_SET(map, vlans);
|
Add support for connection tracking.
This patch adds a new action and fields to OVS that allow connection
tracking to be performed. This support works in conjunction with the
Linux kernel support merged into the Linux-4.3 development cycle.
Packets have two possible states with respect to connection tracking:
Untracked packets have not previously passed through the connection
tracker, while tracked packets have previously been through the
connection tracker. For OpenFlow pipeline processing, untracked packets
can become tracked, and they will remain tracked until the end of the
pipeline. Tracked packets cannot become untracked.
Connections can be unknown, uncommitted, or committed. Packets which are
untracked have unknown connection state. To know the connection state,
the packet must become tracked. Uncommitted connections have no
connection state stored about them, so it is only possible for the
connection tracker to identify whether they are a new connection or
whether they are invalid. Committed connections have connection state
stored beyond the lifetime of the packet, which allows later packets in
the same connection to be identified as part of the same established
connection, or related to an existing connection - for instance ICMP
error responses.
The new 'ct' action transitions the packet from "untracked" to
"tracked" by sending this flow through the connection tracker.
The following parameters are supported initally:
- "commit": When commit is executed, the connection moves from
uncommitted state to committed state. This signals that information
about the connection should be stored beyond the lifetime of the
packet within the pipeline. This allows future packets in the same
connection to be recognized as part of the same "established" (est)
connection, as well as identifying packets in the reply (rpl)
direction, or packets related to an existing connection (rel).
- "zone=[u16|NXM]": Perform connection tracking in the zone specified.
Each zone is an independent connection tracking context. When the
"commit" parameter is used, the connection will only be committed in
the specified zone, and not in other zones. This is 0 by default.
- "table=NUMBER": Fork pipeline processing in two. The original instance
of the packet will continue processing the current actions list as an
untracked packet. An additional instance of the packet will be sent to
the connection tracker, which will be re-injected into the OpenFlow
pipeline to resume processing in the specified table, with the
ct_state and other ct match fields set. If the table is not specified,
then the packet is submitted to the connection tracker, but the
pipeline does not fork and the ct match fields are not populated. It
is strongly recommended to specify a table later than the current
table to prevent loops.
When the "table" option is used, the packet that continues processing in
the specified table will have the ct_state populated. The ct_state may
have any of the following flags set:
- Tracked (trk): Connection tracking has occurred.
- Reply (rpl): The flow is in the reply direction.
- Invalid (inv): The connection tracker couldn't identify the connection.
- New (new): This is the beginning of a new connection.
- Established (est): This is part of an already existing connection.
- Related (rel): This connection is related to an existing connection.
For more information, consult the ovs-ofctl(8) man pages.
Below is a simple example flow table to allow outbound TCP traffic from
port 1 and drop traffic from port 2 that was not initiated by port 1:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,ct_state=-trk,action=ct(commit,zone=9),2
table=0,in_port=2,tcp,ct_state=-trk,action=ct(zone=9,table=1)
table=1,in_port=2,ct_state=+trk+est,tcp,action=1
table=1,in_port=2,ct_state=+trk+new,tcp,action=drop
Based on original design by Justin Pettit, contributions from Thomas
Graf and Daniele Di Proietto.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-08-11 10:56:09 -07:00
|
|
|
|
FLOWMAP_SET(map, ct_state);
|
|
|
|
|
FLOWMAP_SET(map, ct_zone);
|
Add connection tracking mark support.
This patch adds a new 32-bit metadata field to the connection tracking
interface. When a mark is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_mark" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a mark with those
connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_mark)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_mark=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-09-18 13:58:00 -07:00
|
|
|
|
FLOWMAP_SET(map, ct_mark);
|
Add connection tracking label support.
This patch adds a new 128-bit metadata field to the connection tracking
interface. When a label is specified as part of the ct action and the
connection is committed, the value is saved with the current connection.
Subsequent ct lookups with the table specified will expose this metadata
as the "ct_label" field in the flow.
For example, to allow new TCP connections from port 1->2 and only allow
established connections from port 2->1, and to associate a label with
those connections:
table=0,priority=1,action=drop
table=0,arp,action=normal
table=0,in_port=1,tcp,action=ct(commit,exec(set_field:1->ct_label)),2
table=0,in_port=2,ct_state=-trk,tcp,action=ct(table=1)
table=1,in_port=2,ct_state=+trk,ct_label=1,tcp,action=1
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-10-13 11:13:10 -07:00
|
|
|
|
FLOWMAP_SET(map, ct_label);
|
2017-04-25 16:29:59 +00:00
|
|
|
|
FLOWMAP_SET(map, packet_type);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
/* Ethertype-dependent fields. */
|
|
|
|
|
if (OVS_LIKELY(flow->dl_type == htons(ETH_TYPE_IP))) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, nw_src);
|
|
|
|
|
FLOWMAP_SET(map, nw_dst);
|
|
|
|
|
FLOWMAP_SET(map, nw_proto);
|
|
|
|
|
FLOWMAP_SET(map, nw_frag);
|
|
|
|
|
FLOWMAP_SET(map, nw_tos);
|
|
|
|
|
FLOWMAP_SET(map, nw_ttl);
|
2016-04-25 19:01:47 -07:00
|
|
|
|
FLOWMAP_SET(map, tp_src);
|
|
|
|
|
FLOWMAP_SET(map, tp_dst);
|
2017-03-08 17:18:23 -08:00
|
|
|
|
FLOWMAP_SET(map, ct_nw_proto);
|
|
|
|
|
FLOWMAP_SET(map, ct_nw_src);
|
|
|
|
|
FLOWMAP_SET(map, ct_nw_dst);
|
|
|
|
|
FLOWMAP_SET(map, ct_tp_src);
|
|
|
|
|
FLOWMAP_SET(map, ct_tp_dst);
|
2015-08-25 13:55:03 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
if (OVS_UNLIKELY(flow->nw_proto == IPPROTO_IGMP)) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, igmp_group_ip4);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
} else {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, tcp_flags);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
}
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, ipv6_src);
|
|
|
|
|
FLOWMAP_SET(map, ipv6_dst);
|
|
|
|
|
FLOWMAP_SET(map, ipv6_label);
|
|
|
|
|
FLOWMAP_SET(map, nw_proto);
|
|
|
|
|
FLOWMAP_SET(map, nw_frag);
|
|
|
|
|
FLOWMAP_SET(map, nw_tos);
|
|
|
|
|
FLOWMAP_SET(map, nw_ttl);
|
2016-04-25 19:01:47 -07:00
|
|
|
|
FLOWMAP_SET(map, tp_src);
|
|
|
|
|
FLOWMAP_SET(map, tp_dst);
|
2015-08-25 13:55:03 -07:00
|
|
|
|
|
2017-03-08 17:18:23 -08:00
|
|
|
|
if (OVS_UNLIKELY(is_nd(flow, NULL))) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, nd_target);
|
|
|
|
|
FLOWMAP_SET(map, arp_sha);
|
|
|
|
|
FLOWMAP_SET(map, arp_tha);
|
2019-01-28 11:41:06 +00:00
|
|
|
|
FLOWMAP_SET(map, tcp_flags);
|
|
|
|
|
FLOWMAP_SET(map, igmp_group_ip4);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
} else {
|
2017-03-08 17:18:23 -08:00
|
|
|
|
FLOWMAP_SET(map, ct_nw_proto);
|
|
|
|
|
FLOWMAP_SET(map, ct_ipv6_src);
|
|
|
|
|
FLOWMAP_SET(map, ct_ipv6_dst);
|
|
|
|
|
FLOWMAP_SET(map, ct_tp_src);
|
|
|
|
|
FLOWMAP_SET(map, ct_tp_dst);
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, tcp_flags);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
}
|
|
|
|
|
} else if (eth_type_mpls(flow->dl_type)) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, mpls_lse);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_ARP) ||
|
|
|
|
|
flow->dl_type == htons(ETH_TYPE_RARP)) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(map, nw_src);
|
|
|
|
|
FLOWMAP_SET(map, nw_dst);
|
|
|
|
|
FLOWMAP_SET(map, nw_proto);
|
|
|
|
|
FLOWMAP_SET(map, arp_sha);
|
|
|
|
|
FLOWMAP_SET(map, arp_tha);
|
userspace: Add support for NSH MD1 match fields
This patch adds support for NSH packet header fields to the OVS
control plane and the userspace datapath. Initially we support the
fields of the NSH base header as defined in
https://www.ietf.org/id/draft-ietf-sfc-nsh-13.txt
and the fixed context headers specified for metadata format MD1.
The variable length MD2 format is parsed but the TLV context headers
are not yet available for matching.
The NSH fields are modelled as experimenter fields with the dedicated
experimenter class 0x005ad650 proposed for NSH in ONF. The following
fields are defined:
NXOXM code ofctl name Size Comment
=====================================================================
NXOXM_NSH_FLAGS nsh_flags 8 Bits 2-9 of 1st NSH word
(0x005ad650,1)
NXOXM_NSH_MDTYPE nsh_mdtype 8 Bits 16-23
(0x005ad650,2)
NXOXM_NSH_NEXTPROTO nsh_np 8 Bits 24-31
(0x005ad650,3)
NXOXM_NSH_SPI nsh_spi 24 Bits 0-23 of 2nd NSH word
(0x005ad650,4)
NXOXM_NSH_SI nsh_si 8 Bits 24-31
(0x005ad650,5)
NXOXM_NSH_C1 nsh_c1 32 Maskable, nsh_mdtype==1
(0x005ad650,6)
NXOXM_NSH_C2 nsh_c2 32 Maskable, nsh_mdtype==1
(0x005ad650,7)
NXOXM_NSH_C3 nsh_c3 32 Maskable, nsh_mdtype==1
(0x005ad650,8)
NXOXM_NSH_C4 nsh_c4 32 Maskable, nsh_mdtype==1
(0x005ad650,9)
Co-authored-by: Johnson Li <johnson.li@intel.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2017-08-05 13:41:08 +08:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_NSH)) {
|
|
|
|
|
FLOWMAP_SET(map, nsh.flags);
|
|
|
|
|
FLOWMAP_SET(map, nsh.mdtype);
|
|
|
|
|
FLOWMAP_SET(map, nsh.np);
|
2018-01-11 13:24:01 +08:00
|
|
|
|
FLOWMAP_SET(map, nsh.path_hdr);
|
2018-01-06 13:47:51 +08:00
|
|
|
|
FLOWMAP_SET(map, nsh.context);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-10 23:32:51 -08:00
|
|
|
|
/* Clear the metadata and register wildcard masks. They are not packet
|
|
|
|
|
* header fields. */
|
|
|
|
|
void
|
|
|
|
|
flow_wildcards_clear_non_packet_fields(struct flow_wildcards *wc)
|
|
|
|
|
{
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* Update this function whenever struct flow changes. */
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
2013-12-10 23:32:51 -08:00
|
|
|
|
memset(&wc->masks.metadata, 0, sizeof wc->masks.metadata);
|
|
|
|
|
memset(&wc->masks.regs, 0, sizeof wc->masks.regs);
|
2014-11-03 14:24:01 -08:00
|
|
|
|
wc->masks.actset_output = 0;
|
2015-01-11 13:25:24 -08:00
|
|
|
|
wc->masks.conj_id = 0;
|
2013-12-10 23:32:51 -08:00
|
|
|
|
}
|
|
|
|
|
|
2011-09-12 16:38:52 -07:00
|
|
|
|
/* Returns true if 'wc' matches every packet, false if 'wc' fixes any bits or
|
|
|
|
|
* fields. */
|
|
|
|
|
bool
|
|
|
|
|
flow_wildcards_is_catchall(const struct flow_wildcards *wc)
|
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
const uint64_t *wc_u64 = (const uint64_t *) &wc->masks;
|
2012-08-07 13:43:18 -07:00
|
|
|
|
size_t i;
|
2011-09-12 16:38:52 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
if (wc_u64[i]) {
|
2011-09-12 16:38:52 -07:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-10 22:48:58 -07:00
|
|
|
|
/* Sets 'dst' as the bitwise AND of wildcards in 'src1' and 'src2'.
|
|
|
|
|
* That is, a bit or a field is wildcarded in 'dst' if it is wildcarded
|
|
|
|
|
* in 'src1' or 'src2' or both. */
|
2010-11-03 11:00:58 -07:00
|
|
|
|
void
|
2013-06-10 22:48:58 -07:00
|
|
|
|
flow_wildcards_and(struct flow_wildcards *dst,
|
|
|
|
|
const struct flow_wildcards *src1,
|
|
|
|
|
const struct flow_wildcards *src2)
|
2010-11-03 11:00:58 -07:00
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t *dst_u64 = (uint64_t *) &dst->masks;
|
|
|
|
|
const uint64_t *src1_u64 = (const uint64_t *) &src1->masks;
|
|
|
|
|
const uint64_t *src2_u64 = (const uint64_t *) &src2->masks;
|
2012-08-07 13:43:18 -07:00
|
|
|
|
size_t i;
|
2012-01-27 15:38:53 -08:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
dst_u64[i] = src1_u64[i] & src2_u64[i];
|
2012-08-07 13:38:38 -07:00
|
|
|
|
}
|
2010-11-03 11:00:58 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-06-10 22:48:58 -07:00
|
|
|
|
/* Sets 'dst' as the bitwise OR of wildcards in 'src1' and 'src2'. That
|
|
|
|
|
* is, a bit or a field is wildcarded in 'dst' if it is neither
|
|
|
|
|
* wildcarded in 'src1' nor 'src2'. */
|
|
|
|
|
void
|
|
|
|
|
flow_wildcards_or(struct flow_wildcards *dst,
|
|
|
|
|
const struct flow_wildcards *src1,
|
|
|
|
|
const struct flow_wildcards *src2)
|
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t *dst_u64 = (uint64_t *) &dst->masks;
|
|
|
|
|
const uint64_t *src1_u64 = (const uint64_t *) &src1->masks;
|
|
|
|
|
const uint64_t *src2_u64 = (const uint64_t *) &src2->masks;
|
2013-06-10 22:48:58 -07:00
|
|
|
|
size_t i;
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
dst_u64[i] = src1_u64[i] | src2_u64[i];
|
2013-06-10 22:48:58 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-03 11:00:58 -07:00
|
|
|
|
/* Returns a hash of the wildcards in 'wc'. */
|
|
|
|
|
uint32_t
|
2011-05-26 16:23:21 -07:00
|
|
|
|
flow_wildcards_hash(const struct flow_wildcards *wc, uint32_t basis)
|
2010-11-03 11:00:58 -07:00
|
|
|
|
{
|
2012-12-13 16:38:22 -08:00
|
|
|
|
return flow_hash(&wc->masks, basis);
|
2010-11-03 11:00:58 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if 'a' and 'b' represent the same wildcards, false if they are
|
|
|
|
|
* different. */
|
|
|
|
|
bool
|
|
|
|
|
flow_wildcards_equal(const struct flow_wildcards *a,
|
|
|
|
|
const struct flow_wildcards *b)
|
|
|
|
|
{
|
2012-08-07 13:43:18 -07:00
|
|
|
|
return flow_equal(&a->masks, &b->masks);
|
2010-11-03 11:00:58 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if at least one bit or field is wildcarded in 'a' but not in
|
|
|
|
|
* 'b', false otherwise. */
|
|
|
|
|
bool
|
|
|
|
|
flow_wildcards_has_extra(const struct flow_wildcards *a,
|
|
|
|
|
const struct flow_wildcards *b)
|
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
const uint64_t *a_u64 = (const uint64_t *) &a->masks;
|
|
|
|
|
const uint64_t *b_u64 = (const uint64_t *) &b->masks;
|
2012-08-07 13:43:18 -07:00
|
|
|
|
size_t i;
|
2012-01-27 15:38:53 -08:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
if ((a_u64[i] & b_u64[i]) != b_u64[i]) {
|
2010-11-11 10:41:33 -08:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-08-07 13:43:18 -07:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2010-11-11 10:41:33 -08:00
|
|
|
|
|
2012-08-07 13:43:18 -07:00
|
|
|
|
/* Returns true if 'a' and 'b' are equal, except that 0-bits (wildcarded bits)
|
|
|
|
|
* in 'wc' do not need to be equal in 'a' and 'b'. */
|
|
|
|
|
bool
|
|
|
|
|
flow_equal_except(const struct flow *a, const struct flow *b,
|
|
|
|
|
const struct flow_wildcards *wc)
|
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
const uint64_t *a_u64 = (const uint64_t *) a;
|
|
|
|
|
const uint64_t *b_u64 = (const uint64_t *) b;
|
|
|
|
|
const uint64_t *wc_u64 = (const uint64_t *) &wc->masks;
|
2012-08-07 13:43:18 -07:00
|
|
|
|
size_t i;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
if ((a_u64[i] ^ b_u64[i]) & wc_u64[i]) {
|
2012-08-07 13:43:18 -07:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2012-04-25 15:48:40 -07:00
|
|
|
|
}
|
2012-08-07 13:43:18 -07:00
|
|
|
|
return true;
|
2010-11-03 11:00:58 -07:00
|
|
|
|
}
|
|
|
|
|
|
2010-11-11 10:41:33 -08:00
|
|
|
|
/* Sets the wildcard mask for register 'idx' in 'wc' to 'mask'.
|
|
|
|
|
* (A 0-bit indicates a wildcard bit.) */
|
|
|
|
|
void
|
|
|
|
|
flow_wildcards_set_reg_mask(struct flow_wildcards *wc, int idx, uint32_t mask)
|
|
|
|
|
{
|
2012-08-07 13:38:38 -07:00
|
|
|
|
wc->masks.regs[idx] = mask;
|
2010-11-11 10:41:33 -08:00
|
|
|
|
}
|
2011-02-01 18:50:25 -08:00
|
|
|
|
|
2014-07-28 09:50:37 -07:00
|
|
|
|
/* Sets the wildcard mask for register 'idx' in 'wc' to 'mask'.
|
|
|
|
|
* (A 0-bit indicates a wildcard bit.) */
|
|
|
|
|
void
|
|
|
|
|
flow_wildcards_set_xreg_mask(struct flow_wildcards *wc, int idx, uint64_t mask)
|
|
|
|
|
{
|
|
|
|
|
flow_set_xreg(&wc->masks, idx, mask);
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-31 04:45:28 -07:00
|
|
|
|
/* Sets the wildcard mask for register 'idx' in 'wc' to 'mask'.
|
|
|
|
|
* (A 0-bit indicates a wildcard bit.) */
|
|
|
|
|
void
|
|
|
|
|
flow_wildcards_set_xxreg_mask(struct flow_wildcards *wc, int idx,
|
|
|
|
|
ovs_u128 mask)
|
|
|
|
|
{
|
|
|
|
|
flow_set_xxreg(&wc->masks, idx, mask);
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-29 15:50:38 -07:00
|
|
|
|
/* Calculates the 5-tuple hash from the given miniflow.
|
|
|
|
|
* This returns the same value as flow_hash_5tuple for the corresponding
|
|
|
|
|
* flow. */
|
2014-04-18 08:26:57 -07:00
|
|
|
|
uint32_t
|
|
|
|
|
miniflow_hash_5tuple(const struct miniflow *flow, uint32_t basis)
|
|
|
|
|
{
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2014-04-29 15:50:38 -07:00
|
|
|
|
uint32_t hash = basis;
|
2014-04-18 08:26:57 -07:00
|
|
|
|
|
2014-04-29 15:50:38 -07:00
|
|
|
|
if (flow) {
|
|
|
|
|
ovs_be16 dl_type = MINIFLOW_GET_BE16(flow, dl_type);
|
2016-05-17 19:18:51 -07:00
|
|
|
|
uint8_t nw_proto;
|
2014-04-29 15:50:38 -07:00
|
|
|
|
|
|
|
|
|
if (dl_type == htons(ETH_TYPE_IPV6)) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
struct flowmap map = FLOWMAP_EMPTY_INITIALIZER;
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t value;
|
2014-04-18 08:26:57 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_SET(&map, ipv6_src);
|
|
|
|
|
FLOWMAP_SET(&map, ipv6_dst);
|
|
|
|
|
|
|
|
|
|
MINIFLOW_FOR_EACH_IN_FLOWMAP(value, flow, map) {
|
2015-01-06 11:10:42 -08:00
|
|
|
|
hash = hash_add64(hash, value);
|
2014-04-29 15:50:38 -07:00
|
|
|
|
}
|
2016-05-17 19:18:51 -07:00
|
|
|
|
} else if (dl_type == htons(ETH_TYPE_IP)
|
|
|
|
|
|| dl_type == htons(ETH_TYPE_ARP)) {
|
2015-01-06 11:10:42 -08:00
|
|
|
|
hash = hash_add(hash, MINIFLOW_GET_U32(flow, nw_src));
|
|
|
|
|
hash = hash_add(hash, MINIFLOW_GET_U32(flow, nw_dst));
|
2016-05-17 19:18:51 -07:00
|
|
|
|
} else {
|
|
|
|
|
goto out;
|
2014-04-29 15:50:38 -07:00
|
|
|
|
}
|
2016-05-17 19:18:51 -07:00
|
|
|
|
|
|
|
|
|
nw_proto = MINIFLOW_GET_U8(flow, nw_proto);
|
|
|
|
|
hash = hash_add(hash, nw_proto);
|
|
|
|
|
if (nw_proto != IPPROTO_TCP && nw_proto != IPPROTO_UDP
|
|
|
|
|
&& nw_proto != IPPROTO_SCTP && nw_proto != IPPROTO_ICMP
|
|
|
|
|
&& nw_proto != IPPROTO_ICMPV6) {
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* Add both ports at once. */
|
2018-03-19 21:34:26 -07:00
|
|
|
|
hash = hash_add(hash, (OVS_FORCE uint32_t) miniflow_get_ports(flow));
|
2014-04-29 15:50:38 -07:00
|
|
|
|
}
|
2016-05-17 19:18:51 -07:00
|
|
|
|
out:
|
|
|
|
|
return hash_finish(hash, 42);
|
2014-04-18 08:26:57 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-06-09 11:32:24 -07:00
|
|
|
|
ASSERT_SEQUENTIAL_SAME_WORD(tp_src, tp_dst);
|
|
|
|
|
ASSERT_SEQUENTIAL(ipv6_src, ipv6_dst);
|
2014-04-18 08:26:57 -07:00
|
|
|
|
|
2014-02-26 10:07:38 -08:00
|
|
|
|
/* Calculates the 5-tuple hash from the given flow. */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_5tuple(const struct flow *flow, uint32_t basis)
|
|
|
|
|
{
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2014-04-29 15:50:38 -07:00
|
|
|
|
uint32_t hash = basis;
|
2014-02-26 10:07:38 -08:00
|
|
|
|
|
2014-04-29 15:50:38 -07:00
|
|
|
|
if (flow) {
|
|
|
|
|
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
2015-01-06 11:10:42 -08:00
|
|
|
|
const uint64_t *flow_u64 = (const uint64_t *)flow;
|
|
|
|
|
int ofs = offsetof(struct flow, ipv6_src) / 8;
|
|
|
|
|
int end = ofs + 2 * sizeof flow->ipv6_src / 8;
|
2014-02-26 10:07:38 -08:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (;ofs < end; ofs++) {
|
|
|
|
|
hash = hash_add64(hash, flow_u64[ofs]);
|
2014-04-29 15:50:38 -07:00
|
|
|
|
}
|
2016-05-17 19:18:51 -07:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IP)
|
|
|
|
|
|| flow->dl_type == htons(ETH_TYPE_ARP)) {
|
2014-07-04 07:57:18 -07:00
|
|
|
|
hash = hash_add(hash, (OVS_FORCE uint32_t) flow->nw_src);
|
|
|
|
|
hash = hash_add(hash, (OVS_FORCE uint32_t) flow->nw_dst);
|
2016-05-17 19:18:51 -07:00
|
|
|
|
} else {
|
|
|
|
|
goto out;
|
2014-04-29 15:50:38 -07:00
|
|
|
|
}
|
2016-05-17 19:18:51 -07:00
|
|
|
|
|
|
|
|
|
hash = hash_add(hash, flow->nw_proto);
|
|
|
|
|
if (flow->nw_proto != IPPROTO_TCP && flow->nw_proto != IPPROTO_UDP
|
|
|
|
|
&& flow->nw_proto != IPPROTO_SCTP && flow->nw_proto != IPPROTO_ICMP
|
|
|
|
|
&& flow->nw_proto != IPPROTO_ICMPV6) {
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* Add both ports at once. */
|
|
|
|
|
hash = hash_add(hash,
|
|
|
|
|
((const uint32_t *)flow)[offsetof(struct flow, tp_src)
|
|
|
|
|
/ sizeof(uint32_t)]);
|
2014-04-29 15:50:38 -07:00
|
|
|
|
}
|
2016-05-17 19:18:51 -07:00
|
|
|
|
out:
|
|
|
|
|
return hash_finish(hash, 42); /* Arbitrary number. */
|
2014-02-26 10:07:38 -08:00
|
|
|
|
}
|
|
|
|
|
|
2011-02-01 18:50:25 -08:00
|
|
|
|
/* Hashes 'flow' based on its L2 through L4 protocol information. */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
struct {
|
2010-12-29 19:03:46 -08:00
|
|
|
|
union {
|
|
|
|
|
ovs_be32 ipv4_addr;
|
|
|
|
|
struct in6_addr ipv6_addr;
|
|
|
|
|
};
|
2011-02-01 18:50:25 -08:00
|
|
|
|
ovs_be16 eth_type;
|
|
|
|
|
ovs_be16 vlan_tci;
|
2012-02-02 21:57:54 -08:00
|
|
|
|
ovs_be16 tp_port;
|
2015-08-28 14:55:11 -07:00
|
|
|
|
struct eth_addr eth_addr;
|
2011-02-01 18:50:25 -08:00
|
|
|
|
uint8_t ip_proto;
|
|
|
|
|
} fields;
|
|
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
memset(&fields, 0, sizeof fields);
|
2015-08-28 14:55:11 -07:00
|
|
|
|
for (i = 0; i < ARRAY_SIZE(fields.eth_addr.be16); i++) {
|
|
|
|
|
fields.eth_addr.be16[i] = flow->dl_src.be16[i] ^ flow->dl_dst.be16[i];
|
2011-02-01 18:50:25 -08:00
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
for (i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
|
|
|
|
|
fields.vlan_tci ^= flow->vlans[i].tci & htons(VLAN_VID_MASK);
|
|
|
|
|
}
|
2011-02-01 18:50:25 -08:00
|
|
|
|
fields.eth_type = flow->dl_type;
|
2011-05-23 11:39:17 -07:00
|
|
|
|
|
|
|
|
|
/* UDP source and destination port are not taken into account because they
|
|
|
|
|
* will not necessarily be symmetric in a bidirectional flow. */
|
2011-02-01 18:50:25 -08:00
|
|
|
|
if (fields.eth_type == htons(ETH_TYPE_IP)) {
|
2010-12-29 19:03:46 -08:00
|
|
|
|
fields.ipv4_addr = flow->nw_src ^ flow->nw_dst;
|
|
|
|
|
fields.ip_proto = flow->nw_proto;
|
2013-08-22 20:24:44 +12:00
|
|
|
|
if (fields.ip_proto == IPPROTO_TCP || fields.ip_proto == IPPROTO_SCTP) {
|
2012-02-02 21:57:54 -08:00
|
|
|
|
fields.tp_port = flow->tp_src ^ flow->tp_dst;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
}
|
|
|
|
|
} else if (fields.eth_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
const uint8_t *a = &flow->ipv6_src.s6_addr[0];
|
|
|
|
|
const uint8_t *b = &flow->ipv6_dst.s6_addr[0];
|
|
|
|
|
uint8_t *ipv6_addr = &fields.ipv6_addr.s6_addr[0];
|
|
|
|
|
|
|
|
|
|
for (i=0; i<16; i++) {
|
|
|
|
|
ipv6_addr[i] = a[i] ^ b[i];
|
|
|
|
|
}
|
2011-02-01 18:50:25 -08:00
|
|
|
|
fields.ip_proto = flow->nw_proto;
|
2013-08-22 20:24:44 +12:00
|
|
|
|
if (fields.ip_proto == IPPROTO_TCP || fields.ip_proto == IPPROTO_SCTP) {
|
2012-02-02 21:57:54 -08:00
|
|
|
|
fields.tp_port = flow->tp_src ^ flow->tp_dst;
|
2011-02-01 18:50:25 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
return jhash_bytes(&fields, sizeof fields, basis);
|
2011-02-01 18:50:25 -08:00
|
|
|
|
}
|
2011-07-13 16:20:24 -07:00
|
|
|
|
|
2018-05-24 17:27:59 +02:00
|
|
|
|
/* Symmetrically Hashes non-IP 'flow' based on its L2 headers. */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_symmetric_l2(const struct flow *flow, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
union {
|
|
|
|
|
struct {
|
|
|
|
|
ovs_be16 eth_type;
|
|
|
|
|
ovs_be16 vlan_tci;
|
|
|
|
|
struct eth_addr eth_addr;
|
|
|
|
|
ovs_be16 pad;
|
|
|
|
|
};
|
|
|
|
|
uint32_t word[3];
|
|
|
|
|
} fields;
|
|
|
|
|
|
|
|
|
|
uint32_t hash = basis;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (flow->packet_type != htonl(PT_ETH)) {
|
|
|
|
|
/* Cannot hash non-Ethernet flows */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(fields.eth_addr.be16); i++) {
|
|
|
|
|
fields.eth_addr.be16[i] =
|
|
|
|
|
flow->dl_src.be16[i] ^ flow->dl_dst.be16[i];
|
|
|
|
|
}
|
|
|
|
|
fields.vlan_tci = 0;
|
|
|
|
|
for (i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
|
|
|
|
|
fields.vlan_tci ^= flow->vlans[i].tci & htons(VLAN_VID_MASK);
|
|
|
|
|
}
|
|
|
|
|
fields.eth_type = flow->dl_type;
|
|
|
|
|
fields.pad = 0;
|
|
|
|
|
|
|
|
|
|
hash = hash_add(hash, fields.word[0]);
|
|
|
|
|
hash = hash_add(hash, fields.word[1]);
|
|
|
|
|
hash = hash_add(hash, fields.word[2]);
|
|
|
|
|
return hash_finish(hash, basis);
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-06 12:58:24 -05:00
|
|
|
|
/* Hashes 'flow' based on its L3 through L4 protocol information */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_symmetric_l3l4(const struct flow *flow, uint32_t basis,
|
|
|
|
|
bool inc_udp_ports)
|
|
|
|
|
{
|
|
|
|
|
uint32_t hash = basis;
|
|
|
|
|
|
|
|
|
|
/* UDP source and destination port are also taken into account. */
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
hash = hash_add(hash,
|
|
|
|
|
(OVS_FORCE uint32_t) (flow->nw_src ^ flow->nw_dst));
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
/* IPv6 addresses are 64-bit aligned inside struct flow. */
|
|
|
|
|
const uint64_t *a = ALIGNED_CAST(uint64_t *, flow->ipv6_src.s6_addr);
|
|
|
|
|
const uint64_t *b = ALIGNED_CAST(uint64_t *, flow->ipv6_dst.s6_addr);
|
|
|
|
|
|
2017-06-01 20:24:37 -07:00
|
|
|
|
for (int i = 0; i < sizeof flow->ipv6_src / sizeof *a; i++) {
|
2015-07-06 12:58:24 -05:00
|
|
|
|
hash = hash_add64(hash, a[i] ^ b[i]);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2018-05-24 17:27:59 +02:00
|
|
|
|
/* Revert to hashing L2 headers */
|
|
|
|
|
return flow_hash_symmetric_l2(flow, basis);
|
2015-07-06 12:58:24 -05:00
|
|
|
|
}
|
|
|
|
|
hash = hash_add(hash, flow->nw_proto);
|
2019-06-05 22:36:33 +00:00
|
|
|
|
if (!(flow->nw_frag & FLOW_NW_FRAG_MASK)
|
|
|
|
|
&& (flow->nw_proto == IPPROTO_TCP || flow->nw_proto == IPPROTO_SCTP ||
|
|
|
|
|
(inc_udp_ports && flow->nw_proto == IPPROTO_UDP))) {
|
2015-07-06 12:58:24 -05:00
|
|
|
|
hash = hash_add(hash,
|
|
|
|
|
(OVS_FORCE uint16_t) (flow->tp_src ^ flow->tp_dst));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return hash_finish(hash, basis);
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-02 09:40:09 -07:00
|
|
|
|
/* Hashes 'flow' based on its nw_dst and nw_src for multipath. */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_symmetric_l3(const struct flow *flow, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
struct {
|
|
|
|
|
union {
|
|
|
|
|
ovs_be32 ipv4_addr;
|
|
|
|
|
struct in6_addr ipv6_addr;
|
|
|
|
|
};
|
|
|
|
|
ovs_be16 eth_type;
|
|
|
|
|
} fields;
|
|
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
memset(&fields, 0, sizeof fields);
|
|
|
|
|
fields.eth_type = flow->dl_type;
|
|
|
|
|
|
|
|
|
|
if (fields.eth_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
fields.ipv4_addr = flow->nw_src ^ flow->nw_dst;
|
|
|
|
|
} else if (fields.eth_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
const uint8_t *a = &flow->ipv6_src.s6_addr[0];
|
|
|
|
|
const uint8_t *b = &flow->ipv6_dst.s6_addr[0];
|
|
|
|
|
uint8_t *ipv6_addr = &fields.ipv6_addr.s6_addr[0];
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 16; i++) {
|
|
|
|
|
ipv6_addr[i] = a[i] ^ b[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return jhash_bytes(&fields, sizeof fields, basis);
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-17 14:28:20 -07:00
|
|
|
|
/* Initialize a flow with random fields that matter for nx_hash_fields. */
|
|
|
|
|
void
|
|
|
|
|
flow_random_hash_fields(struct flow *flow)
|
|
|
|
|
{
|
|
|
|
|
uint16_t rnd = random_uint16();
|
2017-03-01 17:47:59 -05:00
|
|
|
|
int i;
|
2013-10-17 14:28:20 -07:00
|
|
|
|
|
|
|
|
|
/* Initialize to all zeros. */
|
|
|
|
|
memset(flow, 0, sizeof *flow);
|
|
|
|
|
|
2015-08-28 14:55:11 -07:00
|
|
|
|
eth_addr_random(&flow->dl_src);
|
|
|
|
|
eth_addr_random(&flow->dl_dst);
|
2013-10-17 14:28:20 -07:00
|
|
|
|
|
2017-03-01 17:47:59 -05:00
|
|
|
|
for (i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
|
|
|
|
|
uint16_t vlan = random_uint16() & VLAN_VID_MASK;
|
|
|
|
|
flow->vlans[i].tpid = htons(ETH_TYPE_VLAN_8021Q);
|
|
|
|
|
flow->vlans[i].tci = htons(vlan | VLAN_CFI);
|
|
|
|
|
}
|
2013-10-17 14:28:20 -07:00
|
|
|
|
|
|
|
|
|
/* Make most of the random flows IPv4, some IPv6, and rest random. */
|
|
|
|
|
flow->dl_type = rnd < 0x8000 ? htons(ETH_TYPE_IP) :
|
|
|
|
|
rnd < 0xc000 ? htons(ETH_TYPE_IPV6) : (OVS_FORCE ovs_be16)rnd;
|
|
|
|
|
|
|
|
|
|
if (dl_type_is_ip_any(flow->dl_type)) {
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
flow->nw_src = (OVS_FORCE ovs_be32)random_uint32();
|
|
|
|
|
flow->nw_dst = (OVS_FORCE ovs_be32)random_uint32();
|
|
|
|
|
} else {
|
|
|
|
|
random_bytes(&flow->ipv6_src, sizeof flow->ipv6_src);
|
|
|
|
|
random_bytes(&flow->ipv6_dst, sizeof flow->ipv6_dst);
|
|
|
|
|
}
|
|
|
|
|
/* Make most of IP flows TCP, some UDP or SCTP, and rest random. */
|
|
|
|
|
rnd = random_uint16();
|
|
|
|
|
flow->nw_proto = rnd < 0x8000 ? IPPROTO_TCP :
|
|
|
|
|
rnd < 0xc000 ? IPPROTO_UDP :
|
|
|
|
|
rnd < 0xd000 ? IPPROTO_SCTP : (uint8_t)rnd;
|
|
|
|
|
if (flow->nw_proto == IPPROTO_TCP ||
|
|
|
|
|
flow->nw_proto == IPPROTO_UDP ||
|
|
|
|
|
flow->nw_proto == IPPROTO_SCTP) {
|
|
|
|
|
flow->tp_src = (OVS_FORCE ovs_be16)random_uint16();
|
|
|
|
|
flow->tp_dst = (OVS_FORCE ovs_be16)random_uint16();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-05-14 18:24:43 -07:00
|
|
|
|
/* Masks the fields in 'wc' that are used by the flow hash 'fields'. */
|
|
|
|
|
void
|
2013-06-26 16:37:16 -07:00
|
|
|
|
flow_mask_hash_fields(const struct flow *flow, struct flow_wildcards *wc,
|
|
|
|
|
enum nx_hash_fields fields)
|
2013-05-14 18:24:43 -07:00
|
|
|
|
{
|
2017-03-01 17:47:59 -05:00
|
|
|
|
int i;
|
2013-05-14 18:24:43 -07:00
|
|
|
|
switch (fields) {
|
|
|
|
|
case NX_HASH_FIELDS_ETH_SRC:
|
|
|
|
|
memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L4:
|
|
|
|
|
memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src);
|
|
|
|
|
memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);
|
2013-06-26 16:37:16 -07:00
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
|
|
|
|
|
memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
|
2013-06-28 11:31:48 -07:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
2013-06-26 16:37:16 -07:00
|
|
|
|
memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src);
|
|
|
|
|
memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst);
|
|
|
|
|
}
|
|
|
|
|
if (is_ip_any(flow)) {
|
|
|
|
|
memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
|
2019-07-10 19:02:30 +05:30
|
|
|
|
/* Unwildcard port only for non-UDP packets as udp port
|
|
|
|
|
* numbers are not used in hash calculations.
|
|
|
|
|
*/
|
|
|
|
|
if (flow->nw_proto != IPPROTO_UDP) {
|
|
|
|
|
flow_unwildcard_tp_ports(flow, wc);
|
|
|
|
|
}
|
2013-06-26 16:37:16 -07:00
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
for (i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
|
|
|
|
|
wc->masks.vlans[i].tci |= htons(VLAN_VID_MASK | VLAN_CFI);
|
|
|
|
|
}
|
2013-05-14 18:24:43 -07:00
|
|
|
|
break;
|
2015-07-06 12:58:24 -05:00
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP:
|
2019-06-05 22:36:33 +00:00
|
|
|
|
if (is_ip_any(flow) && flow->nw_proto == IPPROTO_UDP
|
|
|
|
|
&& !(flow->nw_frag & FLOW_NW_FRAG_MASK)) {
|
2015-07-06 12:58:24 -05:00
|
|
|
|
memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
|
|
|
|
|
memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
|
|
|
|
|
}
|
2017-06-23 18:12:49 +02:00
|
|
|
|
/* fall through */
|
2015-07-06 12:58:24 -05:00
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3L4:
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
|
|
|
|
|
memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src);
|
|
|
|
|
memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst);
|
|
|
|
|
} else {
|
|
|
|
|
break; /* non-IP flow */
|
|
|
|
|
}
|
|
|
|
|
memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
|
2019-06-05 22:36:33 +00:00
|
|
|
|
if ((flow->nw_proto == IPPROTO_TCP || flow->nw_proto == IPPROTO_SCTP)
|
|
|
|
|
&& !(flow->nw_frag & FLOW_NW_FRAG_MASK)) {
|
2015-07-06 12:58:24 -05:00
|
|
|
|
memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
|
|
|
|
|
memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2017-03-09 12:01:02 +08:00
|
|
|
|
case NX_HASH_FIELDS_NW_SRC:
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_NW_DST:
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2018-10-02 09:40:09 -07:00
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3:
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
|
|
|
|
|
memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src);
|
|
|
|
|
memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2013-05-14 18:24:43 -07:00
|
|
|
|
default:
|
2013-12-17 10:32:12 -08:00
|
|
|
|
OVS_NOT_REACHED();
|
2013-05-14 18:24:43 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-13 16:20:24 -07:00
|
|
|
|
/* Hashes the portions of 'flow' designated by 'fields'. */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_fields(const struct flow *flow, enum nx_hash_fields fields,
|
|
|
|
|
uint16_t basis)
|
|
|
|
|
{
|
|
|
|
|
switch (fields) {
|
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_ETH_SRC:
|
2015-08-28 14:55:11 -07:00
|
|
|
|
return jhash_bytes(&flow->dl_src, sizeof flow->dl_src, basis);
|
2011-07-13 16:20:24 -07:00
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L4:
|
|
|
|
|
return flow_hash_symmetric_l4(flow, basis);
|
2015-07-06 12:58:24 -05:00
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3L4:
|
|
|
|
|
return flow_hash_symmetric_l3l4(flow, basis, false);
|
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP:
|
|
|
|
|
return flow_hash_symmetric_l3l4(flow, basis, true);
|
|
|
|
|
|
2017-03-09 12:01:02 +08:00
|
|
|
|
case NX_HASH_FIELDS_NW_SRC:
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
return jhash_bytes(&flow->nw_src, sizeof flow->nw_src, basis);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
return jhash_bytes(&flow->ipv6_src, sizeof flow->ipv6_src, basis);
|
|
|
|
|
} else {
|
|
|
|
|
return basis;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case NX_HASH_FIELDS_NW_DST:
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
return jhash_bytes(&flow->nw_dst, sizeof flow->nw_dst, basis);
|
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
return jhash_bytes(&flow->ipv6_dst, sizeof flow->ipv6_dst, basis);
|
|
|
|
|
} else {
|
|
|
|
|
return basis;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-02 09:40:09 -07:00
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3:
|
|
|
|
|
return flow_hash_symmetric_l3(flow, basis);
|
2011-07-13 16:20:24 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-12-17 10:32:12 -08:00
|
|
|
|
OVS_NOT_REACHED();
|
2011-07-13 16:20:24 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns a string representation of 'fields'. */
|
|
|
|
|
const char *
|
|
|
|
|
flow_hash_fields_to_str(enum nx_hash_fields fields)
|
|
|
|
|
{
|
|
|
|
|
switch (fields) {
|
|
|
|
|
case NX_HASH_FIELDS_ETH_SRC: return "eth_src";
|
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L4: return "symmetric_l4";
|
2015-07-06 12:58:24 -05:00
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3L4: return "symmetric_l3l4";
|
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP: return "symmetric_l3l4+udp";
|
2017-03-09 12:01:02 +08:00
|
|
|
|
case NX_HASH_FIELDS_NW_SRC: return "nw_src";
|
|
|
|
|
case NX_HASH_FIELDS_NW_DST: return "nw_dst";
|
2018-10-02 09:40:09 -07:00
|
|
|
|
case NX_HASH_FIELDS_SYMMETRIC_L3: return "symmetric_l3";
|
2011-07-13 16:20:24 -07:00
|
|
|
|
default: return "<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if the value of 'fields' is supported. Otherwise false. */
|
|
|
|
|
bool
|
|
|
|
|
flow_hash_fields_valid(enum nx_hash_fields fields)
|
|
|
|
|
{
|
|
|
|
|
return fields == NX_HASH_FIELDS_ETH_SRC
|
2015-07-06 12:58:24 -05:00
|
|
|
|
|| fields == NX_HASH_FIELDS_SYMMETRIC_L4
|
|
|
|
|
|| fields == NX_HASH_FIELDS_SYMMETRIC_L3L4
|
2017-03-09 12:01:02 +08:00
|
|
|
|
|| fields == NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP
|
|
|
|
|
|| fields == NX_HASH_FIELDS_NW_SRC
|
2018-10-02 09:40:09 -07:00
|
|
|
|
|| fields == NX_HASH_FIELDS_NW_DST
|
|
|
|
|
|| fields == NX_HASH_FIELDS_SYMMETRIC_L3;
|
2011-07-13 16:20:24 -07:00
|
|
|
|
}
|
2011-09-08 14:32:13 -07:00
|
|
|
|
|
2013-06-10 22:48:58 -07:00
|
|
|
|
/* Returns a hash value for the bits of 'flow' that are active based on
|
|
|
|
|
* 'wc', given 'basis'. */
|
|
|
|
|
uint32_t
|
|
|
|
|
flow_hash_in_wildcards(const struct flow *flow,
|
|
|
|
|
const struct flow_wildcards *wc, uint32_t basis)
|
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
const uint64_t *wc_u64 = (const uint64_t *) &wc->masks;
|
|
|
|
|
const uint64_t *flow_u64 = (const uint64_t *) flow;
|
2013-06-10 22:48:58 -07:00
|
|
|
|
uint32_t hash;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
hash = basis;
|
2015-01-06 11:10:42 -08:00
|
|
|
|
for (i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
hash = hash_add64(hash, flow_u64[i] & wc_u64[i]);
|
2013-06-10 22:48:58 -07:00
|
|
|
|
}
|
2015-01-06 11:10:42 -08:00
|
|
|
|
return hash_finish(hash, 8 * FLOW_U64S);
|
2013-06-10 22:48:58 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-11-21 14:14:02 -08:00
|
|
|
|
/* Sets the VLAN VID that 'flow' matches to 'vid', which is interpreted as an
|
|
|
|
|
* OpenFlow 1.0 "dl_vlan" value:
|
|
|
|
|
*
|
2017-03-01 17:47:59 -05:00
|
|
|
|
* - If it is in the range 0...4095, 'flow->vlans[0].tci' is set to match
|
2011-11-21 14:14:02 -08:00
|
|
|
|
* that VLAN. Any existing PCP match is unchanged (it becomes 0 if
|
|
|
|
|
* 'flow' previously matched packets without a VLAN header).
|
|
|
|
|
*
|
|
|
|
|
* - If it is OFP_VLAN_NONE, 'flow->vlan_tci' is set to match a packet
|
|
|
|
|
* without a VLAN tag.
|
|
|
|
|
*
|
|
|
|
|
* - Other values of 'vid' should not be used. */
|
|
|
|
|
void
|
2018-07-17 02:01:56 +00:00
|
|
|
|
flow_set_dl_vlan(struct flow *flow, ovs_be16 vid, int id)
|
2011-11-21 14:14:02 -08:00
|
|
|
|
{
|
2012-07-05 17:41:10 +09:00
|
|
|
|
if (vid == htons(OFP10_VLAN_NONE)) {
|
2018-07-17 02:01:56 +00:00
|
|
|
|
flow->vlans[id].tci = htons(0);
|
2011-11-21 14:14:02 -08:00
|
|
|
|
} else {
|
|
|
|
|
vid &= htons(VLAN_VID_MASK);
|
2018-07-17 02:01:56 +00:00
|
|
|
|
flow->vlans[id].tci &= ~htons(VLAN_VID_MASK);
|
|
|
|
|
flow->vlans[id].tci |= htons(VLAN_CFI) | vid;
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sets the VLAN header TPID, which must be either ETH_TYPE_VLAN_8021Q or
|
|
|
|
|
* ETH_TYPE_VLAN_8021AD. */
|
|
|
|
|
void
|
|
|
|
|
flow_fix_vlan_tpid(struct flow *flow)
|
|
|
|
|
{
|
|
|
|
|
if (flow->vlans[0].tpid == htons(0) && flow->vlans[0].tci != 0) {
|
|
|
|
|
flow->vlans[0].tpid = htons(ETH_TYPE_VLAN_8021Q);
|
2011-11-21 14:14:02 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-07-22 23:20:22 -07:00
|
|
|
|
/* Sets the VLAN VID that 'flow' matches to 'vid', which is interpreted as an
|
|
|
|
|
* OpenFlow 1.2 "vlan_vid" value, that is, the low 13 bits of 'vlan_tci' (VID
|
|
|
|
|
* plus CFI). */
|
|
|
|
|
void
|
|
|
|
|
flow_set_vlan_vid(struct flow *flow, ovs_be16 vid)
|
|
|
|
|
{
|
|
|
|
|
ovs_be16 mask = htons(VLAN_VID_MASK | VLAN_CFI);
|
2017-03-01 17:47:59 -05:00
|
|
|
|
flow->vlans[0].tci &= ~mask;
|
|
|
|
|
flow->vlans[0].tci |= vid & mask;
|
2012-07-22 23:20:22 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-11-21 14:14:02 -08:00
|
|
|
|
/* Sets the VLAN PCP that 'flow' matches to 'pcp', which should be in the
|
|
|
|
|
* range 0...7.
|
|
|
|
|
*
|
|
|
|
|
* This function has no effect on the VLAN ID that 'flow' matches.
|
|
|
|
|
*
|
|
|
|
|
* After calling this function, 'flow' will not match packets without a VLAN
|
|
|
|
|
* header. */
|
|
|
|
|
void
|
2018-07-17 02:01:56 +00:00
|
|
|
|
flow_set_vlan_pcp(struct flow *flow, uint8_t pcp, int id)
|
2011-11-21 14:14:02 -08:00
|
|
|
|
{
|
|
|
|
|
pcp &= 0x07;
|
2018-07-17 02:01:56 +00:00
|
|
|
|
flow->vlans[id].tci &= ~htons(VLAN_PCP_MASK);
|
|
|
|
|
flow->vlans[id].tci |= htons((pcp << VLAN_PCP_SHIFT) | VLAN_CFI);
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Counts the number of VLAN headers. */
|
|
|
|
|
int
|
|
|
|
|
flow_count_vlan_headers(const struct flow *flow)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
|
|
|
|
|
if (!(flow->vlans[i].tci & htons(VLAN_CFI))) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given '*p_an' and '*p_bn' pointing to one past the last VLAN header of
|
|
|
|
|
* 'a' and 'b' respectively, skip common VLANs so that they point to the
|
|
|
|
|
* first different VLAN counting from bottom. */
|
|
|
|
|
void
|
|
|
|
|
flow_skip_common_vlan_headers(const struct flow *a, int *p_an,
|
|
|
|
|
const struct flow *b, int *p_bn)
|
|
|
|
|
{
|
|
|
|
|
int an = *p_an, bn = *p_bn;
|
|
|
|
|
|
|
|
|
|
for (an--, bn--; an >= 0 && bn >= 0; an--, bn--) {
|
|
|
|
|
if (a->vlans[an].qtag != b->vlans[bn].qtag) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*p_an = an;
|
|
|
|
|
*p_bn = bn;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
flow_pop_vlan(struct flow *flow, struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
int n = flow_count_vlan_headers(flow);
|
2017-04-14 21:25:41 -07:00
|
|
|
|
if (n > 1) {
|
|
|
|
|
if (wc) {
|
|
|
|
|
memset(&wc->masks.vlans[1], 0xff,
|
|
|
|
|
sizeof(union flow_vlan_hdr) * (n - 1));
|
|
|
|
|
}
|
|
|
|
|
memmove(&flow->vlans[0], &flow->vlans[1],
|
|
|
|
|
sizeof(union flow_vlan_hdr) * (n - 1));
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
2017-04-14 21:25:41 -07:00
|
|
|
|
if (n > 0) {
|
|
|
|
|
memset(&flow->vlans[n - 1], 0, sizeof(union flow_vlan_hdr));
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
flow_push_vlan_uninit(struct flow *flow, struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
if (wc) {
|
|
|
|
|
int n = flow_count_vlan_headers(flow);
|
2017-03-19 10:11:09 -07:00
|
|
|
|
if (n) {
|
|
|
|
|
memset(wc->masks.vlans, 0xff, sizeof(union flow_vlan_hdr) * n);
|
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
}
|
|
|
|
|
memmove(&flow->vlans[1], &flow->vlans[0],
|
|
|
|
|
sizeof(union flow_vlan_hdr) * (FLOW_MAX_VLAN_HEADERS - 1));
|
|
|
|
|
memset(&flow->vlans[0], 0, sizeof(union flow_vlan_hdr));
|
2011-11-21 14:14:02 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-04 10:32:35 -08:00
|
|
|
|
/* Returns the number of MPLS LSEs present in 'flow'
|
|
|
|
|
*
|
|
|
|
|
* Returns 0 if the 'dl_type' of 'flow' is not an MPLS ethernet type.
|
|
|
|
|
* Otherwise traverses 'flow''s MPLS label stack stopping at the
|
|
|
|
|
* first entry that has the BoS bit set. If no such entry exists then
|
|
|
|
|
* the maximum number of LSEs that can be stored in 'flow' is returned.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
flow_count_mpls_labels(const struct flow *flow, struct flow_wildcards *wc)
|
|
|
|
|
{
|
2014-09-30 13:34:43 -07:00
|
|
|
|
/* dl_type is always masked. */
|
2014-02-04 10:32:35 -08:00
|
|
|
|
if (eth_type_mpls(flow->dl_type)) {
|
|
|
|
|
int i;
|
2014-11-25 07:39:20 -08:00
|
|
|
|
int cnt;
|
2014-02-04 10:32:35 -08:00
|
|
|
|
|
2014-11-25 07:39:20 -08:00
|
|
|
|
cnt = 0;
|
|
|
|
|
for (i = 0; i < FLOW_MAX_MPLS_LABELS; i++) {
|
2014-02-04 10:32:35 -08:00
|
|
|
|
if (wc) {
|
|
|
|
|
wc->masks.mpls_lse[i] |= htonl(MPLS_BOS_MASK);
|
|
|
|
|
}
|
|
|
|
|
if (flow->mpls_lse[i] & htonl(MPLS_BOS_MASK)) {
|
|
|
|
|
return i + 1;
|
|
|
|
|
}
|
2014-11-25 07:39:20 -08:00
|
|
|
|
if (flow->mpls_lse[i]) {
|
|
|
|
|
cnt++;
|
|
|
|
|
}
|
2014-02-04 10:32:35 -08:00
|
|
|
|
}
|
2014-11-25 07:39:20 -08:00
|
|
|
|
return cnt;
|
2014-02-04 10:32:35 -08:00
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns the number consecutive of MPLS LSEs, starting at the
|
|
|
|
|
* innermost LSE, that are common in 'a' and 'b'.
|
|
|
|
|
*
|
|
|
|
|
* 'an' must be flow_count_mpls_labels(a).
|
|
|
|
|
* 'bn' must be flow_count_mpls_labels(b).
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
flow_count_common_mpls_labels(const struct flow *a, int an,
|
|
|
|
|
const struct flow *b, int bn,
|
|
|
|
|
struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
int min_n = MIN(an, bn);
|
|
|
|
|
if (min_n == 0) {
|
|
|
|
|
return 0;
|
|
|
|
|
} else {
|
|
|
|
|
int common_n = 0;
|
|
|
|
|
int a_last = an - 1;
|
|
|
|
|
int b_last = bn - 1;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < min_n; i++) {
|
|
|
|
|
if (wc) {
|
|
|
|
|
wc->masks.mpls_lse[a_last - i] = OVS_BE32_MAX;
|
|
|
|
|
wc->masks.mpls_lse[b_last - i] = OVS_BE32_MAX;
|
|
|
|
|
}
|
|
|
|
|
if (a->mpls_lse[a_last - i] != b->mpls_lse[b_last - i]) {
|
|
|
|
|
break;
|
|
|
|
|
} else {
|
|
|
|
|
common_n++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return common_n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adds a new outermost MPLS label to 'flow' and changes 'flow''s Ethernet type
|
|
|
|
|
* to 'mpls_eth_type', which must be an MPLS Ethertype.
|
|
|
|
|
*
|
|
|
|
|
* If the new label is the first MPLS label in 'flow', it is generated as;
|
|
|
|
|
*
|
|
|
|
|
* - label: 2, if 'flow' is IPv6, otherwise 0.
|
|
|
|
|
*
|
|
|
|
|
* - TTL: IPv4 or IPv6 TTL, if present and nonzero, otherwise 64.
|
|
|
|
|
*
|
|
|
|
|
* - TC: IPv4 or IPv6 TOS, if present, otherwise 0.
|
|
|
|
|
*
|
|
|
|
|
* - BoS: 1.
|
|
|
|
|
*
|
2014-09-30 13:34:43 -07:00
|
|
|
|
* If the new label is the second or later label MPLS label in 'flow', it is
|
2014-02-04 10:32:35 -08:00
|
|
|
|
* generated as;
|
|
|
|
|
*
|
2014-02-07 16:39:53 -08:00
|
|
|
|
* - label: Copied from outer label.
|
2014-02-04 10:32:35 -08:00
|
|
|
|
*
|
|
|
|
|
* - TTL: Copied from outer label.
|
|
|
|
|
*
|
|
|
|
|
* - TC: Copied from outer label.
|
|
|
|
|
*
|
|
|
|
|
* - BoS: 0.
|
|
|
|
|
*
|
|
|
|
|
* 'n' must be flow_count_mpls_labels(flow). 'n' must be less than
|
|
|
|
|
* FLOW_MAX_MPLS_LABELS (because otherwise flow->mpls_lse[] would overflow).
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
flow_push_mpls(struct flow *flow, int n, ovs_be16 mpls_eth_type,
|
mpls: Fix MPLS restoration after patch port and group bucket.
This patch fixes problems with MPLS handling related to patch ports
and group buckets.
If a group bucket or a peer bridge across a patch port pushes MPLS
headers to a non-MPLS packet and outputs, the flow translation after
returning from the group bucket or patch port would undo the packet
transformations so that the processing could continue with the packet
as it was before entering the patch port. There were two problems
with this:
1. As part of the first MPLS push on a non-MPLS packet, the flow
translation would first clear the L3/4 headers of the 'flow' to mark
those fields invalid. Later, when committing 'flow' changes to
datapath actions before output, the necessary datapath MPLS actions
are created and the corresponding changes updated to the 'base flow'.
This was done using the same flow_push_mpls() function that clears
the L2/3 headers, so also the 'base flow' L2/3 headers were cleared.
Then, when translation returns from a patch port or group bucket, the
original 'flow' is restored, now showing no sign of the MPLS labels.
Since the 'base flow' now has the MPLS labels, following translations
know to issue MPLS POP actions before any output actions. However, as
part of checking for changes to IP headers we test that the IP
protocol type was not changed. But now the 'base flow's 'nw_proto'
field is zero and an assert fail crashes OVS.
This is solved by not clearing the L3/4 fields of the 'base
flow'. This allows the processing after the patch port to continue
with L3/4 fields as if no MPLS was done, after first issuing the
necessary MPLS POP actions.
2. IP header updates were done before the MPLS POP actions were
issued. This caused incorrect packet output after, e.g., group action
or patch port. For example, with actions:
group 1234: all bucket=push_mpls,output:LOCAL
ip actions=group:1234,dec_ttl,output:LOCAL,output:LOCAL
the dec_ttl would only be executed before the last output to LOCAL,
since at the time of committing IP changes after the group action the
packet was still an MPLS packet.
This is solved by checking the dl_type of both 'flow' and 'base flow'
and issuing MPLS actions if they can transform the packet from an MPLS
packet to a non-MPLS packet. For an IP packet the change in ttl can
then be correctly committed before the last two output actions.
Two test cases are added to prevent future regressions.
Reported-by: Thomas Morin <thomas.morin@orange.com>
Suggested-by: Takashi YAMAMOTO <yamamoto@ovn.org>
Fixes: 8bfd0fdac ("Enhance userspace support for MPLS, for up to 3 labels.")
Fixes: 1b035ef20 ("mpls: Allow l3 and l4 actions to prior to a push_mpls action")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: YAMAMOTO Takashi <yamamoto@ovn.org>
2016-12-01 14:05:24 -08:00
|
|
|
|
struct flow_wildcards *wc, bool clear_flow_L3)
|
2014-02-04 10:32:35 -08:00
|
|
|
|
{
|
|
|
|
|
ovs_assert(eth_type_mpls(mpls_eth_type));
|
|
|
|
|
ovs_assert(n < FLOW_MAX_MPLS_LABELS);
|
|
|
|
|
|
|
|
|
|
if (n) {
|
|
|
|
|
int i;
|
|
|
|
|
|
2014-09-30 13:34:43 -07:00
|
|
|
|
if (wc) {
|
|
|
|
|
memset(&wc->masks.mpls_lse, 0xff, sizeof *wc->masks.mpls_lse * n);
|
|
|
|
|
}
|
2014-02-04 10:32:35 -08:00
|
|
|
|
for (i = n; i >= 1; i--) {
|
|
|
|
|
flow->mpls_lse[i] = flow->mpls_lse[i - 1];
|
|
|
|
|
}
|
2014-09-30 13:34:43 -07:00
|
|
|
|
flow->mpls_lse[0] = (flow->mpls_lse[1] & htonl(~MPLS_BOS_MASK));
|
2014-02-04 10:32:35 -08:00
|
|
|
|
} else {
|
|
|
|
|
int label = 0; /* IPv4 Explicit Null. */
|
|
|
|
|
int tc = 0;
|
|
|
|
|
int ttl = 64;
|
|
|
|
|
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
|
|
|
|
label = 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_ip_any(flow)) {
|
|
|
|
|
tc = (flow->nw_tos & IP_DSCP_MASK) >> 2;
|
2014-09-30 13:34:43 -07:00
|
|
|
|
if (wc) {
|
|
|
|
|
wc->masks.nw_tos |= IP_DSCP_MASK;
|
|
|
|
|
wc->masks.nw_ttl = 0xff;
|
|
|
|
|
}
|
2014-02-04 10:32:35 -08:00
|
|
|
|
|
|
|
|
|
if (flow->nw_ttl) {
|
|
|
|
|
ttl = flow->nw_ttl;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flow->mpls_lse[0] = set_mpls_lse_values(ttl, tc, 1, htonl(label));
|
|
|
|
|
|
mpls: Fix MPLS restoration after patch port and group bucket.
This patch fixes problems with MPLS handling related to patch ports
and group buckets.
If a group bucket or a peer bridge across a patch port pushes MPLS
headers to a non-MPLS packet and outputs, the flow translation after
returning from the group bucket or patch port would undo the packet
transformations so that the processing could continue with the packet
as it was before entering the patch port. There were two problems
with this:
1. As part of the first MPLS push on a non-MPLS packet, the flow
translation would first clear the L3/4 headers of the 'flow' to mark
those fields invalid. Later, when committing 'flow' changes to
datapath actions before output, the necessary datapath MPLS actions
are created and the corresponding changes updated to the 'base flow'.
This was done using the same flow_push_mpls() function that clears
the L2/3 headers, so also the 'base flow' L2/3 headers were cleared.
Then, when translation returns from a patch port or group bucket, the
original 'flow' is restored, now showing no sign of the MPLS labels.
Since the 'base flow' now has the MPLS labels, following translations
know to issue MPLS POP actions before any output actions. However, as
part of checking for changes to IP headers we test that the IP
protocol type was not changed. But now the 'base flow's 'nw_proto'
field is zero and an assert fail crashes OVS.
This is solved by not clearing the L3/4 fields of the 'base
flow'. This allows the processing after the patch port to continue
with L3/4 fields as if no MPLS was done, after first issuing the
necessary MPLS POP actions.
2. IP header updates were done before the MPLS POP actions were
issued. This caused incorrect packet output after, e.g., group action
or patch port. For example, with actions:
group 1234: all bucket=push_mpls,output:LOCAL
ip actions=group:1234,dec_ttl,output:LOCAL,output:LOCAL
the dec_ttl would only be executed before the last output to LOCAL,
since at the time of committing IP changes after the group action the
packet was still an MPLS packet.
This is solved by checking the dl_type of both 'flow' and 'base flow'
and issuing MPLS actions if they can transform the packet from an MPLS
packet to a non-MPLS packet. For an IP packet the change in ttl can
then be correctly committed before the last two output actions.
Two test cases are added to prevent future regressions.
Reported-by: Thomas Morin <thomas.morin@orange.com>
Suggested-by: Takashi YAMAMOTO <yamamoto@ovn.org>
Fixes: 8bfd0fdac ("Enhance userspace support for MPLS, for up to 3 labels.")
Fixes: 1b035ef20 ("mpls: Allow l3 and l4 actions to prior to a push_mpls action")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: YAMAMOTO Takashi <yamamoto@ovn.org>
2016-12-01 14:05:24 -08:00
|
|
|
|
if (clear_flow_L3) {
|
|
|
|
|
/* Clear all L3 and L4 fields and dp_hash. */
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT(FLOW_WC_SEQ == 42);
|
mpls: Fix MPLS restoration after patch port and group bucket.
This patch fixes problems with MPLS handling related to patch ports
and group buckets.
If a group bucket or a peer bridge across a patch port pushes MPLS
headers to a non-MPLS packet and outputs, the flow translation after
returning from the group bucket or patch port would undo the packet
transformations so that the processing could continue with the packet
as it was before entering the patch port. There were two problems
with this:
1. As part of the first MPLS push on a non-MPLS packet, the flow
translation would first clear the L3/4 headers of the 'flow' to mark
those fields invalid. Later, when committing 'flow' changes to
datapath actions before output, the necessary datapath MPLS actions
are created and the corresponding changes updated to the 'base flow'.
This was done using the same flow_push_mpls() function that clears
the L2/3 headers, so also the 'base flow' L2/3 headers were cleared.
Then, when translation returns from a patch port or group bucket, the
original 'flow' is restored, now showing no sign of the MPLS labels.
Since the 'base flow' now has the MPLS labels, following translations
know to issue MPLS POP actions before any output actions. However, as
part of checking for changes to IP headers we test that the IP
protocol type was not changed. But now the 'base flow's 'nw_proto'
field is zero and an assert fail crashes OVS.
This is solved by not clearing the L3/4 fields of the 'base
flow'. This allows the processing after the patch port to continue
with L3/4 fields as if no MPLS was done, after first issuing the
necessary MPLS POP actions.
2. IP header updates were done before the MPLS POP actions were
issued. This caused incorrect packet output after, e.g., group action
or patch port. For example, with actions:
group 1234: all bucket=push_mpls,output:LOCAL
ip actions=group:1234,dec_ttl,output:LOCAL,output:LOCAL
the dec_ttl would only be executed before the last output to LOCAL,
since at the time of committing IP changes after the group action the
packet was still an MPLS packet.
This is solved by checking the dl_type of both 'flow' and 'base flow'
and issuing MPLS actions if they can transform the packet from an MPLS
packet to a non-MPLS packet. For an IP packet the change in ttl can
then be correctly committed before the last two output actions.
Two test cases are added to prevent future regressions.
Reported-by: Thomas Morin <thomas.morin@orange.com>
Suggested-by: Takashi YAMAMOTO <yamamoto@ovn.org>
Fixes: 8bfd0fdac ("Enhance userspace support for MPLS, for up to 3 labels.")
Fixes: 1b035ef20 ("mpls: Allow l3 and l4 actions to prior to a push_mpls action")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: YAMAMOTO Takashi <yamamoto@ovn.org>
2016-12-01 14:05:24 -08:00
|
|
|
|
memset((char *) flow + FLOW_SEGMENT_2_ENDS_AT, 0,
|
|
|
|
|
sizeof(struct flow) - FLOW_SEGMENT_2_ENDS_AT);
|
|
|
|
|
flow->dp_hash = 0;
|
|
|
|
|
}
|
2014-02-04 10:32:35 -08:00
|
|
|
|
}
|
|
|
|
|
flow->dl_type = mpls_eth_type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Tries to remove the outermost MPLS label from 'flow'. Returns true if
|
|
|
|
|
* successful, false otherwise. On success, sets 'flow''s Ethernet type to
|
|
|
|
|
* 'eth_type'.
|
|
|
|
|
*
|
|
|
|
|
* 'n' must be flow_count_mpls_labels(flow). */
|
|
|
|
|
bool
|
|
|
|
|
flow_pop_mpls(struct flow *flow, int n, ovs_be16 eth_type,
|
|
|
|
|
struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (n == 0) {
|
|
|
|
|
/* Nothing to pop. */
|
|
|
|
|
return false;
|
2014-09-30 13:34:43 -07:00
|
|
|
|
} else if (n == FLOW_MAX_MPLS_LABELS) {
|
|
|
|
|
if (wc) {
|
|
|
|
|
wc->masks.mpls_lse[n - 1] |= htonl(MPLS_BOS_MASK);
|
|
|
|
|
}
|
|
|
|
|
if (!(flow->mpls_lse[n - 1] & htonl(MPLS_BOS_MASK))) {
|
|
|
|
|
/* Can't pop because don't know what to fill in mpls_lse[n - 1]. */
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2014-02-04 10:32:35 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-09-30 13:34:43 -07:00
|
|
|
|
if (wc) {
|
|
|
|
|
memset(&wc->masks.mpls_lse[1], 0xff,
|
|
|
|
|
sizeof *wc->masks.mpls_lse * (n - 1));
|
|
|
|
|
}
|
2014-02-04 10:32:35 -08:00
|
|
|
|
for (i = 1; i < n; i++) {
|
|
|
|
|
flow->mpls_lse[i - 1] = flow->mpls_lse[i];
|
|
|
|
|
}
|
|
|
|
|
flow->mpls_lse[n - 1] = 0;
|
|
|
|
|
flow->dl_type = eth_type;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-25 16:22:07 +09:00
|
|
|
|
/* Sets the MPLS Label that 'flow' matches to 'label', which is interpreted
|
|
|
|
|
* as an OpenFlow 1.1 "mpls_label" value. */
|
|
|
|
|
void
|
2014-02-04 10:32:35 -08:00
|
|
|
|
flow_set_mpls_label(struct flow *flow, int idx, ovs_be32 label)
|
2013-01-25 16:22:07 +09:00
|
|
|
|
{
|
2014-02-04 10:32:35 -08:00
|
|
|
|
set_mpls_lse_label(&flow->mpls_lse[idx], label);
|
2013-01-25 16:22:07 +09:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-06 16:08:23 +09:00
|
|
|
|
/* Sets the MPLS TTL that 'flow' matches to 'ttl', which should be in the
|
|
|
|
|
* range 0...255. */
|
|
|
|
|
void
|
2014-02-04 10:32:35 -08:00
|
|
|
|
flow_set_mpls_ttl(struct flow *flow, int idx, uint8_t ttl)
|
2013-03-06 16:08:23 +09:00
|
|
|
|
{
|
2014-02-04 10:32:35 -08:00
|
|
|
|
set_mpls_lse_ttl(&flow->mpls_lse[idx], ttl);
|
2013-03-06 16:08:23 +09:00
|
|
|
|
}
|
|
|
|
|
|
2013-01-25 16:22:07 +09:00
|
|
|
|
/* Sets the MPLS TC that 'flow' matches to 'tc', which should be in the
|
|
|
|
|
* range 0...7. */
|
|
|
|
|
void
|
2014-02-04 10:32:35 -08:00
|
|
|
|
flow_set_mpls_tc(struct flow *flow, int idx, uint8_t tc)
|
2013-01-25 16:22:07 +09:00
|
|
|
|
{
|
2014-02-04 10:32:35 -08:00
|
|
|
|
set_mpls_lse_tc(&flow->mpls_lse[idx], tc);
|
2013-01-25 16:22:07 +09:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sets the MPLS BOS bit that 'flow' matches to which should be 0 or 1. */
|
|
|
|
|
void
|
2014-02-04 10:32:35 -08:00
|
|
|
|
flow_set_mpls_bos(struct flow *flow, int idx, uint8_t bos)
|
2013-01-25 16:22:07 +09:00
|
|
|
|
{
|
2014-02-04 10:32:35 -08:00
|
|
|
|
set_mpls_lse_bos(&flow->mpls_lse[idx], bos);
|
2013-01-25 16:22:07 +09:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-04 10:32:35 -08:00
|
|
|
|
/* Sets the entire MPLS LSE. */
|
|
|
|
|
void
|
|
|
|
|
flow_set_mpls_lse(struct flow *flow, int idx, ovs_be32 lse)
|
|
|
|
|
{
|
|
|
|
|
flow->mpls_lse[idx] = lse;
|
|
|
|
|
}
|
2013-12-06 12:43:20 -08:00
|
|
|
|
|
2018-01-26 14:36:05 -08:00
|
|
|
|
static void
|
|
|
|
|
flow_compose_l7(struct dp_packet *p, const void *l7, size_t l7_len)
|
|
|
|
|
{
|
|
|
|
|
if (l7_len) {
|
|
|
|
|
if (l7) {
|
|
|
|
|
dp_packet_put(p, l7, l7_len);
|
|
|
|
|
} else {
|
|
|
|
|
uint8_t *payload = dp_packet_put_uninit(p, l7_len);
|
|
|
|
|
for (size_t i = 0; i < l7_len; i++) {
|
|
|
|
|
payload[i] = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
static size_t
|
2018-01-26 14:36:05 -08:00
|
|
|
|
flow_compose_l4(struct dp_packet *p, const struct flow *flow,
|
|
|
|
|
const void *l7, size_t l7_len)
|
2013-12-06 12:43:20 -08:00
|
|
|
|
{
|
2018-01-17 13:57:28 -08:00
|
|
|
|
size_t orig_len = dp_packet_size(p);
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
|
2013-12-06 12:43:20 -08:00
|
|
|
|
if (!(flow->nw_frag & FLOW_NW_FRAG_ANY)
|
|
|
|
|
|| !(flow->nw_frag & FLOW_NW_FRAG_LATER)) {
|
|
|
|
|
if (flow->nw_proto == IPPROTO_TCP) {
|
2018-01-17 13:57:28 -08:00
|
|
|
|
struct tcp_header *tcp = dp_packet_put_zeros(p, sizeof *tcp);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
tcp->tcp_src = flow->tp_src;
|
|
|
|
|
tcp->tcp_dst = flow->tp_dst;
|
|
|
|
|
tcp->tcp_ctl = TCP_CTL(ntohs(flow->tcp_flags), 5);
|
2018-01-26 14:36:05 -08:00
|
|
|
|
if (!(flow->tcp_flags & htons(TCP_SYN | TCP_FIN | TCP_RST))) {
|
|
|
|
|
flow_compose_l7(p, l7, l7_len);
|
|
|
|
|
}
|
2013-12-06 12:43:20 -08:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_UDP) {
|
2018-01-17 13:57:28 -08:00
|
|
|
|
struct udp_header *udp = dp_packet_put_zeros(p, sizeof *udp);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
udp->udp_src = flow->tp_src;
|
|
|
|
|
udp->udp_dst = flow->tp_dst;
|
2018-01-26 14:36:05 -08:00
|
|
|
|
udp->udp_len = htons(sizeof *udp + l7_len);
|
|
|
|
|
flow_compose_l7(p, l7, l7_len);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_SCTP) {
|
2018-01-17 13:57:28 -08:00
|
|
|
|
struct sctp_header *sctp = dp_packet_put_zeros(p, sizeof *sctp);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
sctp->sctp_src = flow->tp_src;
|
|
|
|
|
sctp->sctp_dst = flow->tp_dst;
|
2018-01-26 14:36:05 -08:00
|
|
|
|
/* XXX Someone should figure out what L7 data to include. */
|
2013-12-06 12:43:20 -08:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_ICMP) {
|
2018-01-17 13:57:28 -08:00
|
|
|
|
struct icmp_header *icmp = dp_packet_put_zeros(p, sizeof *icmp);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
icmp->icmp_type = ntohs(flow->tp_src);
|
|
|
|
|
icmp->icmp_code = ntohs(flow->tp_dst);
|
2018-01-26 14:36:05 -08:00
|
|
|
|
if ((icmp->icmp_type == ICMP4_ECHO_REQUEST ||
|
|
|
|
|
icmp->icmp_type == ICMP4_ECHO_REPLY)
|
|
|
|
|
&& icmp->icmp_code == 0) {
|
|
|
|
|
flow_compose_l7(p, l7, l7_len);
|
|
|
|
|
} else {
|
|
|
|
|
/* XXX Add inner IP packet for e.g. destination unreachable? */
|
|
|
|
|
}
|
2014-06-18 22:14:30 -03:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_IGMP) {
|
2018-01-17 13:57:28 -08:00
|
|
|
|
struct igmp_header *igmp = dp_packet_put_zeros(p, sizeof *igmp);
|
2014-06-18 22:14:30 -03:00
|
|
|
|
igmp->igmp_type = ntohs(flow->tp_src);
|
|
|
|
|
igmp->igmp_code = ntohs(flow->tp_dst);
|
|
|
|
|
put_16aligned_be32(&igmp->group, flow->igmp_group_ip4);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_ICMPV6) {
|
2019-10-01 18:18:23 +03:00
|
|
|
|
struct icmp6_data_header *icmp6;
|
|
|
|
|
|
|
|
|
|
icmp6 = dp_packet_put_zeros(p, sizeof *icmp6);
|
|
|
|
|
icmp6->icmp6_base.icmp6_type = ntohs(flow->tp_src);
|
|
|
|
|
icmp6->icmp6_base.icmp6_code = ntohs(flow->tp_dst);
|
|
|
|
|
put_16aligned_be32(icmp6->icmp6_data.be32, flow->igmp_group_ip4);
|
|
|
|
|
|
|
|
|
|
if (icmp6->icmp6_base.icmp6_code == 0 &&
|
|
|
|
|
(icmp6->icmp6_base.icmp6_type == ND_NEIGHBOR_SOLICIT ||
|
|
|
|
|
icmp6->icmp6_base.icmp6_type == ND_NEIGHBOR_ADVERT)) {
|
2013-12-06 12:43:20 -08:00
|
|
|
|
struct in6_addr *nd_target;
|
2017-05-04 20:42:54 +05:30
|
|
|
|
struct ovs_nd_lla_opt *lla_opt;
|
2013-12-06 12:43:20 -08:00
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
nd_target = dp_packet_put_zeros(p, sizeof *nd_target);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
*nd_target = flow->nd_target;
|
|
|
|
|
|
|
|
|
|
if (!eth_addr_is_zero(flow->arp_sha)) {
|
2017-05-04 20:42:54 +05:30
|
|
|
|
lla_opt = dp_packet_put_zeros(p, 8);
|
|
|
|
|
lla_opt->len = 1;
|
|
|
|
|
lla_opt->type = ND_OPT_SOURCE_LINKADDR;
|
|
|
|
|
lla_opt->mac = flow->arp_sha;
|
2013-12-06 12:43:20 -08:00
|
|
|
|
}
|
|
|
|
|
if (!eth_addr_is_zero(flow->arp_tha)) {
|
2017-05-04 20:42:54 +05:30
|
|
|
|
lla_opt = dp_packet_put_zeros(p, 8);
|
|
|
|
|
lla_opt->len = 1;
|
|
|
|
|
lla_opt->type = ND_OPT_TARGET_LINKADDR;
|
|
|
|
|
lla_opt->mac = flow->arp_tha;
|
2013-12-06 12:43:20 -08:00
|
|
|
|
}
|
2019-10-01 18:18:23 +03:00
|
|
|
|
} else if (icmp6->icmp6_base.icmp6_code == 0 &&
|
|
|
|
|
(icmp6->icmp6_base.icmp6_type == ICMP6_ECHO_REQUEST ||
|
|
|
|
|
icmp6->icmp6_base.icmp6_type == ICMP6_ECHO_REPLY)) {
|
2018-01-26 14:36:05 -08:00
|
|
|
|
flow_compose_l7(p, l7, l7_len);
|
|
|
|
|
} else {
|
|
|
|
|
/* XXX Add inner IP packet for e.g. destination unreachable? */
|
2013-12-06 12:43:20 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-01-17 13:57:28 -08:00
|
|
|
|
|
|
|
|
|
return dp_packet_size(p) - orig_len;
|
2013-12-06 12:43:20 -08:00
|
|
|
|
}
|
|
|
|
|
|
2016-04-20 11:19:18 -07:00
|
|
|
|
static void
|
|
|
|
|
flow_compose_l4_csum(struct dp_packet *p, const struct flow *flow,
|
|
|
|
|
uint32_t pseudo_hdr_csum)
|
|
|
|
|
{
|
|
|
|
|
size_t l4_len = (char *) dp_packet_tail(p) - (char *) dp_packet_l4(p);
|
|
|
|
|
|
|
|
|
|
if (!(flow->nw_frag & FLOW_NW_FRAG_ANY)
|
|
|
|
|
|| !(flow->nw_frag & FLOW_NW_FRAG_LATER)) {
|
|
|
|
|
if (flow->nw_proto == IPPROTO_TCP) {
|
|
|
|
|
struct tcp_header *tcp = dp_packet_l4(p);
|
|
|
|
|
|
2017-07-25 16:02:00 +03:00
|
|
|
|
tcp->tcp_csum = 0;
|
2016-04-20 11:19:18 -07:00
|
|
|
|
tcp->tcp_csum = csum_finish(csum_continue(pseudo_hdr_csum,
|
|
|
|
|
tcp, l4_len));
|
2023-06-14 15:03:27 -04:00
|
|
|
|
dp_packet_ol_set_l4_csum_good(p);
|
2016-04-20 11:19:18 -07:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_UDP) {
|
|
|
|
|
struct udp_header *udp = dp_packet_l4(p);
|
|
|
|
|
|
2017-07-25 16:02:00 +03:00
|
|
|
|
udp->udp_csum = 0;
|
2016-04-20 11:19:18 -07:00
|
|
|
|
udp->udp_csum = csum_finish(csum_continue(pseudo_hdr_csum,
|
|
|
|
|
udp, l4_len));
|
2019-01-25 19:08:33 +08:00
|
|
|
|
if (!udp->udp_csum) {
|
|
|
|
|
udp->udp_csum = htons(0xffff);
|
|
|
|
|
}
|
2023-06-14 15:03:27 -04:00
|
|
|
|
dp_packet_ol_set_l4_csum_good(p);
|
2016-04-20 11:19:18 -07:00
|
|
|
|
} else if (flow->nw_proto == IPPROTO_ICMP) {
|
|
|
|
|
struct icmp_header *icmp = dp_packet_l4(p);
|
|
|
|
|
|
2017-07-25 16:02:00 +03:00
|
|
|
|
icmp->icmp_csum = 0;
|
2016-04-20 11:19:18 -07:00
|
|
|
|
icmp->icmp_csum = csum(icmp, l4_len);
|
|
|
|
|
} else if (flow->nw_proto == IPPROTO_IGMP) {
|
|
|
|
|
struct igmp_header *igmp = dp_packet_l4(p);
|
|
|
|
|
|
2017-07-25 16:02:00 +03:00
|
|
|
|
igmp->igmp_csum = 0;
|
2016-04-20 11:19:18 -07:00
|
|
|
|
igmp->igmp_csum = csum(igmp, l4_len);
|
|
|
|
|
} else if (flow->nw_proto == IPPROTO_ICMPV6) {
|
2019-10-01 18:18:23 +03:00
|
|
|
|
struct icmp6_data_header *icmp6 = dp_packet_l4(p);
|
2016-04-20 11:19:18 -07:00
|
|
|
|
|
2019-10-01 18:18:23 +03:00
|
|
|
|
icmp6->icmp6_base.icmp6_cksum = 0;
|
|
|
|
|
icmp6->icmp6_base.icmp6_cksum =
|
|
|
|
|
csum_finish(csum_continue(pseudo_hdr_csum, icmp6, l4_len));
|
2016-04-20 11:19:18 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-25 14:26:22 -07:00
|
|
|
|
/* Increase the size of packet composed by 'flow_compose_minimal'
|
|
|
|
|
* up to 'size' bytes. Fixes all the required packet headers like
|
|
|
|
|
* ip/udp lengths and l3/l4 checksums.
|
|
|
|
|
*
|
|
|
|
|
* 'size' needs to be larger then the current packet size. */
|
2018-01-26 14:36:05 -08:00
|
|
|
|
void
|
2017-07-25 14:26:22 -07:00
|
|
|
|
packet_expand(struct dp_packet *p, const struct flow *flow, size_t size)
|
2017-07-25 16:02:00 +03:00
|
|
|
|
{
|
|
|
|
|
size_t extra_size;
|
|
|
|
|
|
2017-07-25 14:26:22 -07:00
|
|
|
|
ovs_assert(size > dp_packet_size(p));
|
2017-07-25 16:02:00 +03:00
|
|
|
|
|
|
|
|
|
extra_size = size - dp_packet_size(p);
|
|
|
|
|
dp_packet_put_zeros(p, extra_size);
|
|
|
|
|
|
|
|
|
|
if (flow->dl_type == htons(FLOW_DL_TYPE_NONE)) {
|
|
|
|
|
struct eth_header *eth = dp_packet_eth(p);
|
|
|
|
|
|
|
|
|
|
eth->eth_type = htons(dp_packet_size(p));
|
|
|
|
|
} else if (dl_type_is_ip_any(flow->dl_type)) {
|
|
|
|
|
uint32_t pseudo_hdr_csum;
|
|
|
|
|
size_t l4_len = (char *) dp_packet_tail(p) - (char *) dp_packet_l4(p);
|
|
|
|
|
|
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
|
|
|
|
struct ip_header *ip = dp_packet_l3(p);
|
|
|
|
|
|
|
|
|
|
ip->ip_tot_len = htons(p->l4_ofs - p->l3_ofs + l4_len);
|
2023-06-14 15:03:26 -04:00
|
|
|
|
if (dp_packet_hwol_tx_ip_csum(p)) {
|
|
|
|
|
dp_packet_ol_reset_ip_csum_good(p);
|
|
|
|
|
} else {
|
2024-01-17 14:26:30 -05:00
|
|
|
|
dp_packet_ip_set_header_csum(p, false);
|
2023-06-14 15:03:26 -04:00
|
|
|
|
dp_packet_ol_set_ip_csum_good(p);
|
|
|
|
|
}
|
2017-07-25 16:02:00 +03:00
|
|
|
|
pseudo_hdr_csum = packet_csum_pseudoheader(ip);
|
|
|
|
|
} else { /* ETH_TYPE_IPV6 */
|
|
|
|
|
struct ovs_16aligned_ip6_hdr *nh = dp_packet_l3(p);
|
|
|
|
|
|
|
|
|
|
nh->ip6_plen = htons(l4_len);
|
|
|
|
|
pseudo_hdr_csum = packet_csum_pseudoheader6(nh);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((!(flow->nw_frag & FLOW_NW_FRAG_ANY)
|
|
|
|
|
|| !(flow->nw_frag & FLOW_NW_FRAG_LATER))
|
|
|
|
|
&& flow->nw_proto == IPPROTO_UDP) {
|
|
|
|
|
struct udp_header *udp = dp_packet_l4(p);
|
|
|
|
|
|
|
|
|
|
udp->udp_len = htons(l4_len + extra_size);
|
|
|
|
|
}
|
|
|
|
|
flow_compose_l4_csum(p, flow, pseudo_hdr_csum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-12-26 16:08:25 -08:00
|
|
|
|
/* Puts into 'p' a packet that flow_extract() would parse as having the given
|
2011-09-08 14:32:13 -07:00
|
|
|
|
* 'flow'.
|
|
|
|
|
*
|
|
|
|
|
* (This is useful only for testing, obviously, and the packet isn't really
|
2017-07-25 14:26:22 -07:00
|
|
|
|
* valid. Lots of fields are just zeroed.)
|
|
|
|
|
*
|
2023-11-14 17:59:37 +00:00
|
|
|
|
* If 'bad_csum' is true, the final IP checksum is invalid.
|
|
|
|
|
*
|
2018-01-26 14:36:05 -08:00
|
|
|
|
* For packets whose protocols can encapsulate arbitrary L7 payloads, 'l7' and
|
|
|
|
|
* 'l7_len' determine that payload:
|
|
|
|
|
*
|
|
|
|
|
* - If 'l7_len' is zero, no payload is included.
|
|
|
|
|
*
|
|
|
|
|
* - If 'l7_len' is nonzero and 'l7' is null, an arbitrary payload 'l7_len'
|
|
|
|
|
* bytes long is included.
|
|
|
|
|
*
|
|
|
|
|
* - If 'l7_len' is nonzero and 'l7' is nonnull, the payload is copied
|
|
|
|
|
* from 'l7'. */
|
|
|
|
|
void
|
|
|
|
|
flow_compose(struct dp_packet *p, const struct flow *flow,
|
2023-11-14 17:59:37 +00:00
|
|
|
|
const void *l7, size_t l7_len, bool bad_csum)
|
2011-09-08 14:32:13 -07:00
|
|
|
|
{
|
2019-03-28 09:49:01 -07:00
|
|
|
|
/* Add code to this function (or its callees) for emitting new fields or
|
|
|
|
|
* protocols. (This isn't essential, so it can be skipped for initial
|
|
|
|
|
* testing.) */
|
2019-11-25 11:19:23 -08:00
|
|
|
|
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42);
|
2019-03-28 09:49:01 -07:00
|
|
|
|
|
2016-04-20 11:19:18 -07:00
|
|
|
|
uint32_t pseudo_hdr_csum;
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
size_t l4_len;
|
|
|
|
|
|
2013-12-06 12:43:20 -08:00
|
|
|
|
/* eth_compose() sets l3 pointer and makes sure it is 32-bit aligned. */
|
2015-02-22 03:21:09 -08:00
|
|
|
|
eth_compose(p, flow->dl_dst, flow->dl_src, ntohs(flow->dl_type), 0);
|
2011-09-08 14:32:13 -07:00
|
|
|
|
if (flow->dl_type == htons(FLOW_DL_TYPE_NONE)) {
|
2017-04-25 16:29:59 +00:00
|
|
|
|
struct eth_header *eth = dp_packet_eth(p);
|
2015-02-22 03:21:09 -08:00
|
|
|
|
eth->eth_type = htons(dp_packet_size(p));
|
2011-09-08 14:32:13 -07:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-01 17:47:59 -05:00
|
|
|
|
for (int encaps = FLOW_MAX_VLAN_HEADERS - 1; encaps >= 0; encaps--) {
|
|
|
|
|
if (flow->vlans[encaps].tci & htons(VLAN_CFI)) {
|
|
|
|
|
eth_push_vlan(p, flow->vlans[encaps].tpid,
|
|
|
|
|
flow->vlans[encaps].tci);
|
|
|
|
|
}
|
2011-09-08 14:32:13 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-15 15:27:11 +01:00
|
|
|
|
if (flow->dl_type == htons(ETH_TYPE_IP)) {
|
2011-09-08 14:32:13 -07:00
|
|
|
|
struct ip_header *ip;
|
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
ip = dp_packet_put_zeros(p, sizeof *ip);
|
2011-09-08 14:32:13 -07:00
|
|
|
|
ip->ip_ihl_ver = IP_IHL_VER(5, 4);
|
2011-11-09 17:10:27 -08:00
|
|
|
|
ip->ip_tos = flow->nw_tos;
|
2012-10-27 15:05:55 +09:00
|
|
|
|
ip->ip_ttl = flow->nw_ttl;
|
2011-09-08 14:32:13 -07:00
|
|
|
|
ip->ip_proto = flow->nw_proto;
|
packets: Do not assume that IPv4, TCP, or ARP headers are 32-bit aligned.
Ethernet headers are 14 bytes long, so when the beginning of such a header
is 32-bit aligned, the following data is misaligned. The usual trick to
fix that is to start the Ethernet header on an odd-numbered 16-bit
boundary. That trick works OK for Open vSwitch, but there are two
problems:
- OVS doesn't use that trick everywhere. Maybe it should, but it's
difficult to make sure that it does consistently because the CPUs
most commonly used with OVS don't care about misalignment, so we
only find problems when porting.
- Some protocols (GRE, VXLAN) don't use that trick, so in such a case
one can properly align the inner or outer L3/L4/L7 but not both. (OVS
userspace doesn't directly deal with such protocols yet, so this is
just future-proofing.)
- OpenFlow uses the alignment trick in a few places but not all of them.
This commit starts the adoption of what I hope will be a more robust way
to avoid misalignment problems and the resulting bus errors on RISC
architectures. Instead of trying to ensure that 32-bit quantities are
always aligned, we always read them as if they were misaligned. To ensure
that they are read this way, we change their types from 32-bit types to
pairs of 16-bit types. (I don't know of any protocols that offset the
next header by an odd number of bytes, so a 16-bit alignment assumption
seems OK.)
The same would be necessary for 64-bit types in protocol headers, but we
don't yet have any protocol definitions with 64-bit types.
IPv6 protocol headers need the same treatment, but for those we rely on
structs provided by system headers, so I'll leave them for an upcoming
patch.
Signed-off-by: Ben Pfaff <blp@nicira.com>
2013-08-15 10:47:39 -07:00
|
|
|
|
put_16aligned_be32(&ip->ip_src, flow->nw_src);
|
|
|
|
|
put_16aligned_be32(&ip->ip_dst, flow->nw_dst);
|
2011-09-08 14:32:13 -07:00
|
|
|
|
|
2011-11-09 17:10:27 -08:00
|
|
|
|
if (flow->nw_frag & FLOW_NW_FRAG_ANY) {
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
ip->ip_frag_off |= htons(IP_MORE_FRAGMENTS);
|
2011-11-09 17:10:27 -08:00
|
|
|
|
if (flow->nw_frag & FLOW_NW_FRAG_LATER) {
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
ip->ip_frag_off |= htons(100);
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-12-19 14:45:23 -08:00
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
dp_packet_set_l4(p, dp_packet_tail(p));
|
2013-12-06 12:43:20 -08:00
|
|
|
|
|
2018-01-26 14:36:05 -08:00
|
|
|
|
l4_len = flow_compose_l4(p, flow, l7, l7_len);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
ip = dp_packet_l3(p);
|
|
|
|
|
ip->ip_tot_len = htons(p->l4_ofs - p->l3_ofs + l4_len);
|
2016-07-24 18:36:35 +00:00
|
|
|
|
/* Checksum has already been zeroed by put_zeros call. */
|
2012-08-02 16:11:58 -07:00
|
|
|
|
ip->ip_csum = csum(ip, sizeof *ip);
|
2016-04-20 11:19:18 -07:00
|
|
|
|
|
2023-11-14 17:59:37 +00:00
|
|
|
|
if (bad_csum) {
|
|
|
|
|
/*
|
|
|
|
|
* Internet checksum is a sum complement to zero, so any other
|
|
|
|
|
* value will result in an invalid checksum. Here, we flip one
|
|
|
|
|
* bit.
|
|
|
|
|
*/
|
|
|
|
|
ip->ip_csum ^= (OVS_FORCE ovs_be16) 0x1;
|
2025-03-13 13:43:30 +01:00
|
|
|
|
dp_packet_ol_set_ip_csum_bad(p);
|
2023-11-14 17:59:37 +00:00
|
|
|
|
} else {
|
|
|
|
|
dp_packet_ol_set_ip_csum_good(p);
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-20 11:19:18 -07:00
|
|
|
|
pseudo_hdr_csum = packet_csum_pseudoheader(ip);
|
|
|
|
|
flow_compose_l4_csum(p, flow, pseudo_hdr_csum);
|
2013-03-15 15:27:11 +01:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
|
2013-12-06 12:43:20 -08:00
|
|
|
|
struct ovs_16aligned_ip6_hdr *nh;
|
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
nh = dp_packet_put_zeros(p, sizeof *nh);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
put_16aligned_be32(&nh->ip6_flow, htonl(6 << 28) |
|
|
|
|
|
htonl(flow->nw_tos << 20) | flow->ipv6_label);
|
|
|
|
|
nh->ip6_hlim = flow->nw_ttl;
|
|
|
|
|
nh->ip6_nxt = flow->nw_proto;
|
|
|
|
|
|
|
|
|
|
memcpy(&nh->ip6_src, &flow->ipv6_src, sizeof(nh->ip6_src));
|
|
|
|
|
memcpy(&nh->ip6_dst, &flow->ipv6_dst, sizeof(nh->ip6_dst));
|
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
dp_packet_set_l4(p, dp_packet_tail(p));
|
2013-12-06 12:43:20 -08:00
|
|
|
|
|
2018-01-26 14:36:05 -08:00
|
|
|
|
l4_len = flow_compose_l4(p, flow, l7, l7_len);
|
2013-12-06 12:43:20 -08:00
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
nh = dp_packet_l3(p);
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
nh->ip6_plen = htons(l4_len);
|
2016-04-20 11:19:18 -07:00
|
|
|
|
|
|
|
|
|
pseudo_hdr_csum = packet_csum_pseudoheader6(nh);
|
|
|
|
|
flow_compose_l4_csum(p, flow, pseudo_hdr_csum);
|
2013-03-15 15:27:11 +01:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_ARP) ||
|
|
|
|
|
flow->dl_type == htons(ETH_TYPE_RARP)) {
|
2011-09-08 14:32:13 -07:00
|
|
|
|
struct arp_eth_header *arp;
|
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
arp = dp_packet_put_zeros(p, sizeof *arp);
|
|
|
|
|
dp_packet_set_l3(p, arp);
|
2011-09-08 14:32:13 -07:00
|
|
|
|
arp->ar_hrd = htons(1);
|
|
|
|
|
arp->ar_pro = htons(ETH_TYPE_IP);
|
|
|
|
|
arp->ar_hln = ETH_ADDR_LEN;
|
|
|
|
|
arp->ar_pln = 4;
|
|
|
|
|
arp->ar_op = htons(flow->nw_proto);
|
|
|
|
|
|
|
|
|
|
if (flow->nw_proto == ARP_OP_REQUEST ||
|
|
|
|
|
flow->nw_proto == ARP_OP_REPLY) {
|
packets: Do not assume that IPv4, TCP, or ARP headers are 32-bit aligned.
Ethernet headers are 14 bytes long, so when the beginning of such a header
is 32-bit aligned, the following data is misaligned. The usual trick to
fix that is to start the Ethernet header on an odd-numbered 16-bit
boundary. That trick works OK for Open vSwitch, but there are two
problems:
- OVS doesn't use that trick everywhere. Maybe it should, but it's
difficult to make sure that it does consistently because the CPUs
most commonly used with OVS don't care about misalignment, so we
only find problems when porting.
- Some protocols (GRE, VXLAN) don't use that trick, so in such a case
one can properly align the inner or outer L3/L4/L7 but not both. (OVS
userspace doesn't directly deal with such protocols yet, so this is
just future-proofing.)
- OpenFlow uses the alignment trick in a few places but not all of them.
This commit starts the adoption of what I hope will be a more robust way
to avoid misalignment problems and the resulting bus errors on RISC
architectures. Instead of trying to ensure that 32-bit quantities are
always aligned, we always read them as if they were misaligned. To ensure
that they are read this way, we change their types from 32-bit types to
pairs of 16-bit types. (I don't know of any protocols that offset the
next header by an odd number of bytes, so a 16-bit alignment assumption
seems OK.)
The same would be necessary for 64-bit types in protocol headers, but we
don't yet have any protocol definitions with 64-bit types.
IPv6 protocol headers need the same treatment, but for those we rely on
structs provided by system headers, so I'll leave them for an upcoming
patch.
Signed-off-by: Ben Pfaff <blp@nicira.com>
2013-08-15 10:47:39 -07:00
|
|
|
|
put_16aligned_be32(&arp->ar_spa, flow->nw_src);
|
|
|
|
|
put_16aligned_be32(&arp->ar_tpa, flow->nw_dst);
|
2015-08-28 14:55:11 -07:00
|
|
|
|
arp->ar_sha = flow->arp_sha;
|
|
|
|
|
arp->ar_tha = flow->arp_tha;
|
2011-09-08 14:32:13 -07:00
|
|
|
|
}
|
2024-05-31 23:45:12 +02:00
|
|
|
|
} else if (flow->dl_type == htons(ETH_TYPE_NSH)) {
|
|
|
|
|
struct nsh_hdr *nsh;
|
|
|
|
|
|
|
|
|
|
nsh = dp_packet_put_zeros(p, sizeof *nsh);
|
|
|
|
|
dp_packet_set_l3(p, nsh);
|
|
|
|
|
|
|
|
|
|
nsh_set_flags_ttl_len(nsh, flow->nsh.flags, flow->nsh.ttl,
|
|
|
|
|
flow->nsh.mdtype == NSH_M_TYPE1
|
|
|
|
|
? NSH_M_TYPE1_LEN : NSH_BASE_HDR_LEN);
|
|
|
|
|
nsh->next_proto = flow->nsh.np;
|
|
|
|
|
nsh->md_type = flow->nsh.mdtype;
|
|
|
|
|
put_16aligned_be32(&nsh->path_hdr, flow->nsh.path_hdr);
|
|
|
|
|
|
|
|
|
|
if (flow->nsh.mdtype == NSH_M_TYPE1) {
|
|
|
|
|
for (size_t i = 0; i < 4; i++) {
|
|
|
|
|
put_16aligned_be32(&nsh->md1.context[i], flow->nsh.context[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-09-08 14:32:13 -07:00
|
|
|
|
}
|
2013-01-25 16:22:07 +09:00
|
|
|
|
|
|
|
|
|
if (eth_type_mpls(flow->dl_type)) {
|
2014-02-04 10:32:35 -08:00
|
|
|
|
int n;
|
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
p->l2_5_ofs = p->l3_ofs;
|
2014-02-04 10:32:35 -08:00
|
|
|
|
for (n = 1; n < FLOW_MAX_MPLS_LABELS; n++) {
|
|
|
|
|
if (flow->mpls_lse[n - 1] & htonl(MPLS_BOS_MASK)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (n > 0) {
|
2015-02-22 03:21:09 -08:00
|
|
|
|
push_mpls(p, flow->dl_type, flow->mpls_lse[--n]);
|
2014-02-04 10:32:35 -08:00
|
|
|
|
}
|
2013-01-25 16:22:07 +09:00
|
|
|
|
}
|
2011-09-08 14:32:13 -07:00
|
|
|
|
}
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
|
|
|
|
/* Compressed flow. */
|
|
|
|
|
|
2013-02-06 16:13:19 -08:00
|
|
|
|
/* Completes an initialization of 'dst' as a miniflow copy of 'src' begun by
|
2015-08-25 13:55:03 -07:00
|
|
|
|
* the caller. The caller must have already computed 'dst->map' properly to
|
|
|
|
|
* indicate the significant uint64_t elements of 'src'.
|
2013-12-11 11:07:01 -08:00
|
|
|
|
*
|
|
|
|
|
* Normally the significant elements are the ones that are non-zero. However,
|
|
|
|
|
* when a miniflow is initialized from a (mini)mask, the values can be zeroes,
|
2015-07-15 13:17:01 -07:00
|
|
|
|
* so that the flow and mask always have the same maps. */
|
|
|
|
|
void
|
|
|
|
|
miniflow_init(struct miniflow *dst, const struct flow *src)
|
2013-02-06 16:13:19 -08:00
|
|
|
|
{
|
2015-07-16 17:42:24 -07:00
|
|
|
|
uint64_t *dst_u64 = miniflow_values(dst);
|
2015-07-17 15:18:43 -07:00
|
|
|
|
size_t idx;
|
2013-02-06 16:13:19 -08:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_FOR_EACH_INDEX(idx, dst->map) {
|
|
|
|
|
*dst_u64++ = flow_u64_value(src, idx);
|
2013-02-06 16:13:19 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-17 15:18:43 -07:00
|
|
|
|
/* Initialize the maps of 'flow' from 'src'. */
|
2015-07-15 13:17:01 -07:00
|
|
|
|
void
|
|
|
|
|
miniflow_map_init(struct miniflow *flow, const struct flow *src)
|
2012-09-04 12:43:53 -07:00
|
|
|
|
{
|
2015-07-15 13:17:01 -07:00
|
|
|
|
/* Initialize map, counting the number of nonzero elements. */
|
2015-08-25 13:55:03 -07:00
|
|
|
|
flowmap_init(&flow->map);
|
|
|
|
|
for (size_t i = 0; i < FLOW_U64S; i++) {
|
|
|
|
|
if (flow_u64_value(src, i)) {
|
|
|
|
|
flowmap_set(&flow->map, i, 1);
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2015-07-15 13:17:01 -07:00
|
|
|
|
}
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-07-15 13:17:01 -07:00
|
|
|
|
/* Allocates 'n' count of miniflows, consecutive in memory, initializing the
|
|
|
|
|
* map of each from 'src'.
|
|
|
|
|
* Returns the size of the miniflow data. */
|
|
|
|
|
size_t
|
|
|
|
|
miniflow_alloc(struct miniflow *dsts[], size_t n, const struct miniflow *src)
|
|
|
|
|
{
|
2015-07-17 15:18:43 -07:00
|
|
|
|
size_t n_values = miniflow_n_values(src);
|
|
|
|
|
size_t data_size = MINIFLOW_VALUES_SIZE(n_values);
|
|
|
|
|
struct miniflow *dst = xmalloc(n * (sizeof *src + data_size));
|
2015-08-25 13:55:03 -07:00
|
|
|
|
size_t i;
|
2015-07-15 13:17:01 -07:00
|
|
|
|
|
|
|
|
|
COVERAGE_INC(miniflow_malloc);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
2015-07-17 15:18:43 -07:00
|
|
|
|
*dst = *src; /* Copy maps. */
|
2015-07-15 13:17:01 -07:00
|
|
|
|
dsts[i] = dst;
|
2015-07-17 15:18:43 -07:00
|
|
|
|
dst += 1; /* Just past the maps. */
|
|
|
|
|
dst = (struct miniflow *)((uint64_t *)dst + n_values); /* Skip data. */
|
2015-07-15 13:17:01 -07:00
|
|
|
|
}
|
|
|
|
|
return data_size;
|
2013-02-06 16:13:19 -08:00
|
|
|
|
}
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-07-15 13:17:01 -07:00
|
|
|
|
/* Returns a miniflow copy of 'src'. The caller must eventually free() the
|
|
|
|
|
* returned miniflow. */
|
2015-07-15 13:17:01 -07:00
|
|
|
|
struct miniflow *
|
2015-07-15 13:17:01 -07:00
|
|
|
|
miniflow_create(const struct flow *src)
|
2013-02-06 16:13:19 -08:00
|
|
|
|
{
|
2015-07-15 13:17:01 -07:00
|
|
|
|
struct miniflow tmp;
|
|
|
|
|
struct miniflow *dst;
|
|
|
|
|
|
|
|
|
|
miniflow_map_init(&tmp, src);
|
|
|
|
|
|
|
|
|
|
miniflow_alloc(&dst, 1, &tmp);
|
|
|
|
|
miniflow_init(dst, src);
|
|
|
|
|
return dst;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-29 15:50:39 -07:00
|
|
|
|
/* Initializes 'dst' as a copy of 'src'. The caller must have allocated
|
2015-07-15 13:17:01 -07:00
|
|
|
|
* 'dst' to have inline space for 'n_values' data in 'src'. */
|
2014-04-29 15:50:39 -07:00
|
|
|
|
void
|
2015-07-15 13:17:01 -07:00
|
|
|
|
miniflow_clone(struct miniflow *dst, const struct miniflow *src,
|
|
|
|
|
size_t n_values)
|
2014-04-29 15:50:39 -07:00
|
|
|
|
{
|
2015-07-17 15:18:43 -07:00
|
|
|
|
*dst = *src; /* Copy maps. */
|
2015-07-16 17:42:24 -07:00
|
|
|
|
memcpy(miniflow_values(dst), miniflow_get_values(src),
|
|
|
|
|
MINIFLOW_VALUES_SIZE(n_values));
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initializes 'dst' as a copy of 'src'. */
|
|
|
|
|
void
|
|
|
|
|
miniflow_expand(const struct miniflow *src, struct flow *dst)
|
|
|
|
|
{
|
2013-05-09 19:14:20 -07:00
|
|
|
|
memset(dst, 0, sizeof *dst);
|
|
|
|
|
flow_union_with_miniflow(dst, src);
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-15 13:17:01 -07:00
|
|
|
|
/* Returns true if 'a' and 'b' are equal miniflows, false otherwise. */
|
2012-09-04 12:43:53 -07:00
|
|
|
|
bool
|
|
|
|
|
miniflow_equal(const struct miniflow *a, const struct miniflow *b)
|
|
|
|
|
{
|
2015-07-16 17:42:24 -07:00
|
|
|
|
const uint64_t *ap = miniflow_get_values(a);
|
|
|
|
|
const uint64_t *bp = miniflow_get_values(b);
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
/* This is mostly called after a matching hash, so it is highly likely that
|
|
|
|
|
* the maps are equal as well. */
|
|
|
|
|
if (OVS_LIKELY(flowmap_equal(a->map, b->map))) {
|
2015-07-17 15:18:43 -07:00
|
|
|
|
return !memcmp(ap, bp, miniflow_n_values(a) * sizeof *ap);
|
2013-11-18 09:28:44 -08:00
|
|
|
|
} else {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
size_t idx;
|
2013-02-06 16:13:19 -08:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_FOR_EACH_INDEX (idx, flowmap_or(a->map, b->map)) {
|
|
|
|
|
if ((flowmap_is_set(&a->map, idx) ? *ap++ : 0)
|
|
|
|
|
!= (flowmap_is_set(&b->map, idx) ? *bp++ : 0)) {
|
2013-11-18 09:28:44 -08:00
|
|
|
|
return false;
|
2013-02-06 16:13:19 -08:00
|
|
|
|
}
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-06 16:13:19 -08:00
|
|
|
|
return true;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-11-13 11:54:31 -08:00
|
|
|
|
/* Returns false if 'a' and 'b' differ at the places where there are 1-bits
|
|
|
|
|
* in 'mask', true otherwise. */
|
2012-09-04 12:43:53 -07:00
|
|
|
|
bool
|
|
|
|
|
miniflow_equal_in_minimask(const struct miniflow *a, const struct miniflow *b,
|
|
|
|
|
const struct minimask *mask)
|
|
|
|
|
{
|
2015-07-16 17:42:24 -07:00
|
|
|
|
const uint64_t *p = miniflow_get_values(&mask->masks);
|
2015-07-17 15:18:43 -07:00
|
|
|
|
size_t idx;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_FOR_EACH_INDEX(idx, mask->masks.map) {
|
2014-11-26 15:30:33 -08:00
|
|
|
|
if ((miniflow_get(a, idx) ^ miniflow_get(b, idx)) & *p++) {
|
2013-11-18 09:28:44 -08:00
|
|
|
|
return false;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if 'a' and 'b' are equal at the places where there are 1-bits
|
|
|
|
|
* in 'mask', false if they differ. */
|
|
|
|
|
bool
|
|
|
|
|
miniflow_equal_flow_in_minimask(const struct miniflow *a, const struct flow *b,
|
|
|
|
|
const struct minimask *mask)
|
|
|
|
|
{
|
2015-07-16 17:42:24 -07:00
|
|
|
|
const uint64_t *p = miniflow_get_values(&mask->masks);
|
2015-07-17 15:18:43 -07:00
|
|
|
|
size_t idx;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_FOR_EACH_INDEX(idx, mask->masks.map) {
|
|
|
|
|
if ((miniflow_get(a, idx) ^ flow_u64_value(b, idx)) & *p++) {
|
2013-11-18 09:28:44 -08:00
|
|
|
|
return false;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-07-15 13:17:01 -07:00
|
|
|
|
void
|
|
|
|
|
minimask_init(struct minimask *mask, const struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
miniflow_init(&mask->masks, &wc->masks);
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-15 13:17:01 -07:00
|
|
|
|
/* Returns a minimask copy of 'wc'. The caller must eventually free the
|
|
|
|
|
* returned minimask with free(). */
|
|
|
|
|
struct minimask *
|
|
|
|
|
minimask_create(const struct flow_wildcards *wc)
|
2012-09-04 12:43:53 -07:00
|
|
|
|
{
|
2015-07-15 13:17:01 -07:00
|
|
|
|
return (struct minimask *)miniflow_create(&wc->masks);
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initializes 'dst_' as the bit-wise "and" of 'a_' and 'b_'.
|
|
|
|
|
*
|
2015-07-15 13:17:01 -07:00
|
|
|
|
* The caller must provide room for FLOW_U64S "uint64_t"s in 'storage', which
|
|
|
|
|
* must follow '*dst_' in memory, for use by 'dst_'. The caller must *not*
|
|
|
|
|
* free 'dst_' free(). */
|
2012-09-04 12:43:53 -07:00
|
|
|
|
void
|
|
|
|
|
minimask_combine(struct minimask *dst_,
|
|
|
|
|
const struct minimask *a_, const struct minimask *b_,
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t storage[FLOW_U64S])
|
2012-09-04 12:43:53 -07:00
|
|
|
|
{
|
|
|
|
|
struct miniflow *dst = &dst_->masks;
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t *dst_values = storage;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
const struct miniflow *a = &a_->masks;
|
|
|
|
|
const struct miniflow *b = &b_->masks;
|
2015-07-17 15:18:43 -07:00
|
|
|
|
size_t idx;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
flowmap_init(&dst->map);
|
2013-11-18 09:28:44 -08:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_FOR_EACH_INDEX(idx, flowmap_and(a->map, b->map)) {
|
2015-07-17 15:18:43 -07:00
|
|
|
|
/* Both 'a' and 'b' have non-zero data at 'idx'. */
|
2015-08-25 13:55:03 -07:00
|
|
|
|
uint64_t mask = *miniflow_get__(a, idx) & *miniflow_get__(b, idx);
|
2015-07-17 15:18:43 -07:00
|
|
|
|
|
|
|
|
|
if (mask) {
|
2015-08-25 13:55:03 -07:00
|
|
|
|
flowmap_set(&dst->map, idx, 1);
|
2014-11-26 15:30:33 -08:00
|
|
|
|
*dst_values++ = mask;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-15 13:17:01 -07:00
|
|
|
|
/* Initializes 'wc' as a copy of 'mask'. */
|
2012-09-04 12:43:53 -07:00
|
|
|
|
void
|
|
|
|
|
minimask_expand(const struct minimask *mask, struct flow_wildcards *wc)
|
|
|
|
|
{
|
|
|
|
|
miniflow_expand(&mask->masks, &wc->masks);
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-26 15:17:26 -08:00
|
|
|
|
/* Returns true if 'a' and 'b' are the same flow mask, false otherwise.
|
|
|
|
|
* Minimasks may not have zero data values, so for the minimasks to be the
|
|
|
|
|
* same, they need to have the same map and the same data values. */
|
2012-09-04 12:43:53 -07:00
|
|
|
|
bool
|
|
|
|
|
minimask_equal(const struct minimask *a, const struct minimask *b)
|
|
|
|
|
{
|
flow: Avoid unsafe comparison of minimasks.
The following, run inside the OVS sandbox, caused OVS to abort when
Address Sanitizer was used:
ovs-vsctl add-br br-int
ovs-ofctl add-flow br-int "table=0,cookie=0x1234,priority=10000,icmp,actions=drop"
ovs-ofctl --strict del-flows br-int "table=0,cookie=0x1234/-1,priority=10000"
Sample report from Address Sanitizer:
==3029==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x603000043260 at pc 0x7f6b09c2459b bp 0x7ffcb67e7540 sp 0x7ffcb67e6cf0
READ of size 40 at 0x603000043260 thread T0
#0 0x7f6b09c2459a (/lib/x86_64-linux-gnu/libasan.so.5+0xb859a)
#1 0x565110a748a5 in minimask_equal ../lib/flow.c:3510
#2 0x565110a9ea41 in minimatch_equal ../lib/match.c:1821
#3 0x56511091e864 in collect_rules_strict ../ofproto/ofproto.c:4516
#4 0x56511093d526 in delete_flow_start_strict ../ofproto/ofproto.c:5959
#5 0x56511093d526 in ofproto_flow_mod_start ../ofproto/ofproto.c:7949
#6 0x56511093d77b in handle_flow_mod__ ../ofproto/ofproto.c:6122
#7 0x56511093db71 in handle_flow_mod ../ofproto/ofproto.c:6099
#8 0x5651109407f6 in handle_single_part_openflow ../ofproto/ofproto.c:8406
#9 0x5651109407f6 in handle_openflow ../ofproto/ofproto.c:8587
#10 0x5651109e40da in ofconn_run ../ofproto/connmgr.c:1318
#11 0x5651109e40da in connmgr_run ../ofproto/connmgr.c:355
#12 0x56511092b129 in ofproto_run ../ofproto/ofproto.c:1826
#13 0x5651108f23cd in bridge_run__ ../vswitchd/bridge.c:2965
#14 0x565110904887 in bridge_run ../vswitchd/bridge.c:3023
#15 0x5651108e659c in main ../vswitchd/ovs-vswitchd.c:127
#16 0x7f6b093b709a in __libc_start_main ../csu/libc-start.c:308
#17 0x5651108e9009 in _start (/home/blp/nicira/ovs/_build/vswitchd/ovs-vswitchd+0x11d009)
This fixes the problem, which although largely theoretical could crop up
with odd implementations of memcmp(), perhaps ones optimized in various
"clever" ways. All in all, it seems best to avoid the theoretical problem.
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2019-07-17 10:55:16 -07:00
|
|
|
|
/* At first glance, it might seem that this can be reasonably optimized
|
|
|
|
|
* into a single memcmp() for the total size of the region. Such an
|
|
|
|
|
* optimization will work OK with most implementations of memcmp() that
|
|
|
|
|
* proceed from the start of the regions to be compared to the end in
|
|
|
|
|
* reasonably sized chunks. However, memcmp() is not required to be
|
|
|
|
|
* implemented that way, and an implementation that, for example, compares
|
|
|
|
|
* all of the bytes in both regions without early exit when it finds a
|
|
|
|
|
* difference, or one that compares, say, 64 bytes at a time, could access
|
|
|
|
|
* an unmapped region of memory if minimasks 'a' and 'b' have different
|
|
|
|
|
* lengths. By first checking that the maps are the same with the first
|
|
|
|
|
* memcmp(), we verify that 'a' and 'b' have the same length and therefore
|
|
|
|
|
* ensure that the second memcmp() is safe. */
|
|
|
|
|
return (!memcmp(a, b, sizeof *a)
|
|
|
|
|
&& !memcmp(a + 1, b + 1,
|
|
|
|
|
MINIFLOW_VALUES_SIZE(miniflow_n_values(&a->masks))));
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-29 15:50:38 -07:00
|
|
|
|
/* Returns true if at least one bit matched by 'b' is wildcarded by 'a',
|
2012-09-04 12:43:53 -07:00
|
|
|
|
* false otherwise. */
|
|
|
|
|
bool
|
2014-04-29 15:50:38 -07:00
|
|
|
|
minimask_has_extra(const struct minimask *a, const struct minimask *b)
|
2012-09-04 12:43:53 -07:00
|
|
|
|
{
|
2015-07-16 17:42:24 -07:00
|
|
|
|
const uint64_t *bp = miniflow_get_values(&b->masks);
|
2015-07-17 15:18:43 -07:00
|
|
|
|
size_t idx;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-08-25 13:55:03 -07:00
|
|
|
|
FLOWMAP_FOR_EACH_INDEX(idx, b->masks.map) {
|
2015-01-06 11:10:42 -08:00
|
|
|
|
uint64_t b_u64 = *bp++;
|
2012-09-04 12:43:53 -07:00
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* 'b_u64' is non-zero, check if the data in 'a' is either zero
|
|
|
|
|
* or misses some of the bits in 'b_u64'. */
|
2015-08-25 13:55:03 -07:00
|
|
|
|
if (!MINIFLOW_IN_MAP(&a->masks, idx)
|
|
|
|
|
|| ((*miniflow_get__(&a->masks, idx) & b_u64) != b_u64)) {
|
2014-11-26 15:17:26 -08:00
|
|
|
|
return true; /* 'a' wildcards some bits 'b' doesn't. */
|
2012-09-04 12:43:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2017-03-01 17:47:59 -05:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
flow_limit_vlans(int vlan_limit)
|
|
|
|
|
{
|
|
|
|
|
if (vlan_limit <= 0) {
|
|
|
|
|
flow_vlan_limit = FLOW_MAX_VLAN_HEADERS;
|
|
|
|
|
} else {
|
|
|
|
|
flow_vlan_limit = MIN(vlan_limit, FLOW_MAX_VLAN_HEADERS);
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-10-18 21:43:12 +05:30
|
|
|
|
|
|
|
|
|
struct netdev *
|
|
|
|
|
flow_get_tunnel_netdev(struct flow_tnl *tunnel)
|
|
|
|
|
{
|
|
|
|
|
char iface[IFNAMSIZ];
|
|
|
|
|
struct in6_addr ip6;
|
|
|
|
|
struct in6_addr gw;
|
|
|
|
|
|
|
|
|
|
if (tunnel->ip_src) {
|
|
|
|
|
in6_addr_set_mapped_ipv4(&ip6, tunnel->ip_src);
|
|
|
|
|
} else if (ipv6_addr_is_set(&tunnel->ipv6_src)) {
|
|
|
|
|
ip6 = tunnel->ipv6_src;
|
|
|
|
|
} else {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!ovs_router_lookup(0, &ip6, iface, NULL, &gw)) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return netdev_from_name(iface);
|
|
|
|
|
}
|