#include "list.h"
#include "packets.h"
#include "util.h"
+#include "netdev-dpdk.h"
#ifdef __cplusplus
extern "C" {
#endif
-enum ofpbuf_source {
+enum OVS_PACKED_ENUM ofpbuf_source {
OFPBUF_MALLOC, /* Obtained via malloc(). */
OFPBUF_STACK, /* Un-movable stack space or static buffer. */
OFPBUF_STUB, /* Starts on stack, may expand into heap. */
* as necessary if it grows too large for the available memory. */
struct ofpbuf {
void *base; /* First byte of allocated space. */
- size_t allocated; /* Number of bytes allocated. */
- enum ofpbuf_source source; /* Source of memory allocated as 'base'. */
-
+ uint32_t allocated; /* Number of bytes allocated. */
+ uint32_t size; /* Number of bytes in use. */
void *data; /* First byte actually in use. */
- size_t size; /* Number of bytes in use. */
void *l2; /* Link-level header. */
- void *l2_5; /* MPLS label stack */
- void *l3; /* Network-level header. */
- void *l4; /* Transport-level header. */
-
+ uint16_t l2_5_ofs; /* MPLS label stack offset from l2, or
+ * UINT16_MAX */
+ uint16_t l3_ofs; /* Network-level header offset from l2, or
+ * UINT16_MAX. */
+ uint16_t l4_ofs; /* Transport-level header offset from l2, or
+ UINT16_MAX. */
+ enum ofpbuf_source source; /* Source of memory allocated as 'base'. */
struct list list_node; /* Private list element for use by owner. */
- void *private_p; /* Private pointer for use by owner. */
+#ifdef DPDK_NETDEV
+ void *private_p; /* private pointer for use by dpdk */
+#endif
};
+static inline void * ofpbuf_data(const struct ofpbuf *);
+static inline void ofpbuf_set_data(struct ofpbuf *, void *);
+static inline void * ofpbuf_base(const struct ofpbuf *);
+static inline void ofpbuf_set_base(struct ofpbuf *, void *);
+
+static inline uint32_t ofpbuf_size(const struct ofpbuf *);
+static inline void ofpbuf_set_size(struct ofpbuf *, uint32_t);
+
+void * ofpbuf_resize_l2(struct ofpbuf *, int increment);
+void * ofpbuf_resize_l2_5(struct ofpbuf *, int increment);
+static inline void * ofpbuf_get_l2_5(const struct ofpbuf *);
+static inline void ofpbuf_set_l2_5(struct ofpbuf *, void *);
+static inline void * ofpbuf_get_l3(const struct ofpbuf *);
+static inline void ofpbuf_set_l3(struct ofpbuf *, void *);
+static inline void * ofpbuf_get_l4(const struct ofpbuf *);
+static inline void ofpbuf_set_l4(struct ofpbuf *, void *);
+static inline size_t ofpbuf_get_l4_size(const struct ofpbuf *);
+static inline const void *ofpbuf_get_tcp_payload(const struct ofpbuf *);
+static inline const void *ofpbuf_get_udp_payload(const struct ofpbuf *);
+static inline const void *ofpbuf_get_sctp_payload(const struct ofpbuf *);
+static inline const void *ofpbuf_get_icmp_payload(const struct ofpbuf *);
+
void ofpbuf_use(struct ofpbuf *, void *, size_t);
void ofpbuf_use_stack(struct ofpbuf *, void *, size_t);
void ofpbuf_use_stub(struct ofpbuf *, void *, size_t);
void ofpbuf_use_const(struct ofpbuf *, const void *, size_t);
+void ofpbuf_init_dpdk(struct ofpbuf *b, size_t allocated);
+
void ofpbuf_init(struct ofpbuf *, size_t);
void ofpbuf_uninit(struct ofpbuf *);
static inline void *ofpbuf_get_uninit_pointer(struct ofpbuf *);
static inline void *ofpbuf_get_uninit_pointer(struct ofpbuf *b)
{
/* XXX: If 'source' is OFPBUF_DPDK memory gets leaked! */
- return b && b->source == OFPBUF_MALLOC ? b->base : NULL;
+ return b && b->source == OFPBUF_MALLOC ? ofpbuf_base(b) : NULL;
}
/* Frees memory that 'b' points to, as well as 'b' itself. */
static inline void *ofpbuf_at(const struct ofpbuf *b, size_t offset,
size_t size)
{
- return offset + size <= b->size ? (char *) b->data + offset : NULL;
+ return offset + size <= ofpbuf_size(b) ? (char *) ofpbuf_data(b) + offset : NULL;
}
/* Returns a pointer to byte 'offset' in 'b', which must contain at least
static inline void *ofpbuf_at_assert(const struct ofpbuf *b, size_t offset,
size_t size)
{
- ovs_assert(offset + size <= b->size);
- return ((char *) b->data) + offset;
+ ovs_assert(offset + size <= ofpbuf_size(b));
+ return ((char *) ofpbuf_data(b)) + offset;
}
/* Returns the byte following the last byte of data in use in 'b'. */
static inline void *ofpbuf_tail(const struct ofpbuf *b)
{
- return (char *) b->data + b->size;
+ return (char *) ofpbuf_data(b) + ofpbuf_size(b);
}
/* Returns the byte following the last byte allocated for use (but not
* necessarily in use) by 'b'. */
static inline void *ofpbuf_end(const struct ofpbuf *b)
{
- return (char *) b->base + b->allocated;
+ return (char *) ofpbuf_base(b) + b->allocated;
}
/* Returns the number of bytes of headroom in 'b', that is, the number of bytes
* headroom is 0.) */
static inline size_t ofpbuf_headroom(const struct ofpbuf *b)
{
- return (char*)b->data - (char*)b->base;
+ return (char*)ofpbuf_data(b) - (char*)ofpbuf_base(b);
}
/* Returns the number of bytes that may be appended to the tail end of ofpbuf
/* Clears any data from 'b'. */
static inline void ofpbuf_clear(struct ofpbuf *b)
{
- b->data = b->base;
- b->size = 0;
+ ofpbuf_set_data(b, ofpbuf_base(b));
+ ofpbuf_set_size(b, 0);
}
/* Removes 'size' bytes from the head end of 'b', which must contain at least
* 'size' bytes of data. Returns the first byte of data removed. */
static inline void *ofpbuf_pull(struct ofpbuf *b, size_t size)
{
- void *data = b->data;
- ovs_assert(b->size >= size);
- b->data = (char*)b->data + size;
- b->size -= size;
+ void *data = ofpbuf_data(b);
+ ovs_assert(ofpbuf_size(b) >= size);
+ ofpbuf_set_data(b, (char*)ofpbuf_data(b) + size);
+ ofpbuf_set_size(b, ofpbuf_size(b) - size);
return data;
}
* null pointer without modifying 'b'. */
static inline void *ofpbuf_try_pull(struct ofpbuf *b, size_t size)
{
- return b->size >= size ? ofpbuf_pull(b, size) : NULL;
+ return ofpbuf_size(b) >= size ? ofpbuf_pull(b, size) : NULL;
}
static inline struct ofpbuf *ofpbuf_from_list(const struct list *list)
static inline bool ofpbuf_equal(const struct ofpbuf *a, const struct ofpbuf *b)
{
- return a->size == b->size && memcmp(a->data, b->data, a->size) == 0;
+ return ofpbuf_size(a) == ofpbuf_size(b) &&
+ memcmp(ofpbuf_data(a), ofpbuf_data(b), ofpbuf_size(a)) == 0;
+}
+
+static inline void * ofpbuf_get_l2_5(const struct ofpbuf *b)
+{
+ return b->l2_5_ofs != UINT16_MAX ? (char *)b->l2 + b->l2_5_ofs : NULL;
+}
+
+static inline void ofpbuf_set_l2_5(struct ofpbuf *b, void *l2_5)
+{
+ b->l2_5_ofs = l2_5 ? (char *)l2_5 - (char *)b->l2 : UINT16_MAX;
+}
+
+static inline void * ofpbuf_get_l3(const struct ofpbuf *b)
+{
+ return b->l3_ofs != UINT16_MAX ? (char *)b->l2 + b->l3_ofs : NULL;
+}
+
+static inline void ofpbuf_set_l3(struct ofpbuf *b, void *l3)
+{
+ b->l3_ofs = l3 ? (char *)l3 - (char *)b->l2 : UINT16_MAX;
+}
+
+static inline void * ofpbuf_get_l4(const struct ofpbuf *b)
+{
+ return b->l4_ofs != UINT16_MAX ? (char *)b->l2 + b->l4_ofs : NULL;
+}
+
+static inline void ofpbuf_set_l4(struct ofpbuf *b, void *l4)
+{
+ b->l4_ofs = l4 ? (char *)l4 - (char *)b->l2 : UINT16_MAX;
}
static inline size_t ofpbuf_get_l4_size(const struct ofpbuf *b)
{
- return b->l4 ? (const char *)ofpbuf_tail(b) - (const char *)b->l4 : 0;
+ return b->l4_ofs != UINT16_MAX
+ ? (const char *)ofpbuf_tail(b) - (const char *)ofpbuf_get_l4(b) : 0;
}
static inline const void *ofpbuf_get_tcp_payload(const struct ofpbuf *b)
size_t l4_size = ofpbuf_get_l4_size(b);
if (OVS_LIKELY(l4_size >= TCP_HEADER_LEN)) {
- struct tcp_header *tcp = b->l4;
+ struct tcp_header *tcp = ofpbuf_get_l4(b);
int tcp_len = TCP_OFFSET(tcp->tcp_ctl) * 4;
if (OVS_LIKELY(tcp_len >= TCP_HEADER_LEN && tcp_len <= l4_size)) {
static inline const void *ofpbuf_get_udp_payload(const struct ofpbuf *b)
{
return OVS_LIKELY(ofpbuf_get_l4_size(b) >= UDP_HEADER_LEN)
- ? (const char *)b->l4 + UDP_HEADER_LEN : NULL;
+ ? (const char *)ofpbuf_get_l4(b) + UDP_HEADER_LEN : NULL;
}
static inline const void *ofpbuf_get_sctp_payload(const struct ofpbuf *b)
{
return OVS_LIKELY(ofpbuf_get_l4_size(b) >= SCTP_HEADER_LEN)
- ? (const char *)b->l4 + SCTP_HEADER_LEN : NULL;
+ ? (const char *)ofpbuf_get_l4(b) + SCTP_HEADER_LEN : NULL;
}
static inline const void *ofpbuf_get_icmp_payload(const struct ofpbuf *b)
{
return OVS_LIKELY(ofpbuf_get_l4_size(b) >= ICMP_HEADER_LEN)
- ? (const char *)b->l4 + ICMP_HEADER_LEN : NULL;
+ ? (const char *)ofpbuf_get_l4(b) + ICMP_HEADER_LEN : NULL;
+}
+
+static inline void * ofpbuf_data(const struct ofpbuf *b)
+{
+ return b->data;
+}
+
+static inline void ofpbuf_set_data(struct ofpbuf *b, void *d)
+{
+ b->data = d;
+}
+
+static inline void * ofpbuf_base(const struct ofpbuf *b)
+{
+ return b->base;
+}
+
+static inline void ofpbuf_set_base(struct ofpbuf *b, void *d)
+{
+ b->base = d;
+}
+
+static inline uint32_t ofpbuf_size(const struct ofpbuf *b)
+{
+ return b->size;
+}
+
+static inline void ofpbuf_set_size(struct ofpbuf *b, uint32_t v)
+{
+ b->size = v;
}
#ifdef __cplusplus
git://git.onelab.eu / sliver-openvswitch.git / blobdiff