Skip to content

Commit

Permalink
lib/flow: Add miniflow accessors and miniflow_get_tcp_flags().
Browse files Browse the repository at this point in the history 
Add inlined generic accessors for miniflow integer type fields, and a
new miniflow_get_tcp_flags() usinge these.  These will be used in a
later patch.

Some definitions also used in lib/packets.h had to be moved there to
resolve circular include dependencies.  Similarly, some inline
functions using struct flow are now in lib/flow.h.  IMO this is
cleaner, since now the lib/flow.h need not be included from
lib/packets.h.

Signed-off-by: Jarno Rajahalme <[email protected]>
Reviewed-by: YAMAMOTO Takashi <[email protected]>
  • Loading branch information
Jarno Rajahalme committed Apr 18, 2014
1 parent 419681d commit b7807e4
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 96 deletions.
45 changes: 5 additions & 40 deletions lib/flow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1692,42 +1692,15 @@ miniflow_expand(const struct miniflow *src, struct flow *dst)
flow_union_with_miniflow(dst, src);
}

static const uint32_t *
miniflow_get__(const struct miniflow *flow, unsigned int u32_ofs)
{
if (!(flow->map & (UINT64_C(1) << u32_ofs))) {
static const uint32_t zero = 0;
return &zero;
}
return flow->values +
count_1bits(flow->map & ((UINT64_C(1) << u32_ofs) - 1));
}

/* Returns the uint32_t that would be at byte offset '4 * u32_ofs' if 'flow'
* were expanded into a "struct flow". */
uint32_t
static uint32_t
miniflow_get(const struct miniflow *flow, unsigned int u32_ofs)
{
return *miniflow_get__(flow, u32_ofs);
}

/* Returns the ovs_be16 that would be at byte offset 'u8_ofs' if 'flow' were
* expanded into a "struct flow". */
static ovs_be16
miniflow_get_be16(const struct miniflow *flow, unsigned int u8_ofs)
{
const uint32_t *u32p = miniflow_get__(flow, u8_ofs / 4);
const ovs_be16 *be16p = (const ovs_be16 *) u32p;
return be16p[u8_ofs % 4 != 0];
}

/* Returns the VID within the vlan_tci member of the "struct flow" represented
* by 'flow'. */
uint16_t
miniflow_get_vid(const struct miniflow *flow)
{
ovs_be16 tci = miniflow_get_be16(flow, offsetof(struct flow, vlan_tci));
return vlan_tci_to_vid(tci);
return (flow->map & UINT64_C(1) << u32_ofs)
? *(flow->values +
count_1bits(flow->map & ((UINT64_C(1) << u32_ofs) - 1)))
: 0;
}

/* Returns true if 'a' and 'b' are the same flow, false otherwise. */
Expand Down Expand Up @@ -1976,14 +1949,6 @@ minimask_get(const struct minimask *mask, unsigned int u32_ofs)
return miniflow_get(&mask->masks, u32_ofs);
}

/* Returns the VID mask within the vlan_tci member of the "struct
* flow_wildcards" represented by 'mask'. */
uint16_t
minimask_get_vid_mask(const struct minimask *mask)
{
return miniflow_get_vid(&mask->masks);
}

/* Returns true if 'a' and 'b' are the same flow mask, false otherwise. */
bool
minimask_equal(const struct minimask *a, const struct minimask *b)
Expand Down
140 changes: 118 additions & 22 deletions lib/flow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "byte-order.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
#include "packets.h"
#include "hash.h"
#include "util.h"

Expand Down Expand Up @@ -60,23 +61,6 @@ BUILD_ASSERT_DECL(FLOW_NW_FRAG_LATER == NX_IP_FRAG_LATER);

const char *flow_tun_flag_to_string(uint32_t flags);

struct flow_tnl {
ovs_be64 tun_id;
ovs_be32 ip_src;
ovs_be32 ip_dst;
uint16_t flags;
uint8_t ip_tos;
uint8_t ip_ttl;
};

/* Unfortunately, a "struct flow" sometimes has to handle OpenFlow port
* numbers and other times datapath (dpif) port numbers. This union allows
* access to both. */
union flow_in_port {
odp_port_t odp_port;
ofp_port_t ofp_port;
};

/* Maximum number of supported MPLS labels. */
#define FLOW_MAX_MPLS_LABELS 3

Expand Down Expand Up @@ -418,8 +402,21 @@ void miniflow_destroy(struct miniflow *);

void miniflow_expand(const struct miniflow *, struct flow *);

