910-unaligned_access_hacks.patch 26 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909
  1. --- a/arch/mips/include/asm/checksum.h
  2. +++ b/arch/mips/include/asm/checksum.h
  3. @@ -134,26 +134,30 @@ static inline __sum16 ip_fast_csum(const
  4. const unsigned int *stop = word + ihl;
  5. unsigned int csum;
  6. int carry;
  7. + unsigned int w;
  8. - csum = word[0];
  9. - csum += word[1];
  10. - carry = (csum < word[1]);
  11. + csum = net_hdr_word(word++);
  12. +
  13. + w = net_hdr_word(word++);
  14. + csum += w;
  15. + carry = (csum < w);
  16. csum += carry;
  17. - csum += word[2];
  18. - carry = (csum < word[2]);
  19. + w = net_hdr_word(word++);
  20. + csum += w;
  21. + carry = (csum < w);
  22. csum += carry;
  23. - csum += word[3];
  24. - carry = (csum < word[3]);
  25. + w = net_hdr_word(word++);
  26. + csum += w;
  27. + carry = (csum < w);
  28. csum += carry;
  29. - word += 4;
  30. do {
  31. - csum += *word;
  32. - carry = (csum < *word);
  33. + w = net_hdr_word(word++);
  34. + csum += w;
  35. + carry = (csum < w);
  36. csum += carry;
  37. - word++;
  38. } while (word != stop);
  39. return csum_fold(csum);
  40. @@ -212,73 +216,6 @@ static inline __sum16 ip_compute_csum(co
  41. return csum_fold(csum_partial(buff, len, 0));
  42. }
  43. -#define _HAVE_ARCH_IPV6_CSUM
  44. -static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
  45. - const struct in6_addr *daddr,
  46. - __u32 len, unsigned short proto,
  47. - __wsum sum)
  48. -{
  49. - __wsum tmp;
  50. -
  51. - __asm__(
  52. - " .set push # csum_ipv6_magic\n"
  53. - " .set noreorder \n"
  54. - " .set noat \n"
  55. - " addu %0, %5 # proto (long in network byte order)\n"
  56. - " sltu $1, %0, %5 \n"
  57. - " addu %0, $1 \n"
  58. -
  59. - " addu %0, %6 # csum\n"
  60. - " sltu $1, %0, %6 \n"
  61. - " lw %1, 0(%2) # four words source address\n"
  62. - " addu %0, $1 \n"
  63. - " addu %0, %1 \n"
  64. - " sltu $1, %0, %1 \n"
  65. -
  66. - " lw %1, 4(%2) \n"
  67. - " addu %0, $1 \n"
  68. - " addu %0, %1 \n"
  69. - " sltu $1, %0, %1 \n"
  70. -
  71. - " lw %1, 8(%2) \n"
  72. - " addu %0, $1 \n"
  73. - " addu %0, %1 \n"
  74. - " sltu $1, %0, %1 \n"
  75. -
  76. - " lw %1, 12(%2) \n"
  77. - " addu %0, $1 \n"
  78. - " addu %0, %1 \n"
  79. - " sltu $1, %0, %1 \n"
  80. -
  81. - " lw %1, 0(%3) \n"
  82. - " addu %0, $1 \n"
  83. - " addu %0, %1 \n"
  84. - " sltu $1, %0, %1 \n"
  85. -
  86. - " lw %1, 4(%3) \n"
  87. - " addu %0, $1 \n"
  88. - " addu %0, %1 \n"
  89. - " sltu $1, %0, %1 \n"
  90. -
  91. - " lw %1, 8(%3) \n"
  92. - " addu %0, $1 \n"
  93. - " addu %0, %1 \n"
  94. - " sltu $1, %0, %1 \n"
  95. -
  96. - " lw %1, 12(%3) \n"
  97. - " addu %0, $1 \n"
  98. - " addu %0, %1 \n"
  99. - " sltu $1, %0, %1 \n"
  100. -
  101. - " addu %0, $1 # Add final carry\n"
  102. - " .set pop"
  103. - : "=&r" (sum), "=&r" (tmp)
  104. - : "r" (saddr), "r" (daddr),
  105. - "0" (htonl(len)), "r" (htonl(proto)), "r" (sum));
  106. -
  107. - return csum_fold(sum);
  108. -}
  109. -
  110. #include <asm-generic/checksum.h>
  111. #endif /* CONFIG_GENERIC_CSUM */
  112. --- a/include/uapi/linux/ip.h
  113. +++ b/include/uapi/linux/ip.h
  114. @@ -102,7 +102,7 @@ struct iphdr {
  115. __be32 saddr;
  116. __be32 daddr;
  117. /*The options start here. */
  118. -};
  119. +} __attribute__((packed, aligned(2)));
  120. struct ip_auth_hdr {
  121. --- a/include/uapi/linux/ipv6.h
  122. +++ b/include/uapi/linux/ipv6.h
  123. @@ -129,7 +129,7 @@ struct ipv6hdr {
  124. struct in6_addr saddr;
  125. struct in6_addr daddr;
  126. -};
  127. +} __attribute__((packed, aligned(2)));
  128. /* index values for the variables in ipv6_devconf */
  129. --- a/include/uapi/linux/tcp.h
  130. +++ b/include/uapi/linux/tcp.h
  131. @@ -54,7 +54,7 @@ struct tcphdr {
  132. __be16 window;
  133. __sum16 check;
  134. __be16 urg_ptr;
  135. -};
  136. +} __attribute__((packed, aligned(2)));
  137. /*
  138. * The union cast uses a gcc extension to avoid aliasing problems
  139. @@ -64,7 +64,7 @@ struct tcphdr {
  140. union tcp_word_hdr {
  141. struct tcphdr hdr;
  142. __be32 words[5];
  143. -};
  144. +} __attribute__((packed, aligned(2)));
  145. #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3])
  146. --- a/include/uapi/linux/udp.h
  147. +++ b/include/uapi/linux/udp.h
  148. @@ -24,7 +24,7 @@ struct udphdr {
  149. __be16 dest;
  150. __be16 len;
  151. __sum16 check;
  152. -};
  153. +} __attribute__((packed, aligned(2)));
  154. /* UDP socket options */
  155. #define UDP_CORK 1 /* Never send partially complete segments */
  156. --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
  157. +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
  158. @@ -41,8 +41,8 @@ static bool ipv4_pkt_to_tuple(const stru
  159. if (ap == NULL)
  160. return false;
  161. - tuple->src.u3.ip = ap[0];
  162. - tuple->dst.u3.ip = ap[1];
  163. + tuple->src.u3.ip = net_hdr_word(ap++);
  164. + tuple->dst.u3.ip = net_hdr_word(ap);
  165. return true;
  166. }
  167. --- a/include/uapi/linux/icmp.h
  168. +++ b/include/uapi/linux/icmp.h
  169. @@ -80,7 +80,7 @@ struct icmphdr {
  170. __be16 mtu;
  171. } frag;
  172. } un;
  173. -};
  174. +} __attribute__((packed, aligned(2)));
  175. /*
  176. --- a/include/uapi/linux/in6.h
  177. +++ b/include/uapi/linux/in6.h
  178. @@ -42,7 +42,7 @@ struct in6_addr {
  179. #define s6_addr16 in6_u.u6_addr16
  180. #define s6_addr32 in6_u.u6_addr32
  181. #endif
  182. -};
  183. +} __attribute__((packed, aligned(2)));
  184. #endif /* __UAPI_DEF_IN6_ADDR */
  185. #if __UAPI_DEF_SOCKADDR_IN6
  186. --- a/net/ipv6/tcp_ipv6.c
  187. +++ b/net/ipv6/tcp_ipv6.c
  188. @@ -39,6 +39,7 @@
  189. #include <linux/ipsec.h>
  190. #include <linux/times.h>
  191. #include <linux/slab.h>
  192. +#include <asm/unaligned.h>
  193. #include <linux/uaccess.h>
  194. #include <linux/ipv6.h>
  195. #include <linux/icmpv6.h>
  196. @@ -776,10 +777,10 @@ static void tcp_v6_send_response(struct
  197. topt = (__be32 *)(t1 + 1);
  198. if (tsecr) {
  199. - *topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
  200. - (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP);
  201. - *topt++ = htonl(tsval);
  202. - *topt++ = htonl(tsecr);
  203. + put_unaligned_be32((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
  204. + (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP, topt++);
  205. + put_unaligned_be32(tsval, topt++);
  206. + put_unaligned_be32(tsecr, topt++);
  207. }
  208. #ifdef CONFIG_TCP_MD5SIG
  209. --- a/include/linux/ipv6.h
  210. +++ b/include/linux/ipv6.h
  211. @@ -5,6 +5,7 @@
  212. #define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
  213. #define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
  214. +
  215. /*
  216. * This structure contains configuration options per IPv6 link.
  217. */
  218. --- a/net/ipv6/datagram.c
  219. +++ b/net/ipv6/datagram.c
  220. @@ -429,7 +429,7 @@ int ipv6_recv_error(struct sock *sk, str
  221. ipv6_iface_scope_id(&sin->sin6_addr,
  222. IP6CB(skb)->iif);
  223. } else {
  224. - ipv6_addr_set_v4mapped(*(__be32 *)(nh + serr->addr_offset),
  225. + ipv6_addr_set_v4mapped(net_hdr_word(nh + serr->addr_offset),
  226. &sin->sin6_addr);
  227. sin->sin6_scope_id = 0;
  228. }
  229. @@ -766,12 +766,12 @@ int ip6_datagram_send_ctl(struct net *ne
  230. }
  231. if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
  232. - if ((fl6->flowlabel^*(__be32 *)CMSG_DATA(cmsg))&~IPV6_FLOWINFO_MASK) {
  233. + if ((fl6->flowlabel^net_hdr_word(CMSG_DATA(cmsg)))&~IPV6_FLOWINFO_MASK) {
  234. err = -EINVAL;
  235. goto exit_f;
  236. }
  237. }
  238. - fl6->flowlabel = IPV6_FLOWINFO_MASK & *(__be32 *)CMSG_DATA(cmsg);
  239. + fl6->flowlabel = IPV6_FLOWINFO_MASK & net_hdr_word(CMSG_DATA(cmsg));
  240. break;
  241. case IPV6_2292HOPOPTS:
  242. --- a/net/ipv6/ip6_gre.c
  243. +++ b/net/ipv6/ip6_gre.c
  244. @@ -394,7 +394,7 @@ static void ip6gre_err(struct sk_buff *s
  245. t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
  246. flags & GRE_KEY ?
  247. - *(((__be32 *)p) + (grehlen / 4) - 1) : 0,
  248. + net_hdr_word(((__be32 *)p) + (grehlen / 4) - 1) : 0,
  249. p[1]);
  250. if (!t)
  251. return;
  252. @@ -476,11 +476,11 @@ static int ip6gre_rcv(struct sk_buff *sk
  253. offset += 4;
  254. }
  255. if (flags&GRE_KEY) {
  256. - key = *(__be32 *)(h + offset);
  257. + key = net_hdr_word(h + offset);
  258. offset += 4;
  259. }
  260. if (flags&GRE_SEQ) {
  261. - seqno = ntohl(*(__be32 *)(h + offset));
  262. + seqno = ntohl(net_hdr_word(h + offset));
  263. offset += 4;
  264. }
  265. }
  266. @@ -745,7 +745,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
  267. if (tunnel->parms.o_flags&GRE_SEQ) {
  268. ++tunnel->o_seqno;
  269. - *ptr = htonl(tunnel->o_seqno);
  270. + net_hdr_word(ptr) = htonl(tunnel->o_seqno);
  271. ptr--;
  272. }
  273. if (tunnel->parms.o_flags&GRE_KEY) {
  274. @@ -841,7 +841,7 @@ static inline int ip6gre_xmit_ipv6(struc
  275. dsfield = ipv6_get_dsfield(ipv6h);
  276. if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
  277. - fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
  278. + fl6.flowlabel |= net_hdr_word(ipv6h) & IPV6_TCLASS_MASK;
  279. if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)
  280. fl6.flowlabel |= ip6_flowlabel(ipv6h);
  281. if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
  282. --- a/net/ipv6/ip6_tunnel.c
  283. +++ b/net/ipv6/ip6_tunnel.c
  284. @@ -1340,7 +1340,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
  285. dsfield = ipv6_get_dsfield(ipv6h);
  286. if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
  287. - fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
  288. + fl6.flowlabel |= net_hdr_word(ipv6h) & IPV6_TCLASS_MASK;
  289. if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)
  290. fl6.flowlabel |= ip6_flowlabel(ipv6h);
  291. if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
  292. --- a/net/ipv6/exthdrs.c
  293. +++ b/net/ipv6/exthdrs.c
  294. @@ -573,7 +573,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
  295. goto drop;
  296. }
  297. - pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));
  298. + pkt_len = ntohl(net_hdr_word(nh + optoff + 2));
  299. if (pkt_len <= IPV6_MAXPLEN) {
  300. IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),
  301. IPSTATS_MIB_INHDRERRORS);
  302. --- a/include/linux/types.h
  303. +++ b/include/linux/types.h
  304. @@ -215,5 +215,11 @@ struct callback_head {
  305. /* clocksource cycle base type */
  306. typedef u64 cycle_t;
  307. +struct net_hdr_word {
  308. + u32 words[1];
  309. +} __attribute__((packed, aligned(2)));
  310. +
  311. +#define net_hdr_word(_p) (((struct net_hdr_word *) (_p))->words[0])
  312. +
  313. #endif /* __ASSEMBLY__ */
  314. #endif /* _LINUX_TYPES_H */
  315. --- a/net/ipv4/af_inet.c
  316. +++ b/net/ipv4/af_inet.c
  317. @@ -1326,8 +1326,8 @@ static struct sk_buff **inet_gro_receive
  318. if (unlikely(ip_fast_csum((u8 *)iph, 5)))
  319. goto out_unlock;
  320. - id = ntohl(*(__be32 *)&iph->id);
  321. - flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
  322. + id = ntohl(net_hdr_word(&iph->id));
  323. + flush = (u16)((ntohl(net_hdr_word(iph)) ^ skb_gro_len(skb)) | (id & ~IP_DF));
  324. id >>= 16;
  325. for (p = *head; p; p = p->next) {
  326. --- a/net/ipv4/route.c
  327. +++ b/net/ipv4/route.c
  328. @@ -454,7 +454,7 @@ static struct neighbour *ipv4_neigh_look
  329. else if (skb)
  330. pkey = &ip_hdr(skb)->daddr;
  331. - n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);
  332. + n = __ipv4_neigh_lookup(dev, net_hdr_word(pkey));
  333. if (n)
  334. return n;
  335. return neigh_create(&arp_tbl, pkey, dev);
  336. --- a/net/ipv4/tcp_output.c
  337. +++ b/net/ipv4/tcp_output.c
  338. @@ -452,48 +452,53 @@ static void tcp_options_write(__be32 *pt
  339. u16 options = opts->options; /* mungable copy */
  340. if (unlikely(OPTION_MD5 & options)) {
  341. - *ptr++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
  342. - (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
  343. + net_hdr_word(ptr++) =
  344. + htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
  345. + (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
  346. /* overload cookie hash location */
  347. opts->hash_location = (__u8 *)ptr;
  348. ptr += 4;
  349. }
  350. if (unlikely(opts->mss)) {
  351. - *ptr++ = htonl((TCPOPT_MSS << 24) |
  352. - (TCPOLEN_MSS << 16) |
  353. - opts->mss);
  354. + net_hdr_word(ptr++) =
  355. + htonl((TCPOPT_MSS << 24) | (TCPOLEN_MSS << 16) |
  356. + opts->mss);
  357. }
  358. if (likely(OPTION_TS & options)) {
  359. if (unlikely(OPTION_SACK_ADVERTISE & options)) {
  360. - *ptr++ = htonl((TCPOPT_SACK_PERM << 24) |
  361. - (TCPOLEN_SACK_PERM << 16) |
  362. - (TCPOPT_TIMESTAMP << 8) |
  363. - TCPOLEN_TIMESTAMP);
  364. + net_hdr_word(ptr++) =
  365. + htonl((TCPOPT_SACK_PERM << 24) |
  366. + (TCPOLEN_SACK_PERM << 16) |
  367. + (TCPOPT_TIMESTAMP << 8) |
  368. + TCPOLEN_TIMESTAMP);
  369. options &= ~OPTION_SACK_ADVERTISE;
  370. } else {
  371. - *ptr++ = htonl((TCPOPT_NOP << 24) |
  372. - (TCPOPT_NOP << 16) |
  373. - (TCPOPT_TIMESTAMP << 8) |
  374. - TCPOLEN_TIMESTAMP);
  375. + net_hdr_word(ptr++) =
  376. + htonl((TCPOPT_NOP << 24) |
  377. + (TCPOPT_NOP << 16) |
  378. + (TCPOPT_TIMESTAMP << 8) |
  379. + TCPOLEN_TIMESTAMP);
  380. }
  381. - *ptr++ = htonl(opts->tsval);
  382. - *ptr++ = htonl(opts->tsecr);
  383. + net_hdr_word(ptr++) = htonl(opts->tsval);
  384. + net_hdr_word(ptr++) = htonl(opts->tsecr);
  385. }
  386. if (unlikely(OPTION_SACK_ADVERTISE & options)) {
  387. - *ptr++ = htonl((TCPOPT_NOP << 24) |
  388. - (TCPOPT_NOP << 16) |
  389. - (TCPOPT_SACK_PERM << 8) |
  390. - TCPOLEN_SACK_PERM);
  391. + net_hdr_word(ptr++) =
  392. + htonl((TCPOPT_NOP << 24) |
  393. + (TCPOPT_NOP << 16) |
  394. + (TCPOPT_SACK_PERM << 8) |
  395. + TCPOLEN_SACK_PERM);
  396. }
  397. if (unlikely(OPTION_WSCALE & options)) {
  398. - *ptr++ = htonl((TCPOPT_NOP << 24) |
  399. - (TCPOPT_WINDOW << 16) |
  400. - (TCPOLEN_WINDOW << 8) |
  401. - opts->ws);
  402. + net_hdr_word(ptr++) =
  403. + htonl((TCPOPT_NOP << 24) |
  404. + (TCPOPT_WINDOW << 16) |
  405. + (TCPOLEN_WINDOW << 8) |
  406. + opts->ws);
  407. }
  408. if (unlikely(opts->num_sack_blocks)) {
  409. @@ -501,16 +506,17 @@ static void tcp_options_write(__be32 *pt
  410. tp->duplicate_sack : tp->selective_acks;
  411. int this_sack;
  412. - *ptr++ = htonl((TCPOPT_NOP << 24) |
  413. - (TCPOPT_NOP << 16) |
  414. - (TCPOPT_SACK << 8) |
  415. - (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
  416. + net_hdr_word(ptr++) =
  417. + htonl((TCPOPT_NOP << 24) |
  418. + (TCPOPT_NOP << 16) |
  419. + (TCPOPT_SACK << 8) |
  420. + (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
  421. TCPOLEN_SACK_PERBLOCK)));
  422. for (this_sack = 0; this_sack < opts->num_sack_blocks;
  423. ++this_sack) {
  424. - *ptr++ = htonl(sp[this_sack].start_seq);
  425. - *ptr++ = htonl(sp[this_sack].end_seq);
  426. + net_hdr_word(ptr++) = htonl(sp[this_sack].start_seq);
  427. + net_hdr_word(ptr++) = htonl(sp[this_sack].end_seq);
  428. }
  429. tp->rx_opt.dsack = 0;
  430. @@ -523,13 +529,14 @@ static void tcp_options_write(__be32 *pt
  431. if (foc->exp) {
  432. len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
  433. - *ptr = htonl((TCPOPT_EXP << 24) | (len << 16) |
  434. + net_hdr_word(ptr) =
  435. + htonl((TCPOPT_EXP << 24) | (len << 16) |
  436. TCPOPT_FASTOPEN_MAGIC);
  437. p += TCPOLEN_EXP_FASTOPEN_BASE;
  438. } else {
  439. len = TCPOLEN_FASTOPEN_BASE + foc->len;
  440. - *p++ = TCPOPT_FASTOPEN;
  441. - *p++ = len;
  442. + net_hdr_word(p++) = TCPOPT_FASTOPEN;
  443. + net_hdr_word(p++) = len;
  444. }
  445. memcpy(p, foc->val, foc->len);
  446. --- a/net/ipv4/igmp.c
  447. +++ b/net/ipv4/igmp.c
  448. @@ -496,7 +496,7 @@ static struct sk_buff *add_grec(struct s
  449. if (!skb)
  450. return NULL;
  451. psrc = (__be32 *)skb_put(skb, sizeof(__be32));
  452. - *psrc = psf->sf_inaddr;
  453. + net_hdr_word(psrc) = psf->sf_inaddr;
  454. scount++; stotal++;
  455. if ((type == IGMPV3_ALLOW_NEW_SOURCES ||
  456. type == IGMPV3_BLOCK_OLD_SOURCES) && psf->sf_crcount) {
  457. --- a/include/uapi/linux/igmp.h
  458. +++ b/include/uapi/linux/igmp.h
  459. @@ -32,7 +32,7 @@ struct igmphdr {
  460. __u8 code; /* For newer IGMP */
  461. __sum16 csum;
  462. __be32 group;
  463. -};
  464. +} __attribute__((packed, aligned(2)));
  465. /* V3 group record types [grec_type] */
  466. #define IGMPV3_MODE_IS_INCLUDE 1
  467. @@ -48,7 +48,7 @@ struct igmpv3_grec {
  468. __be16 grec_nsrcs;
  469. __be32 grec_mca;
  470. __be32 grec_src[0];
  471. -};
  472. +} __attribute__((packed, aligned(2)));
  473. struct igmpv3_report {
  474. __u8 type;
  475. @@ -57,7 +57,7 @@ struct igmpv3_report {
  476. __be16 resv2;
  477. __be16 ngrec;
  478. struct igmpv3_grec grec[0];
  479. -};
  480. +} __attribute__((packed, aligned(2)));
  481. struct igmpv3_query {
  482. __u8 type;
  483. @@ -78,7 +78,7 @@ struct igmpv3_query {
  484. __u8 qqic;
  485. __be16 nsrcs;
  486. __be32 srcs[0];
  487. -};
  488. +} __attribute__((packed, aligned(2)));
  489. #define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
  490. #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
  491. --- a/net/core/flow_dissector.c
  492. +++ b/net/core/flow_dissector.c
  493. @@ -53,7 +53,7 @@ __be32 __skb_flow_get_ports(const struct
  494. ports = __skb_header_pointer(skb, thoff + poff,
  495. sizeof(_ports), data, hlen, &_ports);
  496. if (ports)
  497. - return *ports;
  498. + return (__be32)net_hdr_word(ports);
  499. }
  500. return 0;
  501. --- a/include/uapi/linux/icmpv6.h
  502. +++ b/include/uapi/linux/icmpv6.h
  503. @@ -76,7 +76,7 @@ struct icmp6hdr {
  504. #define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other
  505. #define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime
  506. #define icmp6_router_pref icmp6_dataun.u_nd_ra.router_pref
  507. -};
  508. +} __attribute__((packed, aligned(2)));
  509. #define ICMPV6_ROUTER_PREF_LOW 0x3
  510. --- a/include/net/ndisc.h
  511. +++ b/include/net/ndisc.h
  512. @@ -76,7 +76,7 @@ struct ra_msg {
  513. struct icmp6hdr icmph;
  514. __be32 reachable_time;
  515. __be32 retrans_timer;
  516. -};
  517. +} __attribute__((packed, aligned(2)));
  518. struct rd_msg {
  519. struct icmp6hdr icmph;
  520. @@ -148,10 +148,10 @@ static inline u32 ndisc_hashfn(const voi
  521. {
  522. const u32 *p32 = pkey;
  523. - return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
  524. - (p32[1] * hash_rnd[1]) +
  525. - (p32[2] * hash_rnd[2]) +
  526. - (p32[3] * hash_rnd[3]));
  527. + return (((net_hdr_word(&p32[0]) ^ hash32_ptr(dev)) * hash_rnd[0]) +
  528. + (net_hdr_word(&p32[1]) * hash_rnd[1]) +
  529. + (net_hdr_word(&p32[2]) * hash_rnd[2]) +
  530. + (net_hdr_word(&p32[3]) * hash_rnd[3]));
  531. }
  532. static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
  533. --- a/net/sched/cls_u32.c
  534. +++ b/net/sched/cls_u32.c
  535. @@ -151,7 +151,7 @@ next_knode:
  536. data = skb_header_pointer(skb, toff, 4, &hdata);
  537. if (!data)
  538. goto out;
  539. - if ((*data ^ key->val) & key->mask) {
  540. + if ((net_hdr_word(data) ^ key->val) & key->mask) {
  541. n = rcu_dereference_bh(n->next);
  542. goto next_knode;
  543. }
  544. @@ -204,8 +204,8 @@ check_terminal:
  545. &hdata);
  546. if (!data)
  547. goto out;
  548. - sel = ht->divisor & u32_hash_fold(*data, &n->sel,
  549. - n->fshift);
  550. + sel = ht->divisor & u32_hash_fold(net_hdr_word(data),
  551. + &n->sel, n->fshift);
  552. }
  553. if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
  554. goto next_ht;
  555. --- a/net/ipv6/ip6_offload.c
  556. +++ b/net/ipv6/ip6_offload.c
  557. @@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive
  558. continue;
  559. iph2 = (struct ipv6hdr *)(p->data + off);
  560. - first_word = *(__be32 *)iph ^ *(__be32 *)iph2;
  561. + first_word = net_hdr_word(iph) ^ net_hdr_word(iph2);
  562. /* All fields must match except length and Traffic Class.
  563. * XXX skbs on the gro_list have all been parsed and pulled
  564. --- a/include/net/addrconf.h
  565. +++ b/include/net/addrconf.h
  566. @@ -43,7 +43,7 @@ struct prefix_info {
  567. __be32 reserved2;
  568. struct in6_addr prefix;
  569. -};
  570. +} __attribute__((packed, aligned(2)));
  571. #include <linux/netdevice.h>
  572. --- a/include/net/inet_ecn.h
  573. +++ b/include/net/inet_ecn.h
  574. @@ -124,9 +124,9 @@ static inline int IP6_ECN_set_ce(struct
  575. if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
  576. return 0;
  577. - from = *(__be32 *)iph;
  578. + from = net_hdr_word(iph);
  579. to = from | htonl(INET_ECN_CE << 20);
  580. - *(__be32 *)iph = to;
  581. + net_hdr_word(iph) = to;
  582. if (skb->ip_summed == CHECKSUM_COMPLETE)
  583. skb->csum = csum_add(csum_sub(skb->csum, from), to);
  584. return 1;
  585. @@ -134,7 +134,7 @@ static inline int IP6_ECN_set_ce(struct
  586. static inline void IP6_ECN_clear(struct ipv6hdr *iph)
  587. {
  588. - *(__be32*)iph &= ~htonl(INET_ECN_MASK << 20);
  589. + net_hdr_word(iph) &= ~htonl(INET_ECN_MASK << 20);
  590. }
  591. static inline void ipv6_copy_dscp(unsigned int dscp, struct ipv6hdr *inner)
  592. --- a/include/net/ipv6.h
  593. +++ b/include/net/ipv6.h
  594. @@ -107,7 +107,7 @@ struct frag_hdr {
  595. __u8 reserved;
  596. __be16 frag_off;
  597. __be32 identification;
  598. -};
  599. +} __attribute__((packed, aligned(2)));
  600. #define IP6_MF 0x0001
  601. #define IP6_OFFSET 0xFFF8
  602. @@ -415,8 +415,8 @@ static inline void __ipv6_addr_set_half(
  603. }
  604. #endif
  605. #endif
  606. - addr[0] = wh;
  607. - addr[1] = wl;
  608. + net_hdr_word(&addr[0]) = wh;
  609. + net_hdr_word(&addr[1]) = wl;
  610. }
  611. static inline void ipv6_addr_set(struct in6_addr *addr,
  612. @@ -475,6 +475,8 @@ static inline bool ipv6_prefix_equal(con
  613. const __be32 *a1 = addr1->s6_addr32;
  614. const __be32 *a2 = addr2->s6_addr32;
  615. unsigned int pdw, pbi;
  616. + /* Used for last <32-bit fraction of prefix */
  617. + u32 pbia1, pbia2;
  618. /* check complete u32 in prefix */
  619. pdw = prefixlen >> 5;
  620. @@ -483,7 +485,9 @@ static inline bool ipv6_prefix_equal(con
  621. /* check incomplete u32 in prefix */
  622. pbi = prefixlen & 0x1f;
  623. - if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
  624. + pbia1 = net_hdr_word(&a1[pdw]);
  625. + pbia2 = net_hdr_word(&a2[pdw]);
  626. + if (pbi && ((pbia1 ^ pbia2) & htonl((0xffffffff) << (32 - pbi))))
  627. return false;
  628. return true;
  629. @@ -627,13 +631,13 @@ static inline void ipv6_addr_set_v4mappe
  630. */
  631. static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
  632. {
  633. - const __be32 *a1 = token1, *a2 = token2;
  634. + const struct in6_addr *a1 = token1, *a2 = token2;
  635. int i;
  636. addrlen >>= 2;
  637. for (i = 0; i < addrlen; i++) {
  638. - __be32 xb = a1[i] ^ a2[i];
  639. + __be32 xb = a1->s6_addr32[i] ^ a2->s6_addr32[i];
  640. if (xb)
  641. return i * 32 + 31 - __fls(ntohl(xb));
  642. }
  643. @@ -759,17 +763,18 @@ static inline __be32 ip6_make_flowlabel(
  644. static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
  645. __be32 flowlabel)
  646. {
  647. - *(__be32 *)hdr = htonl(0x60000000 | (tclass << 20)) | flowlabel;
  648. + net_hdr_word((__be32 *)hdr) =
  649. + htonl(0x60000000 | (tclass << 20)) | flowlabel;
  650. }
  651. static inline __be32 ip6_flowinfo(const struct ipv6hdr *hdr)
  652. {
  653. - return *(__be32 *)hdr & IPV6_FLOWINFO_MASK;
  654. + return net_hdr_word((__be32 *)hdr) & IPV6_FLOWINFO_MASK;
  655. }
  656. static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)
  657. {
  658. - return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;
  659. + return net_hdr_word((__be32 *)hdr) & IPV6_FLOWLABEL_MASK;
  660. }
  661. static inline u8 ip6_tclass(__be32 flowinfo)
  662. --- a/include/net/secure_seq.h
  663. +++ b/include/net/secure_seq.h
  664. @@ -2,6 +2,7 @@
  665. #define _NET_SECURE_SEQ
  666. #include <linux/types.h>
  667. +#include <linux/in6.h>
  668. u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
  669. u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
  670. --- a/include/uapi/linux/in.h
  671. +++ b/include/uapi/linux/in.h
  672. @@ -81,7 +81,7 @@ enum {
  673. /* Internet address. */
  674. struct in_addr {
  675. __be32 s_addr;
  676. -};
  677. +} __attribute__((packed, aligned(2)));
  678. #endif
  679. #define IP_TOS 1
  680. --- a/net/core/secure_seq.c
  681. +++ b/net/core/secure_seq.c
  682. @@ -46,11 +46,12 @@ __u32 secure_tcpv6_sequence_number(const
  683. u32 secret[MD5_MESSAGE_BYTES / 4];
  684. u32 hash[MD5_DIGEST_WORDS];
  685. u32 i;
  686. + const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
  687. net_secret_init();
  688. memcpy(hash, saddr, 16);
  689. for (i = 0; i < 4; i++)
  690. - secret[i] = net_secret[i] + (__force u32)daddr[i];
  691. + secret[i] = net_secret[i] + (__force u32)daddr6->s6_addr32[i];
  692. secret[4] = net_secret[4] +
  693. (((__force u16)sport << 16) + (__force u16)dport);
  694. for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
  695. @@ -68,11 +69,12 @@ u32 secure_ipv6_port_ephemeral(const __b
  696. u32 secret[MD5_MESSAGE_BYTES / 4];
  697. u32 hash[MD5_DIGEST_WORDS];
  698. u32 i;
  699. + const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
  700. net_secret_init();
  701. memcpy(hash, saddr, 16);
  702. for (i = 0; i < 4; i++)
  703. - secret[i] = net_secret[i] + (__force u32) daddr[i];
  704. + secret[i] = net_secret[i] + (__force u32) daddr6->s6_addr32[i];
  705. secret[4] = net_secret[4] + (__force u32)dport;
  706. for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
  707. secret[i] = net_secret[i];
  708. @@ -150,11 +152,12 @@ u64 secure_dccpv6_sequence_number(__be32
  709. u32 hash[MD5_DIGEST_WORDS];
  710. u64 seq;
  711. u32 i;
  712. + const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
  713. net_secret_init();
  714. memcpy(hash, saddr, 16);
  715. for (i = 0; i < 4; i++)
  716. - secret[i] = net_secret[i] + daddr[i];
  717. + secret[i] = net_secret[i] + daddr6->s6_addr32[i];
  718. secret[4] = net_secret[4] +
  719. (((__force u16)sport << 16) + (__force u16)dport);
  720. for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
  721. --- a/net/ipv6/ip6_fib.c
  722. +++ b/net/ipv6/ip6_fib.c
  723. @@ -137,7 +137,7 @@ static __be32 addr_bit_set(const void *t
  724. * See include/asm-generic/bitops/le.h.
  725. */
  726. return (__force __be32)(1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)) &
  727. - addr[fn_bit >> 5];
  728. + net_hdr_word(&addr[fn_bit >> 5]);
  729. }
  730. static struct fib6_node *node_alloc(void)
  731. --- a/net/netfilter/nf_conntrack_proto_tcp.c
  732. +++ b/net/netfilter/nf_conntrack_proto_tcp.c
  733. @@ -456,7 +456,7 @@ static void tcp_sack(const struct sk_buf
  734. /* Fast path for timestamp-only option */
  735. if (length == TCPOLEN_TSTAMP_ALIGNED
  736. - && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
  737. + && net_hdr_word(ptr) == htonl((TCPOPT_NOP << 24)
  738. | (TCPOPT_NOP << 16)
  739. | (TCPOPT_TIMESTAMP << 8)
  740. | TCPOLEN_TIMESTAMP))
  741. --- a/net/xfrm/xfrm_input.c
  742. +++ b/net/xfrm/xfrm_input.c
  743. @@ -154,8 +154,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
  744. if (!pskb_may_pull(skb, hlen))
  745. return -EINVAL;
  746. - *spi = *(__be32 *)(skb_transport_header(skb) + offset);
  747. - *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
  748. + *spi = net_hdr_word(skb_transport_header(skb) + offset);
  749. + *seq = net_hdr_word(skb_transport_header(skb) + offset_seq);
  750. return 0;
  751. }
  752. --- a/net/ipv4/tcp_input.c
  753. +++ b/net/ipv4/tcp_input.c
  754. @@ -3760,14 +3760,16 @@ static bool tcp_parse_aligned_timestamp(
  755. {
  756. const __be32 *ptr = (const __be32 *)(th + 1);
  757. - if (*ptr == htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
  758. - | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
  759. + if (net_hdr_word(ptr) ==
  760. + htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
  761. + (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
  762. tp->rx_opt.saw_tstamp = 1;
  763. ++ptr;
  764. - tp->rx_opt.rcv_tsval = ntohl(*ptr);
  765. + tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr);
  766. ++ptr;
  767. - if (*ptr)
  768. - tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset;
  769. + if (net_hdr_word(ptr))
  770. + tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) -
  771. + tp->tsoffset;
  772. else
  773. tp->rx_opt.rcv_tsecr = 0;
  774. return true;
  775. --- a/include/uapi/linux/if_pppox.h
  776. +++ b/include/uapi/linux/if_pppox.h
  777. @@ -47,6 +47,7 @@ struct pppoe_addr {
  778. */
  779. struct pptp_addr {
  780. __u16 call_id;
  781. + __u16 pad;
  782. struct in_addr sin_addr;
  783. };
  784. --- a/net/ipv6/netfilter/nf_log_ipv6.c
  785. +++ b/net/ipv6/netfilter/nf_log_ipv6.c
  786. @@ -66,9 +66,9 @@ static void dump_ipv6_packet(struct nf_l
  787. /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
  788. nf_log_buf_add(m, "LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
  789. ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
  790. - (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
  791. + (ntohl(net_hdr_word(ih)) & 0x0ff00000) >> 20,
  792. ih->hop_limit,
  793. - (ntohl(*(__be32 *)ih) & 0x000fffff));
  794. + (ntohl(net_hdr_word(ih)) & 0x000fffff));
  795. fragment = 0;
  796. ptr = ip6hoff + sizeof(struct ipv6hdr);
  797. --- a/include/net/neighbour.h
  798. +++ b/include/net/neighbour.h
  799. @@ -262,8 +262,10 @@ static inline bool neigh_key_eq128(const
  800. const u32 *n32 = (const u32 *)n->primary_key;
  801. const u32 *p32 = pkey;
  802. - return ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
  803. - (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0;
  804. + return ((n32[0] ^ net_hdr_word(&p32[0])) |
  805. + (n32[1] ^ net_hdr_word(&p32[1])) |
  806. + (n32[2] ^ net_hdr_word(&p32[2])) |
  807. + (n32[3] ^ net_hdr_word(&p32[3]))) == 0;
  808. }
  809. static inline struct neighbour *___neigh_lookup_noref(
  810. --- a/include/uapi/linux/netfilter_arp/arp_tables.h
  811. +++ b/include/uapi/linux/netfilter_arp/arp_tables.h
  812. @@ -68,7 +68,7 @@ struct arpt_arp {
  813. __u8 flags;
  814. /* Inverse flags */
  815. __u16 invflags;
  816. -};
  817. +} __attribute__((aligned(4)));
  818. /* Values for "flag" field in struct arpt_ip (general arp structure).
  819. * No flags defined yet.