2009-09-15 15:22:17 -07:00
|
|
|
/*
|
2014-04-04 20:21:15 -07:00
|
|
|
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 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>
|
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"
|
2012-07-25 21:37:59 -07:00
|
|
|
#include "hmap.h"
|
2010-12-29 19:03:46 -08:00
|
|
|
#include "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;
|
|
|
|
|
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
|
|
|
|
eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN])
|
|
|
|
{
|
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;
|
|
|
|
}
|
|
|
|
|
2009-12-03 11:28:40 -08:00
|
|
|
bool
|
|
|
|
eth_addr_from_string(const char *s, uint8_t ea[ETH_ADDR_LEN])
|
|
|
|
{
|
2013-11-09 15:44:23 -08:00
|
|
|
if (ovs_scan(s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(ea))) {
|
2009-12-03 11:28:40 -08:00
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
memset(ea, 0, ETH_ADDR_LEN);
|
|
|
|
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-02-22 03:21:09 -08:00
|
|
|
compose_rarp(struct dp_packet *b, const uint8_t eth_src[ETH_ADDR_LEN])
|
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);
|
2012-06-07 15:27:22 -07:00
|
|
|
memcpy(eth->eth_dst, eth_addr_broadcast, ETH_ADDR_LEN);
|
|
|
|
memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN);
|
|
|
|
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);
|
|
|
|
memcpy(arp->ar_sha, eth_src, ETH_ADDR_LEN);
|
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));
|
2012-07-26 16:29:10 -07:00
|
|
|
memcpy(arp->ar_tha, eth_src, ETH_ADDR_LEN);
|
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-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_frame(b, eth);
|
|
|
|
dp_packet_set_l3(b, arp);
|
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'.
|
|
|
|
*
|
2013-01-25 16:22:07 +09:00
|
|
|
* 'packet->l2_5' should initially point to 'packet''s outer-most MPLS header
|
|
|
|
* or may be NULL if there are no MPLS 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
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct vlan_eth_header *veh = dp_packet_l2(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
|
2011-11-14 14:02:43 -08:00
|
|
|
&& veh->veth_type == htons(ETH_TYPE_VLAN)) {
|
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct eth_header *eh = dp_packet_l2(packet);
|
2014-04-02 15:44:21 -07:00
|
|
|
|
|
|
|
if (!eh) {
|
|
|
|
return;
|
|
|
|
}
|
2013-01-25 16:22:07 +09:00
|
|
|
|
|
|
|
if (eh->eth_type == htons(ETH_TYPE_VLAN)) {
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Push MPLS label stack entry 'lse' onto 'packet' as the the outermost MPLS
|
|
|
|
* 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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
eth_format_masked(const uint8_t eth[ETH_ADDR_LEN],
|
|
|
|
const uint8_t mask[ETH_ADDR_LEN], struct ds *s)
|
|
|
|
{
|
|
|
|
ds_put_format(s, ETH_ADDR_FMT, ETH_ADDR_ARGS(eth));
|
2012-05-29 00:38:21 +12:00
|
|
|
if (mask && !eth_mask_is_exact(mask)) {
|
2012-05-29 11:07:16 -07:00
|
|
|
ds_put_format(s, "/"ETH_ADDR_FMT, ETH_ADDR_ARGS(mask));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
eth_addr_bitand(const uint8_t src[ETH_ADDR_LEN],
|
|
|
|
const uint8_t mask[ETH_ADDR_LEN],
|
|
|
|
uint8_t dst[ETH_ADDR_LEN])
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ETH_ADDR_LEN; i++) {
|
|
|
|
dst[i] = src[i] & mask[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-12-29 19:03:46 -08: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. */
|
|
|
|
void
|
|
|
|
format_ipv6_addr(char *addr_str, const struct in6_addr *addr)
|
|
|
|
{
|
|
|
|
inet_ntop(AF_INET6, addr, addr_str, INET6_ADDRSTRLEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
print_ipv6_addr(struct ds *string, const struct in6_addr *addr)
|
|
|
|
{
|
2011-08-17 10:55:15 -07:00
|
|
|
char *dst;
|
|
|
|
|
|
|
|
ds_reserve(string, string->length + INET6_ADDRSTRLEN);
|
|
|
|
|
|
|
|
dst = string->string + string->length;
|
|
|
|
format_ipv6_addr(dst, addr);
|
|
|
|
string->length += strlen(dst);
|
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
|
2011-08-17 10:55:15 -07:00
|
|
|
void
|
|
|
|
print_ipv6_masked(struct ds *s, const struct in6_addr *addr,
|
|
|
|
const struct in6_addr *mask)
|
|
|
|
{
|
|
|
|
print_ipv6_addr(s, addr);
|
|
|
|
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, '/');
|
|
|
|
print_ipv6_addr(s, mask);
|
|
|
|
}
|
|
|
|
}
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct in6_addr ipv6_addr_bitand(const struct in6_addr *a,
|
|
|
|
const struct in6_addr *b)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct in6_addr dst;
|
|
|
|
|
|
|
|
#ifdef s6_addr32
|
|
|
|
for (i=0; i<4; i++) {
|
|
|
|
dst.s6_addr32[i] = a->s6_addr32[i] & b->s6_addr32[i];
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
for (i=0; i<16; i++) {
|
|
|
|
dst.s6_addr[i] = a->s6_addr[i] & b->s6_addr[i];
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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-02-22 03:21:09 -08:00
|
|
|
eth_compose(struct dp_packet *b, const uint8_t eth_dst[ETH_ADDR_LEN],
|
2011-03-24 13:34:05 -07:00
|
|
|
const uint8_t eth_src[ETH_ADDR_LEN], uint16_t eth_type,
|
|
|
|
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);
|
|
|
|
data = dp_packet_put_uninit(b, size);
|
2011-01-18 18:46:58 -08:00
|
|
|
|
2011-03-23 12:59:40 -07:00
|
|
|
memcpy(eth->eth_dst, eth_dst, ETH_ADDR_LEN);
|
2011-01-18 18:46:58 -08:00
|
|
|
memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN);
|
2011-03-23 12:59:40 -07:00
|
|
|
eth->eth_type = htons(eth_type);
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_frame(b, eth);
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2011-12-15 17:58:23 -08:00
|
|
|
static 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
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_rh_present(struct dp_packet *packet)
|
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
|
|
|
int nexthdr;
|
|
|
|
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;
|
|
|
|
nexthdr = nh->ip6_nxt;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
if ((nexthdr != IPPROTO_HOPOPTS)
|
|
|
|
&& (nexthdr != IPPROTO_ROUTING)
|
|
|
|
&& (nexthdr != IPPROTO_DSTOPTS)
|
|
|
|
&& (nexthdr != IPPROTO_AH)
|
|
|
|
&& (nexthdr != IPPROTO_FRAGMENT)) {
|
|
|
|
/* It's either a terminal header (e.g., TCP, UDP) or one we
|
|
|
|
* don't understand. In either case, we're done with the
|
|
|
|
* packet, so use it to fill in 'nw_proto'. */
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nexthdr == IPPROTO_AH) {
|
|
|
|
/* A standard AH definition isn't available, but the fields
|
|
|
|
* we care about are in the same location as the generic
|
|
|
|
* option header--only the header length is calculated
|
|
|
|
* differently. */
|
|
|
|
const struct ip6_ext *ext_hdr = (struct ip6_ext *)data;
|
|
|
|
|
|
|
|
nexthdr = ext_hdr->ip6e_nxt;
|
|
|
|
len = (ext_hdr->ip6e_len + 2) * 4;
|
|
|
|
} 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
|
|
|
|
|
|
|
nexthdr = frag_hdr->ip6f_nxt;
|
|
|
|
len = sizeof *frag_hdr;
|
|
|
|
} else if (nexthdr == IPPROTO_ROUTING) {
|
|
|
|
const struct ip6_rthdr *rh = (struct ip6_rthdr *)data;
|
|
|
|
|
|
|
|
if (rh->ip6r_segleft > 0) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
nexthdr = rh->ip6r_nxt;
|
|
|
|
len = (rh->ip6r_len + 1) * 8;
|
|
|
|
} else {
|
|
|
|
const struct ip6_ext *ext_hdr = (struct ip6_ext *)data;
|
|
|
|
|
|
|
|
nexthdr = ext_hdr->ip6e_nxt;
|
|
|
|
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,
|
2013-08-15 11:07:24 -07:00
|
|
|
ovs_16aligned_be32 addr[4], const ovs_be32 new_addr[4])
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_ipv6_addr(struct dp_packet *packet, uint8_t proto,
|
2014-01-24 15:50:41 +09:00
|
|
|
ovs_16aligned_be32 addr[4], const ovs_be32 new_addr[4],
|
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
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_ipv6(struct dp_packet *packet, uint8_t proto, const ovs_be32 src[4],
|
2012-11-05 15:53:32 +02:00
|
|
|
const ovs_be32 dst[4], uint8_t key_tc, ovs_be32 key_fl,
|
|
|
|
uint8_t key_hl)
|
|
|
|
{
|
2015-02-22 03:21:09 -08:00
|
|
|
struct ovs_16aligned_ip6_hdr *nh = dp_packet_l3(packet);
|
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,
|
2012-11-05 15:53:32 +02:00
|
|
|
!packet_rh_present(packet));
|
|
|
|
}
|
|
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2014-12-23 23:42:05 +00:00
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
packet_set_nd(struct dp_packet *packet, const ovs_be32 target[4],
|
2014-12-23 23:42:05 +00:00
|
|
|
const uint8_t sll[ETH_ADDR_LEN],
|
|
|
|
const uint8_t tll[ETH_ADDR_LEN]) {
|
|
|
|
struct ovs_nd_msg *ns;
|
|
|
|
struct ovs_nd_opt *nd_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);
|
2014-12-23 23:42:05 +00:00
|
|
|
nd_opt = &ns->options[0];
|
|
|
|
bytes_remain -= sizeof(*ns);
|
|
|
|
|
|
|
|
if (memcmp(&ns->target, target, sizeof(ovs_be32[4]))) {
|
|
|
|
packet_set_ipv6_addr(packet, IPPROTO_ICMPV6,
|
|
|
|
ns->target.be32,
|
|
|
|
target, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (bytes_remain >= ND_OPT_LEN && nd_opt->nd_opt_len != 0) {
|
|
|
|
if (nd_opt->nd_opt_type == ND_OPT_SOURCE_LINKADDR
|
|
|
|
&& nd_opt->nd_opt_len == 1) {
|
|
|
|
if (memcmp(nd_opt->nd_opt_data, sll, ETH_ADDR_LEN)) {
|
|
|
|
ovs_be16 *csum = &(ns->icmph.icmp6_cksum);
|
|
|
|
|
|
|
|
*csum = recalc_csum48(*csum, nd_opt->nd_opt_data, sll);
|
|
|
|
memcpy(nd_opt->nd_opt_data, sll, ETH_ADDR_LEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A packet can only contain one SLL or TLL option */
|
|
|
|
break;
|
|
|
|
} else if (nd_opt->nd_opt_type == ND_OPT_TARGET_LINKADDR
|
|
|
|
&& nd_opt->nd_opt_len == 1) {
|
|
|
|
if (memcmp(nd_opt->nd_opt_data, tll, ETH_ADDR_LEN)) {
|
|
|
|
ovs_be16 *csum = &(ns->icmph.icmp6_cksum);
|
|
|
|
|
|
|
|
*csum = recalc_csum48(*csum, nd_opt->nd_opt_data, tll);
|
|
|
|
memcpy(nd_opt->nd_opt_data, tll, ETH_ADDR_LEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A packet can only contain one SLL or TLL option */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
nd_opt += nd_opt->nd_opt_len;
|
|
|
|
bytes_remain -= nd_opt->nd_opt_len * ND_OPT_LEN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
void
|
2015-02-22 03:21:09 -08:00
|
|
|
compose_arp(struct dp_packet *b, const uint8_t eth_src[ETH_ADDR_LEN],
|
2014-11-11 11:53:47 -08:00
|
|
|
ovs_be32 ip_src, ovs_be32 ip_dst)
|
|
|
|
{
|
|
|
|
struct eth_header *eth;
|
|
|
|
struct arp_eth_header *arp;
|
|
|
|
|
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
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
eth = dp_packet_put_uninit(b, sizeof *eth);
|
2014-11-11 11:53:47 -08:00
|
|
|
memcpy(eth->eth_dst, eth_addr_broadcast, ETH_ADDR_LEN);
|
|
|
|
memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN);
|
|
|
|
eth->eth_type = htons(ETH_TYPE_ARP);
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
arp = dp_packet_put_uninit(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;
|
|
|
|
arp->ar_op = htons(ARP_OP_REQUEST);
|
|
|
|
memcpy(arp->ar_sha, eth_src, ETH_ADDR_LEN);
|
|
|
|
memset(arp->ar_tha, 0, ETH_ADDR_LEN);
|
|
|
|
|
|
|
|
put_16aligned_be32(&arp->ar_spa, ip_src);
|
|
|
|
put_16aligned_be32(&arp->ar_tpa, ip_dst);
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
dp_packet_set_frame(b, eth);
|
|
|
|
dp_packet_set_l3(b, arp);
|
2014-11-11 11:53:47 -08:00
|
|
|
}
|