uint32_t miniflow_get(const struct miniflow *, unsigned int u32_ofs);
uint16_t miniflow_get_vid(const struct miniflow *);
/* These accessors use byte offsets, which are assumed to be compile-time
* constants. */
static inline uint8_t miniflow_get_u8(const struct miniflow *,
unsigned int ofs);
static inline uint16_t miniflow_get_u16(const struct miniflow *,
unsigned int ofs);
static inline ovs_be16 miniflow_get_be16(const struct miniflow *,
unsigned int ofs);
static inline uint32_t miniflow_get_u32(const struct miniflow *,
unsigned int ofs);
static inline ovs_be32 miniflow_get_be32(const struct miniflow *,
unsigned int ofs);

static inline uint16_t miniflow_get_vid(const struct miniflow *);
static inline uint16_t miniflow_get_tcp_flags(const struct miniflow *);
static inline ovs_be64 miniflow_get_metadata(const struct miniflow *);

bool miniflow_equal(const struct miniflow *a, const struct miniflow *b);
Expand Down Expand Up @@ -460,7 +457,7 @@ void minimask_destroy(struct minimask *);
void minimask_expand(const struct minimask *, struct flow_wildcards *);

uint32_t minimask_get(const struct minimask *, unsigned int u32_ofs);
uint16_t minimask_get_vid_mask(const struct minimask *);
static inline uint16_t minimask_get_vid_mask(const struct minimask *);
static inline ovs_be64 minimask_get_metadata_mask(const struct minimask *);

bool minimask_equal(const struct minimask *a, const struct minimask *b);
Expand All @@ -469,14 +466,81 @@ uint32_t minimask_hash(const struct minimask *, uint32_t basis);
bool minimask_has_extra(const struct minimask *, const struct minimask *);
bool minimask_is_catchall(const struct minimask *);


/* 'OFS' is a compile-time constant. */
#define MINIFLOW_GET_TYPE(MF, TYPE, OFS) \
(MF->map & UINT64_C(1) << OFS / 4) \
? ((OVS_FORCE const TYPE *) \
(MF->values + count_1bits(MF->map & ((UINT64_C(1) << OFS / 4) - 1)))) \
[OFS % 4 / sizeof(TYPE)] \
: 0

static inline uint8_t
miniflow_get_u8(const struct miniflow *flow, unsigned int ofs)
{
return MINIFLOW_GET_TYPE(flow, uint8_t, ofs);
}

static inline uint16_t
miniflow_get_u16(const struct miniflow *flow, unsigned int ofs)
{
return MINIFLOW_GET_TYPE(flow, uint16_t, ofs);
}

/* Returns the ovs_be16 that would be at byte offset 'u8_ofs' if 'flow' were
* expanded into a "struct flow". */
static inline ovs_be16
miniflow_get_be16(const struct miniflow *flow, unsigned int ofs)
{
return MINIFLOW_GET_TYPE(flow, ovs_be16, ofs);
}

static inline uint32_t
miniflow_get_u32(const struct miniflow *flow, unsigned int ofs)
{
return MINIFLOW_GET_TYPE(flow, uint32_t, ofs);
}

static inline ovs_be32
miniflow_get_be32(const struct miniflow *flow, unsigned int ofs)
{
return MINIFLOW_GET_TYPE(flow, ovs_be32, ofs);
}

#undef MINIFLOW_GET_TYPE

/* Returns the VID within the vlan_tci member of the "struct flow" represented
* by 'flow'. */
static inline uint16_t
miniflow_get_vid(const struct miniflow *flow)
{
ovs_be16 tci = miniflow_get_be16(flow, offsetof(struct flow, vlan_tci));
return vlan_tci_to_vid(tci);
}

/* Returns the VID mask within the vlan_tci member of the "struct
* flow_wildcards" represented by 'mask'. */
static inline uint16_t
minimask_get_vid_mask(const struct minimask *mask)
{
return miniflow_get_vid(&mask->masks);
}

/* Returns the value of the "tcp_flags" field in 'flow'. */
static inline uint16_t
miniflow_get_tcp_flags(const struct miniflow *flow)
{
return ntohs(miniflow_get_be16(flow, offsetof(struct flow, tcp_flags)));
}

/* Returns the value of the OpenFlow 1.1+ "metadata" field in 'flow'. */
static inline ovs_be64
miniflow_get_metadata(const struct miniflow *flow)
{
enum { MD_OFS = offsetof(struct flow, metadata) };
BUILD_ASSERT_DECL(MD_OFS % sizeof(uint32_t) == 0);
ovs_be32 hi = (OVS_FORCE ovs_be32) miniflow_get(flow, MD_OFS / 4);
ovs_be32 lo = (OVS_FORCE ovs_be32) miniflow_get(flow, MD_OFS / 4 + 1);
ovs_be32 hi = miniflow_get_be32(flow, MD_OFS);
ovs_be32 lo = miniflow_get_be32(flow, MD_OFS + 4);

return htonll(((uint64_t) ntohl(hi) << 32) | ntohl(lo));
}
Expand All @@ -493,4 +557,36 @@ minimask_get_metadata_mask(const struct minimask *mask)
return miniflow_get_metadata(&mask->masks);
}

