diff options
| author | Denis Pynkin <denis.pynkin@collabora.com> | 2017-07-21 19:28:42 +0300 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2017-08-07 15:18:31 -0500 |
| commit | 704f3acfcf55343043bbed01c5fb0a0094a68e8a (patch) | |
| tree | 0cfaa8fdbf7794beb1773b79a6b526e83f693a4d | |
| parent | 66c89ee31b778a3c45b63b4d39ada2c6b5a2844a (diff) | |
| download | u-boot-704f3acfcf55343043bbed01c5fb0a0094a68e8a.zip u-boot-704f3acfcf55343043bbed01c5fb0a0094a68e8a.tar.gz u-boot-704f3acfcf55343043bbed01c5fb0a0094a68e8a.tar.bz2 | |
net: Use packed structures for networking
PXE boot is broken with GCC 7.1 due option '-fstore-merging' enabled
by default for '-O2':
BOOTP broadcast 1
data abort
pc : [<8ff8bb30>] lr : [<00004f1f>]
reloc pc : [<17832b30>] lr : [<878abf1f>]
sp : 8f558bc0 ip : 00000000 fp : 8ffef5a4
r10: 8ffed248 r9 : 8f558ee0 r8 : 8ffef594
r7 : 0000000e r6 : 8ffed700 r5 : 00000000 r4 : 8ffed74e
r3 : 00060101 r2 : 8ffed230 r1 : 8ffed706 r0 : 00000ddd
Flags: nzcv IRQs off FIQs off Mode SVC_32
Resetting CPU ...
Core reason is usage of structures for network headers without packed
attribute.
Reviewed-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | include/net.h | 14 | ||||
| -rw-r--r-- | net/bootp.h | 2 | ||||
| -rw-r--r-- | net/dns.h | 2 | ||||
| -rw-r--r-- | net/nfs.h | 2 | ||||
| -rw-r--r-- | net/sntp.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/include/net.h b/include/net.h index 2eaa882..e126948 100644 --- a/include/net.h +++ b/include/net.h @@ -308,7 +308,7 @@ struct ethernet_hdr { u8 et_dest[ARP_HLEN]; /* Destination node */ u8 et_src[ARP_HLEN]; /* Source node */ u16 et_protlen; /* Protocol or length */ -}; +} __attribute__((packed)); /* Ethernet header size */ #define ETHER_HDR_SIZE (sizeof(struct ethernet_hdr)) @@ -326,7 +326,7 @@ struct e802_hdr { u8 et_snap2; u8 et_snap3; u16 et_prot; /* 802 protocol */ -}; +} __attribute__((packed)); /* 802 + SNAP + ethernet header size */ #define E802_HDR_SIZE (sizeof(struct e802_hdr)) @@ -340,7 +340,7 @@ struct vlan_ethernet_hdr { u16 vet_vlan_type; /* PROT_VLAN */ u16 vet_tag; /* TAG of VLAN */ u16 vet_type; /* protocol type */ -}; +} __attribute__((packed)); /* VLAN Ethernet header size */ #define VLAN_ETHER_HDR_SIZE (sizeof(struct vlan_ethernet_hdr)) @@ -369,7 +369,7 @@ struct ip_hdr { u16 ip_sum; /* checksum */ struct in_addr ip_src; /* Source IP address */ struct in_addr ip_dst; /* Destination IP address */ -}; +} __attribute__((packed)); #define IP_OFFS 0x1fff /* ip offset *= 8 */ #define IP_FLAGS 0xe000 /* first 3 bits */ @@ -397,7 +397,7 @@ struct ip_udp_hdr { u16 udp_dst; /* UDP destination port */ u16 udp_len; /* Length of UDP packet */ u16 udp_xsum; /* Checksum */ -}; +} __attribute__((packed)); #define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr)) #define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE) @@ -435,7 +435,7 @@ struct arp_hdr { u8 ar_tha[]; /* Target hardware address */ u8 ar_tpa[]; /* Target protocol address */ #endif /* 0 */ -}; +} __attribute__((packed)); #define ARP_HDR_SIZE (8+20) /* Size assuming ethernet */ @@ -470,7 +470,7 @@ struct icmp_hdr { } frag; u8 data[0]; } un; -}; +} __attribute__((packed)); #define ICMP_HDR_SIZE (sizeof(struct icmp_hdr)) #define IP_ICMP_HDR_SIZE (IP_HDR_SIZE + ICMP_HDR_SIZE) diff --git a/net/bootp.h b/net/bootp.h index fcb0a64..567340e 100644 --- a/net/bootp.h +++ b/net/bootp.h @@ -49,7 +49,7 @@ struct bootp_hdr { char bp_sname[64]; /* Server host name */ char bp_file[128]; /* Boot file name */ char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */ -}; +} __attribute__((packed)); #define BOOTP_HDR_SIZE sizeof(struct bootp_hdr) @@ -29,7 +29,7 @@ struct header { uint16_t nauth; /* Authority PRs */ uint16_t nother; /* Other PRs */ unsigned char data[1]; /* Data, variable length */ -}; +} __attribute__((packed)); void dns_start(void); /* Begin DNS */ @@ -79,7 +79,7 @@ struct rpc_t { uint32_t data[NFS_READ_SIZE]; } reply; } u; -}; +} __attribute__((packed)); void nfs_start(void); /* Begin NFS */ @@ -51,7 +51,7 @@ struct sntp_pkt_t { unsigned long long originate_timestamp; unsigned long long receive_timestamp; unsigned long long transmit_timestamp; -}; +} __attribute__((packed)); void sntp_start(void); /* Begin SNTP */ |