* [Qemu-devel] [PATCH v5] rtl8139: add vlan support
@ 2011-03-07 22:53 Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 1/3] rtl8139: cleanup FCS calculation Benjamin Poirier
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Benjamin Poirier @ 2011-03-07 22:53 UTC (permalink / raw)
To: qemu-devel
Here is version 5 of my patchset to add vlan support to the emulated rtl8139
nic.
Changes since v4:
* removed alloca(), for real. Thanks to the reviewers for their
patience. This patchset now has more versions than the vlan header
has bytes!
* corrected the unlikely, debug printf and long lines, as per comments
* cleaned out ifdef's pertaining to ethernet checksum calculation.
According to a comment since removed they were related to an
"optimization":
> RTL8139 provides frame CRC with received packet, this feature
> seems to be ignored by most drivers, disabled by default
see commit ccf1d14
I've tested v5 using x86_64 host/guest with the usual procedure. I've also ran
the clang analyzer on the qemu code base, just for fun.
Changes since v3:
* removed alloca() and #include <net/ethernet.h> as per comments
* reordered patches to put extraction before insertion. Extraction
touches only the receive path but insertion touches both. The two
patches are now needed to have vlan functionnality.
I've tested v4 with x86_64 host/guest. I used the same testing procedure as
before. I've tested a plain configuration as well as one with tso + vlan
offload, successfully.
I had to hack around the Linux 8139cp driver to be able to enable tso on vlan
which leads me to wonder, can someone with access to the C+ spec or a real
card confirm that it can do tso and vlan offload at the same time? The patch
I used for the kernel is at https://gist.github.com/851895.
Changes since v2:
insertion:
* moved insertion later in the process, to handle tso
* use qemu_sendv_packet() to insert the tag for us
* added dot1q_buf parameter to rtl8139_do_receive() to avoid some
memcpy() in loopback mode. Note that the code path through that
function is unchanged when dot1q_buf is NULL.
extraction:
* reduced the amount of copying by moving the "frame too short" logic
after the removal of the vlan tag (as is done in e1000.c for
example). Unfortunately, that logic can no longer be shared betwen
C+ and C mode.
I've posted v2 of these patches back in November
http://article.gmane.org/gmane.comp.emulators.qemu/84252
I've tested v3 on the following combinations of guest and hosts:
host: x86_64, guest: x86_64
host: x86_64, guest: ppc32
host: ppc32, guest: ppc32
Testing on the x86_64 host used '-net tap' and consisted of:
* making an http transfert on the untagged interface.
* ping -s 0-1472 to another host on a vlan.
* making an scp upload to another host on a vlan.
Testing on the ppc32 host used '-net socket' connected to an x86_64 qemu-kvm
running the virtio nic and consisted of:
* establishing an ssh connection between the two using an untagged interface.
* ping -s 0-1472 between the two using a vlan.
* making an scp transfer in both directions using a vlan.
All that was successful. Nevertheless, it doesn't exercise all code paths so
care is in order.
Please note that the lack of vlan support in rtl8139 has taken a few people
aback:
https://bugzilla.redhat.com/show_bug.cgi?id=516587
http://article.gmane.org/gmane.linux.network.general/14266
Thanks,
-Ben
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v5 1/3] rtl8139: cleanup FCS calculation
2011-03-07 22:53 [Qemu-devel] [PATCH v5] rtl8139: add vlan support Benjamin Poirier
@ 2011-03-07 22:53 ` Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 2/3] rtl8139: add vlan tag extraction Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 3/3] rtl8139: add vlan tag insertion Benjamin Poirier
2 siblings, 0 replies; 6+ messages in thread
From: Benjamin Poirier @ 2011-03-07 22:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Jason Wang, Michael S. Tsirkin
clean out ifdef's around ethernet checksum calculation
Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
Cc: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
---
hw/rtl8139.c | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index a22530c..3772ac1 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -47,6 +47,9 @@
* Darwin)
*/
+/* For crc32 */
+#include <zlib.h>
+
#include "hw.h"
#include "pci.h"
#include "qemu-timer.h"
@@ -62,14 +65,6 @@
/* debug RTL8139 card C+ mode only */
//#define DEBUG_RTL8139CP 1
-/* Calculate CRCs properly on Rx packets */
-#define RTL8139_CALCULATE_RXCRC 1
-
-#if defined(RTL8139_CALCULATE_RXCRC)
-/* For crc32 */
-#include <zlib.h>
-#endif
-
#define SET_MASKED(input, mask, curr) \
( ( (input) & ~(mask) ) | ( (curr) & (mask) ) )
@@ -1030,11 +1025,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
}
/* write checksum */
-#if defined (RTL8139_CALCULATE_RXCRC)
val = cpu_to_le32(crc32(0, buf, size));
-#else
- val = 0;
-#endif
cpu_physical_memory_write( rx_addr+size, (uint8_t *)&val, 4);
/* first segment of received packet flag */
@@ -1136,12 +1127,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
rtl8139_write_buffer(s, buf, size);
/* write checksum */
-#if defined (RTL8139_CALCULATE_RXCRC)
val = cpu_to_le32(crc32(0, buf, size));
-#else
- val = 0;
-#endif
-
rtl8139_write_buffer(s, (uint8_t *)&val, 4);
/* correct buffer write pointer */
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v5 2/3] rtl8139: add vlan tag extraction
2011-03-07 22:53 [Qemu-devel] [PATCH v5] rtl8139: add vlan support Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 1/3] rtl8139: cleanup FCS calculation Benjamin Poirier
@ 2011-03-07 22:53 ` Benjamin Poirier
2011-03-08 3:44 ` Jason Wang
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 3/3] rtl8139: add vlan tag insertion Benjamin Poirier
2 siblings, 1 reply; 6+ messages in thread
From: Benjamin Poirier @ 2011-03-07 22:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Jason Wang, Michael S. Tsirkin
Add support to the emulated hardware to extract vlan tags in packets
going from the network to the guest.
Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
Cc: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
--
AFAIK, extraction is optional to get vlans working. The driver
requests rx detagging but should not assume that it was done. Under
Linux, the mac layer will catch the vlan ethertype. I only added this
part for completeness (to emulate the hardware more truthfully...)
---
hw/rtl8139.c | 86 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 3772ac1..55a386e 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -72,6 +72,16 @@
#define MOD2(input, size) \
( ( input ) & ( size - 1 ) )
+#define ETHER_ADDR_LEN 6
+#define ETHER_TYPE_LEN 2
+#define ETH_HLEN (ETHER_ADDR_LEN * 2 + ETHER_TYPE_LEN)
+#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */
+#define ETH_P_IP 0x0800 /* Internet Protocol packet */
+#define ETH_MTU 1500
+
+#define VLAN_TCI_LEN 2
+#define VLAN_HLEN (ETHER_TYPE_LEN + VLAN_TCI_LEN)
+
#if defined (DEBUG_RTL8139)
# define DEBUG_PRINT(x) do { printf x ; } while (0)
#else
@@ -813,10 +823,13 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
{
RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque;
int size = size_;
+ const uint8_t *dot1q_buf;
+ const uint8_t *next_part;
+ size_t next_part_size;
uint32_t packet_header = 0;
- uint8_t buf1[60];
+ uint8_t buf1[MIN_BUF_SIZE];
static const uint8_t broadcast_macaddr[6] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -928,14 +941,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
}
}
- /* if too small buffer, then expand it */
- if (size < MIN_BUF_SIZE) {
- memcpy(buf1, buf, size);
- memset(buf1 + size, 0, MIN_BUF_SIZE - size);
- buf = buf1;
- size = MIN_BUF_SIZE;
- }
-
if (rtl8139_cp_receiver_enabled(s))
{
DEBUG_PRINT(("RTL8139: in C+ Rx mode ================\n"));
@@ -996,6 +1001,40 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
uint32_t rx_space = rxdw0 & CP_RX_BUFFER_SIZE_MASK;
+ /* write VLAN info to descriptor variables */
+ /* next_part starts right after the vlan header (if any), at the
+ * ethertype for the payload */
+ next_part = &buf[ETHER_ADDR_LEN * 2];
+ if (s->CpCmd & CPlusRxVLAN && be16_to_cpup((uint16_t *) next_part) ==
+ ETH_P_8021Q) {
+ dot1q_buf = next_part;
+ next_part += VLAN_HLEN;
+ size -= VLAN_HLEN;
+
+ rxdw1 &= ~CP_RX_VLAN_TAG_MASK;
+ /* BE + ~le_to_cpu()~ + cpu_to_le() = BE */
+ rxdw1 |= CP_RX_TAVA | le16_to_cpup((uint16_t *) &buf[ETH_HLEN]);
+
+ DEBUG_PRINT(("RTL8139: C+ Rx mode : extracted vlan tag with tci: "
+ "%u\n", be16_to_cpup((uint16_t *) &buf[ETH_HLEN])));
+ } else {
+ /* reset VLAN tag flag */
+ rxdw1 &= ~CP_RX_TAVA;
+ dot1q_buf = NULL;
+ }
+ next_part_size = buf + size_ - next_part;
+
+ /* if too small buffer, then expand it */
+ if (size < MIN_BUF_SIZE) {
+ size_t tmp_size = MIN_BUF_SIZE - ETHER_ADDR_LEN * 2;
+
+ memcpy(buf1, next_part, next_part_size);
+ memset(buf1 + next_part_size, 0, tmp_size - next_part_size);
+ next_part = buf1;
+ next_part_size = tmp_size;
+ size = MIN_BUF_SIZE;
+ }
+
/* TODO: scatter the packet over available receive ring descriptors space */
if (size+4 > rx_space)
@@ -1017,7 +1056,17 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
target_phys_addr_t rx_addr = rtl8139_addr64(rxbufLO, rxbufHI);
/* receive/copy to target memory */
- cpu_physical_memory_write( rx_addr, buf, size );
+ if (dot1q_buf) {
+ cpu_physical_memory_write(rx_addr, buf, 2 * ETHER_ADDR_LEN);
+ val = crc32(0, buf, 2 * ETHER_ADDR_LEN);
+ val = crc32(val, dot1q_buf, VLAN_HLEN);
+ cpu_physical_memory_write(rx_addr + 2 * ETHER_ADDR_LEN, next_part,
+ next_part_size);
+ val = crc32(val, buf + 2 * ETHER_ADDR_LEN, next_part_size);
+ } else {
+ cpu_physical_memory_write(rx_addr, buf, size);
+ val = crc32(0, buf, size);
+ }
if (s->CpCmd & CPlusRxChkSum)
{
@@ -1025,7 +1074,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
}
/* write checksum */
- val = cpu_to_le32(crc32(0, buf, size));
+ val = cpu_to_le32(val);
cpu_physical_memory_write( rx_addr+size, (uint8_t *)&val, 4);
/* first segment of received packet flag */
@@ -1070,9 +1119,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
rxdw0 &= ~CP_RX_BUFFER_SIZE_MASK;
rxdw0 |= (size+4);
- /* reset VLAN tag flag */
- rxdw1 &= ~CP_RX_TAVA;
-
/* update ring data */
val = cpu_to_le32(rxdw0);
cpu_physical_memory_write(cplus_rx_ring_desc, (uint8_t *)&val, 4);
@@ -1099,6 +1145,14 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
{
DEBUG_PRINT(("RTL8139: in ring Rx mode ================\n"));
+ /* if too small buffer, then expand it */
+ if (size < MIN_BUF_SIZE) {
+ memcpy(buf1, buf, size);
+ memset(buf1 + size, 0, MIN_BUF_SIZE - size);
+ buf = buf1;
+ size = MIN_BUF_SIZE;
+ }
+
/* begin ring receiver mode */
int avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr, s->RxBufferSize);
@@ -2066,10 +2120,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
{
DEBUG_PRINT(("RTL8139: +++ C+ mode offloaded task checksum\n"));
- #define ETH_P_IP 0x0800 /* Internet Protocol packet */
- #define ETH_HLEN 14
- #define ETH_MTU 1500
-
/* ip packet header */
ip_header *ip = NULL;
int hlen = 0;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v5 3/3] rtl8139: add vlan tag insertion
2011-03-07 22:53 [Qemu-devel] [PATCH v5] rtl8139: add vlan support Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 1/3] rtl8139: cleanup FCS calculation Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 2/3] rtl8139: add vlan tag extraction Benjamin Poirier
@ 2011-03-07 22:53 ` Benjamin Poirier
2011-03-08 6:44 ` Jason Wang
2 siblings, 1 reply; 6+ messages in thread
From: Benjamin Poirier @ 2011-03-07 22:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Jason Wang, Michael S. Tsirkin
Add support to the emulated hardware to insert vlan tags in packets
going from the guest to the network.
Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
Cc: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
---
hw/rtl8139.c | 107 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 28 deletions(-)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 55a386e..265918a 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -819,11 +819,14 @@ static int rtl8139_can_receive(VLANClientState *nc)
}
}
-static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_t size_, int do_interrupt)
+static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf,
+ size_t buf_size, int do_interrupt, const uint8_t *dot1q_buf)
{
RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque;
+ /* size_ is the total length of argument buffers */
+ int size_ = buf_size + (dot1q_buf ? VLAN_HLEN : 0);
+ /* size is the length of the buffer passed to the driver */
int size = size_;
- const uint8_t *dot1q_buf;
const uint8_t *next_part;
size_t next_part_size;
@@ -1005,10 +1008,13 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
/* next_part starts right after the vlan header (if any), at the
* ethertype for the payload */
next_part = &buf[ETHER_ADDR_LEN * 2];
- if (s->CpCmd & CPlusRxVLAN && be16_to_cpup((uint16_t *) next_part) ==
- ETH_P_8021Q) {
- dot1q_buf = next_part;
- next_part += VLAN_HLEN;
+ if (s->CpCmd & CPlusRxVLAN && (dot1q_buf || be16_to_cpup((uint16_t *)
+ next_part) == ETH_P_8021Q)) {
+ if (!dot1q_buf) {
+ /* the tag is in the buffer */
+ dot1q_buf = next_part;
+ next_part += VLAN_HLEN;
+ }
size -= VLAN_HLEN;
rxdw1 &= ~CP_RX_VLAN_TAG_MASK;
@@ -1020,9 +1026,8 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
} else {
/* reset VLAN tag flag */
rxdw1 &= ~CP_RX_TAVA;
- dot1q_buf = NULL;
}
- next_part_size = buf + size_ - next_part;
+ next_part_size = buf + buf_size - next_part;
/* if too small buffer, then expand it */
if (size < MIN_BUF_SIZE) {
@@ -1147,10 +1152,18 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
/* if too small buffer, then expand it */
if (size < MIN_BUF_SIZE) {
- memcpy(buf1, buf, size);
+ if (dot1q_buf) {
+ memcpy(buf1, buf, 2 * ETHER_ADDR_LEN);
+ memcpy(buf1 + 2 * ETHER_ADDR_LEN, dot1q_buf, VLAN_HLEN);
+ memcpy(buf1 + 2 * ETHER_ADDR_LEN + VLAN_HLEN, buf + 2 *
+ ETHER_ADDR_LEN, buf_size - 2 * ETHER_ADDR_LEN);
+ } else {
+ memcpy(buf1, buf, size);
+ }
memset(buf1 + size, 0, MIN_BUF_SIZE - size);
buf = buf1;
size = MIN_BUF_SIZE;
+ dot1q_buf = NULL;
}
/* begin ring receiver mode */
@@ -1178,10 +1191,23 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
rtl8139_write_buffer(s, (uint8_t *)&val, 4);
- rtl8139_write_buffer(s, buf, size);
+ /* receive/copy to target memory */
+ if (dot1q_buf) {
+ rtl8139_write_buffer(s, buf, 2 * ETHER_ADDR_LEN);
+ val = crc32(0, buf, 2 * ETHER_ADDR_LEN);
+ rtl8139_write_buffer(s, dot1q_buf, VLAN_HLEN);
+ val = crc32(val, dot1q_buf, VLAN_HLEN);
+ rtl8139_write_buffer(s, buf + 2 * ETHER_ADDR_LEN, buf_size - 2 *
+ ETHER_ADDR_LEN);
+ val = crc32(val, buf + 2 * ETHER_ADDR_LEN, buf_size - 2 *
+ ETHER_ADDR_LEN);
+ } else {
+ rtl8139_write_buffer(s, buf, size);
+ val = crc32(0, buf, size);
+ }
/* write checksum */
- val = cpu_to_le32(crc32(0, buf, size));
+ val = cpu_to_le32(val);
rtl8139_write_buffer(s, (uint8_t *)&val, 4);
/* correct buffer write pointer */
@@ -1205,7 +1231,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
static ssize_t rtl8139_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
{
- return rtl8139_do_receive(nc, buf, size, 1);
+ return rtl8139_do_receive(nc, buf, size, 1, NULL);
}
static void rtl8139_reset_rxring(RTL8139State *s, uint32_t bufferSize)
@@ -1780,7 +1806,8 @@ static uint32_t rtl8139_RxConfig_read(RTL8139State *s)
return ret;
}
-static void rtl8139_transfer_frame(RTL8139State *s, const uint8_t *buf, int size, int do_interrupt)
+static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size,
+ int do_interrupt, const uint8_t *dot1q_buf)
{
if (!size)
{
@@ -1791,11 +1818,22 @@ static void rtl8139_transfer_frame(RTL8139State *s, const uint8_t *buf, int size
if (TxLoopBack == (s->TxConfig & TxLoopBack))
{
DEBUG_PRINT(("RTL8139: +++ transmit loopback mode\n"));
- rtl8139_do_receive(&s->nic->nc, buf, size, do_interrupt);
+ rtl8139_do_receive(&s->nic->nc, buf, size, do_interrupt, dot1q_buf);
}
else
{
- qemu_send_packet(&s->nic->nc, buf, size);
+ if (dot1q_buf) {
+ struct iovec iov[] = {
+ { .iov_base = buf, .iov_len = ETHER_ADDR_LEN * 2 },
+ { .iov_base = (void *) dot1q_buf, .iov_len = VLAN_HLEN },
+ { .iov_base = buf + ETHER_ADDR_LEN * 2,
+ .iov_len = size - ETHER_ADDR_LEN * 2 },
+ };
+
+ qemu_sendv_packet(&s->nic->nc, iov, ARRAY_SIZE(iov));
+ } else {
+ qemu_send_packet(&s->nic->nc, buf, size);
+ }
}
}
@@ -1829,7 +1867,7 @@ static int rtl8139_transmit_one(RTL8139State *s, int descriptor)
s->TxStatus[descriptor] |= TxHostOwns;
s->TxStatus[descriptor] |= TxStatOK;
- rtl8139_transfer_frame(s, txbuffer, txsize, 0);
+ rtl8139_transfer_frame(s, txbuffer, txsize, 0, NULL);
DEBUG_PRINT(("RTL8139: +++ transmitted %d bytes from descriptor %d\n", txsize, descriptor));
@@ -1956,7 +1994,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
cpu_physical_memory_read(cplus_tx_ring_desc, (uint8_t *)&val, 4);
txdw0 = le32_to_cpu(val);
- /* TODO: implement VLAN tagging support, VLAN tag data is read to txdw1 */
cpu_physical_memory_read(cplus_tx_ring_desc+4, (uint8_t *)&val, 4);
txdw1 = le32_to_cpu(val);
cpu_physical_memory_read(cplus_tx_ring_desc+8, (uint8_t *)&val, 4);
@@ -1968,9 +2005,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
descriptor,
txdw0, txdw1, txbufLO, txbufHI));
- /* TODO: the following discard cast should clean clang analyzer output */
- (void)txdw1;
-
/* w0 ownership flag */
#define CP_TX_OWN (1<<31)
/* w0 end of ring flag */
@@ -1994,9 +2028,9 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
/* w0 bits 0...15 : buffer size */
#define CP_TX_BUFFER_SIZE (1<<16)
#define CP_TX_BUFFER_SIZE_MASK (CP_TX_BUFFER_SIZE - 1)
-/* w1 tag available flag */
-#define CP_RX_TAGC (1<<17)
-/* w1 bits 0...15 : VLAN tag */
+/* w1 add tag flag */
+#define CP_TX_TAGC (1<<17)
+/* w1 bits 0...15 : VLAN tag (big endian) */
#define CP_TX_VLAN_TAG_MASK ((1<<16) - 1)
/* w2 low 32bit of Rx buffer ptr */
/* w3 high 32bit of Rx buffer ptr */
@@ -2096,13 +2130,13 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
/* update ring data */
val = cpu_to_le32(txdw0);
cpu_physical_memory_write(cplus_tx_ring_desc, (uint8_t *)&val, 4);
- /* TODO: implement VLAN tagging support, VLAN tag data is read to txdw1 */
-// val = cpu_to_le32(txdw1);
-// cpu_physical_memory_write(cplus_tx_ring_desc+4, &val, 4);
/* Now decide if descriptor being processed is holding the last segment of packet */
if (txdw0 & CP_TX_LS)
{
+ uint8_t dot1q_buffer_space[VLAN_HLEN];
+ uint16_t *dot1q_buffer;
+
DEBUG_PRINT(("RTL8139: +++ C+ Tx mode : descriptor %d is last segment descriptor\n", descriptor));
/* can transfer fully assembled packet */
@@ -2111,6 +2145,21 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
int saved_size = s->cplus_txbuffer_offset;
int saved_buffer_len = s->cplus_txbuffer_len;
+ /* create vlan tag */
+ if (txdw1 & CP_TX_TAGC) {
+ /* the vlan tag is in BE byte order in the descriptor
+ * BE + le_to_cpu() + ~swap()~ = cpu */
+ DEBUG_PRINT(("RTL8139: +++ C+ Tx mode : inserting vlan tag with "
+ "tci: %u\n", bswap16(txdw1 & CP_TX_VLAN_TAG_MASK)));
+
+ dot1q_buffer = (uint16_t*) dot1q_buffer_space;
+ dot1q_buffer[0] = cpu_to_be16(ETH_P_8021Q);
+ /* BE + le_to_cpu() + ~cpu_to_le()~ = BE */
+ dot1q_buffer[1] = cpu_to_le16(txdw1 & CP_TX_VLAN_TAG_MASK);
+ } else {
+ dot1q_buffer = NULL;
+ }
+
/* reset the card space to protect from recursive call */
s->cplus_txbuffer = NULL;
s->cplus_txbuffer_offset = 0;
@@ -2264,7 +2313,8 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size;
DEBUG_PRINT(("RTL8139: +++ C+ mode TSO transferring packet size %d\n", tso_send_size));
- rtl8139_transfer_frame(s, saved_buffer, tso_send_size, 0);
+ rtl8139_transfer_frame(s, saved_buffer, tso_send_size,
+ 0, (uint8_t *) dot1q_buffer);
/* add transferred count to TCP sequence number */
p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq));
@@ -2337,7 +2387,8 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
DEBUG_PRINT(("RTL8139: +++ C+ mode transmitting %d bytes packet\n", saved_size));
- rtl8139_transfer_frame(s, saved_buffer, saved_size, 1);
+ rtl8139_transfer_frame(s, saved_buffer, saved_size, 1,
+ (uint8_t *) dot1q_buffer);
/* restore card space if there was no recursion and reset offset */
if (!s->cplus_txbuffer)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v5 2/3] rtl8139: add vlan tag extraction
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 2/3] rtl8139: add vlan tag extraction Benjamin Poirier
@ 2011-03-08 3:44 ` Jason Wang
0 siblings, 0 replies; 6+ messages in thread
From: Jason Wang @ 2011-03-08 3:44 UTC (permalink / raw)
To: Benjamin Poirier; +Cc: Blue Swirl, Jason Wang, qemu-devel, Michael S. Tsirkin
Benjamin Poirier writes:
> Add support to the emulated hardware to extract vlan tags in packets
> going from the network to the guest.
>
> Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> Cc: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
>
> --
>
> AFAIK, extraction is optional to get vlans working. The driver
> requests rx detagging but should not assume that it was done. Under
> Linux, the mac layer will catch the vlan ethertype. I only added this
> part for completeness (to emulate the hardware more truthfully...)
> ---
> hw/rtl8139.c | 86 +++++++++++++++++++++++++++++++++++++++++++++------------
> 1 files changed, 68 insertions(+), 18 deletions(-)
>
> diff --git a/hw/rtl8139.c b/hw/rtl8139.c
> index 3772ac1..55a386e 100644
> --- a/hw/rtl8139.c
> +++ b/hw/rtl8139.c
> @@ -72,6 +72,16 @@
> #define MOD2(input, size) \
> ( ( input ) & ( size - 1 ) )
>
> +#define ETHER_ADDR_LEN 6
> +#define ETHER_TYPE_LEN 2
> +#define ETH_HLEN (ETHER_ADDR_LEN * 2 + ETHER_TYPE_LEN)
> +#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */
> +#define ETH_P_IP 0x0800 /* Internet Protocol packet */
> +#define ETH_MTU 1500
> +
> +#define VLAN_TCI_LEN 2
> +#define VLAN_HLEN (ETHER_TYPE_LEN + VLAN_TCI_LEN)
> +
> #if defined (DEBUG_RTL8139)
> # define DEBUG_PRINT(x) do { printf x ; } while (0)
> #else
> @@ -813,10 +823,13 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> {
> RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque;
> int size = size_;
> + const uint8_t *dot1q_buf;
> + const uint8_t *next_part;
> + size_t next_part_size;
>
> uint32_t packet_header = 0;
>
> - uint8_t buf1[60];
> + uint8_t buf1[MIN_BUF_SIZE];
> static const uint8_t broadcast_macaddr[6] =
> { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
>
> @@ -928,14 +941,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> }
> }
>
> - /* if too small buffer, then expand it */
> - if (size < MIN_BUF_SIZE) {
> - memcpy(buf1, buf, size);
> - memset(buf1 + size, 0, MIN_BUF_SIZE - size);
> - buf = buf1;
> - size = MIN_BUF_SIZE;
> - }
> -
> if (rtl8139_cp_receiver_enabled(s))
> {
> DEBUG_PRINT(("RTL8139: in C+ Rx mode ================\n"));
> @@ -996,6 +1001,40 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
>
> uint32_t rx_space = rxdw0 & CP_RX_BUFFER_SIZE_MASK;
>
> + /* write VLAN info to descriptor variables */
> + /* next_part starts right after the vlan header (if any), at the
> + * ethertype for the payload */
> + next_part = &buf[ETHER_ADDR_LEN * 2];
> + if (s->CpCmd & CPlusRxVLAN && be16_to_cpup((uint16_t *) next_part) ==
> + ETH_P_8021Q) {
> + dot1q_buf = next_part;
> + next_part += VLAN_HLEN;
> + size -= VLAN_HLEN;
> +
> + rxdw1 &= ~CP_RX_VLAN_TAG_MASK;
> + /* BE + ~le_to_cpu()~ + cpu_to_le() = BE */
> + rxdw1 |= CP_RX_TAVA | le16_to_cpup((uint16_t *) &buf[ETH_HLEN]);
> +
> + DEBUG_PRINT(("RTL8139: C+ Rx mode : extracted vlan tag with tci: "
> + "%u\n", be16_to_cpup((uint16_t *) &buf[ETH_HLEN])));
> + } else {
> + /* reset VLAN tag flag */
> + rxdw1 &= ~CP_RX_TAVA;
> + dot1q_buf = NULL;
> + }
> + next_part_size = buf + size_ - next_part;
> +
> + /* if too small buffer, then expand it */
> + if (size < MIN_BUF_SIZE) {
> + size_t tmp_size = MIN_BUF_SIZE - ETHER_ADDR_LEN * 2;
> +
> + memcpy(buf1, next_part, next_part_size);
> + memset(buf1 + next_part_size, 0, tmp_size - next_part_size);
> + next_part = buf1;
> + next_part_size = tmp_size;
> + size = MIN_BUF_SIZE;
> + }
> +
> /* TODO: scatter the packet over available receive ring descriptors space */
>
> if (size+4 > rx_space)
> @@ -1017,7 +1056,17 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> target_phys_addr_t rx_addr = rtl8139_addr64(rxbufLO, rxbufHI);
>
> /* receive/copy to target memory */
> - cpu_physical_memory_write( rx_addr, buf, size );
> + if (dot1q_buf) {
> + cpu_physical_memory_write(rx_addr, buf, 2 * ETHER_ADDR_LEN);
> + val = crc32(0, buf, 2 * ETHER_ADDR_LEN);
> + val = crc32(val, dot1q_buf, VLAN_HLEN);
> + cpu_physical_memory_write(rx_addr + 2 * ETHER_ADDR_LEN, next_part,
> + next_part_size);
> + val = crc32(val, buf + 2 * ETHER_ADDR_LEN, next_part_size);
> + } else {
> + cpu_physical_memory_write(rx_addr, buf, size);
You does padding for buf1, but use buf here, so the it would be missed if you
have a non-vlan frame whose size is less than MIN_BUF_SIZE. Looks like the
following codes just work:
cpu_physical_memory_write(rx_addr, buf, 2 * ETHER_ADDR_LEN);
val = crc32(0, buf, 2 * ETHER_ADDR_LEN);
if (dot1q_buf)
val = crc32(val, dot1q_buf, VLAN_HLEN);
cpu_physical_memory_write(rx_addr + 2 * ETHER_ADDR_LEN, next_part,
next_part_size);
val = crc32(val, buf + 2 * ETHER_ADDR_LEN, next_part_size);
> + val = crc32(0, buf, size);
> + }
>
> if (s->CpCmd & CPlusRxChkSum)
> {
> @@ -1025,7 +1074,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> }
>
> /* write checksum */
> - val = cpu_to_le32(crc32(0, buf, size));
> + val = cpu_to_le32(val);
> cpu_physical_memory_write( rx_addr+size, (uint8_t *)&val, 4);
>
> /* first segment of received packet flag */
> @@ -1070,9 +1119,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> rxdw0 &= ~CP_RX_BUFFER_SIZE_MASK;
> rxdw0 |= (size+4);
>
> - /* reset VLAN tag flag */
> - rxdw1 &= ~CP_RX_TAVA;
> -
> /* update ring data */
> val = cpu_to_le32(rxdw0);
> cpu_physical_memory_write(cplus_rx_ring_desc, (uint8_t *)&val, 4);
> @@ -1099,6 +1145,14 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> {
> DEBUG_PRINT(("RTL8139: in ring Rx mode ================\n"));
>
> + /* if too small buffer, then expand it */
> + if (size < MIN_BUF_SIZE) {
> + memcpy(buf1, buf, size);
> + memset(buf1 + size, 0, MIN_BUF_SIZE - size);
> + buf = buf1;
> + size = MIN_BUF_SIZE;
> + }
> +
> /* begin ring receiver mode */
> int avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr, s->RxBufferSize);
>
> @@ -2066,10 +2120,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
> {
> DEBUG_PRINT(("RTL8139: +++ C+ mode offloaded task checksum\n"));
>
> - #define ETH_P_IP 0x0800 /* Internet Protocol packet */
> - #define ETH_HLEN 14
> - #define ETH_MTU 1500
> -
> /* ip packet header */
> ip_header *ip = NULL;
> int hlen = 0;
> --
> 1.7.2.3
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v5 3/3] rtl8139: add vlan tag insertion
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 3/3] rtl8139: add vlan tag insertion Benjamin Poirier
@ 2011-03-08 6:44 ` Jason Wang
0 siblings, 0 replies; 6+ messages in thread
From: Jason Wang @ 2011-03-08 6:44 UTC (permalink / raw)
To: Benjamin Poirier; +Cc: Blue Swirl, Jason Wang, qemu-devel, Michael S. Tsirkin
Benjamin Poirier writes:
> Add support to the emulated hardware to insert vlan tags in packets
> going from the guest to the network.
>
> Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> Cc: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> ---
> hw/rtl8139.c | 107 ++++++++++++++++++++++++++++++++++++++++++---------------
> 1 files changed, 79 insertions(+), 28 deletions(-)
Style issues were found through scripts/checkpatch.pl please have a look, and
better to meger all rx changes into previous patch. Other looks good.
>
> diff --git a/hw/rtl8139.c b/hw/rtl8139.c
> index 55a386e..265918a 100644
> --- a/hw/rtl8139.c
> +++ b/hw/rtl8139.c
> @@ -819,11 +819,14 @@ static int rtl8139_can_receive(VLANClientState *nc)
> }
> }
>
> -static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_t size_, int do_interrupt)
> +static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf,
> + size_t buf_size, int do_interrupt, const uint8_t *dot1q_buf)
> {
> RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque;
> + /* size_ is the total length of argument buffers */
> + int size_ = buf_size + (dot1q_buf ? VLAN_HLEN : 0);
> + /* size is the length of the buffer passed to the driver */
> int size = size_;
> - const uint8_t *dot1q_buf;
> const uint8_t *next_part;
> size_t next_part_size;
>
> @@ -1005,10 +1008,13 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> /* next_part starts right after the vlan header (if any), at the
> * ethertype for the payload */
> next_part = &buf[ETHER_ADDR_LEN * 2];
> - if (s->CpCmd & CPlusRxVLAN && be16_to_cpup((uint16_t *) next_part) ==
> - ETH_P_8021Q) {
> - dot1q_buf = next_part;
> - next_part += VLAN_HLEN;
> + if (s->CpCmd & CPlusRxVLAN && (dot1q_buf || be16_to_cpup((uint16_t *)
> + next_part) == ETH_P_8021Q)) {
> + if (!dot1q_buf) {
> + /* the tag is in the buffer */
> + dot1q_buf = next_part;
> + next_part += VLAN_HLEN;
> + }
> size -= VLAN_HLEN;
>
> rxdw1 &= ~CP_RX_VLAN_TAG_MASK;
> @@ -1020,9 +1026,8 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
> } else {
> /* reset VLAN tag flag */
> rxdw1 &= ~CP_RX_TAVA;
> - dot1q_buf = NULL;
> }
> - next_part_size = buf + size_ - next_part;
> + next_part_size = buf + buf_size - next_part;
>
> /* if too small buffer, then expand it */
> if (size < MIN_BUF_SIZE) {
> @@ -1147,10 +1152,18 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
>
> /* if too small buffer, then expand it */
> if (size < MIN_BUF_SIZE) {
> - memcpy(buf1, buf, size);
> + if (dot1q_buf) {
> + memcpy(buf1, buf, 2 * ETHER_ADDR_LEN);
> + memcpy(buf1 + 2 * ETHER_ADDR_LEN, dot1q_buf, VLAN_HLEN);
> + memcpy(buf1 + 2 * ETHER_ADDR_LEN + VLAN_HLEN, buf + 2 *
> + ETHER_ADDR_LEN, buf_size - 2 * ETHER_ADDR_LEN);
> + } else {
> + memcpy(buf1, buf, size);
> + }
> memset(buf1 + size, 0, MIN_BUF_SIZE - size);
> buf = buf1;
> size = MIN_BUF_SIZE;
> + dot1q_buf = NULL;
> }
>
> /* begin ring receiver mode */
> @@ -1178,10 +1191,23 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
>
> rtl8139_write_buffer(s, (uint8_t *)&val, 4);
>
> - rtl8139_write_buffer(s, buf, size);
> + /* receive/copy to target memory */
> + if (dot1q_buf) {
> + rtl8139_write_buffer(s, buf, 2 * ETHER_ADDR_LEN);
> + val = crc32(0, buf, 2 * ETHER_ADDR_LEN);
> + rtl8139_write_buffer(s, dot1q_buf, VLAN_HLEN);
> + val = crc32(val, dot1q_buf, VLAN_HLEN);
> + rtl8139_write_buffer(s, buf + 2 * ETHER_ADDR_LEN, buf_size - 2 *
> + ETHER_ADDR_LEN);
> + val = crc32(val, buf + 2 * ETHER_ADDR_LEN, buf_size - 2 *
> + ETHER_ADDR_LEN);
> + } else {
> + rtl8139_write_buffer(s, buf, size);
> + val = crc32(0, buf, size);
> + }
>
> /* write checksum */
> - val = cpu_to_le32(crc32(0, buf, size));
> + val = cpu_to_le32(val);
> rtl8139_write_buffer(s, (uint8_t *)&val, 4);
>
> /* correct buffer write pointer */
> @@ -1205,7 +1231,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
>
> static ssize_t rtl8139_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
> {
> - return rtl8139_do_receive(nc, buf, size, 1);
> + return rtl8139_do_receive(nc, buf, size, 1, NULL);
> }
>
> static void rtl8139_reset_rxring(RTL8139State *s, uint32_t bufferSize)
> @@ -1780,7 +1806,8 @@ static uint32_t rtl8139_RxConfig_read(RTL8139State *s)
> return ret;
> }
>
> -static void rtl8139_transfer_frame(RTL8139State *s, const uint8_t *buf, int size, int do_interrupt)
> +static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size,
> + int do_interrupt, const uint8_t *dot1q_buf)
> {
> if (!size)
> {
> @@ -1791,11 +1818,22 @@ static void rtl8139_transfer_frame(RTL8139State *s, const uint8_t *buf, int size
> if (TxLoopBack == (s->TxConfig & TxLoopBack))
> {
> DEBUG_PRINT(("RTL8139: +++ transmit loopback mode\n"));
> - rtl8139_do_receive(&s->nic->nc, buf, size, do_interrupt);
> + rtl8139_do_receive(&s->nic->nc, buf, size, do_interrupt, dot1q_buf);
> }
> else
> {
> - qemu_send_packet(&s->nic->nc, buf, size);
> + if (dot1q_buf) {
> + struct iovec iov[] = {
> + { .iov_base = buf, .iov_len = ETHER_ADDR_LEN * 2 },
> + { .iov_base = (void *) dot1q_buf, .iov_len = VLAN_HLEN },
> + { .iov_base = buf + ETHER_ADDR_LEN * 2,
> + .iov_len = size - ETHER_ADDR_LEN * 2 },
> + };
> +
> + qemu_sendv_packet(&s->nic->nc, iov, ARRAY_SIZE(iov));
> + } else {
> + qemu_send_packet(&s->nic->nc, buf, size);
> + }
> }
> }
>
> @@ -1829,7 +1867,7 @@ static int rtl8139_transmit_one(RTL8139State *s, int descriptor)
> s->TxStatus[descriptor] |= TxHostOwns;
> s->TxStatus[descriptor] |= TxStatOK;
>
> - rtl8139_transfer_frame(s, txbuffer, txsize, 0);
> + rtl8139_transfer_frame(s, txbuffer, txsize, 0, NULL);
>
> DEBUG_PRINT(("RTL8139: +++ transmitted %d bytes from descriptor %d\n", txsize, descriptor));
>
> @@ -1956,7 +1994,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
>
> cpu_physical_memory_read(cplus_tx_ring_desc, (uint8_t *)&val, 4);
> txdw0 = le32_to_cpu(val);
> - /* TODO: implement VLAN tagging support, VLAN tag data is read to txdw1 */
> cpu_physical_memory_read(cplus_tx_ring_desc+4, (uint8_t *)&val, 4);
> txdw1 = le32_to_cpu(val);
> cpu_physical_memory_read(cplus_tx_ring_desc+8, (uint8_t *)&val, 4);
> @@ -1968,9 +2005,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
> descriptor,
> txdw0, txdw1, txbufLO, txbufHI));
>
> - /* TODO: the following discard cast should clean clang analyzer output */
> - (void)txdw1;
> -
> /* w0 ownership flag */
> #define CP_TX_OWN (1<<31)
> /* w0 end of ring flag */
> @@ -1994,9 +2028,9 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
> /* w0 bits 0...15 : buffer size */
> #define CP_TX_BUFFER_SIZE (1<<16)
> #define CP_TX_BUFFER_SIZE_MASK (CP_TX_BUFFER_SIZE - 1)
> -/* w1 tag available flag */
> -#define CP_RX_TAGC (1<<17)
> -/* w1 bits 0...15 : VLAN tag */
> +/* w1 add tag flag */
> +#define CP_TX_TAGC (1<<17)
> +/* w1 bits 0...15 : VLAN tag (big endian) */
> #define CP_TX_VLAN_TAG_MASK ((1<<16) - 1)
> /* w2 low 32bit of Rx buffer ptr */
> /* w3 high 32bit of Rx buffer ptr */
> @@ -2096,13 +2130,13 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
> /* update ring data */
> val = cpu_to_le32(txdw0);
> cpu_physical_memory_write(cplus_tx_ring_desc, (uint8_t *)&val, 4);
> - /* TODO: implement VLAN tagging support, VLAN tag data is read to txdw1 */
> -// val = cpu_to_le32(txdw1);
> -// cpu_physical_memory_write(cplus_tx_ring_desc+4, &val, 4);
>
> /* Now decide if descriptor being processed is holding the last segment of packet */
> if (txdw0 & CP_TX_LS)
> {
> + uint8_t dot1q_buffer_space[VLAN_HLEN];
> + uint16_t *dot1q_buffer;
> +
> DEBUG_PRINT(("RTL8139: +++ C+ Tx mode : descriptor %d is last segment descriptor\n", descriptor));
>
> /* can transfer fully assembled packet */
> @@ -2111,6 +2145,21 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
> int saved_size = s->cplus_txbuffer_offset;
> int saved_buffer_len = s->cplus_txbuffer_len;
>
> + /* create vlan tag */
> + if (txdw1 & CP_TX_TAGC) {
> + /* the vlan tag is in BE byte order in the descriptor
> + * BE + le_to_cpu() + ~swap()~ = cpu */
> + DEBUG_PRINT(("RTL8139: +++ C+ Tx mode : inserting vlan tag with "
> + "tci: %u\n", bswap16(txdw1 & CP_TX_VLAN_TAG_MASK)));
> +
> + dot1q_buffer = (uint16_t*) dot1q_buffer_space;
> + dot1q_buffer[0] = cpu_to_be16(ETH_P_8021Q);
> + /* BE + le_to_cpu() + ~cpu_to_le()~ = BE */
> + dot1q_buffer[1] = cpu_to_le16(txdw1 & CP_TX_VLAN_TAG_MASK);
> + } else {
> + dot1q_buffer = NULL;
> + }
> +
> /* reset the card space to protect from recursive call */
> s->cplus_txbuffer = NULL;
> s->cplus_txbuffer_offset = 0;
> @@ -2264,7 +2313,8 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
>
> int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size;
> DEBUG_PRINT(("RTL8139: +++ C+ mode TSO transferring packet size %d\n", tso_send_size));
> - rtl8139_transfer_frame(s, saved_buffer, tso_send_size, 0);
> + rtl8139_transfer_frame(s, saved_buffer, tso_send_size,
> + 0, (uint8_t *) dot1q_buffer);
>
> /* add transferred count to TCP sequence number */
> p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq));
> @@ -2337,7 +2387,8 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
>
> DEBUG_PRINT(("RTL8139: +++ C+ mode transmitting %d bytes packet\n", saved_size));
>
> - rtl8139_transfer_frame(s, saved_buffer, saved_size, 1);
> + rtl8139_transfer_frame(s, saved_buffer, saved_size, 1,
> + (uint8_t *) dot1q_buffer);
>
> /* restore card space if there was no recursion and reset offset */
> if (!s->cplus_txbuffer)
> --
> 1.7.2.3
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-08 6:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-07 22:53 [Qemu-devel] [PATCH v5] rtl8139: add vlan support Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 1/3] rtl8139: cleanup FCS calculation Benjamin Poirier
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 2/3] rtl8139: add vlan tag extraction Benjamin Poirier
2011-03-08 3:44 ` Jason Wang
2011-03-07 22:53 ` [Qemu-devel] [PATCH v5 3/3] rtl8139: add vlan tag insertion Benjamin Poirier
2011-03-08 6:44 ` Jason Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).