Skip to content

Commit

Permalink
Add a function named packet_new_nocopy for COLO.
Browse files Browse the repository at this point in the history
Use the packet_new_nocopy instead of packet_new in the
filter-rewriter module. There will be one less memory
copy in the processing of each network packet.

Signed-off-by: Lei Rao <lei.rao@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
  • Loading branch information
raolei-intel authored and jasowang committed Jun 11, 2021
1 parent 3ba0244 commit 9b49271
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
25 changes: 17 additions & 8 deletions net/colo.c
Expand Up @@ -157,19 +157,28 @@ void connection_destroy(void *opaque)

Packet *packet_new(const void *data, int size, int vnet_hdr_len)
{
Packet *pkt = g_slice_new(Packet);
Packet *pkt = g_slice_new0(Packet);

pkt->data = g_memdup(data, size);
pkt->size = size;
pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
pkt->vnet_hdr_len = vnet_hdr_len;
pkt->tcp_seq = 0;
pkt->tcp_ack = 0;
pkt->seq_end = 0;
pkt->header_size = 0;
pkt->payload_size = 0;
pkt->offset = 0;
pkt->flags = 0;

return pkt;
}

/*
* packet_new_nocopy will not copy data, so the caller can't release
* the data. And it will be released in packet_destroy.
*/
Packet *packet_new_nocopy(void *data, int size, int vnet_hdr_len)
{
Packet *pkt = g_slice_new0(Packet);

pkt->data = data;
pkt->size = size;
pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
pkt->vnet_hdr_len = vnet_hdr_len;

return pkt;
}
Expand Down
1 change: 1 addition & 0 deletions net/colo.h
Expand Up @@ -101,6 +101,7 @@ bool connection_has_tracked(GHashTable *connection_track_table,
ConnectionKey *key);
void connection_hashtable_reset(GHashTable *connection_track_table);
Packet *packet_new(const void *data, int size, int vnet_hdr_len);
Packet *packet_new_nocopy(void *data, int size, int vnet_hdr_len);
void packet_destroy(void *opaque, void *user_data);
void packet_destroy_partial(void *opaque, void *user_data);

Expand Down
3 changes: 1 addition & 2 deletions net/filter-rewriter.c
Expand Up @@ -270,8 +270,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
vnet_hdr_len = nf->netdev->vnet_hdr_len;
}

pkt = packet_new(buf, size, vnet_hdr_len);
g_free(buf);
pkt = packet_new_nocopy(buf, size, vnet_hdr_len);

/*
* if we get tcp packet
Expand Down

0 comments on commit 9b49271

Please sign in to comment.