mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

dpif-netdev: use dpif_packet structure for packets

Browse Source 
This commit introduces a new data structure used for receiving packets from
netdevs and passing them to dpifs.
The purpose of this change is to allow storing some private data for each
packet. The subsequent commits make use of it.

Signed-off-by: Daniele Di Proietto <ddiproietto@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Daniele Di Proietto
2014-06-23 11:43:57 -07:00
committed by Pravin B Shelar
parent 9441caf372
commit 910885540a
18 changed files with 277 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/netdev-dpdk.c
View File

@@ -38,6 +38,7 @@
#include "ofpbuf.h"
#include "ovs-thread.h"
#include "ovs-rcu.h"
#include "packet-dpif.h"
#include "packets.h"
#include "shash.h"
#include "sset.h"
@@ -203,8 +204,9 @@ dpdk_rte_mzalloc(size_t sz)
}
void
free_dpdk_buf(struct ofpbuf *b)
free_dpdk_buf(struct dpif_packet *p)
{
struct ofpbuf *b = &p->ofpbuf;
struct rte_mbuf *pkt = (struct rte_mbuf *) b->dpdk_buf;
rte_mempool_put(pkt->pool, pkt);
@@ -217,16 +219,16 @@ __rte_pktmbuf_init(struct rte_mempool *mp,
unsigned i OVS_UNUSED)
{
struct rte_mbuf *m = _m;
uint32_t buf_len = mp->elt_size - sizeof(struct ofpbuf);
uint32_t buf_len = mp->elt_size - sizeof(struct dpif_packet);
RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct ofpbuf));
RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct dpif_packet));
memset(m, 0, mp->elt_size);
/* start of buffer is just after mbuf structure */
m->buf_addr = (char *)m + sizeof(struct ofpbuf);
m->buf_addr = (char *)m + sizeof(struct dpif_packet);
m->buf_physaddr = rte_mempool_virt2phy(mp, m) +
sizeof(struct ofpbuf);
sizeof(struct dpif_packet);
m->buf_len = (uint16_t)buf_len;
/* keep some headroom between start of buffer and data */
@@ -586,7 +588,8 @@ dpdk_queue_flush(struct netdev_dpdk *dev, int qid)
}
static int
netdev_dpdk_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **packets, int *c)
netdev_dpdk_rxq_recv(struct netdev_rxq *rxq_, struct dpif_packet **packets,
int *c)
{
struct netdev_rxq_dpdk *rx = netdev_rxq_dpdk_cast(rxq_);
struct netdev *netdev = rx->up.netdev;
@@ -672,9 +675,10 @@ dpdk_do_tx_copy(struct netdev *netdev, char *buf, int size)
static int
netdev_dpdk_send(struct netdev *netdev,
struct ofpbuf *ofpbuf, bool may_steal)
struct dpif_packet *packet, bool may_steal)
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
struct ofpbuf *ofpbuf = &packet->ofpbuf;
int ret;
if (ofpbuf_size(ofpbuf) > dev->max_packet_len) {
@@ -693,7 +697,7 @@ netdev_dpdk_send(struct netdev *netdev,
dpdk_do_tx_copy(netdev, (char *) ofpbuf_data(ofpbuf), ofpbuf_size(ofpbuf));
if (may_steal) {
ofpbuf_delete(ofpbuf);
dpif_packet_delete(packet);
}
} else {
int qid;