X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofpbuf.c;h=3de8ca5e234f535afd8bb3582c0b31d835d22b90;hb=8a9562d21a40c765a8ae6775a070cb279cb2147a;hp=8166d6b1c1a1f3ee29ed361fbae3afc9ef1690be;hpb=7ecb095d0bf4940406ce684c5c6d5c7adac4cf77;p=sliver-openvswitch.git diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c index 8166d6b1c..3de8ca5e2 100644 --- a/lib/ofpbuf.c +++ b/lib/ofpbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ #include #include "ofpbuf.h" -#include #include #include #include "dynamic-string.h" +#include "netdev-dpdk.h" #include "util.h" static void @@ -30,7 +30,7 @@ ofpbuf_use__(struct ofpbuf *b, void *base, size_t allocated, b->allocated = allocated; b->source = source; b->size = 0; - b->l2 = b->l3 = b->l4 = b->l7 = NULL; + b->l2 = b->l2_5 = b->l3 = b->l4 = b->l7 = NULL; list_poison(&b->list_node); b->private_p = NULL; } @@ -47,23 +47,44 @@ ofpbuf_use(struct ofpbuf *b, void *base, size_t allocated) /* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of * memory starting at 'base'. 'base' should point to a buffer on the stack. - * - * An ofpbuf operation that requires reallocating data will assert-fail if this - * function was used to initialize it. + * (Nothing actually relies on 'base' being allocated on the stack. It could + * be static or malloc()'d memory. But stack space is the most common use + * case.) * * 'base' should be appropriately aligned. Using an array of uint32_t or * uint64_t for the buffer is a reasonable way to ensure appropriate alignment * for 32- or 64-bit data. * - * (Nothing actually relies on 'base' being allocated on the stack. It could - * be static or malloc()'d memory. But stack space is the most common use - * case.) */ + * An ofpbuf operation that requires reallocating data will assert-fail if this + * function was used to initialize it. Thus, one need not call ofpbuf_uninit() + * on an ofpbuf initialized by this function (though doing so is harmless), + * because it is guaranteed that 'b' does not own any heap-allocated memory. */ void ofpbuf_use_stack(struct ofpbuf *b, void *base, size_t allocated) { ofpbuf_use__(b, base, allocated, OFPBUF_STACK); } +/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of + * memory starting at 'base'. 'base' should point to a buffer on the stack. + * (Nothing actually relies on 'base' being allocated on the stack. It could + * be static or malloc()'d memory. But stack space is the most common use + * case.) + * + * 'base' should be appropriately aligned. Using an array of uint32_t or + * uint64_t for the buffer is a reasonable way to ensure appropriate alignment + * for 32- or 64-bit data. + * + * An ofpbuf operation that requires reallocating data will copy the provided + * buffer into a malloc()'d buffer. Thus, it is wise to call ofpbuf_uninit() + * on an ofpbuf initialized by this function, so that if it expanded into the + * heap, that memory is freed. */ +void +ofpbuf_use_stub(struct ofpbuf *b, void *base, size_t allocated) +{ + ofpbuf_use__(b, base, allocated, OFPBUF_STUB); +} + /* Initializes 'b' as an ofpbuf whose data starts at 'data' and continues for * 'size' bytes. This is appropriate for an ofpbuf that will be used to * inspect existing data, without moving it around or reallocating it, and @@ -74,7 +95,7 @@ ofpbuf_use_stack(struct ofpbuf *b, void *base, size_t allocated) void ofpbuf_use_const(struct ofpbuf *b, const void *data, size_t size) { - ofpbuf_use__(b, (void *) data, size, OFPBUF_STACK); + ofpbuf_use__(b, CONST_CAST(void *, data), size, OFPBUF_STACK); b->size = size; } @@ -90,11 +111,25 @@ ofpbuf_init(struct ofpbuf *b, size_t size) void ofpbuf_uninit(struct ofpbuf *b) { - if (b && b->source == OFPBUF_MALLOC) { - free(b->base); + if (b) { + if (b->source == OFPBUF_MALLOC) { + free(b->base); + } + if (b->source == OFPBUF_DPDK) { + free_dpdk_buf(b); + } } } +/* Returns a pointer that may be passed to free() to accomplish the same thing + * as ofpbuf_uninit(b). The return value is a null pointer if ofpbuf_uninit() + * would not free any memory. */ +void * +ofpbuf_get_uninit_pointer(struct ofpbuf *b) +{ + return b && b->source == OFPBUF_MALLOC ? b->base : NULL; +} + /* Frees memory that 'b' points to and allocates a new ofpbuf */ void ofpbuf_reinit(struct ofpbuf *b, size_t size) @@ -129,7 +164,7 @@ ofpbuf_new_with_headroom(size_t size, size_t headroom) struct ofpbuf * ofpbuf_clone(const struct ofpbuf *buffer) { - return ofpbuf_clone_data(buffer->data, buffer->size); + return ofpbuf_clone_with_headroom(buffer, 0); } /* Creates and returns a new ofpbuf whose data are copied from 'buffer'. The @@ -137,8 +172,30 @@ ofpbuf_clone(const struct ofpbuf *buffer) struct ofpbuf * ofpbuf_clone_with_headroom(const struct ofpbuf *buffer, size_t headroom) { - return ofpbuf_clone_data_with_headroom(buffer->data, buffer->size, - headroom); + struct ofpbuf *new_buffer; + uintptr_t data_delta; + + new_buffer = ofpbuf_clone_data_with_headroom(buffer->data, buffer->size, + headroom); + data_delta = (char *) new_buffer->data - (char *) buffer->data; + + if (buffer->l2) { + new_buffer->l2 = (char *) buffer->l2 + data_delta; + } + if (buffer->l2_5) { + new_buffer->l2_5 = (char *) buffer->l2_5 + data_delta; + } + if (buffer->l3) { + new_buffer->l3 = (char *) buffer->l3 + data_delta; + } + if (buffer->l4) { + new_buffer->l4 = (char *) buffer->l4 + data_delta; + } + if (buffer->l7) { + new_buffer->l7 = (char *) buffer->l7 + data_delta; + } + + return new_buffer; } /* Creates and returns a new ofpbuf that initially contains a copy of the @@ -214,6 +271,9 @@ ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom) new_allocated = new_headroom + b->size + new_tailroom; switch (b->source) { + case OFPBUF_DPDK: + OVS_NOT_REACHED(); + case OFPBUF_MALLOC: if (new_headroom == ofpbuf_headroom(b)) { new_base = xrealloc(b->base, new_allocated); @@ -225,10 +285,16 @@ ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom) break; case OFPBUF_STACK: - NOT_REACHED(); + OVS_NOT_REACHED(); + + case OFPBUF_STUB: + b->source = OFPBUF_MALLOC; + new_base = xmalloc(new_allocated); + ofpbuf_copy__(b, new_base, new_headroom, new_tailroom); + break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } b->allocated = new_allocated; @@ -241,6 +307,9 @@ ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom) if (b->l2) { b->l2 = (char *) b->l2 + data_delta; } + if (b->l2_5) { + b->l2_5 = (char *) b->l2_5 + data_delta; + } if (b->l3) { b->l3 = (char *) b->l3 + data_delta; } @@ -283,12 +352,42 @@ ofpbuf_prealloc_headroom(struct ofpbuf *b, size_t size) void ofpbuf_trim(struct ofpbuf *b) { + ovs_assert(b->source != OFPBUF_DPDK); + if (b->source == OFPBUF_MALLOC && (ofpbuf_headroom(b) || ofpbuf_tailroom(b))) { ofpbuf_resize__(b, 0, 0); } } +/* If 'b' is shorter than 'length' bytes, pads its tail out with zeros to that + * length. */ +void +ofpbuf_padto(struct ofpbuf *b, size_t length) +{ + if (b->size < length) { + ofpbuf_put_zeros(b, length - b->size); + } +} + +/* Shifts all of the data within the allocated space in 'b' by 'delta' bytes. + * For example, a 'delta' of 1 would cause each byte of data to move one byte + * forward (from address 'p' to 'p+1'), and a 'delta' of -1 would cause each + * byte to move one byte backward (from 'p' to 'p-1'). */ +void +ofpbuf_shift(struct ofpbuf *b, int delta) +{ + ovs_assert(delta > 0 ? delta <= ofpbuf_tailroom(b) + : delta < 0 ? -delta <= ofpbuf_headroom(b) + : true); + + if (delta != 0) { + char *dst = (char *) b->data + delta; + memmove(dst, b->data, b->size); + b->data = dst; + } +} + /* Appends 'size' bytes of data to the tail end of 'b', reallocating and * copying its data if necessary. Returns a pointer to the first byte of the * new data, which is left uninitialized. */ @@ -337,13 +436,13 @@ ofpbuf_put_hex(struct ofpbuf *b, const char *s, size_t *n) uint8_t byte; bool ok; - s += strspn(s, " "); + s += strspn(s, " \t\r\n"); byte = hexits_value(s, 2, &ok); if (!ok) { if (n) { *n = b->size - initial_size; } - return (char *) s; + return CONST_CAST(char *, s); } ofpbuf_put(b, &byte, 1); @@ -356,11 +455,22 @@ ofpbuf_put_hex(struct ofpbuf *b, const char *s, size_t *n) void ofpbuf_reserve(struct ofpbuf *b, size_t size) { - assert(!b->size); + ovs_assert(!b->size); ofpbuf_prealloc_tailroom(b, size); b->data = (char*)b->data + size; } +/* Reserves 'size' bytes of headroom so that they can be later allocated with + * ofpbuf_push_uninit() without reallocating the ofpbuf. */ +void +ofpbuf_reserve_with_tailroom(struct ofpbuf *b, size_t headroom, + size_t tailroom) +{ + ovs_assert(!b->size); + ofpbuf_prealloc_tailroom(b, headroom + tailroom); + b->data = (char*)b->data + headroom; +} + /* Prefixes 'size' bytes to the head end of 'b', reallocating and copying its * data if necessary. Returns a pointer to the first byte of the data's * location in the ofpbuf. The new data is left uninitialized. */ @@ -408,7 +518,7 @@ ofpbuf_at(const struct ofpbuf *b, size_t offset, size_t size) void * ofpbuf_at_assert(const struct ofpbuf *b, size_t offset, size_t size) { - assert(offset + size <= b->size); + ovs_assert(offset + size <= b->size); return ((char *) b->data) + offset; } @@ -441,7 +551,7 @@ void * ofpbuf_pull(struct ofpbuf *b, size_t size) { void *data = b->data; - assert(b->size >= size); + ovs_assert(b->size >= size); b->data = (char*)b->data + size; b->size -= size; return data; @@ -463,6 +573,8 @@ void * ofpbuf_steal_data(struct ofpbuf *b) { void *p; + ovs_assert(b->source != OFPBUF_DPDK); + if (b->source == OFPBUF_MALLOC && b->data == b->base) { p = b->data; } else { @@ -483,7 +595,7 @@ ofpbuf_to_string(const struct ofpbuf *b, size_t maxbytes) struct ds s; ds_init(&s); - ds_put_format(&s, "size=%zu, allocated=%zu, head=%zu, tail=%zu\n", + ds_put_format(&s, "size=%"PRIuSIZE", allocated=%"PRIuSIZE", head=%"PRIuSIZE", tail=%"PRIuSIZE"\n", b->size, b->allocated, ofpbuf_headroom(b), ofpbuf_tailroom(b)); ds_put_hex_dump(&s, b->data, MIN(b->size, maxbytes), 0, false);