From owner-svn-src-all@freebsd.org Wed Apr 22 20:43:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDD792C0EF9; Wed, 22 Apr 2020 20:43:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 496spG54l9z3JHs; Wed, 22 Apr 2020 20:43:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 906D420C24; Wed, 22 Apr 2020 20:43:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03MKhIhu044170; Wed, 22 Apr 2020 20:43:18 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03MKhIvs044169; Wed, 22 Apr 2020 20:43:18 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202004222043.03MKhIvs044169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 22 Apr 2020 20:43:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360203 - head/tests/sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/tests/sys/opencrypto X-SVN-Commit-Revision: 360203 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2020 20:43:18 -0000 Author: jhb Date: Wed Apr 22 20:43:18 2020 New Revision: 360203 URL: https://svnweb.freebsd.org/changeset/base/360203 Log: Update blake2 accelerated software tests to work after OCF refactoring. - Lookup device drivers to test by name instead of assuming that the software / hardware flags will select specific drivers. - Set the sysctl to permit software /dev/crypto requests when testing the accelerated software blake2 driver. PR: 245825 Reported by: lwhsu Reviewed by: cem, lwhsu Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24540 Modified: head/tests/sys/opencrypto/blake2_test.c Modified: head/tests/sys/opencrypto/blake2_test.c ============================================================================== --- head/tests/sys/opencrypto/blake2_test.c Wed Apr 22 19:44:33 2020 (r360202) +++ head/tests/sys/opencrypto/blake2_test.c Wed Apr 22 20:43:18 2020 (r360203) @@ -75,6 +75,17 @@ initialize_constant_buffers(void) } static int +lookup_crid(int fd, const char *devname) +{ + struct crypt_find_op find; + + find.crid = -1; + strlcpy(find.name, devname, sizeof(find.name)); + ATF_REQUIRE(ioctl(fd, CIOCFINDDEV, &find) != -1); + return (find.crid); +} + +static int get_handle_fd(void) { int dc_fd, fd; @@ -124,10 +135,10 @@ do_cryptop(int fd, int ses, size_t inlen, void *out) } static void -test_blake2b_vectors(int crid, const char *modname) +test_blake2b_vectors(const char *devname, const char *modname) { uint8_t hash[BLAKE2B_OUTBYTES]; - int fd, ses; + int crid, fd, ses; size_t i; ATF_REQUIRE_KERNEL_MODULE(modname); @@ -135,6 +146,7 @@ test_blake2b_vectors(int crid, const char *modname) initialize_constant_buffers(); fd = get_handle_fd(); + crid = lookup_crid(fd, devname); ses = create_session(fd, CRYPTO_BLAKE2B, crid, key2b, sizeof(key2b)); for (i = 0; i < sizeof(katbuf); i++) { @@ -147,10 +159,10 @@ test_blake2b_vectors(int crid, const char *modname) } static void -test_blake2s_vectors(int crid, const char *modname) +test_blake2s_vectors(const char *devname, const char *modname) { uint8_t hash[BLAKE2S_OUTBYTES]; - int fd, ses; + int crid, fd, ses; size_t i; ATF_REQUIRE_KERNEL_MODULE(modname); @@ -158,6 +170,7 @@ test_blake2s_vectors(int crid, const char *modname) initialize_constant_buffers(); fd = get_handle_fd(); + crid = lookup_crid(fd, devname); ses = create_session(fd, CRYPTO_BLAKE2S, crid, key2s, sizeof(key2s)); for (i = 0; i < sizeof(katbuf); i++) { @@ -173,33 +186,29 @@ ATF_TC_WITHOUT_HEAD(blake2b_vectors); ATF_TC_BODY(blake2b_vectors, tc) { ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); - test_blake2b_vectors(CRYPTO_FLAG_SOFTWARE, "nexus/cryptosoft"); + test_blake2b_vectors("cryptosoft0", "nexus/cryptosoft"); } ATF_TC_WITHOUT_HEAD(blake2s_vectors); ATF_TC_BODY(blake2s_vectors, tc) { ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); - test_blake2s_vectors(CRYPTO_FLAG_SOFTWARE, "nexus/cryptosoft"); + test_blake2s_vectors("cryptosoft0", "nexus/cryptosoft"); } #if defined(__i386__) || defined(__amd64__) ATF_TC_WITHOUT_HEAD(blake2b_vectors_x86); ATF_TC_BODY(blake2b_vectors_x86, tc) { - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_skip("https://bugs.freebsd.org/245825"); - - test_blake2b_vectors(CRYPTO_FLAG_HARDWARE, "nexus/blake2"); + ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + test_blake2b_vectors("blaketwo0", "nexus/blake2"); } ATF_TC_WITHOUT_HEAD(blake2s_vectors_x86); ATF_TC_BODY(blake2s_vectors_x86, tc) { - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_skip("https://bugs.freebsd.org/245825"); - - test_blake2s_vectors(CRYPTO_FLAG_HARDWARE, "nexus/blake2"); + ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + test_blake2s_vectors("blaketwo0", "nexus/blake2"); } #endif