2009-09-15 15:22:17 -07:00
|
|
|
/*
|
2016-03-01 18:14:37 -08:00
|
|
|
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
|
2009-09-15 15:22:17 -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:
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include "packets.h"
|
2010-12-29 19:03:46 -08:00
|
|
|
#include <arpa/inet.h>
|
2011-11-01 13:25:49 +01:00
|
|
|
#include <sys/socket.h>
|
2009-09-15 15:22:17 -07:00
|
|
|
#include <netinet/in.h>
|
2012-11-05 15:53:32 +02:00
|
|
|
#include <netinet/ip6.h>
|
2014-08-15 11:01:54 -07:00
|
|
|
#include <netinet/icmp6.h>
|
2009-12-03 11:28:40 -08:00
|
|
|
#include <stdlib.h>
|
2017-11-02 11:13:56 -05:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <netdb.h>
|
2010-12-29 19:03:46 -08:00
|
|
|
#include "byte-order.h"
|
2011-12-15 17:58:23 -08:00
|
|
|
#include "csum.h"
|
2013-08-22 20:24:44 +12:00
|
|
|
#include "crc32c.h"
|
2012-01-19 16:55:50 -08:00
|
|
|
#include "flow.h"
|
2016-07-12 16:37:34 -05:00
|
|
|
#include "openvswitch/hmap.h"
|
2016-03-03 10:20:46 -08:00
|
|
|
#include "openvswitch/dynamic-string.h"
|
2013-04-23 15:03:57 -07:00
|
|
|
#include "ovs-thread.h"
|
2014-02-26 18:08:04 -08:00
|
|
|
#include "odp-util.h"
|
2015-02-22 03:21:09 -08:00
|
|
|
#include "dp-packet.h"
|
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
|
|
|
#include "unaligned.h"
|
2009-09-15 15:22:17 -07:00
|
|
|
|
2010-12-29 19:03:46 -08:00
|
|
|
const struct in6_addr in6addr_exact = IN6ADDR_EXACT_INIT;
|
2015-07-01 16:12:12 -03:00
|
|
|
const struct in6_addr in6addr_all_hosts = IN6ADDR_ALL_HOSTS_INIT;
|
2017-05-04 20:42:30 +05:30
|
|
|
const struct in6_addr in6addr_all_routers = IN6ADDR_ALL_ROUTERS_INIT;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
2015-11-25 11:31:11 -02:00
|
|
|
struct in6_addr
|
|
|
|
flow_tnl_dst(const struct flow_tnl *tnl)
|
|
|
|
{
|
2015-12-03 13:00:38 -08:00
|
|
|
return tnl->ip_dst ? in6_addr_mapped_ipv4(tnl->ip_dst) : tnl->ipv6_dst;
|
2015-11-25 11:31:11 -02:00
|
|
|
}
|
|
|
|
|
|
|
|
struct in6_addr
|
|
|
|
flow_tnl_src(const struct flow_tnl *tnl)
|
|
|
|
{
|
2015-12-03 13:00:38 -08:00
|
|
|
return tnl->ip_src ? in6_addr_mapped_ipv4(tnl->ip_src) : tnl->ipv6_src;
|
2015-11-25 11:31:11 -02:00
|
|
|
}
|
|
|
|
|
2010-10-21 10:40:05 -07:00
|
|
|
/* Parses 's' as a 16-digit hexadecimal number representing a datapath ID. On
|
|
|
|
* success stores the dpid into '*dpidp' and returns true, on failure stores 0
|
|
|
|
* into '*dpidp' and returns false.
|
|
|
|
*
|
|
|
|
* Rejects an all-zeros dpid as invalid. */
|
2009-12-03 11:28:40 -08:00
|
|
|
bool
|
|
|
|
dpid_from_string(const char *s, uint64_t *dpidp)
|
|
|
|
{
|
2009-11-13 13:21:13 -08:00
|
|
|
*dpidp = (strlen(s) == 16 && strspn(s, "0123456789abcdefABCDEF") == 16
|
2010-10-21 10:40:05 -07:00
|
|
|
? strtoull(s, NULL, 16)
|
2009-12-03 11:28:40 -08:00
|
|
|
: 0);
|
|
|
|
return *dpidp != 0;
|
|
|
|
}
|
|
|
|
|
2012-07-25 21:37:59 -07:00
|
|
|
/* Returns true if 'ea' is a reserved address, that a bridge must never
|
|
|
|
* forward, false otherwise.
|
2012-06-01 14:33:41 -07:00
|
|
|
*
|
|
|
|
* If you change this function's behavior, please update corresponding
|
|
|
|
* documentation in vswitch.xml at the same time. */
|
|
|
|
bool
|
2015-08-28 14:55:11 -07:00
|
|
|
eth_addr_is_reserved(const struct eth_addr ea)
|
2012-06-01 14:33:41 -07:00
|
|
|
{
|
2012-07-25 21:37:59 -07:00
|
|
|
struct eth_addr_node {
|
|
|
|
struct hmap_node hmap_node;
|
2013-04-23 15:03:57 -07:00
|
|
|
const uint64_t ea64;
|
2012-06-01 14:33:41 -07:00
|
|
|
};
|
|
|
|
|
2012-07-25 21:37:59 -07:00
|
|
|
static struct eth_addr_node nodes[] = {
|
|
|
|
/* STP, IEEE pause frames, and other reserved protocols. */
|
2013-05-28 16:05:34 -07:00
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000000ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000001ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000002ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000003ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000004ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000005ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000006ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000007ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000008ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c2000009ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c200000aULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c200000bULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c200000cULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c200000dULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c200000eULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x0180c200000fULL },
|
2012-07-25 21:37:59 -07:00
|
|
|
|
|
|
|
/* Extreme protocols. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x00e02b000000ULL }, /* EDP. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x00e02b000004ULL }, /* EAPS. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x00e02b000006ULL }, /* EAPS. */
|
|
|
|
|
|
|
|
/* Cisco protocols. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000c000000ULL }, /* ISL. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccccULL }, /* PAgP, UDLD, CDP,
|
|
|
|
* DTP, VTP. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000ccccccdULL }, /* PVST+. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000ccdcdcdULL }, /* STP Uplink Fast,
|
|
|
|
* FlexLink. */
|
|
|
|
|
|
|
|
/* Cisco CFM. */
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc0ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc1ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc2ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc3ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc4ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc5ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc6ULL },
|
|
|
|
{ HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc7ULL },
|
|
|
|
};
|
2012-06-01 14:33:41 -07:00
|
|
|
|
2013-04-23 15:03:57 -07:00
|
|
|
static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
|
2012-07-25 21:37:59 -07:00
|
|
|
struct eth_addr_node *node;
|
2013-04-23 15:03:57 -07:00
|
|
|
static struct hmap addrs;
|
2012-07-25 21:37:59 -07:00
|
|
|
uint64_t ea64;
|
2012-06-01 14:33:41 -07:00
|
|
|
|
2013-04-23 15:03:57 -07:00
|
|
|
if (ovsthread_once_start(&once)) {
|
|
|
|
hmap_init(&addrs);
|
2012-07-25 21:37:59 -07:00
|
|
|
for (node = nodes; node < &nodes[ARRAY_SIZE(nodes)]; node++) {
|
2014-03-27 19:38:04 -07:00
|
|
|
hmap_insert(&addrs, &node->hmap_node, hash_uint64(node->ea64));
|
2012-07-25 21:37:59 -07:00
|
|
|
}
|
2013-04-23 15:03:57 -07:00
|
|
|
ovsthread_once_done(&once);
|
2012-07-25 21:37:59 -07:00
|
|
|
}
|
2012-06-01 14:33:41 -07:00
|
|
|
|
2012-07-25 21:37:59 -07:00
|
|
|
ea64 = eth_addr_to_uint64(ea);
|
2014-03-27 19:38:04 -07:00
|
|
|
HMAP_FOR_EACH_IN_BUCKET (node, hmap_node, hash_uint64(ea64), &addrs) {
|
2012-07-25 21:37:59 -07:00
|
|
|
if (node->ea64 == ea64) {
|
2012-06-01 14:33:41 -07:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-07-20 16:44:55 -07:00
|
|
|
/* Attempts to parse 's' as an Ethernet address. If successful, stores the
|
|
|
|
* address in 'ea' and returns true, otherwise zeros 'ea' and returns
|
2016-10-05 04:20:43 -07:00
|
|
|
* false. This function checks trailing characters. */
|
2009-12-03 11:28:40 -08:00
|
|
|
bool
|
2015-08-28 14:55:11 -07:00
|
|
|
eth_addr_from_string(const char *s, struct eth_addr *ea)
|
2009-12-03 11:28:40 -08:00
|
|
|
{
|
2016-10-05 04:20:43 -07:00
|
|
|
int n = 0;
|
|
|
|
if (ovs_scan(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(*ea), &n)
|
|
|
|
&& !s[n]) {
|
2009-12-03 11:28:40 -08:00
|
|
|
return true;
|
|
|
|
} else {
|
2015-08-28 14:55:11 -07:00
|
|
|
*ea = eth_addr_zero;
|
2009-12-03 11:28:40 -08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-07 15:27:22 -07:00
|
|
|
/* Fills 'b' with a Reverse ARP packet with Ethernet source address 'eth_src'.
|
2009-09-15 15:22:17 -07:00
|
|
|
* This function is used by Open vSwitch to compose packets in cases where
|
2012-06-07 15:27:22 -07:00
|
|
|
* context is important but content doesn't (or shouldn't) matter.
|
|
|
|
*
|
|
|
|
* The returned packet has enough headroom to insert an 802.1Q VLAN header if
|
|
|
|
* desired. */
|
2009-09-15 15:22:17 -07:00
|
|
|
void
|
2015-08-28 14:55:11 -07:00
|
|
|
compose_rarp(struct dp_packet *b, const struct eth_addr eth_src)
|
2009-09-15 15:22:17 -07:00
|
|
|
{
|
2012-06-07 15:27:22 -07:00
|
|
|
struct eth_header *eth;
|
2012-07-26 16:29:10 -07:00
|
|
|
struct arp_eth_header *arp;
|
2009-09-15 15:22:17 -07:00
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_clear(b);
|
|
|
|
dp_packet_prealloc_tailroom(b, 2 + ETH_HEADER_LEN + VLAN_HEADER_LEN
|
2012-07-26 16:29:10 -07:00
|
|
|
+ ARP_ETH_HEADER_LEN);
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_reserve(b, 2 + VLAN_HEADER_LEN);
|
|
|
|
eth = dp_packet_put_uninit(b, sizeof *eth);
|
2015-08-28 14:55:11 -07:00
|
|
|
eth->eth_dst = eth_addr_broadcast;
|
|
|
|
eth->eth_src = eth_src;
|
2012-06-07 15:27:22 -07:00
|
|
|
eth->eth_type = htons(ETH_TYPE_RARP);
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
arp = dp_packet_put_uninit(b, sizeof *arp);
|
2012-07-26 16:29:10 -07:00
|
|
|
arp->ar_hrd = htons(ARP_HRD_ETHERNET);
|
|
|
|
arp->ar_pro = htons(ARP_PRO_IP);
|
|
|
|
arp->ar_hln = sizeof arp->ar_sha;
|
|
|
|
arp->ar_pln = sizeof arp->ar_spa;
|
|
|
|
arp->ar_op = htons(ARP_OP_RARP);
|
2015-08-28 14:55:11 -07:00
|
|
|
arp->ar_sha = eth_src;
|
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, htonl(0));
|
2015-08-28 14:55:11 -07:00
|
|
|
arp->ar_tha = eth_src;
|
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_tpa, htonl(0));
|
2014-04-02 15:44:21 -07:00
|
|
|
|
2015-05-18 10:47:46 -07:00
|
|
|
dp_packet_reset_offsets(b);
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_l3(b, arp);
|
2017-04-25 16:29:59 +00:00
|
|
|
b->packet_type = htonl(PT_ETH);
|
2009-09-15 15:22:17 -07:00
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
|
2011-09-09 18:13:26 -07:00
|
|
|
/* Insert VLAN header according to given TCI. Packet passed must be Ethernet
|
2012-01-03 10:42:56 -08:00
|
|
|
* packet. Ignores the CFI bit of 'tci' using 0 instead.
|
2011-03-29 09:27:47 -07:00
|
|
|
*
|
2014-04-02 15:44:21 -07:00
|
|
|
* Also adjusts the layer offsets accordingly. */
|
2011-03-29 09:27:47 -07:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
eth_push_vlan(struct dp_packet *packet, ovs_be16 tpid, ovs_be16 tci)
|
2011-03-29 09:27:47 -07:00
|
|
|
{
|
|
|
|
struct vlan_eth_header *veh;
|
|
|
|
|
2011-09-09 18:13:26 -07:00
|
|
|
/* Insert new 802.1Q header. */
|
2015-02-22 03:21:09 -08:00
|
|
|
veh = dp_packet_resize_l2(packet, VLAN_HEADER_LEN);
|
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
|
|
|
memmove(veh, (char *)veh + VLAN_HEADER_LEN, 2 * ETH_ADDR_LEN);
|
|
|
|
veh->veth_type = tpid;
|
|
|
|
veh->veth_tci = tci & htons(~VLAN_CFI);
|
2011-03-29 09:27:47 -07:00
|
|
|
}
|
|
|
|
|
2011-11-14 14:02:43 -08:00
|
|
|
/* Removes outermost VLAN header (if any is present) from 'packet'.
|
|
|
|
*
|
2015-06-02 13:55:28 -04:00
|
|
|
* 'packet->l2_5' should initially point to 'packet''s outer-most VLAN header
|
|
|
|
* or may be NULL if there are no VLAN headers. */
|
2011-11-14 14:02:43 -08:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
eth_pop_vlan(struct dp_packet *packet)
|
2011-11-14 14:02:43 -08:00
|
|
|
{
|
2017-04-25 16:29:59 +00:00
|
|
|
struct vlan_eth_header *veh = dp_packet_eth(packet);
|
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
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
if (veh && dp_packet_size(packet) >= sizeof *veh
|
2015-06-02 13:55:28 -04:00
|
|
|
&& eth_type_vlan(veh->veth_type)) {
|
2011-11-14 14:02:43 -08:00
|
|
|
|
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
|
|
|
memmove((char *)veh + VLAN_HEADER_LEN, veh, 2 * ETH_ADDR_LEN);
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_resize_l2(packet, -VLAN_HEADER_LEN);
|
2011-11-14 14:02:43 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-06 15:49:43 +00:00
|
|
|
/* Push Ethernet header onto 'packet' assuming it is layer 3 */
|
|
|
|
void
|
|
|
|
push_eth(struct dp_packet *packet, const struct eth_addr *dst,
|
|
|
|
const struct eth_addr *src)
|
|
|
|
{
|
|
|
|
struct eth_header *eh;
|
|
|
|
|
|
|
|
ovs_assert(packet->packet_type != htonl(PT_ETH));
|
|
|
|
eh = dp_packet_resize_l2(packet, ETH_HEADER_LEN);
|
|
|
|
eh->eth_dst = *dst;
|
|
|
|
eh->eth_src = *src;
|
|
|
|
eh->eth_type = pt_ns_type_be(packet->packet_type);
|
|
|
|
packet->packet_type = htonl(PT_ETH);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Removes Ethernet header, including VLAN header, from 'packet'.
|
|
|
|
*
|
|
|
|
* Previous to calling this function, 'ofpbuf_l3(packet)' must not be NULL */
|
|
|
|
void
|
|
|
|
pop_eth(struct dp_packet *packet)
|
|
|
|
{
|
|
|
|
char *l2_5 = dp_packet_l2_5(packet);
|
|
|
|
char *l3 = dp_packet_l3(packet);
|
|
|
|
ovs_be16 ethertype;
|
|
|
|
int increment;
|
|
|
|
|
|
|
|
ovs_assert(packet->packet_type == htonl(PT_ETH));
|
|
|
|
ovs_assert(l3 != NULL);
|
|
|
|
|
|
|
|
if (l2_5) {
|
|
|
|
increment = packet->l2_5_ofs;
|
|
|
|
ethertype = *(ALIGNED_CAST(ovs_be16 *, (l2_5 - 2)));
|
|
|
|
} else {
|
|
|
|
increment = packet->l3_ofs;
|
|
|
|
ethertype = *(ALIGNED_CAST(ovs_be16 *, (l3 - 2)));
|
|
|
|
}
|
|
|
|
|
|
|
|
dp_packet_resize_l2(packet, -increment);
|
|
|
|
packet->packet_type = PACKET_TYPE_BE(OFPHTN_ETHERTYPE, ntohs(ethertype));
|
|
|
|
}
|
|
|
|
|
2013-01-25 16:22:07 +09:00
|
|
|
/* Set ethertype of the packet. */
|
2014-02-12 16:31:03 +09:00
|
|
|
static void
|
2015-02-22 03:21:09 -08:00
|
|
|
set_ethertype(struct dp_packet *packet, ovs_be16 eth_type)
|
2013-01-25 16:22:07 +09:00
|
|
|
{
|
2017-04-25 16:29:59 +00:00
|
|
|
struct eth_header *eh = dp_packet_eth(packet);
|
2014-04-02 15:44:21 -07:00
|
|
|
|
|
|
|
if (!eh) {
|
|
|
|
return;
|
|
|
|
}
|
2013-01-25 16:22:07 +09:00
|
|
|
|
2015-06-02 13:55:28 -04:00
|
|
|
if (eth_type_vlan(eh->eth_type)) {
|
2013-01-25 16:22:07 +09:00
|
|
|
ovs_be16 *p;
|
2015-02-22 03:21:09 -08:00
|
|
|
char *l2_5 = dp_packet_l2_5(packet);
|
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-07-22 15:47:19 -07:00
|
|
|
p = ALIGNED_CAST(ovs_be16 *,
|
2015-02-22 03:21:09 -08:00
|
|
|
(l2_5 ? l2_5 : (char *)dp_packet_l3(packet)) - 2);
|
2013-01-25 16:22:07 +09:00
|
|
|
*p = eth_type;
|
|
|
|
} else {
|
|
|
|
eh->eth_type = eth_type;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
static bool is_mpls(struct dp_packet *packet)
|
2013-01-25 16:22:07 +09:00
|
|
|
{
|
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
|
|
|
return packet->l2_5_ofs != UINT16_MAX;
|
2013-01-25 16:22:07 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set time to live (TTL) of an MPLS label stack entry (LSE). */
|
2013-03-06 16:08:23 +09:00
|
|
|
void
|
2013-01-25 16:22:07 +09:00
|
|
|
set_mpls_lse_ttl(ovs_be32 *lse, uint8_t ttl)
|
|
|
|
{
|
|
|
|
*lse &= ~htonl(MPLS_TTL_MASK);
|
|
|
|
*lse |= htonl((ttl << MPLS_TTL_SHIFT) & MPLS_TTL_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set traffic class (TC) of an MPLS label stack entry (LSE). */
|
|
|
|
void
|
|
|
|
set_mpls_lse_tc(ovs_be32 *lse, uint8_t tc)
|
|
|
|
{
|
|
|
|
*lse &= ~htonl(MPLS_TC_MASK);
|
|
|
|
*lse |= htonl((tc << MPLS_TC_SHIFT) & MPLS_TC_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set label of an MPLS label stack entry (LSE). */
|
|
|
|
void
|
|
|
|
set_mpls_lse_label(ovs_be32 *lse, ovs_be32 label)
|
|
|
|
{
|
|
|
|
*lse &= ~htonl(MPLS_LABEL_MASK);
|
|
|
|
*lse |= htonl((ntohl(label) << MPLS_LABEL_SHIFT) & MPLS_LABEL_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set bottom of stack (BoS) bit of an MPLS label stack entry (LSE). */
|
|
|
|
void
|
|
|
|
set_mpls_lse_bos(ovs_be32 *lse, uint8_t bos)
|
|
|
|
{
|
|
|
|
*lse &= ~htonl(MPLS_BOS_MASK);
|
|
|
|
*lse |= htonl((bos << MPLS_BOS_SHIFT) & MPLS_BOS_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compose an MPLS label stack entry (LSE) from its components:
|
|
|
|
* label, traffic class (TC), time to live (TTL) and
|
|
|
|
* bottom of stack (BoS) bit. */
|
|
|
|
ovs_be32
|
|
|
|
set_mpls_lse_values(uint8_t ttl, uint8_t tc, uint8_t bos, ovs_be32 label)
|
|
|
|
{
|
|
|
|
ovs_be32 lse = htonl(0);
|
|
|
|
set_mpls_lse_ttl(&lse, ttl);
|
|
|
|
set_mpls_lse_tc(&lse, tc);
|
|
|
|
set_mpls_lse_bos(&lse, bos);
|
|
|
|
set_mpls_lse_label(&lse, label);
|
|
|
|
return lse;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set MPLS label stack entry to outermost MPLS header.*/
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
set_mpls_lse(struct dp_packet *packet, ovs_be32 mpls_lse)
|
2013-01-25 16:22:07 +09:00
|
|
|
{
|
|
|
|
/* Packet type should be MPLS to set label stack entry. */
|
|
|
|
if (is_mpls(packet)) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct mpls_hdr *mh = dp_packet_l2_5(packet);
|
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-01-25 16:22:07 +09:00
|
|
|
/* Update mpls label stack entry. */
|
2014-04-04 20:21:15 -07:00
|
|
|
put_16aligned_be32(&mh->mpls_lse, mpls_lse);
|
2013-01-25 16:22:07 +09:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-03 15:30:02 -07:00
|
|
|
/* Push MPLS label stack entry 'lse' onto 'packet' as the outermost MPLS
|
2013-01-25 16:22:07 +09:00
|
|
|
* header. If 'packet' does not already have any MPLS labels, then its
|
|
|
|
* Ethertype is changed to 'ethtype' (which must be an MPLS Ethertype). */
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
push_mpls(struct dp_packet *packet, ovs_be16 ethtype, ovs_be32 lse)
|
2013-01-25 16:22:07 +09:00
|
|
|
{
|
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
|
|
|
char * header;
|
|
|
|
size_t len;
|
2013-01-25 16:22:07 +09:00
|
|
|
|
|
|
|
if (!eth_type_mpls(ethtype)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_mpls(packet)) {
|
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
|
|
|
/* Set MPLS label stack offset. */
|
|
|
|
packet->l2_5_ofs = packet->l3_ofs;
|
2013-01-25 16:22:07 +09:00
|
|
|
}
|
|
|
|
|
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
|
|
|
set_ethertype(packet, ethtype);
|
|
|
|
|
2013-01-25 16:22:07 +09:00
|
|
|
/* Push new MPLS shim header onto packet. */
|
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
|
|
|
len = packet->l2_5_ofs;
|
2015-02-22 03:21:09 -08:00
|
|
|
header = dp_packet_resize_l2_5(packet, MPLS_HLEN);
|
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
|
|
|
memmove(header, header + MPLS_HLEN, len);
|
|
|
|
memcpy(header + len, &lse, sizeof lse);
|
2013-01-25 16:22:07 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If 'packet' is an MPLS packet, removes its outermost MPLS label stack entry.
|
|
|
|
* If the label that was removed was the only MPLS label, changes 'packet''s
|
|
|
|
* Ethertype to 'ethtype' (which ordinarily should not be an MPLS
|
|
|
|
* Ethertype). */
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
pop_mpls(struct dp_packet *packet, ovs_be16 ethtype)
|
2013-01-25 16:22:07 +09:00
|
|
|
{
|
|
|
|
if (is_mpls(packet)) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct mpls_hdr *mh = dp_packet_l2_5(packet);
|
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 len = packet->l2_5_ofs;
|
|
|
|
|
2013-06-05 14:28:52 +09:00
|
|
|
set_ethertype(packet, ethtype);
|
2014-04-04 20:21:15 -07:00
|
|
|
if (get_16aligned_be32(&mh->mpls_lse) & htonl(MPLS_BOS_MASK)) {
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_l2_5(packet, NULL);
|
2013-01-25 16:22:07 +09:00
|
|
|
}
|
|
|
|
/* Shift the l2 header forward. */
|
2015-02-22 03:21:09 -08:00
|
|
|
memmove((char*)dp_packet_data(packet) + MPLS_HLEN, dp_packet_data(packet), len);
|
|
|
|
dp_packet_resize_l2_5(packet, -MPLS_HLEN);
|
2013-01-25 16:22:07 +09:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-05 13:41:11 +08:00
|
|
|
void
|
|
|
|
encap_nsh(struct dp_packet *packet, const struct ovs_action_encap_nsh *encap)
|
|
|
|
{
|
|
|
|
struct nsh_hdr *nsh;
|
|
|
|
size_t length = NSH_BASE_HDR_LEN + encap->mdlen;
|
|
|
|
uint8_t next_proto;
|
|
|
|
|
|
|
|
switch (ntohl(packet->packet_type)) {
|
|
|
|
case PT_ETH:
|
|
|
|
next_proto = NSH_P_ETHERNET;
|
|
|
|
break;
|
|
|
|
case PT_IPV4:
|
|
|
|
next_proto = NSH_P_IPV4;
|
|
|
|
break;
|
|
|
|
case PT_IPV6:
|
|
|
|
next_proto = NSH_P_IPV6;
|
|
|
|
break;
|
|
|
|
case PT_NSH:
|
|
|
|
next_proto = NSH_P_NSH;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
OVS_NOT_REACHED();
|
|
|
|
}
|
|
|
|
|
|
|
|
nsh = (struct nsh_hdr *) dp_packet_push_uninit(packet, length);
|
2017-11-07 00:40:21 +01:00
|
|
|
nsh->ver_flags_ttl_len =
|
|
|
|
htons(((encap->flags << NSH_FLAGS_SHIFT) & NSH_FLAGS_MASK)
|
|
|
|
| (63 << NSH_TTL_SHIFT)
|
|
|
|
| ((length >> 2) << NSH_LEN_SHIFT));
|
|
|
|
nsh->md_type = (encap->mdtype << NSH_MDTYPE_SHIFT) & NSH_MDTYPE_MASK;
|
2017-08-05 13:41:11 +08:00
|
|
|
nsh->next_proto = next_proto;
|
|
|
|
put_16aligned_be32(&nsh->path_hdr, encap->path_hdr);
|
2017-11-07 00:40:21 +01:00
|
|
|
switch (encap->mdtype) {
|
2017-08-05 13:41:11 +08:00
|
|
|
case NSH_M_TYPE1:
|
|
|
|
nsh->md1 = *ALIGNED_CAST(struct nsh_md1_ctx *, encap->metadata);
|
|
|
|
break;
|
|
|
|
case NSH_M_TYPE2: {
|
|
|
|
/* The MD2 metadata in encap is already padded to 4 bytes. */
|
2017-11-07 15:48:39 +01:00
|
|
|
memcpy(&nsh->md2, encap->metadata, encap->mdlen);
|
2017-08-05 13:41:11 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
OVS_NOT_REACHED();
|
|
|
|
}
|
|
|
|
|
|
|
|
packet->packet_type = htonl(PT_NSH);
|
|
|
|
dp_packet_reset_offsets(packet);
|
|
|
|
packet->l3_ofs = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
decap_nsh(struct dp_packet *packet)
|
|
|
|
{
|
|
|
|
struct nsh_hdr *nsh = (struct nsh_hdr *) dp_packet_l3(packet);
|
|
|
|
size_t length;
|
|
|
|
uint32_t next_pt;
|
|
|
|
|
|
|
|
if (packet->packet_type == htonl(PT_NSH) && nsh) {
|
|
|
|
switch (nsh->next_proto) {
|
|
|
|
case NSH_P_ETHERNET:
|
|
|
|
next_pt = PT_ETH;
|
|
|
|
break;
|
|
|
|
case NSH_P_IPV4:
|
|
|
|
next_pt = PT_IPV4;
|
|
|
|
break;
|
|
|
|
case NSH_P_IPV6:
|
|
|
|
next_pt = PT_IPV6;
|
|
|
|
break;
|
|
|
|
case NSH_P_NSH:
|
|
|
|
next_pt = PT_NSH;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Unknown inner packet type. Drop packet. */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
length = nsh_hdr_len(nsh);
|
|
|
|
dp_packet_reset_packet(packet, length);
|
|
|
|
packet->packet_type = htonl(next_pt);
|
|
|
|
/* Packet must be recirculated for further processing. */
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-12-06 14:09:10 -08:00
|
|
|
/* Converts hex digits in 'hex' to an Ethernet packet in '*packetp'. The
|
|
|
|
* caller must free '*packetp'. On success, returns NULL. On failure, returns
|
2013-08-27 22:10:22 -07:00
|
|
|
* an error message and stores NULL in '*packetp'.
|
|
|
|
*
|
|
|
|
* Aligns the L3 header of '*packetp' on a 32-bit boundary. */
|
2011-12-06 14:09:10 -08:00
|
|
|
const char *
|
2015-02-22 03:21:09 -08:00
|
|
|
eth_from_hex(const char *hex, struct dp_packet **packetp)
|
2011-12-06 14:09:10 -08:00
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct dp_packet *packet;
|
2011-12-06 14:09:10 -08:00
|
|
|
|
2013-08-27 22:10:22 -07:00
|
|
|
/* Use 2 bytes of headroom to 32-bit align the L3 header. */
|
2015-02-22 03:21:09 -08:00
|
|
|
packet = *packetp = dp_packet_new_with_headroom(strlen(hex) / 2, 2);
|
2011-12-06 14:09:10 -08:00
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
if (dp_packet_put_hex(packet, hex, NULL)[0] != '\0') {
|
|
|
|
dp_packet_delete(packet);
|
2011-12-06 14:09:10 -08:00
|
|
|
*packetp = NULL;
|
|
|
|
return "Trailing garbage in packet data";
|
|
|
|
}
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
if (dp_packet_size(packet) < ETH_HEADER_LEN) {
|
|
|
|
dp_packet_delete(packet);
|
2011-12-06 14:09:10 -08:00
|
|
|
*packetp = NULL;
|
|
|
|
return "Packet data too short for Ethernet";
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-05-29 11:07:16 -07:00
|
|
|
void
|
2015-08-28 14:55:11 -07:00
|
|
|
eth_format_masked(const struct eth_addr eth,
|
|
|
|
const struct eth_addr *mask, struct ds *s)
|
2012-05-29 11:07:16 -07:00
|
|
|
{
|
|
|
|
ds_put_format(s, ETH_ADDR_FMT, ETH_ADDR_ARGS(eth));
|
2015-08-28 14:55:11 -07:00
|
|
|
if (mask && !eth_mask_is_exact(*mask)) {
|
|
|
|
ds_put_format(s, "/"ETH_ADDR_FMT, ETH_ADDR_ARGS(*mask));
|
2012-05-29 11:07:16 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-17 10:55:15 -07:00
|
|
|
/* Given the IP netmask 'netmask', returns the number of bits of the IP address
|
2012-05-22 22:06:03 -07:00
|
|
|
* that it specifies, that is, the number of 1-bits in 'netmask'.
|
|
|
|
*
|
|
|
|
* If 'netmask' is not a CIDR netmask (see ip_is_cidr()), the return value will
|
|
|
|
* still be in the valid range but isn't otherwise meaningful. */
|
2011-08-17 10:55:15 -07:00
|
|
|
int
|
|
|
|
ip_count_cidr_bits(ovs_be32 netmask)
|
|
|
|
{
|
2013-12-03 13:41:41 -08:00
|
|
|
return 32 - ctz32(ntohl(netmask));
|
2011-08-17 10:55:15 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ip_format_masked(ovs_be32 ip, ovs_be32 mask, struct ds *s)
|
|
|
|
{
|
2012-12-12 15:26:21 -08:00
|
|
|
ds_put_format(s, IP_FMT, IP_ARGS(ip));
|
2013-06-27 15:27:15 -07:00
|
|
|
if (mask != OVS_BE32_MAX) {
|
2011-08-17 10:55:15 -07:00
|
|
|
if (ip_is_cidr(mask)) {
|
|
|
|
ds_put_format(s, "/%d", ip_count_cidr_bits(mask));
|
|
|
|
} else {
|
2012-12-12 15:26:21 -08:00
|
|
|
ds_put_format(s, "/"IP_FMT, IP_ARGS(mask));
|
2011-08-17 10:55:15 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-30 19:57:41 -07:00
|
|
|
/* Parses string 's', which must be an IP address. Stores the IP address into
|
|
|
|
* '*ip'. Returns true if successful, otherwise false. */
|
|
|
|
bool
|
|
|
|
ip_parse(const char *s, ovs_be32 *ip)
|
|
|
|
{
|
|
|
|
return inet_pton(AF_INET, s, ip) == 1;
|
|
|
|
}
|
|
|
|
|
2016-10-03 01:57:37 -07:00
|
|
|
/* Parses string 's', which must be an IP address with a port number
|
|
|
|
* with ":" as a separator (e.g.: 192.168.1.2:80).
|
2016-10-31 19:00:41 -07:00
|
|
|
* Stores the IP address into '*ip' and port number to '*port'.
|
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise an error message that the caller must
|
|
|
|
* free(). */
|
2016-10-03 01:57:37 -07:00
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
|
|
|
ip_parse_port(const char *s, ovs_be32 *ip, ovs_be16 *port)
|
|
|
|
{
|
|
|
|
int n = 0;
|
2016-10-31 19:00:41 -07:00
|
|
|
if (ovs_scan(s, IP_PORT_SCAN_FMT"%n", IP_PORT_SCAN_ARGS(ip, port), &n)
|
|
|
|
&& !s[n]) {
|
|
|
|
return NULL;
|
2016-10-03 01:57:37 -07:00
|
|
|
}
|
|
|
|
|
2016-10-31 19:00:41 -07:00
|
|
|
return xasprintf("%s: invalid IP address or port number", s);
|
2016-10-03 01:57:37 -07:00
|
|
|
}
|
|
|
|
|
2015-10-16 13:54:45 -07:00
|
|
|
/* Parses string 's', which must be an IP address with an optional netmask or
|
2016-02-22 15:59:37 +05:30
|
|
|
* CIDR prefix length. Stores the IP address into '*ip', netmask into '*mask',
|
|
|
|
* (255.255.255.255, if 's' lacks a netmask), and number of scanned characters
|
|
|
|
* into '*n'.
|
2015-10-16 13:54:45 -07:00
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise an error message that the caller must
|
|
|
|
* free(). */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
2016-02-22 15:59:37 +05:30
|
|
|
ip_parse_masked_len(const char *s, int *n, ovs_be32 *ip,
|
|
|
|
ovs_be32 *mask)
|
2015-10-16 13:54:45 -07:00
|
|
|
{
|
|
|
|
int prefix;
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
if (ovs_scan_len(s, n, IP_SCAN_FMT"/"IP_SCAN_FMT,
|
|
|
|
IP_SCAN_ARGS(ip), IP_SCAN_ARGS(mask))) {
|
2015-10-16 13:54:45 -07:00
|
|
|
/* OK. */
|
2016-02-22 15:59:37 +05:30
|
|
|
} else if (ovs_scan_len(s, n, IP_SCAN_FMT"/%d",
|
|
|
|
IP_SCAN_ARGS(ip), &prefix)) {
|
2016-05-17 07:08:29 -07:00
|
|
|
if (prefix < 0 || prefix > 32) {
|
|
|
|
return xasprintf("%s: IPv4 network prefix bits not between 0 and "
|
|
|
|
"32, inclusive", s);
|
2015-10-16 13:54:45 -07:00
|
|
|
}
|
|
|
|
*mask = be32_prefix_mask(prefix);
|
2016-02-22 15:59:37 +05:30
|
|
|
} else if (ovs_scan_len(s, n, IP_SCAN_FMT, IP_SCAN_ARGS(ip))) {
|
2015-10-16 13:54:45 -07:00
|
|
|
*mask = OVS_BE32_MAX;
|
|
|
|
} else {
|
|
|
|
return xasprintf("%s: invalid IP address", s);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-08-17 10:55:15 -07:00
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
/* This function is similar to ip_parse_masked_len(), but doesn't return the
|
|
|
|
* number of scanned characters and expects 's' to end after the ip/(optional)
|
|
|
|
* mask.
|
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise an error message that the caller must
|
|
|
|
* free(). */
|
2015-10-30 19:57:41 -07:00
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
2016-02-22 15:59:37 +05:30
|
|
|
ip_parse_masked(const char *s, ovs_be32 *ip, ovs_be32 *mask)
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
char *error = ip_parse_masked_len(s, &n, ip, mask);
|
|
|
|
if (!error && s[n]) {
|
|
|
|
return xasprintf("%s: invalid IP address", s);
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Similar to ip_parse_masked_len(), but the mask, if present, must be a CIDR
|
|
|
|
* mask and is returned as a prefix len in '*plen'. */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
|
|
|
ip_parse_cidr_len(const char *s, int *n, ovs_be32 *ip, unsigned int *plen)
|
2015-10-30 19:57:41 -07:00
|
|
|
{
|
|
|
|
ovs_be32 mask;
|
|
|
|
char *error;
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
error = ip_parse_masked_len(s, n, ip, &mask);
|
2015-10-30 19:57:41 -07:00
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ip_is_cidr(mask)) {
|
|
|
|
return xasprintf("%s: CIDR network required", s);
|
|
|
|
}
|
|
|
|
*plen = ip_count_cidr_bits(mask);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
/* Similar to ip_parse_cidr_len(), but doesn't return the number of scanned
|
|
|
|
* characters and expects 's' to be NULL terminated at the end of the
|
|
|
|
* ip/(optional) cidr. */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
|
|
|
ip_parse_cidr(const char *s, ovs_be32 *ip, unsigned int *plen)
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
char *error = ip_parse_cidr_len(s, &n, ip, plen);
|
|
|
|
if (!error && s[n]) {
|
|
|
|
return xasprintf("%s: invalid IP address", s);
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2017-11-02 11:13:56 -05:00
|
|
|
/* Parses the string into an IPv4 or IPv6 address.
|
|
|
|
* The port flags act as follows:
|
|
|
|
* * PORT_OPTIONAL: A port may be present but is not required
|
|
|
|
* * PORT_REQUIRED: A port must be present
|
|
|
|
* * PORT_FORBIDDEN: A port must not be present
|
|
|
|
*/
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
|
|
|
ipv46_parse(const char *s, enum port_flags flags, struct sockaddr_storage *ss)
|
|
|
|
{
|
|
|
|
char *error = NULL;
|
|
|
|
|
|
|
|
char *copy;
|
|
|
|
copy = xstrdup(s);
|
|
|
|
|
|
|
|
char *addr;
|
|
|
|
char *port;
|
|
|
|
if (*copy == '[') {
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
addr = copy + 1;
|
|
|
|
end = strchr(addr, ']');
|
|
|
|
if (!end) {
|
|
|
|
error = xasprintf("No closing bracket on address %s", s);
|
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
*end++ = '\0';
|
|
|
|
if (*end == ':') {
|
|
|
|
port = end + 1;
|
|
|
|
} else {
|
|
|
|
port = NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
addr = copy;
|
|
|
|
port = strchr(copy, ':');
|
|
|
|
if (port) {
|
|
|
|
if (strchr(port + 1, ':')) {
|
|
|
|
port = NULL;
|
|
|
|
} else {
|
|
|
|
*port++ = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (port && !*port) {
|
|
|
|
error = xasprintf("Port is an empty string");
|
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (port && flags == PORT_FORBIDDEN) {
|
|
|
|
error = xasprintf("Port forbidden in address %s", s);
|
|
|
|
goto finish;
|
|
|
|
} else if (!port && flags == PORT_REQUIRED) {
|
|
|
|
error = xasprintf("Port required in address %s", s);
|
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct addrinfo hints = {
|
|
|
|
.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV,
|
|
|
|
.ai_family = AF_UNSPEC,
|
|
|
|
};
|
|
|
|
struct addrinfo *res;
|
|
|
|
int status;
|
|
|
|
status = getaddrinfo(addr, port, &hints, &res);
|
|
|
|
if (status) {
|
|
|
|
error = xasprintf("Error parsing address %s: %s",
|
|
|
|
s, gai_strerror(status));
|
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
memcpy(ss, res->ai_addr, res->ai_addrlen);
|
|
|
|
freeaddrinfo(res);
|
|
|
|
|
|
|
|
finish:
|
|
|
|
free(copy);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2015-10-30 19:57:41 -07:00
|
|
|
/* Parses string 's', which must be an IPv6 address. Stores the IPv6 address
|
|
|
|
* into '*ip'. Returns true if successful, otherwise false. */
|
|
|
|
bool
|
|
|
|
ipv6_parse(const char *s, struct in6_addr *ip)
|
|
|
|
{
|
|
|
|
return inet_pton(AF_INET6, s, ip) == 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parses string 's', which must be an IPv6 address with an optional netmask or
|
|
|
|
* CIDR prefix length. Stores the IPv6 address into '*ip' and the netmask into
|
2016-02-22 15:59:37 +05:30
|
|
|
* '*mask' (if 's' does not contain a netmask, all-one-bits is assumed), and
|
|
|
|
* number of scanned characters into '*n'.
|
2015-10-30 19:57:41 -07:00
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise an error message that the caller must
|
|
|
|
* free(). */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
2016-02-22 15:59:37 +05:30
|
|
|
ipv6_parse_masked_len(const char *s, int *n, struct in6_addr *ip,
|
|
|
|
struct in6_addr *mask)
|
2015-10-30 19:57:41 -07:00
|
|
|
{
|
|
|
|
char ipv6_s[IPV6_SCAN_LEN + 1];
|
|
|
|
int prefix;
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
if (ovs_scan_len(s, n, " "IPV6_SCAN_FMT, ipv6_s)
|
|
|
|
&& ipv6_parse(ipv6_s, ip)) {
|
|
|
|
if (ovs_scan_len(s, n, "/%d", &prefix)) {
|
2016-05-17 07:08:29 -07:00
|
|
|
if (prefix < 0 || prefix > 128) {
|
2015-10-30 19:57:41 -07:00
|
|
|
return xasprintf("%s: IPv6 network prefix bits not between 0 "
|
2016-05-17 07:08:29 -07:00
|
|
|
"and 128, inclusive", s);
|
2015-10-30 19:57:41 -07:00
|
|
|
}
|
|
|
|
*mask = ipv6_create_mask(prefix);
|
2016-02-22 15:59:37 +05:30
|
|
|
} else if (ovs_scan_len(s, n, "/"IPV6_SCAN_FMT, ipv6_s)) {
|
|
|
|
if (!ipv6_parse(ipv6_s, mask)) {
|
|
|
|
return xasprintf("%s: Invalid IPv6 mask", s);
|
|
|
|
}
|
2015-10-30 19:57:41 -07:00
|
|
|
/* OK. */
|
|
|
|
} else {
|
2016-02-22 15:59:37 +05:30
|
|
|
/* OK. No mask. */
|
|
|
|
*mask = in6addr_exact;
|
2015-10-30 19:57:41 -07:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return xasprintf("%s: invalid IPv6 address", s);
|
|
|
|
}
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
/* This function is similar to ipv6_parse_masked_len(), but doesn't return the
|
|
|
|
* number of scanned characters and expects 's' to end following the
|
|
|
|
* ipv6/(optional) mask. */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
|
|
|
ipv6_parse_masked(const char *s, struct in6_addr *ip, struct in6_addr *mask)
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
char *error = ipv6_parse_masked_len(s, &n, ip, mask);
|
|
|
|
if (!error && s[n]) {
|
|
|
|
return xasprintf("%s: invalid IPv6 address", s);
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Similar to ipv6_parse_masked_len(), but the mask, if present, must be a CIDR
|
2015-10-30 19:57:41 -07:00
|
|
|
* mask and is returned as a prefix length in '*plen'. */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
2016-02-22 15:59:37 +05:30
|
|
|
ipv6_parse_cidr_len(const char *s, int *n, struct in6_addr *ip,
|
|
|
|
unsigned int *plen)
|
2015-10-30 19:57:41 -07:00
|
|
|
{
|
|
|
|
struct in6_addr mask;
|
|
|
|
char *error;
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
error = ipv6_parse_masked_len(s, n, ip, &mask);
|
2015-10-30 19:57:41 -07:00
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ipv6_is_cidr(&mask)) {
|
|
|
|
return xasprintf("%s: IPv6 CIDR network required", s);
|
|
|
|
}
|
|
|
|
*plen = ipv6_count_cidr_bits(&mask);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-02-22 15:59:37 +05:30
|
|
|
/* Similar to ipv6_parse_cidr_len(), but doesn't return the number of scanned
|
|
|
|
* characters and expects 's' to end after the ipv6/(optional) cidr. */
|
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
|
|
|
ipv6_parse_cidr(const char *s, struct in6_addr *ip, unsigned int *plen)
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
char *error = ipv6_parse_cidr_len(s, &n, ip, plen);
|
|
|
|
if (!error && s[n]) {
|
|
|
|
return xasprintf("%s: invalid IPv6 address", s);
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2015-10-30 19:57:41 -07:00
|
|
|
/* Stores the string representation of the IPv6 address 'addr' into the
|
|
|
|
* character array 'addr_str', which must be at least INET6_ADDRSTRLEN
|
|
|
|
* bytes long. */
|
2010-12-29 19:03:46 -08:00
|
|
|
void
|
2015-10-25 13:19:22 -07:00
|
|
|
ipv6_format_addr(const struct in6_addr *addr, struct ds *s)
|
2010-12-29 19:03:46 -08:00
|
|
|
{
|
2011-08-17 10:55:15 -07:00
|
|
|
char *dst;
|
|
|
|
|
2015-10-25 13:19:22 -07:00
|
|
|
ds_reserve(s, s->length + INET6_ADDRSTRLEN);
|
2011-08-17 10:55:15 -07:00
|
|
|
|
2015-10-25 13:19:22 -07:00
|
|
|
dst = s->string + s->length;
|
|
|
|
inet_ntop(AF_INET6, addr, dst, INET6_ADDRSTRLEN);
|
|
|
|
s->length += strlen(dst);
|
2011-08-17 10:55:15 -07:00
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
|
2015-11-24 15:47:56 -08:00
|
|
|
/* Same as print_ipv6_addr, but optionally encloses the address in square
|
|
|
|
* brackets. */
|
|
|
|
void
|
|
|
|
ipv6_format_addr_bracket(const struct in6_addr *addr, struct ds *s,
|
|
|
|
bool bracket)
|
|
|
|
{
|
|
|
|
if (bracket) {
|
|
|
|
ds_put_char(s, '[');
|
|
|
|
}
|
|
|
|
ipv6_format_addr(addr, s);
|
|
|
|
if (bracket) {
|
|
|
|
ds_put_char(s, ']');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-01 16:12:11 -03:00
|
|
|
void
|
2015-10-25 13:19:22 -07:00
|
|
|
ipv6_format_mapped(const struct in6_addr *addr, struct ds *s)
|
2015-07-01 16:12:11 -03:00
|
|
|
{
|
|
|
|
if (IN6_IS_ADDR_V4MAPPED(addr)) {
|
|
|
|
ds_put_format(s, IP_FMT, addr->s6_addr[12], addr->s6_addr[13],
|
|
|
|
addr->s6_addr[14], addr->s6_addr[15]);
|
|
|
|
} else {
|
2015-10-25 13:19:22 -07:00
|
|
|
ipv6_format_addr(addr, s);
|
2015-07-01 16:12:11 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-17 10:55:15 -07:00
|
|
|
void
|
2015-10-25 13:19:22 -07:00
|
|
|
ipv6_format_masked(const struct in6_addr *addr, const struct in6_addr *mask,
|
|
|
|
struct ds *s)
|
2011-08-17 10:55:15 -07:00
|
|
|
{
|
2015-10-25 13:19:22 -07:00
|
|
|
ipv6_format_addr(addr, s);
|
2011-08-17 10:55:15 -07:00
|
|
|
if (mask && !ipv6_mask_is_exact(mask)) {
|
|
|
|
if (ipv6_is_cidr(mask)) {
|
|
|
|
int cidr_bits = ipv6_count_cidr_bits(mask);
|
|
|
|
ds_put_format(s, "/%d", cidr_bits);
|
|
|
|
} else {
|
|
|
|
ds_put_char(s, '/');
|
2015-10-25 13:19:22 -07:00
|
|
|
ipv6_format_addr(mask, s);
|
2011-08-17 10:55:15 -07:00
|
|
|
}
|
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
|
|
|
|
2015-11-25 11:31:06 -02:00
|
|
|
/* Stores the string representation of the IPv6 address 'addr' into the
|
|
|
|
* character array 'addr_str', which must be at least INET6_ADDRSTRLEN
|
|
|
|
* bytes long. If addr is IPv4-mapped, store an IPv4 dotted-decimal string. */
|
|
|
|
const char *
|
|
|
|
ipv6_string_mapped(char *addr_str, const struct in6_addr *addr)
|
|
|
|
{
|
|
|
|
ovs_be32 ip;
|
|
|
|
ip = in6_addr_get_mapped_ipv4(addr);
|
|
|
|
if (ip) {
|
|
|
|
return inet_ntop(AF_INET, &ip, addr_str, INET6_ADDRSTRLEN);
|
|
|
|
} else {
|
|
|
|
return inet_ntop(AF_INET6, addr, addr_str, INET6_ADDRSTRLEN);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-29 19:03:46 -08:00
|
|
|
#ifdef s6_addr32
|
2016-06-22 18:17:07 -07:00
|
|
|
#define s6_addrX s6_addr32
|
|
|
|
#define IPV6_FOR_EACH(VAR) for (int VAR = 0; VAR < 4; VAR++)
|
2010-12-29 19:03:46 -08:00
|
|
|
#else
|
2016-06-22 18:17:07 -07:00
|
|
|
#define s6_addrX s6_addr
|
|
|
|
#define IPV6_FOR_EACH(VAR) for (int VAR = 0; VAR < 16; VAR++)
|
2010-12-29 19:03:46 -08:00
|
|
|
#endif
|
|
|
|
|
2016-06-22 18:17:07 -07:00
|
|
|
struct in6_addr
|
|
|
|
ipv6_addr_bitand(const struct in6_addr *a, const struct in6_addr *b)
|
|
|
|
{
|
|
|
|
struct in6_addr dst;
|
|
|
|
IPV6_FOR_EACH (i) {
|
|
|
|
dst.s6_addrX[i] = a->s6_addrX[i] & b->s6_addrX[i];
|
|
|
|
}
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct in6_addr
|
|
|
|
ipv6_addr_bitxor(const struct in6_addr *a, const struct in6_addr *b)
|
|
|
|
{
|
|
|
|
struct in6_addr dst;
|
|
|
|
IPV6_FOR_EACH (i) {
|
|
|
|
dst.s6_addrX[i] = a->s6_addrX[i] ^ b->s6_addrX[i];
|
|
|
|
}
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
ipv6_is_zero(const struct in6_addr *a)
|
|
|
|
{
|
|
|
|
IPV6_FOR_EACH (i) {
|
|
|
|
if (a->s6_addrX[i]) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns an in6_addr consisting of 'mask' high-order 1-bits and 128-N
|
|
|
|
* low-order 0-bits. */
|
|
|
|
struct in6_addr
|
|
|
|
ipv6_create_mask(int mask)
|
|
|
|
{
|
|
|
|
struct in6_addr netmask;
|
|
|
|
uint8_t *netmaskp = &netmask.s6_addr[0];
|
|
|
|
|
|
|
|
memset(&netmask, 0, sizeof netmask);
|
|
|
|
while (mask > 8) {
|
|
|
|
*netmaskp = 0xff;
|
|
|
|
netmaskp++;
|
|
|
|
mask -= 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mask) {
|
|
|
|
*netmaskp = 0xff << (8 - mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
return netmask;
|
|
|
|
}
|
|
|
|
|
2011-08-17 10:55:15 -07:00
|
|
|
/* Given the IPv6 netmask 'netmask', returns the number of bits of the IPv6
|
|
|
|
* address that it specifies, that is, the number of 1-bits in 'netmask'.
|
2012-05-22 22:49:31 -07:00
|
|
|
* 'netmask' must be a CIDR netmask (see ipv6_is_cidr()).
|
|
|
|
*
|
|
|
|
* If 'netmask' is not a CIDR netmask (see ipv6_is_cidr()), the return value
|
|
|
|
* will still be in the valid range but isn't otherwise meaningful. */
|
2010-12-29 19:03:46 -08:00
|
|
|
int
|
|
|
|
ipv6_count_cidr_bits(const struct in6_addr *netmask)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int count = 0;
|
|
|
|
const uint8_t *netmaskp = &netmask->s6_addr[0];
|
|
|
|
|
|
|
|
for (i=0; i<16; i++) {
|
|
|
|
if (netmaskp[i] == 0xff) {
|
|
|
|
count += 8;
|
|
|
|
} else {
|
|
|
|
uint8_t nm;
|
|
|
|
|
|
|
|
for(nm = netmaskp[i]; nm; nm <<= 1) {
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns true if 'netmask' is a CIDR netmask, that is, if it consists of N
|
|
|
|
* high-order 1-bits and 128-N low-order 0-bits. */
|
|
|
|
bool
|
|
|
|
ipv6_is_cidr(const struct in6_addr *netmask)
|
|
|
|
{
|
|
|
|
const uint8_t *netmaskp = &netmask->s6_addr[0];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i=0; i<16; i++) {
|
|
|
|
if (netmaskp[i] != 0xff) {
|
|
|
|
uint8_t x = ~netmaskp[i];
|
|
|
|
if (x & (x + 1)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
while (++i < 16) {
|
|
|
|
if (netmaskp[i]) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2011-01-18 18:46:58 -08:00
|
|
|
|
2011-03-24 13:34:05 -07:00
|
|
|
/* Populates 'b' with an Ethernet II packet headed with the given 'eth_dst',
|
|
|
|
* 'eth_src' and 'eth_type' parameters. A payload of 'size' bytes is allocated
|
|
|
|
* in 'b' and returned. This payload may be populated with appropriate
|
2014-04-02 15:44:21 -07:00
|
|
|
* information by the caller. Sets 'b''s 'frame' pointer and 'l3' offset to
|
|
|
|
* the Ethernet header and payload respectively. Aligns b->l3 on a 32-bit
|
2013-08-27 22:10:22 -07:00
|
|
|
* boundary.
|
2011-03-29 09:28:49 -07:00
|
|
|
*
|
|
|
|
* The returned packet has enough headroom to insert an 802.1Q VLAN header if
|
|
|
|
* desired. */
|
2011-03-23 12:59:40 -07:00
|
|
|
void *
|
2015-08-28 14:55:11 -07:00
|
|
|
eth_compose(struct dp_packet *b, const struct eth_addr eth_dst,
|
|
|
|
const struct eth_addr eth_src, uint16_t eth_type,
|
2011-03-24 13:34:05 -07:00
|
|
|
size_t size)
|
2011-01-18 18:46:58 -08:00
|
|
|
{
|
2011-03-23 12:59:40 -07:00
|
|
|
void *data;
|
2011-01-18 18:46:58 -08:00
|
|
|
struct eth_header *eth;
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_clear(b);
|
2011-01-18 18:46:58 -08:00
|
|
|
|
2013-08-27 22:10:22 -07:00
|
|
|
/* The magic 2 here ensures that the L3 header (when it is added later)
|
|
|
|
* will be 32-bit aligned. */
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_prealloc_tailroom(b, 2 + ETH_HEADER_LEN + VLAN_HEADER_LEN + size);
|
|
|
|
dp_packet_reserve(b, 2 + VLAN_HEADER_LEN);
|
|
|
|
eth = dp_packet_put_uninit(b, ETH_HEADER_LEN);
|
2016-03-24 09:30:57 -07:00
|
|
|
data = dp_packet_put_zeros(b, size);
|
2011-01-18 18:46:58 -08:00
|
|
|
|
2015-08-28 14:55:11 -07:00
|
|
|
eth->eth_dst = eth_dst;
|
|
|
|
eth->eth_src = eth_src;
|
2011-03-23 12:59:40 -07:00
|
|
|
eth->eth_type = htons(eth_type);
|
|
|
|
|
2017-04-25 16:29:59 +00:00
|
|
|
b->packet_type = htonl(PT_ETH);
|
2015-05-18 10:47:46 -07:00
|
|
|
dp_packet_reset_offsets(b);
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_l3(b, data);
|
2011-11-03 13:03:16 -07:00
|
|
|
|
2011-03-23 12:59:40 -07:00
|
|
|
return data;
|
2011-03-01 13:27:23 -08:00
|
|
|
}
|
|
|
|
|
odp-execute: Optimize IP header modification in OVS datapath
I measured the packet processing cost of OVS DPDK datapath for different
OpenFlow actions. I configured OVS to use a single pmd thread and
measured the packet throughput in a phy-to-phy setup. I used 10G
interfaces bounded to DPDK driver and overloaded the vSwitch with 64
byte packets through one of the 10G interfaces.
The processing cost of the dec_ttl action seemed to be gratuitously high
compared with other actions.
I looked into the code and saw that dec_ttl is encoded as a masked
nested attribute in OVS_ACTION_ATTR_SET_MASKED(OVS_KEY_ATTR_IPV4).
That way, OVS datapath can modify several IP header fields (TTL, TOS,
source and destination IP addresses) by a single invocation of
packet_set_ipv4() in the odp_set_ipv4() function in the
lib/odp-execute.c file. The packet_set_ipv4() function takes the new
TOS, TTL and IP addresses as arguments, compares them with the actual
ones and updates the fields if needed. This means, that even if only TTL
needs to be updated, each of the four IP header fields is passed to the
callee and is compared to the actual field for each packet.
The odp_set_ipv4() caller function possesses information about the
fields that need to be updated in the 'mask' structure. The idea is to
spare invocation of the packet_set_ipv4() function but use its code
parts directly. So the 'mask' can be used to decide which IP header
fields need to be updated. In addition, a faster packet processing can
be achieved if the values of local variables are
calculated right before their usage.
| T | T | I | I |
| T | O | P | P | Vanilla OVS || + new patch
| L | S | s | d | (nsec/packet) || (nsec/packet)
-------+---+---+---+---+---------------++---------------
output | | | | | 67.19 || 67.19
| X | | | | 74.48 || 68.78
| | X | | | 74.42 || 70.07
| | | X | | 84.62 || 78.03
| | | | X | 84.25 || 77.94
| | | X | X | 97.46 || 91.86
| X | | X | X | 100.42 || 96.00
| X | X | X | X | 102.80 || 100.73
The table shows the average processing cost of packets in nanoseconds
for the following actions:
output; output + dec_ttl; output + mod_nw_tos; output + mod_nw_src;
output + mod_nw_dst and some of their combinations.
I ran each test five times. The values are the mean of the readings
obtained.
I added OVS_LIKELY to the 'if' condition for the TTL field, since as far
as I know, this field will typically be decremented when any field of
the IP header is modified.
Signed-off-by: Zoltán Balogh <zoltan.balogh@ericsson.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
2016-12-13 17:27:37 +00:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_ipv4_addr(struct dp_packet *packet,
|
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
|
|
|
ovs_16aligned_be32 *addr, ovs_be32 new_addr)
|
2011-12-15 17:58:23 -08:00
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct ip_header *nh = dp_packet_l3(packet);
|
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
|
|
|
ovs_be32 old_addr = get_16aligned_be32(addr);
|
2015-02-22 03:21:09 -08:00
|
|
|
size_t l4_size = dp_packet_l4_size(packet);
|
2011-12-15 17:58:23 -08:00
|
|
|
|
2014-03-25 15:26:23 -07:00
|
|
|
if (nh->ip_proto == IPPROTO_TCP && l4_size >= TCP_HEADER_LEN) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct tcp_header *th = dp_packet_l4(packet);
|
2011-12-15 17:58:23 -08:00
|
|
|
|
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
|
|
|
th->tcp_csum = recalc_csum32(th->tcp_csum, old_addr, new_addr);
|
2014-03-25 15:26:23 -07:00
|
|
|
} else if (nh->ip_proto == IPPROTO_UDP && l4_size >= UDP_HEADER_LEN ) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct udp_header *uh = dp_packet_l4(packet);
|
2011-12-15 17:58:23 -08:00
|
|
|
|
|
|
|
if (uh->udp_csum) {
|
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
|
|
|
uh->udp_csum = recalc_csum32(uh->udp_csum, old_addr, new_addr);
|
2011-12-15 17:58:23 -08:00
|
|
|
if (!uh->udp_csum) {
|
|
|
|
uh->udp_csum = htons(0xffff);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
nh->ip_csum = recalc_csum32(nh->ip_csum, old_addr, new_addr);
|
|
|
|
put_16aligned_be32(addr, new_addr);
|
2011-12-15 17:58:23 -08:00
|
|
|
}
|
|
|
|
|
2012-11-05 15:53:32 +02:00
|
|
|
/* Returns true, if packet contains at least one routing header where
|
|
|
|
* segements_left > 0.
|
|
|
|
*
|
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
|
|
|
* This function assumes that L3 and L4 offsets are set in the packet. */
|
2012-11-05 15:53:32 +02:00
|
|
|
static bool
|
2016-04-22 22:22:56 +10:00
|
|
|
packet_rh_present(struct dp_packet *packet, uint8_t *nexthdr)
|
2012-11-05 15:53:32 +02:00
|
|
|
{
|
2013-08-15 11:07:24 -07:00
|
|
|
const struct ovs_16aligned_ip6_hdr *nh;
|
2012-11-05 15:53:32 +02:00
|
|
|
size_t len;
|
|
|
|
size_t remaining;
|
2015-02-22 03:21:09 -08:00
|
|
|
uint8_t *data = dp_packet_l3(packet);
|
2012-11-05 15:53:32 +02:00
|
|
|
|
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
|
|
|
remaining = packet->l4_ofs - packet->l3_ofs;
|
2012-11-05 15:53:32 +02:00
|
|
|
if (remaining < sizeof *nh) {
|
|
|
|
return false;
|
|
|
|
}
|
2013-08-15 11:07:24 -07:00
|
|
|
nh = ALIGNED_CAST(struct ovs_16aligned_ip6_hdr *, data);
|
2012-11-05 15:53:32 +02:00
|
|
|
data += sizeof *nh;
|
|
|
|
remaining -= sizeof *nh;
|
2016-04-22 22:22:56 +10:00
|
|
|
*nexthdr = nh->ip6_nxt;
|
2012-11-05 15:53:32 +02:00
|
|
|
|
|
|
|
while (1) {
|
2016-04-22 22:22:56 +10:00
|
|
|
if ((*nexthdr != IPPROTO_HOPOPTS)
|
|
|
|
&& (*nexthdr != IPPROTO_ROUTING)
|
|
|
|
&& (*nexthdr != IPPROTO_DSTOPTS)
|
|
|
|
&& (*nexthdr != IPPROTO_AH)
|
|
|
|
&& (*nexthdr != IPPROTO_FRAGMENT)) {
|
2012-11-05 15:53:32 +02:00
|
|
|
/* 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'. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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 (remaining < 8) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-04-22 22:22:56 +10:00
|
|
|
if (*nexthdr == IPPROTO_AH) {
|
2012-11-05 15:53:32 +02:00
|
|
|
/* 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 = (struct ip6_ext *)data;
|
|
|
|
|
2016-04-22 22:22:56 +10:00
|
|
|
*nexthdr = ext_hdr->ip6e_nxt;
|
2012-11-05 15:53:32 +02:00
|
|
|
len = (ext_hdr->ip6e_len + 2) * 4;
|
2016-04-22 22:22:56 +10:00
|
|
|
} else if (*nexthdr == IPPROTO_FRAGMENT) {
|
2013-08-15 11:07:24 -07:00
|
|
|
const struct ovs_16aligned_ip6_frag *frag_hdr
|
|
|
|
= ALIGNED_CAST(struct ovs_16aligned_ip6_frag *, data);
|
2012-11-05 15:53:32 +02:00
|
|
|
|
2016-04-22 22:22:56 +10:00
|
|
|
*nexthdr = frag_hdr->ip6f_nxt;
|
2012-11-05 15:53:32 +02:00
|
|
|
len = sizeof *frag_hdr;
|
2016-04-22 22:22:56 +10:00
|
|
|
} else if (*nexthdr == IPPROTO_ROUTING) {
|
2012-11-05 15:53:32 +02:00
|
|
|
const struct ip6_rthdr *rh = (struct ip6_rthdr *)data;
|
|
|
|
|
|
|
|
if (rh->ip6r_segleft > 0) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2016-04-22 22:22:56 +10:00
|
|
|
*nexthdr = rh->ip6r_nxt;
|
2012-11-05 15:53:32 +02:00
|
|
|
len = (rh->ip6r_len + 1) * 8;
|
|
|
|
} else {
|
|
|
|
const struct ip6_ext *ext_hdr = (struct ip6_ext *)data;
|
|
|
|
|
2016-04-22 22:22:56 +10:00
|
|
|
*nexthdr = ext_hdr->ip6e_nxt;
|
2012-11-05 15:53:32 +02:00
|
|
|
len = (ext_hdr->ip6e_len + 1) * 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (remaining < len) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
remaining -= len;
|
|
|
|
data += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_update_csum128(struct dp_packet *packet, uint8_t proto,
|
2017-01-04 16:10:56 -08:00
|
|
|
ovs_16aligned_be32 addr[4],
|
|
|
|
const struct in6_addr *new_addr)
|
2012-11-05 15:53:32 +02:00
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
size_t l4_size = dp_packet_l4_size(packet);
|
2014-03-25 15:26:23 -07:00
|
|
|
|
|
|
|
if (proto == IPPROTO_TCP && l4_size >= TCP_HEADER_LEN) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct tcp_header *th = dp_packet_l4(packet);
|
2012-11-05 15:53:32 +02:00
|
|
|
|
|
|
|
th->tcp_csum = recalc_csum128(th->tcp_csum, addr, new_addr);
|
2014-03-25 15:26:23 -07:00
|
|
|
} else if (proto == IPPROTO_UDP && l4_size >= UDP_HEADER_LEN) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct udp_header *uh = dp_packet_l4(packet);
|
2012-11-05 15:53:32 +02:00
|
|
|
|
|
|
|
if (uh->udp_csum) {
|
|
|
|
uh->udp_csum = recalc_csum128(uh->udp_csum, addr, new_addr);
|
|
|
|
if (!uh->udp_csum) {
|
|
|
|
uh->udp_csum = htons(0xffff);
|
|
|
|
}
|
|
|
|
}
|
2014-09-02 17:57:21 -07:00
|
|
|
} else if (proto == IPPROTO_ICMPV6 &&
|
|
|
|
l4_size >= sizeof(struct icmp6_header)) {
|
2015-02-22 03:21:09 -08:00
|
|
|
struct icmp6_header *icmp = dp_packet_l4(packet);
|
2014-08-15 11:01:54 -07:00
|
|
|
|
|
|
|
icmp->icmp6_cksum = recalc_csum128(icmp->icmp6_cksum, addr, new_addr);
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-16 00:47:32 -08:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_ipv6_addr(struct dp_packet *packet, uint8_t proto,
|
2017-01-04 16:10:56 -08:00
|
|
|
ovs_16aligned_be32 addr[4],
|
|
|
|
const struct in6_addr *new_addr,
|
2012-11-05 15:53:32 +02:00
|
|
|
bool recalculate_csum)
|
|
|
|
{
|
|
|
|
if (recalculate_csum) {
|
2013-08-15 11:07:24 -07:00
|
|
|
packet_update_csum128(packet, proto, addr, new_addr);
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
2014-01-24 15:50:41 +09:00
|
|
|
memcpy(addr, new_addr, sizeof(ovs_be32[4]));
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-08-15 11:07:24 -07:00
|
|
|
packet_set_ipv6_flow_label(ovs_16aligned_be32 *flow_label, ovs_be32 flow_key)
|
2012-11-05 15:53:32 +02:00
|
|
|
{
|
2013-08-15 11:07:24 -07:00
|
|
|
ovs_be32 old_label = get_16aligned_be32(flow_label);
|
|
|
|
ovs_be32 new_label = (old_label & htonl(~IPV6_LABEL_MASK)) | flow_key;
|
|
|
|
put_16aligned_be32(flow_label, new_label);
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-08-15 11:07:24 -07:00
|
|
|
packet_set_ipv6_tc(ovs_16aligned_be32 *flow_label, uint8_t tc)
|
2012-11-05 15:53:32 +02:00
|
|
|
{
|
2013-08-15 11:07:24 -07:00
|
|
|
ovs_be32 old_label = get_16aligned_be32(flow_label);
|
|
|
|
ovs_be32 new_label = (old_label & htonl(0xF00FFFFF)) | htonl(tc << 20);
|
|
|
|
put_16aligned_be32(flow_label, new_label);
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
|
|
|
|
2011-12-15 17:58:23 -08:00
|
|
|
/* Modifies the IPv4 header fields of 'packet' to be consistent with 'src',
|
|
|
|
* 'dst', 'tos', and 'ttl'. Updates 'packet''s L4 checksums as appropriate.
|
|
|
|
* 'packet' must contain a valid IPv4 packet with correctly populated l[347]
|
|
|
|
* markers. */
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_ipv4(struct dp_packet *packet, ovs_be32 src, ovs_be32 dst,
|
2011-12-15 17:58:23 -08:00
|
|
|
uint8_t tos, uint8_t ttl)
|
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct ip_header *nh = dp_packet_l3(packet);
|
2011-12-15 17:58:23 -08:00
|
|
|
|
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
|
|
|
if (get_16aligned_be32(&nh->ip_src) != src) {
|
2011-12-15 17:58:23 -08:00
|
|
|
packet_set_ipv4_addr(packet, &nh->ip_src, src);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
if (get_16aligned_be32(&nh->ip_dst) != dst) {
|
2011-12-15 17:58:23 -08:00
|
|
|
packet_set_ipv4_addr(packet, &nh->ip_dst, dst);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nh->ip_tos != tos) {
|
|
|
|
uint8_t *field = &nh->ip_tos;
|
|
|
|
|
|
|
|
nh->ip_csum = recalc_csum16(nh->ip_csum, htons((uint16_t) *field),
|
|
|
|
htons((uint16_t) tos));
|
|
|
|
*field = tos;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nh->ip_ttl != ttl) {
|
|
|
|
uint8_t *field = &nh->ip_ttl;
|
|
|
|
|
|
|
|
nh->ip_csum = recalc_csum16(nh->ip_csum, htons(*field << 8),
|
|
|
|
htons(ttl << 8));
|
|
|
|
*field = ttl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-05 15:53:32 +02:00
|
|
|
/* Modifies the IPv6 header fields of 'packet' to be consistent with 'src',
|
|
|
|
* 'dst', 'traffic class', and 'next hop'. Updates 'packet''s L4 checksums as
|
|
|
|
* appropriate. 'packet' must contain a valid IPv6 packet with correctly
|
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
|
|
|
* populated l[34] offsets. */
|
2012-11-05 15:53:32 +02:00
|
|
|
void
|
2017-01-04 16:10:56 -08:00
|
|
|
packet_set_ipv6(struct dp_packet *packet, const struct in6_addr *src,
|
|
|
|
const struct in6_addr *dst, uint8_t key_tc, ovs_be32 key_fl,
|
2012-11-05 15:53:32 +02:00
|
|
|
uint8_t key_hl)
|
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct ovs_16aligned_ip6_hdr *nh = dp_packet_l3(packet);
|
2016-04-22 22:22:56 +10:00
|
|
|
uint8_t proto = 0;
|
|
|
|
bool rh_present;
|
|
|
|
|
|
|
|
rh_present = packet_rh_present(packet, &proto);
|
2012-11-05 15:53:32 +02:00
|
|
|
|
|
|
|
if (memcmp(&nh->ip6_src, src, sizeof(ovs_be32[4]))) {
|
2013-08-15 11:07:24 -07:00
|
|
|
packet_set_ipv6_addr(packet, proto, nh->ip6_src.be32, src, true);
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (memcmp(&nh->ip6_dst, dst, sizeof(ovs_be32[4]))) {
|
2013-08-15 11:07:24 -07:00
|
|
|
packet_set_ipv6_addr(packet, proto, nh->ip6_dst.be32, dst,
|
2016-04-22 22:22:56 +10:00
|
|
|
!rh_present);
|
2012-11-05 15:53:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
packet_set_ipv6_tc(&nh->ip6_flow, key_tc);
|
|
|
|
packet_set_ipv6_flow_label(&nh->ip6_flow, key_fl);
|
|
|
|
nh->ip6_hlim = key_hl;
|
|
|
|
}
|
|
|
|
|
2011-12-15 17:58:23 -08:00
|
|
|
static void
|
|
|
|
packet_set_port(ovs_be16 *port, ovs_be16 new_port, ovs_be16 *csum)
|
|
|
|
{
|
|
|
|
if (*port != new_port) {
|
|
|
|
*csum = recalc_csum16(*csum, *port, new_port);
|
|
|
|
*port = new_port;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sets the TCP source and destination port ('src' and 'dst' respectively) of
|
|
|
|
* the TCP header contained in 'packet'. 'packet' must be a valid TCP packet
|
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
|
|
|
* with its l4 offset properly populated. */
|
2011-12-15 17:58:23 -08:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_tcp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst)
|
2011-12-15 17:58:23 -08:00
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct tcp_header *th = dp_packet_l4(packet);
|
2011-12-15 17:58:23 -08:00
|
|
|
|
|
|
|
packet_set_port(&th->tcp_src, src, &th->tcp_csum);
|
|
|
|
packet_set_port(&th->tcp_dst, dst, &th->tcp_csum);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sets the UDP source and destination port ('src' and 'dst' respectively) of
|
|
|
|
* the UDP header contained in 'packet'. 'packet' must be a valid UDP packet
|
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
|
|
|
* with its l4 offset properly populated. */
|
2011-12-15 17:58:23 -08:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_udp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst)
|
2011-12-15 17:58:23 -08:00
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct udp_header *uh = dp_packet_l4(packet);
|
2011-12-15 17:58:23 -08:00
|
|
|
|
|
|
|
if (uh->udp_csum) {
|
|
|
|
packet_set_port(&uh->udp_src, src, &uh->udp_csum);
|
|
|
|
packet_set_port(&uh->udp_dst, dst, &uh->udp_csum);
|
|
|
|
|
|
|
|
if (!uh->udp_csum) {
|
|
|
|
uh->udp_csum = htons(0xffff);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
uh->udp_src = src;
|
|
|
|
uh->udp_dst = dst;
|
|
|
|
}
|
|
|
|
}
|
2012-01-19 16:55:50 -08:00
|
|
|
|
2013-08-22 20:24:44 +12:00
|
|
|
/* Sets the SCTP source and destination port ('src' and 'dst' respectively) of
|
|
|
|
* the SCTP header contained in 'packet'. 'packet' must be a valid SCTP packet
|
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
|
|
|
* with its l4 offset properly populated. */
|
2013-08-22 20:24:44 +12:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_sctp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst)
|
2013-08-22 20:24:44 +12:00
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct sctp_header *sh = dp_packet_l4(packet);
|
2013-08-22 20:24:44 +12:00
|
|
|
ovs_be32 old_csum, old_correct_csum, new_csum;
|
2015-02-22 03:21:09 -08:00
|
|
|
uint16_t tp_len = dp_packet_l4_size(packet);
|
2013-08-22 20:24:44 +12:00
|
|
|
|
2014-04-04 20:21:15 -07:00
|
|
|
old_csum = get_16aligned_be32(&sh->sctp_csum);
|
|
|
|
put_16aligned_be32(&sh->sctp_csum, 0);
|
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
|
|
|
old_correct_csum = crc32c((void *)sh, tp_len);
|
2013-08-22 20:24:44 +12:00
|
|
|
|
|
|
|
sh->sctp_src = src;
|
|
|
|
sh->sctp_dst = dst;
|
|
|
|
|
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
|
|
|
new_csum = crc32c((void *)sh, tp_len);
|
2014-04-04 20:21:15 -07:00
|
|
|
put_16aligned_be32(&sh->sctp_csum, old_csum ^ old_correct_csum ^ new_csum);
|
2013-08-22 20:24:44 +12:00
|
|
|
}
|
|
|
|
|
2015-10-20 22:03:14 -07:00
|
|
|
/* Sets the ICMP type and code of the ICMP header contained in 'packet'.
|
|
|
|
* 'packet' must be a valid ICMP packet with its l4 offset properly
|
|
|
|
* populated. */
|
|
|
|
void
|
|
|
|
packet_set_icmp(struct dp_packet *packet, uint8_t type, uint8_t code)
|
|
|
|
{
|
|
|
|
struct icmp_header *ih = dp_packet_l4(packet);
|
|
|
|
ovs_be16 orig_tc = htons(ih->icmp_type << 8 | ih->icmp_code);
|
|
|
|
ovs_be16 new_tc = htons(type << 8 | code);
|
|
|
|
|
|
|
|
if (orig_tc != new_tc) {
|
|
|
|
ih->icmp_type = type;
|
|
|
|
ih->icmp_code = code;
|
|
|
|
|
|
|
|
ih->icmp_csum = recalc_csum16(ih->icmp_csum, orig_tc, new_tc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-23 23:42:05 +00:00
|
|
|
void
|
2017-01-04 16:10:56 -08:00
|
|
|
packet_set_nd(struct dp_packet *packet, const struct in6_addr *target,
|
2016-03-24 09:30:57 -07:00
|
|
|
const struct eth_addr sll, const struct eth_addr tll)
|
|
|
|
{
|
2014-12-23 23:42:05 +00:00
|
|
|
struct ovs_nd_msg *ns;
|
2017-05-04 20:42:54 +05:30
|
|
|
struct ovs_nd_lla_opt *opt;
|
2015-02-22 03:21:09 -08:00
|
|
|
int bytes_remain = dp_packet_l4_size(packet);
|
2014-12-23 23:42:05 +00:00
|
|
|
|
|
|
|
if (OVS_UNLIKELY(bytes_remain < sizeof(*ns))) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
ns = dp_packet_l4(packet);
|
2017-05-04 20:42:54 +05:30
|
|
|
opt = &ns->options[0];
|
2014-12-23 23:42:05 +00:00
|
|
|
bytes_remain -= sizeof(*ns);
|
|
|
|
|
|
|
|
if (memcmp(&ns->target, target, sizeof(ovs_be32[4]))) {
|
2017-01-04 16:10:56 -08:00
|
|
|
packet_set_ipv6_addr(packet, IPPROTO_ICMPV6, ns->target.be32, target,
|
|
|
|
true);
|
2014-12-23 23:42:05 +00:00
|
|
|
}
|
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
while (bytes_remain >= ND_LLA_OPT_LEN && opt->len != 0) {
|
|
|
|
if (opt->type == ND_OPT_SOURCE_LINKADDR && opt->len == 1) {
|
|
|
|
if (!eth_addr_equals(opt->mac, sll)) {
|
2014-12-23 23:42:05 +00:00
|
|
|
ovs_be16 *csum = &(ns->icmph.icmp6_cksum);
|
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
*csum = recalc_csum48(*csum, opt->mac, sll);
|
|
|
|
opt->mac = sll;
|
2014-12-23 23:42:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* A packet can only contain one SLL or TLL option */
|
|
|
|
break;
|
2017-05-04 20:42:54 +05:30
|
|
|
} else if (opt->type == ND_OPT_TARGET_LINKADDR && opt->len == 1) {
|
|
|
|
if (!eth_addr_equals(opt->mac, tll)) {
|
2014-12-23 23:42:05 +00:00
|
|
|
ovs_be16 *csum = &(ns->icmph.icmp6_cksum);
|
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
*csum = recalc_csum48(*csum, opt->mac, tll);
|
|
|
|
opt->mac = tll;
|
2014-12-23 23:42:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* A packet can only contain one SLL or TLL option */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
opt += opt->len;
|
|
|
|
bytes_remain -= opt->len * ND_LLA_OPT_LEN;
|
2014-12-23 23:42:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-02 15:14:09 -08:00
|
|
|
const char *
|
|
|
|
packet_tcp_flag_to_string(uint32_t flag)
|
|
|
|
{
|
|
|
|
switch (flag) {
|
|
|
|
case TCP_FIN:
|
|
|
|
return "fin";
|
|
|
|
case TCP_SYN:
|
|
|
|
return "syn";
|
|
|
|
case TCP_RST:
|
|
|
|
return "rst";
|
|
|
|
case TCP_PSH:
|
|
|
|
return "psh";
|
|
|
|
case TCP_ACK:
|
|
|
|
return "ack";
|
|
|
|
case TCP_URG:
|
|
|
|
return "urg";
|
|
|
|
case TCP_ECE:
|
|
|
|
return "ece";
|
|
|
|
case TCP_CWR:
|
|
|
|
return "cwr";
|
|
|
|
case TCP_NS:
|
|
|
|
return "ns";
|
|
|
|
case 0x200:
|
|
|
|
return "[200]";
|
|
|
|
case 0x400:
|
|
|
|
return "[400]";
|
|
|
|
case 0x800:
|
|
|
|
return "[800]";
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-05 10:24:56 -07:00
|
|
|
/* Appends a string representation of the TCP flags value 'tcp_flags'
|
2014-03-19 16:13:32 -07:00
|
|
|
* (e.g. from struct flow.tcp_flags or obtained via TCP_FLAGS) to 's', in the
|
2012-04-05 10:24:56 -07:00
|
|
|
* format used by tcpdump. */
|
|
|
|
void
|
2013-10-28 13:54:39 -07:00
|
|
|
packet_format_tcp_flags(struct ds *s, uint16_t tcp_flags)
|
2012-04-05 10:24:56 -07:00
|
|
|
{
|
|
|
|
if (!tcp_flags) {
|
|
|
|
ds_put_cstr(s, "none");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tcp_flags & TCP_SYN) {
|
|
|
|
ds_put_char(s, 'S');
|
|
|
|
}
|
|
|
|
if (tcp_flags & TCP_FIN) {
|
|
|
|
ds_put_char(s, 'F');
|
|
|
|
}
|
|
|
|
if (tcp_flags & TCP_PSH) {
|
|
|
|
ds_put_char(s, 'P');
|
|
|
|
}
|
|
|
|
if (tcp_flags & TCP_RST) {
|
|
|
|
ds_put_char(s, 'R');
|
|
|
|
}
|
|
|
|
if (tcp_flags & TCP_URG) {
|
|
|
|
ds_put_char(s, 'U');
|
|
|
|
}
|
|
|
|
if (tcp_flags & TCP_ACK) {
|
|
|
|
ds_put_char(s, '.');
|
|
|
|
}
|
2013-10-28 13:54:39 -07:00
|
|
|
if (tcp_flags & TCP_ECE) {
|
|
|
|
ds_put_cstr(s, "E");
|
2012-04-05 10:24:56 -07:00
|
|
|
}
|
2013-10-28 13:54:39 -07:00
|
|
|
if (tcp_flags & TCP_CWR) {
|
|
|
|
ds_put_cstr(s, "C");
|
|
|
|
}
|
|
|
|
if (tcp_flags & TCP_NS) {
|
|
|
|
ds_put_cstr(s, "N");
|
|
|
|
}
|
|
|
|
if (tcp_flags & 0x200) {
|
|
|
|
ds_put_cstr(s, "[200]");
|
|
|
|
}
|
|
|
|
if (tcp_flags & 0x400) {
|
|
|
|
ds_put_cstr(s, "[400]");
|
|
|
|
}
|
|
|
|
if (tcp_flags & 0x800) {
|
|
|
|
ds_put_cstr(s, "[800]");
|
2012-04-05 10:24:56 -07:00
|
|
|
}
|
|
|
|
}
|
2014-11-11 11:53:47 -08:00
|
|
|
|
|
|
|
#define ARP_PACKET_SIZE (2 + ETH_HEADER_LEN + VLAN_HEADER_LEN + \
|
|
|
|
ARP_ETH_HEADER_LEN)
|
|
|
|
|
2015-06-14 11:03:23 -07:00
|
|
|
/* Clears 'b' and replaces its contents by an ARP frame with the specified
|
|
|
|
* 'arp_op', 'arp_sha', 'arp_tha', 'arp_spa', and 'arp_tpa'. The outer
|
|
|
|
* Ethernet frame is initialized with Ethernet source 'arp_sha' and destination
|
|
|
|
* 'arp_tha', except that destination ff:ff:ff:ff:ff:ff is used instead if
|
2016-03-01 18:14:37 -08:00
|
|
|
* 'broadcast' is true. Points the L3 header to the ARP header. */
|
2014-11-11 11:53:47 -08:00
|
|
|
void
|
2015-06-14 11:03:23 -07:00
|
|
|
compose_arp(struct dp_packet *b, uint16_t arp_op,
|
2015-08-28 14:55:11 -07:00
|
|
|
const struct eth_addr arp_sha, const struct eth_addr arp_tha,
|
|
|
|
bool broadcast, ovs_be32 arp_spa, ovs_be32 arp_tpa)
|
2014-11-11 11:53:47 -08:00
|
|
|
{
|
2016-03-01 18:14:37 -08:00
|
|
|
compose_arp__(b);
|
|
|
|
|
2017-04-25 16:29:59 +00:00
|
|
|
struct eth_header *eth = dp_packet_eth(b);
|
2016-03-01 18:14:37 -08:00
|
|
|
eth->eth_dst = broadcast ? eth_addr_broadcast : arp_tha;
|
|
|
|
eth->eth_src = arp_sha;
|
|
|
|
|
|
|
|
struct arp_eth_header *arp = dp_packet_l3(b);
|
|
|
|
arp->ar_op = htons(arp_op);
|
|
|
|
arp->ar_sha = arp_sha;
|
|
|
|
arp->ar_tha = arp_tha;
|
|
|
|
put_16aligned_be32(&arp->ar_spa, arp_spa);
|
|
|
|
put_16aligned_be32(&arp->ar_tpa, arp_tpa);
|
|
|
|
}
|
2014-11-11 11:53:47 -08:00
|
|
|
|
2016-03-01 18:14:37 -08:00
|
|
|
/* Clears 'b' and replaces its contents by an ARP frame. Sets the fields in
|
|
|
|
* the Ethernet and ARP headers that are fixed for ARP frames to those fixed
|
|
|
|
* values, and zeroes the other fields. Points the L3 header to the ARP
|
|
|
|
* header. */
|
|
|
|
void
|
|
|
|
compose_arp__(struct dp_packet *b)
|
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_clear(b);
|
|
|
|
dp_packet_prealloc_tailroom(b, ARP_PACKET_SIZE);
|
|
|
|
dp_packet_reserve(b, 2 + VLAN_HEADER_LEN);
|
2014-11-11 11:53:47 -08:00
|
|
|
|
2016-03-01 18:14:37 -08:00
|
|
|
struct eth_header *eth = dp_packet_put_zeros(b, sizeof *eth);
|
2014-11-11 11:53:47 -08:00
|
|
|
eth->eth_type = htons(ETH_TYPE_ARP);
|
|
|
|
|
2016-03-01 18:14:37 -08:00
|
|
|
struct arp_eth_header *arp = dp_packet_put_zeros(b, sizeof *arp);
|
2014-11-11 11:53:47 -08:00
|
|
|
arp->ar_hrd = htons(ARP_HRD_ETHERNET);
|
|
|
|
arp->ar_pro = htons(ARP_PRO_IP);
|
|
|
|
arp->ar_hln = sizeof arp->ar_sha;
|
|
|
|
arp->ar_pln = sizeof arp->ar_spa;
|
|
|
|
|
2015-05-18 10:47:46 -07:00
|
|
|
dp_packet_reset_offsets(b);
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_l3(b, arp);
|
2017-04-25 16:29:59 +00:00
|
|
|
|
|
|
|
b->packet_type = htonl(PT_ETH);
|
2014-11-11 11:53:47 -08:00
|
|
|
}
|
2015-03-30 12:17:05 -07:00
|
|
|
|
2016-06-17 17:17:58 -07:00
|
|
|
/* This function expects packet with ethernet header with correct
|
2016-03-24 09:30:57 -07:00
|
|
|
* l3 pointer set. */
|
|
|
|
static void *
|
2016-06-17 17:17:58 -07:00
|
|
|
compose_ipv6(struct dp_packet *packet, uint8_t proto,
|
|
|
|
const struct in6_addr *src, const struct in6_addr *dst,
|
|
|
|
uint8_t key_tc, ovs_be32 key_fl, uint8_t key_hl, int size)
|
2016-03-24 09:30:57 -07:00
|
|
|
{
|
|
|
|
struct ip6_hdr *nh;
|
|
|
|
void *data;
|
|
|
|
|
|
|
|
nh = dp_packet_l3(packet);
|
|
|
|
nh->ip6_vfc = 0x60;
|
|
|
|
nh->ip6_nxt = proto;
|
|
|
|
nh->ip6_plen = htons(size);
|
|
|
|
data = dp_packet_put_zeros(packet, size);
|
|
|
|
dp_packet_set_l4(packet, data);
|
2017-01-04 16:10:56 -08:00
|
|
|
packet_set_ipv6(packet, src, dst, key_tc, key_fl, key_hl);
|
2016-03-24 09:30:57 -07:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
2016-06-17 17:17:58 -07:00
|
|
|
/* Compose an IPv6 Neighbor Discovery Neighbor Solicitation message. */
|
2015-12-04 12:36:48 -02:00
|
|
|
void
|
2016-06-17 17:17:58 -07:00
|
|
|
compose_nd_ns(struct dp_packet *b, const struct eth_addr eth_src,
|
|
|
|
const struct in6_addr *ipv6_src, const struct in6_addr *ipv6_dst)
|
2015-12-04 12:36:48 -02:00
|
|
|
{
|
|
|
|
struct in6_addr sn_addr;
|
|
|
|
struct eth_addr eth_dst;
|
|
|
|
struct ovs_nd_msg *ns;
|
2017-05-04 20:42:54 +05:30
|
|
|
struct ovs_nd_lla_opt *lla_opt;
|
2016-03-24 09:30:57 -07:00
|
|
|
uint32_t icmp_csum;
|
2015-12-04 12:36:48 -02:00
|
|
|
|
|
|
|
in6_addr_solicited_node(&sn_addr, ipv6_dst);
|
|
|
|
ipv6_multicast_to_ethernet(ð_dst, &sn_addr);
|
|
|
|
|
2016-03-24 09:30:57 -07:00
|
|
|
eth_compose(b, eth_dst, eth_src, ETH_TYPE_IPV6, IPV6_HEADER_LEN);
|
2016-06-17 17:17:58 -07:00
|
|
|
ns = compose_ipv6(b, IPPROTO_ICMPV6, ipv6_src, &sn_addr,
|
2017-05-04 20:42:54 +05:30
|
|
|
0, 0, 255, ND_MSG_LEN + ND_LLA_OPT_LEN);
|
2015-12-04 12:36:48 -02:00
|
|
|
|
|
|
|
ns->icmph.icmp6_type = ND_NEIGHBOR_SOLICIT;
|
|
|
|
ns->icmph.icmp6_code = 0;
|
2016-07-06 16:19:40 -07:00
|
|
|
put_16aligned_be32(&ns->rso_flags, htonl(0));
|
2015-12-04 12:36:48 -02:00
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
lla_opt = &ns->options[0];
|
|
|
|
lla_opt->type = ND_OPT_SOURCE_LINKADDR;
|
|
|
|
lla_opt->len = 1;
|
2016-03-24 09:30:57 -07:00
|
|
|
|
2017-01-04 16:10:56 -08:00
|
|
|
packet_set_nd(b, ipv6_dst, eth_src, eth_addr_zero);
|
2016-06-17 17:17:58 -07:00
|
|
|
|
2016-03-24 09:30:57 -07:00
|
|
|
ns->icmph.icmp6_cksum = 0;
|
|
|
|
icmp_csum = packet_csum_pseudoheader6(dp_packet_l3(b));
|
2017-05-04 20:42:54 +05:30
|
|
|
ns->icmph.icmp6_cksum = csum_finish(
|
|
|
|
csum_continue(icmp_csum, ns, ND_MSG_LEN + ND_LLA_OPT_LEN));
|
2015-12-04 12:36:48 -02:00
|
|
|
}
|
|
|
|
|
2016-06-17 17:17:58 -07:00
|
|
|
/* Compose an IPv6 Neighbor Discovery Neighbor Advertisement message. */
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
void
|
2016-06-17 17:17:58 -07:00
|
|
|
compose_nd_na(struct dp_packet *b,
|
|
|
|
const struct eth_addr eth_src, const struct eth_addr eth_dst,
|
|
|
|
const struct in6_addr *ipv6_src, const struct in6_addr *ipv6_dst,
|
|
|
|
ovs_be32 rso_flags)
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
{
|
|
|
|
struct ovs_nd_msg *na;
|
2017-05-04 20:42:54 +05:30
|
|
|
struct ovs_nd_lla_opt *lla_opt;
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
uint32_t icmp_csum;
|
|
|
|
|
|
|
|
eth_compose(b, eth_dst, eth_src, ETH_TYPE_IPV6, IPV6_HEADER_LEN);
|
2016-06-17 17:17:58 -07:00
|
|
|
na = compose_ipv6(b, IPPROTO_ICMPV6, ipv6_src, ipv6_dst,
|
2017-05-04 20:42:54 +05:30
|
|
|
0, 0, 255, ND_MSG_LEN + ND_LLA_OPT_LEN);
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
|
|
|
|
na->icmph.icmp6_type = ND_NEIGHBOR_ADVERT;
|
|
|
|
na->icmph.icmp6_code = 0;
|
2016-07-06 16:19:40 -07:00
|
|
|
put_16aligned_be32(&na->rso_flags, rso_flags);
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
lla_opt = &na->options[0];
|
|
|
|
lla_opt->type = ND_OPT_TARGET_LINKADDR;
|
|
|
|
lla_opt->len = 1;
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
|
2017-01-04 16:10:56 -08:00
|
|
|
packet_set_nd(b, ipv6_src, eth_addr_zero, eth_src);
|
2016-06-17 17:17:58 -07:00
|
|
|
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
na->icmph.icmp6_cksum = 0;
|
|
|
|
icmp_csum = packet_csum_pseudoheader6(dp_packet_l3(b));
|
2017-05-04 20:42:54 +05:30
|
|
|
na->icmph.icmp6_cksum = csum_finish(csum_continue(
|
|
|
|
icmp_csum, na, ND_MSG_LEN + ND_LLA_OPT_LEN));
|
ovn: Add 'na' action and lflow for ND
This patch tries to support ND versus ARP for OVN.
It adds a new OVN action 'na' in ovn-controller side, and modify lflows
for 'na' action and relevant packets in ovn-northd.
First, for ovn-northd, it will generate lflows per each lport with its
IPv6 addresses and mac addresss, with 'na' action, such as:
match=(icmp6 && icmp6.type == 135 &&
(nd.target == fd81:ce49:a948:0:f816:3eff:fe46:8a42 ||
nd.target == fd81:ce49:b123:0:f816:3eff:fe46:8a42)),
action=(na { eth.src = fa:16:3e:46:8a:42; nd.tll = fa:16:3e:46:8a:42;
outport = inport;
inport = ""; /* Allow sending out inport. */ output; };)
and new lflows will be set in tabel ls_in_arp_nd_rsp, which is renamed
from previous ls_in_arp_rsp.
Later, for ovn-controller, when it received a ND packet, it frames a
template NA packet for reply. The NA packet will be initialized based on
ND packet, such as NA packet will use:
- ND packet eth.src as eth.dst,
- ND packet eth.dst as eth.src,
- ND packet ip6.src as ip6.dst,
- ND packet nd.target as ip6.src,
- ND packet eth.dst as nd.tll.
Finally, nested actions in 'na' action will update necessary fileds
for NA packet, such as:
- eth.src, nd.tll
- inport, outport
Since patch port for IPv6 router interface is not ready yet, this
patch will only try to deal with ND from VM. This patch will set
RSO flags to 011 for NA packets.
This patch also modified current ACL lflows for ND, not to do conntrack
on ND and NA packets in following tables:
- S_SWITCH_IN_PRE_ACL
- S_SWITCH_OUT_PRE_ACL
- S_SWITCH_IN_ACL
- S_SWITCH_OUT_ACL
Signed-off-by: Zong Kai LI <zealokii@gmail.com>
[blp@ovn.org made several minor simplifications and improvements]
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-27 14:54:52 +08:00
|
|
|
}
|
|
|
|
|
2017-05-04 20:42:30 +05:30
|
|
|
/* Compose an IPv6 Neighbor Discovery Router Advertisement message with
|
|
|
|
* Source Link-layer Address Option and MTU Option.
|
|
|
|
* Caller can call packet_put_ra_prefix_opt to append Prefix Information
|
|
|
|
* Options to composed messags in 'b'. */
|
|
|
|
void
|
|
|
|
compose_nd_ra(struct dp_packet *b,
|
|
|
|
const struct eth_addr eth_src, const struct eth_addr eth_dst,
|
|
|
|
const struct in6_addr *ipv6_src, const struct in6_addr *ipv6_dst,
|
|
|
|
uint8_t cur_hop_limit, uint8_t mo_flags,
|
|
|
|
ovs_be16 router_lt, ovs_be32 reachable_time,
|
|
|
|
ovs_be32 retrans_timer, ovs_be32 mtu)
|
|
|
|
{
|
|
|
|
/* Don't compose Router Advertisement packet with MTU Option if mtu
|
|
|
|
* value is 0. */
|
|
|
|
bool with_mtu = mtu != 0;
|
|
|
|
size_t mtu_opt_len = with_mtu ? ND_MTU_OPT_LEN : 0;
|
|
|
|
|
|
|
|
eth_compose(b, eth_dst, eth_src, ETH_TYPE_IPV6, IPV6_HEADER_LEN);
|
|
|
|
|
|
|
|
struct ovs_ra_msg *ra = compose_ipv6(
|
|
|
|
b, IPPROTO_ICMPV6, ipv6_src, ipv6_dst, 0, 0, 255,
|
2017-05-04 20:42:54 +05:30
|
|
|
RA_MSG_LEN + ND_LLA_OPT_LEN + mtu_opt_len);
|
2017-05-04 20:42:30 +05:30
|
|
|
ra->icmph.icmp6_type = ND_ROUTER_ADVERT;
|
|
|
|
ra->icmph.icmp6_code = 0;
|
|
|
|
ra->cur_hop_limit = cur_hop_limit;
|
|
|
|
ra->mo_flags = mo_flags;
|
|
|
|
ra->router_lifetime = router_lt;
|
|
|
|
ra->reachable_time = reachable_time;
|
|
|
|
ra->retrans_timer = retrans_timer;
|
|
|
|
|
2017-05-04 20:42:54 +05:30
|
|
|
struct ovs_nd_lla_opt *lla_opt = ra->options;
|
|
|
|
lla_opt->type = ND_OPT_SOURCE_LINKADDR;
|
|
|
|
lla_opt->len = 1;
|
|
|
|
lla_opt->mac = eth_src;
|
2017-05-04 20:42:30 +05:30
|
|
|
|
|
|
|
if (with_mtu) {
|
2017-05-04 20:42:54 +05:30
|
|
|
/* ovs_nd_mtu_opt has the same size with ovs_nd_lla_opt. */
|
2017-05-04 20:42:30 +05:30
|
|
|
struct ovs_nd_mtu_opt *mtu_opt
|
|
|
|
= (struct ovs_nd_mtu_opt *)(lla_opt + 1);
|
|
|
|
mtu_opt->type = ND_OPT_MTU;
|
|
|
|
mtu_opt->len = 1;
|
|
|
|
mtu_opt->reserved = 0;
|
|
|
|
put_16aligned_be32(&mtu_opt->mtu, mtu);
|
|
|
|
}
|
|
|
|
|
|
|
|
ra->icmph.icmp6_cksum = 0;
|
|
|
|
uint32_t icmp_csum = packet_csum_pseudoheader6(dp_packet_l3(b));
|
|
|
|
ra->icmph.icmp6_cksum = csum_finish(csum_continue(
|
2017-05-04 20:42:54 +05:30
|
|
|
icmp_csum, ra, RA_MSG_LEN + ND_LLA_OPT_LEN + mtu_opt_len));
|
2017-05-04 20:42:30 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/* Append an IPv6 Neighbor Discovery Prefix Information option to a
|
|
|
|
* Router Advertisement message. */
|
|
|
|
void
|
|
|
|
packet_put_ra_prefix_opt(struct dp_packet *b,
|
|
|
|
uint8_t plen, uint8_t la_flags,
|
|
|
|
ovs_be32 valid_lifetime, ovs_be32 preferred_lifetime,
|
|
|
|
const ovs_be128 prefix)
|
|
|
|
{
|
|
|
|
size_t prev_l4_size = dp_packet_l4_size(b);
|
|
|
|
struct ip6_hdr *nh = dp_packet_l3(b);
|
|
|
|
nh->ip6_plen = htons(prev_l4_size + ND_PREFIX_OPT_LEN);
|
|
|
|
|
|
|
|
struct ovs_ra_msg *ra = dp_packet_l4(b);
|
2017-06-15 14:08:15 +05:30
|
|
|
struct ovs_nd_prefix_opt *prefix_opt =
|
|
|
|
dp_packet_put_uninit(b, sizeof *prefix_opt);
|
2017-05-04 20:42:30 +05:30
|
|
|
prefix_opt->type = ND_OPT_PREFIX_INFORMATION;
|
|
|
|
prefix_opt->len = 4;
|
|
|
|
prefix_opt->prefix_len = plen;
|
|
|
|
prefix_opt->la_flags = la_flags;
|
|
|
|
put_16aligned_be32(&prefix_opt->valid_lifetime, valid_lifetime);
|
|
|
|
put_16aligned_be32(&prefix_opt->preferred_lifetime, preferred_lifetime);
|
|
|
|
put_16aligned_be32(&prefix_opt->reserved, 0);
|
|
|
|
memcpy(prefix_opt->prefix.be32, prefix.be32, sizeof(ovs_be32[4]));
|
|
|
|
|
|
|
|
ra->icmph.icmp6_cksum = 0;
|
|
|
|
uint32_t icmp_csum = packet_csum_pseudoheader6(dp_packet_l3(b));
|
|
|
|
ra->icmph.icmp6_cksum = csum_finish(csum_continue(
|
|
|
|
icmp_csum, ra, prev_l4_size + ND_PREFIX_OPT_LEN));
|
|
|
|
}
|
|
|
|
|
2015-03-30 12:17:05 -07:00
|
|
|
uint32_t
|
|
|
|
packet_csum_pseudoheader(const struct ip_header *ip)
|
|
|
|
{
|
|
|
|
uint32_t partial = 0;
|
|
|
|
|
|
|
|
partial = csum_add32(partial, get_16aligned_be32(&ip->ip_src));
|
|
|
|
partial = csum_add32(partial, get_16aligned_be32(&ip->ip_dst));
|
|
|
|
partial = csum_add16(partial, htons(ip->ip_proto));
|
|
|
|
partial = csum_add16(partial, htons(ntohs(ip->ip_tot_len) -
|
|
|
|
IP_IHL(ip->ip_ihl_ver) * 4));
|
|
|
|
|
|
|
|
return partial;
|
|
|
|
}
|
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
|
|
|
|
2015-12-04 12:36:47 -02:00
|
|
|
#ifndef __CHECKER__
|
|
|
|
uint32_t
|
|
|
|
packet_csum_pseudoheader6(const struct ovs_16aligned_ip6_hdr *ip6)
|
|
|
|
{
|
|
|
|
uint32_t partial = 0;
|
|
|
|
|
2016-12-23 09:06:39 -08:00
|
|
|
partial = csum_continue(partial, &ip6->ip6_src, sizeof ip6->ip6_src);
|
|
|
|
partial = csum_continue(partial, &ip6->ip6_dst, sizeof ip6->ip6_dst);
|
2016-03-24 09:30:57 -07:00
|
|
|
partial = csum_add16(partial, htons(ip6->ip6_nxt));
|
2015-12-04 12:36:47 -02:00
|
|
|
partial = csum_add16(partial, ip6->ip6_plen);
|
|
|
|
|
|
|
|
return partial;
|
|
|
|
}
|
2016-12-14 19:08:27 +01:00
|
|
|
|
|
|
|
/* Calculate the IPv6 upper layer checksum according to RFC2460. We pass the
|
|
|
|
ip6_nxt and ip6_plen values, so it will also work if extension headers
|
|
|
|
are present. */
|
|
|
|
uint16_t
|
|
|
|
packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *ip6,
|
|
|
|
const void *data, uint8_t l4_protocol,
|
|
|
|
uint16_t l4_size)
|
|
|
|
{
|
|
|
|
uint32_t partial = 0;
|
|
|
|
|
|
|
|
partial = csum_continue(partial, &ip6->ip6_src, sizeof ip6->ip6_src);
|
|
|
|
partial = csum_continue(partial, &ip6->ip6_dst, sizeof ip6->ip6_dst);
|
|
|
|
partial = csum_add16(partial, htons(l4_protocol));
|
|
|
|
partial = csum_add16(partial, htons(l4_size));
|
|
|
|
|
|
|
|
partial = csum_continue(partial, data, l4_size);
|
|
|
|
|
|
|
|
return csum_finish(partial);
|
|
|
|
}
|
2015-12-04 12:36:47 -02:00
|
|
|
#endif
|
2016-05-17 17:35:28 -07:00
|
|
|
|
|
|
|
void
|
|
|
|
IP_ECN_set_ce(struct dp_packet *pkt, bool is_ipv6)
|
|
|
|
{
|
|
|
|
if (is_ipv6) {
|
|
|
|
ovs_16aligned_be32 *ip6 = dp_packet_l3(pkt);
|
|
|
|
|
|
|
|
put_16aligned_be32(ip6, get_16aligned_be32(ip6) |
|
|
|
|
htonl(IP_ECN_CE << 20));
|
|
|
|
} else {
|
|
|
|
struct ip_header *nh = dp_packet_l3(pkt);
|
|
|
|
uint8_t tos = nh->ip_tos;
|
|
|
|
|
|
|
|
tos |= IP_ECN_CE;
|
|
|
|
if (nh->ip_tos != tos) {
|
|
|
|
nh->ip_csum = recalc_csum16(nh->ip_csum, htons(nh->ip_tos),
|
|
|
|
htons((uint16_t) tos));
|
|
|
|
nh->ip_tos = tos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|