Page MenuHomeFreeBSD
Differential D2285

gcc 4.9.1 compilation fixes for aesni
ClosedPublic
Actions

Authored by • rodrigc on Apr 12 2015, 9:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 7:11 AM
Unknown Object (File)
Mon, Apr 14, 6:19 AM
Unknown Object (File)
Mon, Apr 14, 6:02 AM
Unknown Object (File)
Mon, Apr 14, 5:50 AM
Unknown Object (File)
Mon, Apr 14, 5:47 AM
Unknown Object (File)
Mon, Apr 14, 5:46 AM
Unknown Object (File)
Sun, Apr 13, 2:42 PM
Unknown Object (File)
Thu, Apr 10, 3:48 PM
View All Files
Subscribers
dim
emaste
freebsd-toolchain-list
kib

Details

Reviewers
jmg
Commits
rS281606: In the version of gcc in the FreeBSD tree, this modification was made to
Summary

In the version of gcc in the FreeBSD tree, this modification was made to
the compiler:
https://svnweb.freebsd.org/base?view=revision&revision=r242182

#if STDC_HOSTED
#include <mm_malloc.h>
#endif

A similar change was done to clang in the FreeBSD tree:
https://svnweb.freebsd.org/base?view=revision&revision=r218893

However, for external gcc toolchains, this patch is not in the compiler's header
file.

This patch to FreeBSD's aesni code allows compilation with an external
gcc toolchain

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

• rodrigc updated this revision to Diff 4798.Apr 12 2015, 9:42 PM
• rodrigc retitled this revision from to gcc 4.9.1 compilation fixes for aesni.
• rodrigc updated this object.
• rodrigc edited the test plan for this revision. (Show Details)
• rodrigc added a reviewer: jmg.
• rodrigc added a subscriber: Unknown Object (MLST).
jmg edited edge metadata.Apr 13 2015, 4:18 PM

