svn commit: r350837 - head/tests/sys/opencrypto
Enji Cooper
ngie at FreeBSD.org
Sat Aug 10 15:53:43 UTC 2019
Author: ngie
Date: Sat Aug 10 15:53:42 2019
New Revision: 350837
URL: https://svnweb.freebsd.org/changeset/base/350837
Log:
tests/sys/opencrypto: enable armv8crypto on aarch64
This change makes required modifications in runtests to also only require the
aesni module on Intel (i386/amd64) platforms, as it is an Intel specific
module.
MFC after: 1 month
MFC to: ^/stable/12 (support not present on ^/stable/11)
Submitted by: Greg V <greg at unrelenting.technology>
Differential Revision: https://reviews.freebsd.org/D21018
Modified:
head/tests/sys/opencrypto/cryptotest.py
head/tests/sys/opencrypto/runtests.sh
Modified: head/tests/sys/opencrypto/cryptotest.py
==============================================================================
--- head/tests/sys/opencrypto/cryptotest.py Sat Aug 10 13:50:15 2019 (r350836)
+++ head/tests/sys/opencrypto/cryptotest.py Sat Aug 10 15:53:42 2019 (r350837)
@@ -50,9 +50,9 @@ def katg(base, glob):
raise unittest.SkipTest("Missing %s test vectors" % (base))
return iglob(os.path.join(katdir, base, glob))
-aesmodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
+aesmodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
desmodules = [ 'cryptosoft0', ]
-shamodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
+shamodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
def GenTestCase(cname):
try:
@@ -500,6 +500,7 @@ def GenTestCase(cname):
cryptosoft = GenTestCase('cryptosoft0')
aesni = GenTestCase('aesni0')
+armv8crypto = GenTestCase('armv8crypto0')
ccr = GenTestCase('ccr0')
ccp = GenTestCase('ccp0')
Modified: head/tests/sys/opencrypto/runtests.sh
==============================================================================
--- head/tests/sys/opencrypto/runtests.sh Sat Aug 10 13:50:15 2019 (r350836)
+++ head/tests/sys/opencrypto/runtests.sh Sat Aug 10 15:53:42 2019 (r350837)
@@ -60,7 +60,19 @@ cleanup_tests()
}
trap cleanup_tests EXIT INT TERM
-for required_module in nexus/aesni cryptodev; do
+cpu_type="$(uname -p)"
+cpu_module=
+
+case ${cpu_type} in
+aarch64)
+ cpu_module=nexus/armv8crypto
+ ;;
+amd64|i386)
+ cpu_module=nexus/aesni
+ ;;
+esac
+
+for required_module in $cpu_module cryptodev; do
if ! kldstat -q -m $required_module; then
module_to_load=${required_module#nexus/}
if ! kldload ${module_to_load}; then
More information about the svn-src-all
mailing list