mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-27 14:14:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: Use packed structures for networking

Browse Source 
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>
This commit is contained in:
Denis Pynkin 2017-07-21 19:28:42 +03:00 committed by Joe Hershberger
parent 66c89ee31b
commit 704f3acfcf
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/net.h
View File

@ -308,7 +308,7 @@ struct ethernet_hdr {
u8 et_dest[ARP_HLEN]; /* Destination node */ u8 et_dest[ARP_HLEN]; /* Destination node */
u8 et_src[ARP_HLEN]; /* Source node */ u8 et_src[ARP_HLEN]; /* Source node */
u16 et_protlen; /* Protocol or length */ u16 et_protlen; /* Protocol or length */
}; } __attribute__((packed));
/* Ethernet header size */ /* Ethernet header size */
#define ETHER_HDR_SIZE (sizeof(struct ethernet_hdr)) #define ETHER_HDR_SIZE (sizeof(struct ethernet_hdr))
@ -326,7 +326,7 @@ struct e802_hdr {
u8 et_snap2; u8 et_snap2;
u8 et_snap3; u8 et_snap3;
u16 et_prot; /* 802 protocol */ u16 et_prot; /* 802 protocol */
}; } __attribute__((packed));
/* 802 + SNAP + ethernet header size */ /* 802 + SNAP + ethernet header size */
#define E802_HDR_SIZE (sizeof(struct e802_hdr)) #define E802_HDR_SIZE (sizeof(struct e802_hdr))
@ -340,7 +340,7 @@ struct vlan_ethernet_hdr {
u16 vet_vlan_type; /* PROT_VLAN */ u16 vet_vlan_type; /* PROT_VLAN */
u16 vet_tag; /* TAG of VLAN */ u16 vet_tag; /* TAG of VLAN */
u16 vet_type; /* protocol type */ u16 vet_type; /* protocol type */
}; } __attribute__((packed));
/* VLAN Ethernet header size */ /* VLAN Ethernet header size */
#define VLAN_ETHER_HDR_SIZE (sizeof(struct vlan_ethernet_hdr)) #define VLAN_ETHER_HDR_SIZE (sizeof(struct vlan_ethernet_hdr))
@ -369,7 +369,7 @@ struct ip_hdr {
u16 ip_sum; /* checksum */ u16 ip_sum; /* checksum */
struct in_addr ip_src; /* Source IP address */ struct in_addr ip_src; /* Source IP address */
struct in_addr ip_dst; /* Destination IP address */ struct in_addr ip_dst; /* Destination IP address */
}; } __attribute__((packed));
#define IP_OFFS 0x1fff /* ip offset *= 8 */ #define IP_OFFS 0x1fff /* ip offset *= 8 */
#define IP_FLAGS 0xe000 /* first 3 bits */ #define IP_FLAGS 0xe000 /* first 3 bits */
@ -397,7 +397,7 @@ struct ip_udp_hdr {
u16 udp_dst; /* UDP destination port */ u16 udp_dst; /* UDP destination port */
u16 udp_len; /* Length of UDP packet */ u16 udp_len; /* Length of UDP packet */
u16 udp_xsum; /* Checksum */ u16 udp_xsum; /* Checksum */
}; } __attribute__((packed));
#define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr)) #define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr))
#define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE) #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_tha[]; /* Target hardware address */
u8 ar_tpa[]; /* Target protocol address */ u8 ar_tpa[]; /* Target protocol address */
#endif /* 0 */ #endif /* 0 */
}; } __attribute__((packed));
#define ARP_HDR_SIZE (8+20) /* Size assuming ethernet */ #define ARP_HDR_SIZE (8+20) /* Size assuming ethernet */
@ -470,7 +470,7 @@ struct icmp_hdr {
} frag; } frag;
u8 data[0]; u8 data[0];
} un; } un;
}; } __attribute__((packed));
#define ICMP_HDR_SIZE (sizeof(struct icmp_hdr)) #define ICMP_HDR_SIZE (sizeof(struct icmp_hdr))
#define IP_ICMP_HDR_SIZE (IP_HDR_SIZE + ICMP_HDR_SIZE) #define IP_ICMP_HDR_SIZE (IP_HDR_SIZE + ICMP_HDR_SIZE)

2
net/bootp.h
View File

@ -49,7 +49,7 @@ struct bootp_hdr {
char bp_sname[64]; /* Server host name */ char bp_sname[64]; /* Server host name */
char bp_file[128]; /* Boot file name */ char bp_file[128]; /* Boot file name */
char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */ char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */
}; } __attribute__((packed));
#define BOOTP_HDR_SIZE sizeof(struct bootp_hdr) #define BOOTP_HDR_SIZE sizeof(struct bootp_hdr)

2
net/dns.h
View File

@ -29,7 +29,7 @@ struct header {
uint16_t nauth; /* Authority PRs */ uint16_t nauth; /* Authority PRs */
uint16_t nother; /* Other PRs */ uint16_t nother; /* Other PRs */
unsigned char data[1]; /* Data, variable length */ unsigned char data[1]; /* Data, variable length */
}; } __attribute__((packed));
void dns_start(void); /* Begin DNS */ void dns_start(void); /* Begin DNS */

2
net/nfs.h
View File

@ -79,7 +79,7 @@ struct rpc_t {
uint32_t data[NFS_READ_SIZE]; uint32_t data[NFS_READ_SIZE];
} reply; } reply;
} u; } u;
}; } __attribute__((packed));
void nfs_start(void); /* Begin NFS */ void nfs_start(void); /* Begin NFS */

2
net/sntp.h
View File

@ -51,7 +51,7 @@ struct sntp_pkt_t {
unsigned long long originate_timestamp; unsigned long long originate_timestamp;
unsigned long long receive_timestamp; unsigned long long receive_timestamp;
unsigned long long transmit_timestamp; unsigned long long transmit_timestamp;
}; } __attribute__((packed));
void sntp_start(void); /* Begin SNTP */ void sntp_start(void); /* Begin SNTP */