diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-08-03 13:15:57 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-09-02 13:24:13 +0100 |
| commit | 26c0114d3f69c3accaf83d56ff1d850bd0213b58 (patch) | |
| tree | ee9930ad4065b1dcee4109b678ef335228851ca5 /hw/net | |
| parent | 1bf11332c4770e2750247733c713a4e771047282 (diff) | |
rtl8139: use ldl/stl wrapper for unaligned 32-bit access
The tx offload feature accesses a 16-bit aligned TCP header struct. The
32-bit fields must be accessed using ldl/stl wrappers since some host
architectures fault on unaligned access.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Message-id: 1438604157-29664-4-git-send-email-stefanha@redhat.com
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/rtl8139.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 36be22b99c..366d1b59bf 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2118,7 +2118,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) DPRINTF("+++ C+ mode has IP packet\n"); - /* not aligned */ + /* Note on memory alignment: eth_payload_data is 16-bit aligned + * since saved_buffer is allocated with g_malloc() and ETH_HLEN is + * even. 32-bit accesses must use ldl/stl wrappers to avoid + * unaligned accesses. + */ eth_payload_data = saved_buffer + ETH_HLEN; eth_payload_len = saved_size - ETH_HLEN; @@ -2215,7 +2219,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", - be32_to_cpu(p_tcp_hdr->th_seq)); + ldl_be_p(&p_tcp_hdr->th_seq)); /* add 4 TCP pseudoheader fields */ /* copy IP source and destination fields */ @@ -2271,7 +2275,8 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) 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)); + stl_be_p(&p_tcp_hdr->th_seq, + chunk_size + ldl_be_p(&p_tcp_hdr->th_seq)); ++send_count; } |