static inline struct pkt_metadata
pkt_metadata_from_flow(const struct flow *flow)
{
struct pkt_metadata md;

md.recirc_id = flow->recirc_id;
md.dp_hash = flow->dp_hash;
md.tunnel = flow->tunnel;
md.skb_priority = flow->skb_priority;
md.pkt_mark = flow->pkt_mark;
md.in_port = flow->in_port;

return md;
}

static inline bool is_ip_any(const struct flow *flow)
{
return dl_type_is_ip_any(flow->dl_type);
}

static inline bool is_icmpv4(const struct flow *flow)
{
return (flow->dl_type == htons(ETH_TYPE_IP)
&& flow->nw_proto == IPPROTO_ICMP);
}

static inline bool is_icmpv6(const struct flow *flow)
{
return (flow->dl_type == htons(ETH_TYPE_IPV6)
&& flow->nw_proto == IPPROTO_ICMPV6);
}

#endif /* flow.h */
51 changes: 18 additions & 33 deletions lib/packets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <stdint.h>
#include <string.h>
#include "compiler.h"
#include "flow.h"
#include "openvswitch/types.h"
#include "random.h"
#include "hash.h"
Expand All @@ -32,6 +31,24 @@
struct ofpbuf;
struct ds;

/* Tunnel information used in flow key and metadata. */
struct flow_tnl {
ovs_be64 tun_id;
ovs_be32 ip_src;
ovs_be32 ip_dst;
uint16_t flags;
uint8_t ip_tos;
uint8_t ip_ttl;
};

/* Unfortunately, a "struct flow" sometimes has to handle OpenFlow port
* numbers and other times datapath (dpif) port numbers. This union allows
* access to both. */
union flow_in_port {
odp_port_t odp_port;
ofp_port_t ofp_port;
};

/* Datapath packet metadata */
struct pkt_metadata {
uint32_t recirc_id; /* Recirculation id carried with the
Expand All @@ -48,21 +65,6 @@ struct pkt_metadata {
#define PKT_METADATA_INITIALIZER(PORT) \
(struct pkt_metadata){ 0, 0, { 0, 0, 0, 0, 0, 0}, 0, 0, {(PORT)} }

static inline struct pkt_metadata
pkt_metadata_from_flow(const struct flow *flow)
{
struct pkt_metadata md;

md.recirc_id = flow->recirc_id;
md.dp_hash = flow->dp_hash;
md.tunnel = flow->tunnel;
md.skb_priority = flow->skb_priority;
md.pkt_mark = flow->pkt_mark;
md.in_port = flow->in_port;

return md;
}

bool dpid_from_string(const char *s, uint64_t *dpidp);

#define ETH_ADDR_LEN 6
Expand Down Expand Up @@ -652,23 +654,6 @@ static inline bool dl_type_is_ip_any(ovs_be16 dl_type)
|| dl_type == htons(ETH_TYPE_IPV6);
}

static inline bool is_ip_any(const struct flow *flow)
{
return dl_type_is_ip_any(flow->dl_type);
}

static inline bool is_icmpv4(const struct flow *flow)
{
return (flow->dl_type == htons(ETH_TYPE_IP)
&& flow->nw_proto == IPPROTO_ICMP);
}

static inline bool is_icmpv6(const struct flow *flow)
{
return (flow->dl_type == htons(ETH_TYPE_IPV6)
&& flow->nw_proto == IPPROTO_ICMPV6);
}

void format_ipv6_addr(char *addr_str, const struct in6_addr *addr);
void print_ipv6_addr(struct ds *string, const struct in6_addr *addr);
void print_ipv6_masked(struct ds *string, const struct in6_addr *addr,
Expand Down
1 change: 1 addition & 0 deletions ofproto/ofproto-dpif-monitor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <stdint.h>

#include "openflow/openflow.h"
#include "packets.h"

struct bfd;
Expand Down
2 changes: 1 addition & 1 deletion tests/test-classifier.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ test_miniflow(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
/* Check that the flow equals its miniflow. */
assert(miniflow_get_vid(&miniflow) == vlan_tci_to_vid(flow.vlan_tci));
for (i = 0; i < FLOW_U32S; i++) {
assert(miniflow_get(&miniflow, i) == flow_u32[i]);
assert(miniflow_get_u32(&miniflow, i * 4) == flow_u32[i]);
}

/* Check that the miniflow equals itself. */
Expand Down
1 change: 1 addition & 0 deletions tests/test-sflow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <config.h>

#include <arpa/inet.h>
#include <errno.h>
#include <getopt.h>
#include <signal.h>
Expand Down

0 comments on commit b7807e4

Please sign in to comment.