aesni: Ensure that key schedules are aligned
ClosedPublic
Actions

Authored by markj on Jan 14 2021, 4:35 PM.

Details

Reviewers

jmg
jhb
kib

Commits

rG098c902b5202: aesni: Ensure that key schedules are aligned

Summary

Right now it is happening by accident, since the aesni session softc is
allocated using malloc() and happens to return suitably aligned memory.
Stop relying on this.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Jan 14 2021, 4:35 PM

Herald added a reviewer: jmg. · View Herald TranscriptJan 14 2021, 4:35 PM

Herald added a subscriber: imp. · View Herald Transcript

markj requested review of this revision.Jan 14 2021, 4:35 PM

Harbormaster completed remote builds in B36200: Diff 82268.Jan 14 2021, 4:35 PM

markj added reviewers: jhb, kib.Jan 14 2021, 4:35 PM

markj added a child revision: D28158: opencrypto: Embed the driver softc in the session structure.Jan 14 2021, 4:35 PM

kib accepted this revision.Jan 14 2021, 10:20 PM

This revision is now accepted and ready to land.Jan 14 2021, 10:20 PM

Closed by commit rG098c902b5202: aesni: Ensure that key schedules are aligned (authored by markj). · Explain WhyJan 18 2021, 10:08 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rG098c902b5202: aesni: Ensure that key schedules are aligned.

Revision Contents
Changeset List

Path

Size

sys/

crypto/

aesni/

aesni.h

8 lines

aesni.c

7 lines

Diff 82510

View Options

sys/crypto/aesni/aesni.h

	Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
	PLIST_SUB+= ARCH="${KMK_ARCH}"			PLIST_SUB+= ARCH="${KMK_ARCH}"

	KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}			KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
	KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys			KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
	KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}			KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}

	.include <bsd.port.pre.mk>			.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD			.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
	.if ${OSVERSION} >= 1400059			(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
	BROKEN= Fails to compile with libc++ 14.0.3			# llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
	.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000			# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
	BROKEN= Fails to compile: error: ran out of registers during register allocation			# and 14 where the llvm 15 is included: PR#265539.
	.endif			# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
	.endif

	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
	# clang > 11 included in FreeBSD 14 fails to compile this legacy version
	# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
	# included.
	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}			BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
	CC= clang${VBOX_LLVM_VER}			CC= clang${VBOX_LLVM_VER}
	CXX= clang++${VBOX_LLVM_VER}			CXX= clang++${VBOX_LLVM_VER}
	VBOX_LLVM_VER?= 11			VBOX_LLVM_VER?= 15
	.endif			.endif

	.if ${PYTHON_MAJOR_VER} >= 3			.if ${PYTHON_MAJOR_VER} >= 3
	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \			PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc			PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
	.else			.else
	PLIST_SUB+= PYTHON_PYCDIR=/ \			PLIST_SUB+= PYTHON_PYCDIR=/ \
	PYTHON_PYCEXT=.pyc			PYTHON_PYCEXT=.pyc
	▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines