Commit 26c0114d authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJason Wang <jasowang@redhat.com>
Message-id: 1438604157-29664-4-git-send-email-stefanha@redhat.com
parent 1bf11332

hw/net/rtl8139.c

+8 −3
Original line number Diff line number Diff line
@@ -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;

                }