hmm.. maybe we should put this hack into a different header file and just include that one… since all these files are in crypto/aesni, why not a local header (use quotes) that is named gnuhack.h or something (can't think of a good name right now)?

Right now it's only three files, but I have work that may expand the number of files that this hack is required to be added too, and if we need to add hacks for other compilers, or if gnu changes how things are, then we can update the hacks in one location, instead of n locations.

dim added a subscriber: dim.Apr 13 2015, 7:35 PM
dim added inline comments.
sys/crypto/aesni/aesni_wrap.c
49

This part seems to be superfluous, since "aesencdec.h", just two files above this one, already defines _MM_MALLOC_INCLUDED.

emaste added a subscriber: emaste.Apr 14 2015, 1:05 PM
• rodrigc updated this revision to Diff 4825.EditedApr 14 2015, 5:19 PM
• rodrigc edited edge metadata.

OK, here's an updated diff where things are separated out into a different header file.

kib added a subscriber: kib.Apr 14 2015, 5:33 PM
kib added inline comments.
sys/crypto/aesni/aesencdec.h
30

Why this line uses "" ?

jmg added a comment.Apr 15 2015, 7:07 AM

we should either include both w/ quotes or both w/ angle braces… I personally would prefer quotes, but that's me, but I won't object to angle braces.

sys/crypto/aesni/aesencdec.h
30

so it looks like the same directory as the file instead of having to specify a full path.. similar to how this header is included in aesni_wrap.c...

• rodrigc updated this revision to Diff 4840.Apr 15 2015, 5:02 PM

Change to <>

dim added a comment.Apr 15 2015, 5:55 PM

LGTM.

• rodrigc closed this revision.Apr 16 2015, 5:43 PM
• rodrigc updated this revision to Diff 4852.

Closed by commit rS281606 (authored by @rodrigc).

Revision Contents
Changeset List

PathSize
sys/
crypto/
aesni/
5 lines
5 lines
6 lines

Diff 4798

View Options

sys/crypto/aesni/aesencdec.h

Show First 20 Lines • Show All 249 Lines • ▼ Show 20 Linesenum tcp_log_events {
BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining -- now not used 49 */ BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining -- now not used 49 */
TCP_LOG_REASS, /* Reassembly buffer logging 50 */ TCP_LOG_REASS, /* Reassembly buffer logging 50 */
TCP_HDWR_PACE_SIZE, /* TCP pacing size set (rl and rack uses this) 51 */ TCP_HDWR_PACE_SIZE, /* TCP pacing size set (rl and rack uses this) 51 */
BBR_LOG_HDWR_PACE, /* TCP Hardware pacing log 52 */ BBR_LOG_HDWR_PACE, /* TCP Hardware pacing log 52 */
BBR_LOG_TSTMP_VAL, /* Temp debug timestamp validation 53 */ BBR_LOG_TSTMP_VAL, /* Temp debug timestamp validation 53 */
TCP_LOG_CONNEND, /* End of connection 54 */ TCP_LOG_CONNEND, /* End of connection 54 */
TCP_LOG_LRO, /* LRO entry 55 */ TCP_LOG_LRO, /* LRO entry 55 */
TCP_SACK_FILTER_RES, /* Results of SACK Filter 56 */ TCP_SACK_FILTER_RES, /* Results of SACK Filter 56 */
TCP_SAD_DETECTION, /* Sack Attack Detection 57 */ TCP_SAD_DETECT, /* Sack Attack Detection 57 */
ccUnsubmitted
Done
Inline Actions

Please adjust the alignment of the comment.

cc: Please adjust the alignment of the comment.
TCP_TIMELY_WORK, /* Logs regarding Timely CC tweaks 58 */ TCP_TIMELY_WORK, /* Logs regarding Timely CC tweaks 58 */
TCP_LOG_USER_EVENT, /* User space event data 59 */ TCP_LOG_USER_EVENT, /* User space event data 59 */
TCP_LOG_SENDFILE, /* sendfile() logging for TCP connections 60 */ TCP_LOG_SENDFILE, /* sendfile() logging for TCP connections 60 */
TCP_LOG_HTTP_T, /* logging of http request tracking 61 */ TCP_LOG_HTTP_T, /* logging of http request tracking 61 */
TCP_LOG_ACCOUNTING, /* Log of TCP Accounting data 62 */ TCP_LOG_ACCOUNTING, /* Log of TCP Accounting data 62 */
TCP_LOG_FSB, /* FSB information 63 */ TCP_LOG_FSB, /* FSB information 63 */
RACK_DSACK_HANDLING, /* Handling of DSACK in rack for reordering window 64 */ RACK_DSACK_HANDLING, /* Handling of DSACK in rack for reordering window 64 */
TCP_HYSTART, /* TCP Hystart logging 65 */ TCP_HYSTART, /* TCP Hystart logging 65 */
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines
View Options

sys/crypto/aesni/aesni_ghash.c

Show First 20 Lines • Show All 249 Lines • ▼ Show 20 Linesenum tcp_log_events {
BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining -- now not used 49 */ BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining -- now not used 49 */
TCP_LOG_REASS, /* Reassembly buffer logging 50 */ TCP_LOG_REASS, /* Reassembly buffer logging 50 */
TCP_HDWR_PACE_SIZE, /* TCP pacing size set (rl and rack uses this) 51 */ TCP_HDWR_PACE_SIZE, /* TCP pacing size set (rl and rack uses this) 51 */
BBR_LOG_HDWR_PACE, /* TCP Hardware pacing log 52 */ BBR_LOG_HDWR_PACE, /* TCP Hardware pacing log 52 */
BBR_LOG_TSTMP_VAL, /* Temp debug timestamp validation 53 */ BBR_LOG_TSTMP_VAL, /* Temp debug timestamp validation 53 */
TCP_LOG_CONNEND, /* End of connection 54 */ TCP_LOG_CONNEND, /* End of connection 54 */
TCP_LOG_LRO, /* LRO entry 55 */ TCP_LOG_LRO, /* LRO entry 55 */
TCP_SACK_FILTER_RES, /* Results of SACK Filter 56 */ TCP_SACK_FILTER_RES, /* Results of SACK Filter 56 */
TCP_SAD_DETECTION, /* Sack Attack Detection 57 */ TCP_SAD_DETECT, /* Sack Attack Detection 57 */
ccUnsubmitted
Done
Inline Actions

Please adjust the alignment of the comment.

cc: Please adjust the alignment of the comment.
TCP_TIMELY_WORK, /* Logs regarding Timely CC tweaks 58 */ TCP_TIMELY_WORK, /* Logs regarding Timely CC tweaks 58 */
TCP_LOG_USER_EVENT, /* User space event data 59 */ TCP_LOG_USER_EVENT, /* User space event data 59 */
TCP_LOG_SENDFILE, /* sendfile() logging for TCP connections 60 */ TCP_LOG_SENDFILE, /* sendfile() logging for TCP connections 60 */
TCP_LOG_HTTP_T, /* logging of http request tracking 61 */ TCP_LOG_HTTP_T, /* logging of http request tracking 61 */
TCP_LOG_ACCOUNTING, /* Log of TCP Accounting data 62 */ TCP_LOG_ACCOUNTING, /* Log of TCP Accounting data 62 */
TCP_LOG_FSB, /* FSB information 63 */ TCP_LOG_FSB, /* FSB information 63 */
RACK_DSACK_HANDLING, /* Handling of DSACK in rack for reordering window 64 */ RACK_DSACK_HANDLING, /* Handling of DSACK in rack for reordering window 64 */
TCP_HYSTART, /* TCP Hystart logging 65 */ TCP_HYSTART, /* TCP Hystart logging 65 */
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines
View Options

sys/crypto/aesni/aesni_wrap.c

Show First 20 Lines • Show All 249 Lines • ▼ Show 20 Linesenum tcp_log_events {
BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining -- now not used 49 */ BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining -- now not used 49 */
TCP_LOG_REASS, /* Reassembly buffer logging 50 */ TCP_LOG_REASS, /* Reassembly buffer logging 50 */
TCP_HDWR_PACE_SIZE, /* TCP pacing size set (rl and rack uses this) 51 */ TCP_HDWR_PACE_SIZE, /* TCP pacing size set (rl and rack uses this) 51 */
BBR_LOG_HDWR_PACE, /* TCP Hardware pacing log 52 */ BBR_LOG_HDWR_PACE, /* TCP Hardware pacing log 52 */
BBR_LOG_TSTMP_VAL, /* Temp debug timestamp validation 53 */ BBR_LOG_TSTMP_VAL, /* Temp debug timestamp validation 53 */
TCP_LOG_CONNEND, /* End of connection 54 */ TCP_LOG_CONNEND, /* End of connection 54 */
TCP_LOG_LRO, /* LRO entry 55 */ TCP_LOG_LRO, /* LRO entry 55 */
TCP_SACK_FILTER_RES, /* Results of SACK Filter 56 */ TCP_SACK_FILTER_RES, /* Results of SACK Filter 56 */
TCP_SAD_DETECTION, /* Sack Attack Detection 57 */ TCP_SAD_DETECT, /* Sack Attack Detection 57 */
ccUnsubmitted
Done
Inline Actions

Please adjust the alignment of the comment.

cc: Please adjust the alignment of the comment.
TCP_TIMELY_WORK, /* Logs regarding Timely CC tweaks 58 */ TCP_TIMELY_WORK, /* Logs regarding Timely CC tweaks 58 */
TCP_LOG_USER_EVENT, /* User space event data 59 */ TCP_LOG_USER_EVENT, /* User space event data 59 */
TCP_LOG_SENDFILE, /* sendfile() logging for TCP connections 60 */ TCP_LOG_SENDFILE, /* sendfile() logging for TCP connections 60 */
TCP_LOG_HTTP_T, /* logging of http request tracking 61 */ TCP_LOG_HTTP_T, /* logging of http request tracking 61 */
TCP_LOG_ACCOUNTING, /* Log of TCP Accounting data 62 */ TCP_LOG_ACCOUNTING, /* Log of TCP Accounting data 62 */
TCP_LOG_FSB, /* FSB information 63 */ TCP_LOG_FSB, /* FSB information 63 */
RACK_DSACK_HANDLING, /* Handling of DSACK in rack for reordering window 64 */ RACK_DSACK_HANDLING, /* Handling of DSACK in rack for reordering window 64 */
TCP_HYSTART, /* TCP Hystart logging 65 */ TCP_HYSTART, /* TCP Hystart logging 65 */
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines