d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/vhost: remove the non-working zero copy code

Browse Source 
It's reported that it's has not been working for a long while. And due
to it's complex, it's better to redesign it than to fix it to make it
work again.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
This commit is contained in:
Yuanhan Liu 2016-05-02 14:23:43 -07:00
parent 2963d99a8b
commit 68363d8585
3 changed files with 25 additions and 1526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doc/guides/sample_app_ug/vhost.rst
View File

@ -491,39 +491,9 @@ The default value is 15.
-- --rx-retry 1 --rx-retry-delay 20
**Zero copy.**
The zero copy option enables/disables the zero copy mode for RX/TX packet,
in the zero copy mode the packet buffer address from guest translate into host physical address
and then set directly as DMA address.
If the zero copy mode is disabled, then one copy mode is utilized in the sample.
This option is disabled by default.
.. code-block:: console
./vhost-switch -c f -n 4 --socket-mem 1024 --huge-dir /mnt/huge \
-- --zero-copy [0,1]
**RX descriptor number.**
The RX descriptor number option specify the Ethernet RX descriptor number,
Linux legacy virtio-net has different behavior in how to use the vring descriptor from DPDK based virtio-net PMD,
the former likely allocate half for virtio header, another half for frame buffer,
while the latter allocate all for frame buffer,
this lead to different number for available frame buffer in vring,
and then lead to different Ethernet RX descriptor number could be used in zero copy mode.
So it is valid only in zero copy mode is enabled. The value is 32 by default.
.. code-block:: console
./vhost-switch -c f -n 4 --socket-mem 1024 --huge-dir /mnt/huge \
-- --zero-copy 1 --rx-desc-num [0, n]
**TX descriptor number.**
The TX descriptor number option specify the Ethernet TX descriptor number, it is valid only in zero copy mode is enabled.
The value is 64 by default.
.. code-block:: console
./vhost-switch -c f -n 4 --socket-mem 1024 --huge-dir /mnt/huge \
-- --zero-copy 1 --tx-desc-num [0, n]
Zero copy mode is removed, due to it has not been working for a while. And
due to the large and complex code, it's better to redesign it than fixing
it to make it work again. Hence, zero copy may be added back later.
**VLAN strip.**
The VLAN strip option enable/disable the VLAN strip on host, if disabled, the guest will receive the packets with VLAN tag.

1498
examples/vhost/main.c
View File

File diff suppressed because it is too large Load Diff

17
examples/vhost/main.h
View File

@ -39,21 +39,6 @@
#define RTE_LOGTYPE_VHOST_DATA RTE_LOGTYPE_USER2
#define RTE_LOGTYPE_VHOST_PORT RTE_LOGTYPE_USER3
/**
* Information relating to memory regions including offsets to
* addresses in host physical space.
*/
struct virtio_memory_regions_hpa {
/**< Base guest physical address of region. */
uint64_t guest_phys_address;
/**< End guest physical address of region. */
uint64_t guest_phys_address_end;
/**< Size of region. */
uint64_t memory_size;
/**< Offset of region for gpa to hpa translation. */
uint64_t host_phys_addr_offset;
};
/*
* Device linked list structure for data path.
*/
@ -62,8 +47,6 @@ struct vhost_dev {
struct virtio_net *dev;
/**< Number of memory regions for gpa to hpa translation. */
uint32_t nregions_hpa;
/**< Memory region information for gpa to hpa translation. */
struct virtio_memory_regions_hpa *regions_hpa;
/**< Device MAC address (Obtained on first TX packet). */
struct ether_addr mac_address;
/**< RX VMDQ queue number. */