From owner-svn-src-user@freebsd.org Mon Sep 2 07:52:40 2019 Return-Path: Delivered-To: svn-src-user@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 81DD4D4B56 for ; Mon, 2 Sep 2019 07:52:40 +0000 (UTC) (envelope-from pho@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 46MMkc2nvpz4Nf9; Mon, 2 Sep 2019 07:52:40 +0000 (UTC) (envelope-from pho@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 442D4EF3B; Mon, 2 Sep 2019 07:52:40 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x827qeWm061595; Mon, 2 Sep 2019 07:52:40 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x827qeJL061594; Mon, 2 Sep 2019 07:52:40 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909020752.x827qeJL061594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Sep 2019 07:52:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351684 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351684 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 07:52:40 -0000 Author: pho Date: Mon Sep 2 07:52:39 2019 New Revision: 351684 URL: https://svnweb.freebsd.org/changeset/base/351684 Log: Added "Fixed by". Pointed out problem with an uninitialized "flags" variable. Style fixes. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/sctp.sh Modified: user/pho/stress2/misc/sctp.sh ============================================================================== --- user/pho/stress2/misc/sctp.sh Mon Sep 2 02:51:51 2019 (r351683) +++ user/pho/stress2/misc/sctp.sh Mon Sep 2 07:52:39 2019 (r351684) @@ -5,6 +5,7 @@ # "panic: general protection fault" seen: # https://people.freebsd.org/~pho/stress/log/sctp.txt +# Fixed by r350626 # $FreeBSD$ @@ -25,91 +26,92 @@ static int my_port_num; static void die(const char *s) { - perror(s); - exit(1); + perror(s); + exit(1); } -static void + static void server(void) { - struct sctp_sndrcvinfo sndrcvinfo; - struct sockaddr_in servaddr = { - .sin_family = AF_INET, - .sin_addr.s_addr = htonl(INADDR_ANY), - .sin_port = htons(my_port_num), - }; - struct sctp_initmsg initmsg = { - .sinit_num_ostreams = 5, - .sinit_max_instreams = 5, - .sinit_max_attempts = 4, - }; - int listen_fd, conn_fd, flags, ret, in; + struct sctp_sndrcvinfo sndrcvinfo; + struct sockaddr_in servaddr = { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_ANY), + .sin_port = htons(my_port_num), + }; + struct sctp_initmsg initmsg = { + .sinit_num_ostreams = 5, + .sinit_max_instreams = 5, + .sinit_max_attempts = 4, + }; + int listen_fd, conn_fd, flags, ret, in; - listen_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); - if (listen_fd < 0) - die("socket"); + listen_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (listen_fd < 0) + die("socket"); - ret = bind(listen_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); - if (ret < 0) - die("bind"); + ret = bind(listen_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); + if (ret < 0) + die("bind"); - ret = setsockopt(listen_fd, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, - sizeof(initmsg)); - if (ret < 0) - die("setsockopt"); + ret = setsockopt(listen_fd, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, + sizeof(initmsg)); + if (ret < 0) + die("setsockopt"); - ret = listen(listen_fd, initmsg.sinit_max_instreams); - if (ret < 0) - die("listen"); + ret = listen(listen_fd, initmsg.sinit_max_instreams); + if (ret < 0) + die("listen"); - for (;;) { - char buffer[1024]; + for (;;) { + char buffer[1024]; - printf("Waiting for connection\n"); - fflush(stdout); + printf("Waiting for connection\n"); + fflush(stdout); - conn_fd = accept(listen_fd, (struct sockaddr *) NULL, NULL); - if(conn_fd < 0) - die("accept()"); + conn_fd = accept(listen_fd, (struct sockaddr *) NULL, NULL); + if(conn_fd < 0) + die("accept()"); - printf("New client connected\n"); - fflush(stdout); + printf("New client connected\n"); + fflush(stdout); - in = sctp_recvmsg(conn_fd, buffer, sizeof(buffer), NULL, 0, - &sndrcvinfo, &flags); - if (in > 0) { - printf("Received data: %s\n", buffer); - fflush(stdout); - } + /* Note that flags is uninitialized here */ + in = sctp_recvmsg(conn_fd, buffer, sizeof(buffer), NULL, 0, + &sndrcvinfo, &flags); + if (in > 0) { + printf("Received data: %s\n", buffer); + fflush(stdout); + } - close(conn_fd); - } + close(conn_fd); + } } static void client(void) { - struct sockaddr_in servaddr = { - .sin_family = AF_INET, - .sin_port = htons(my_port_num), - .sin_addr.s_addr = inet_addr("127.0.0.1"), - }; - int conn_fd, ret; - const char *msg = "Hello, Server!"; + struct sockaddr_in servaddr = { + .sin_family = AF_INET, + .sin_port = htons(my_port_num), + .sin_addr.s_addr = inet_addr("127.0.0.1"), + }; + int conn_fd, ret; + const char *msg = "Hello, Server!"; - conn_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); - if (conn_fd < 0) - die("socket()"); + conn_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (conn_fd < 0) + die("socket()"); - ret = connect(conn_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); - if (ret < 0) - die("connect()"); + ret = connect(conn_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); + if (ret < 0) + die("connect()"); - ret = sctp_sendmsg(conn_fd, (void *) msg, strlen(msg) + 1, NULL, 0, 0, 0, 0, 0, 0 ); - if (ret < 0) - die("sctp_sendmsg"); + ret = sctp_sendmsg(conn_fd, (void *) msg, strlen(msg) + 1, NULL, 0, 0, 0, 0, 0, 0 ); + if (ret < 0) + die("sctp_sendmsg"); - close(conn_fd); + close(conn_fd); } int @@ -117,12 +119,12 @@ main(int argc __unused, char *argv[]) { my_port_num = atoi(argv[1]); - if (strstr(basename(argv[0]), "server")) - server(); - else - client(); + if (strstr(basename(argv[0]), "server")) + server(); + else + client(); - return 0; + return (0); } EOF @@ -153,5 +155,5 @@ pkill server wait while pkill swap; do :; done wait -rm -f /tmp/server /tmp/client +rm -f /tmp/sctp.c /tmp/server /tmp/client exit 0 From owner-svn-src-user@freebsd.org Mon Sep 2 07:54:03 2019 Return-Path: Delivered-To: svn-src-user@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 14F7FD4B98 for ; Mon, 2 Sep 2019 07:54:03 +0000 (UTC) (envelope-from pho@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 46MMmB6pFqz4Nl8; Mon, 2 Sep 2019 07:54:02 +0000 (UTC) (envelope-from pho@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 CD7BDEF3D; Mon, 2 Sep 2019 07:54:02 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x827s2JZ061706; Mon, 2 Sep 2019 07:54:02 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x827s2jU061704; Mon, 2 Sep 2019 07:54:02 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909020754.x827s2jU061704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Sep 2019 07:54:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351685 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351685 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 07:54:03 -0000 Author: pho Date: Mon Sep 2 07:54:02 2019 New Revision: 351685 URL: https://svnweb.freebsd.org/changeset/base/351685 Log: Added two more SCTP test case variations. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/sctp2.sh (contents, props changed) user/pho/stress2/misc/sctp3.sh (contents, props changed) Added: user/pho/stress2/misc/sctp2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sctp2.sh Mon Sep 2 07:54:02 2019 (r351685) @@ -0,0 +1,167 @@ +#!/bin/sh + +# Based on https://gist.github.com/zonque/7d03568eab14a2bb57cb by +# Daniel Mack github@zonque.org + +# Modified version of sctp.sh by Michael Tuexen : +# * Use loopback as the address of the server on both side initialized using +# htonl(INADDR_LOOPBACK). +# * Negotiate only 1 stream in both directions since only one stream is used. +# * Don't use initmsg.sinit_max_instreams as an argument in listen(), which +# does not make sense. +# Use an arbitrary positive integer, 5 in this case. +# * Initialize flags before calling sctp_recvmsg(). + +# "panic: Don't own TCB lock" seen: +# https://people.freebsd.org/~pho/stress/log/sctp2.txt + +# $FreeBSD$ + +cat > /tmp/sctp2.c < +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int my_port_num; + +static void +die(const char *s) +{ + perror(s); + exit(1); +} + +static void +server(void) +{ + struct sctp_sndrcvinfo sndrcvinfo; + struct sockaddr_in servaddr = { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = htons(my_port_num), + }; + struct sctp_initmsg initmsg = { + .sinit_num_ostreams = 1, + .sinit_max_instreams = 1, + .sinit_max_attempts = 4, + }; + int listen_fd, conn_fd, flags, ret, in; + + listen_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (listen_fd < 0) + die("socket"); + + ret = bind(listen_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); + if (ret < 0) + die("bind"); + + ret = setsockopt(listen_fd, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, + sizeof(initmsg)); + if (ret < 0) + die("setsockopt"); + + ret = listen(listen_fd, 5); + if (ret < 0) + die("listen"); + + for (;;) { + char buffer[1024]; + + printf("Waiting for connection\n"); + fflush(stdout); + + conn_fd = accept(listen_fd, (struct sockaddr *) NULL, NULL); + if(conn_fd < 0) + die("accept()"); + + printf("New client connected\n"); + fflush(stdout); + + flags = 0; + in = sctp_recvmsg(conn_fd, buffer, sizeof(buffer), NULL, 0, + &sndrcvinfo, &flags); + if (in > 0) { + printf("Received data: %s\n", buffer); + fflush(stdout); + } + + close(conn_fd); + } +} + +static void +client(void) +{ + struct sockaddr_in servaddr = { + .sin_family = AF_INET, + .sin_port = htons(my_port_num), + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + }; + int conn_fd, ret; + const char *msg = "Hello, Server!"; + + conn_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (conn_fd < 0) + die("socket()"); + + ret = connect(conn_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); + if (ret < 0) + die("connect()"); + + ret = sctp_sendmsg(conn_fd, (void *) msg, strlen(msg) + 1, NULL, 0, 0, 0, 0, 0, 0 ); + if (ret < 0) + die("sctp_sendmsg"); + + close(conn_fd); +} + +int +main(int argc __unused, char *argv[]) +{ + + my_port_num = atoi(argv[1]); + if (strstr(basename(argv[0]), "server")) + server(); + else + client(); + + return (0); +} +EOF + +cc -o /tmp/server -Wall -Wextra -O2 /tmp/sctp2.c || exit +ln -sf /tmp/server /tmp/client + +parallel=100 +for i in `jot $parallel 62324`; do + /tmp/server $i > /dev/null & +done +(cd ../testcases/swap; ./swap -t 1m -i 20 -l 100) & +sleep 2 + +start=`date +%s` +while [ $((`date +%s` - start)) -lt 60 ]; do + pids= + for i in `jot 50`; do + for j in `jot $parallel 62324`; do + /tmp/client $j & + pids="$pids $!" + done + done + for i in $pids; do + wait $i + done +done +pkill server +wait +while pkill swap; do :; done +wait +rm -f /tmp/sctp2.c /tmp/server /tmp/client +exit 0 Added: user/pho/stress2/misc/sctp3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sctp3.sh Mon Sep 2 07:54:02 2019 (r351685) @@ -0,0 +1,173 @@ +#!/bin/sh + +# Based on https://gist.github.com/zonque/7d03568eab14a2bb57cb by +# Daniel Mack github@zonque.org + +# Modified version of sctp.sh by Michael Tuexen : +# Basically it is the first test without calling sctp_recvmsg() on +# the server side and the required cleanups to avoid unused variables. +# This program triggers pretty quickly the "Queues are not empty when +# handling SHUTDOWN-COMPLETE" panic. This happened "by accident" with +# the original sctp.sh, if the flags argument contained the value +# MSG_DONTWAIT and sctp_recvmsg() returned -1 indicating EAGAIN. This +# way no successful sctp_recvmsg() call happened. + +# "panic: Queues are not empty when handling SHUTDOWN-COMPLETE" seen. + +# $FreeBSD$ + +cat > /tmp/sctp3.c < +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int my_port_num; + +static void +die(const char *s) +{ + perror(s); + exit(1); +} + +static void +server(void) +{ +#if 0 + struct sctp_sndrcvinfo sndrcvinfo; +#endif + struct sockaddr_in servaddr = { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = htons(my_port_num), + }; + struct sctp_initmsg initmsg = { + .sinit_num_ostreams = 1, + .sinit_max_instreams = 1, + .sinit_max_attempts = 4, + }; + int listen_fd, conn_fd, ret; +#if 0 + int flags, in; +#endif + + listen_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (listen_fd < 0) + die("socket"); + + ret = bind(listen_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); + if (ret < 0) + die("bind"); + + ret = setsockopt(listen_fd, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, + sizeof(initmsg)); + if (ret < 0) + die("setsockopt"); + + ret = listen(listen_fd, 5); + if (ret < 0) + die("listen"); + + for (;;) { +#if 0 + char buffer[1024]; +#endif + printf("Waiting for connection\n"); + fflush(stdout); + + conn_fd = accept(listen_fd, (struct sockaddr *) NULL, NULL); + if(conn_fd < 0) + die("accept()"); + + printf("New client connected\n"); + fflush(stdout); + +#if 0 + flags = 0; + in = sctp_recvmsg(conn_fd, buffer, sizeof(buffer), NULL, 0, + &sndrcvinfo, &flags); + if (in > 0) { + printf("Received data: %s\n", buffer); + fflush(stdout); + } +#endif + close(conn_fd); + } +} + +static void +client(void) +{ + struct sockaddr_in servaddr = { + .sin_family = AF_INET, + .sin_port = htons(my_port_num), + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + }; + int conn_fd, ret; + const char *msg = "Hello, Server!"; + + conn_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (conn_fd < 0) + die("socket()"); + + ret = connect(conn_fd, (struct sockaddr *) &servaddr, sizeof(servaddr)); + if (ret < 0) + die("connect()"); + + ret = sctp_sendmsg(conn_fd, (void *) msg, strlen(msg) + 1, NULL, 0, 0, 0, 0, 0, 0 ); + if (ret < 0) + die("sctp_sendmsg"); + + close(conn_fd); +} + +int +main(int argc __unused, char *argv[]) +{ + + my_port_num = atoi(argv[1]); + if (strstr(basename(argv[0]), "server")) + server(); + else + client(); + + return (0); +} +EOF + +cc -o /tmp/server -Wall -Wextra -O2 /tmp/sctp3.c || exit +ln -sf /tmp/server /tmp/client + +parallel=100 +for i in `jot $parallel 62324`; do + /tmp/server $i > /dev/null & +done +(cd ../testcases/swap; ./swap -t 1m -i 20 -l 100) & +sleep 2 + +start=`date +%s` +while [ $((`date +%s` - start)) -lt 60 ]; do + pids= + for i in `jot 50`; do + for j in `jot $parallel 62324`; do + /tmp/client $j & + pids="$pids $!" + done + done + for i in $pids; do + wait $i + done +done +pkill server +wait +while pkill swap; do :; done +wait +rm -f /tmp/sctp3.c /tmp/server /tmp/client +exit 0 From owner-svn-src-user@freebsd.org Mon Sep 2 07:56:22 2019 Return-Path: Delivered-To: svn-src-user@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 4FED3D4C47 for ; Mon, 2 Sep 2019 07:56:22 +0000 (UTC) (envelope-from pho@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 46MMpt1RWHz4NsS; Mon, 2 Sep 2019 07:56:22 +0000 (UTC) (envelope-from pho@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 15140EF42; Mon, 2 Sep 2019 07:56:22 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x827uLL4061890; Mon, 2 Sep 2019 07:56:21 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x827uLNb061889; Mon, 2 Sep 2019 07:56:21 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909020756.x827uLNb061889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Sep 2019 07:56:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351686 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351686 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 07:56:22 -0000 Author: pho Date: Mon Sep 2 07:56:21 2019 New Revision: 351686 URL: https://svnweb.freebsd.org/changeset/base/351686 Log: Added a regression test. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/random.sh (contents, props changed) Added: user/pho/stress2/misc/random.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/random.sh Mon Sep 2 07:56:21 2019 (r351686) @@ -0,0 +1,41 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2019 Dell EMC Isilon +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# A regression test for short AES mode reads +# https://people.freebsd.org/~pho/stress/log/fsck-2.txt +# Fixed by r349176 + +# $FreeBSD$ + +for i in `jot 1024 1`; do + dd if=/dev/random of=/dev/null bs=$i count=1 status=none +done +exit 0 From owner-svn-src-user@freebsd.org Mon Sep 2 07:59:26 2019 Return-Path: Delivered-To: svn-src-user@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 B0B11D4CFD for ; Mon, 2 Sep 2019 07:59:26 +0000 (UTC) (envelope-from pho@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 46MMtQ40jxz4Nyy; Mon, 2 Sep 2019 07:59:26 +0000 (UTC) (envelope-from pho@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 6E20AEF46; Mon, 2 Sep 2019 07:59:26 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x827xQ8a062077; Mon, 2 Sep 2019 07:59:26 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x827xQhj062076; Mon, 2 Sep 2019 07:59:26 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909020759.x827xQhj062076@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Sep 2019 07:59:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351687 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351687 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 07:59:26 -0000 Author: pho Date: Mon Sep 2 07:59:26 2019 New Revision: 351687 URL: https://svnweb.freebsd.org/changeset/base/351687 Log: Added finding. Limit load and runtime. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/trim.sh Modified: user/pho/stress2/misc/trim.sh ============================================================================== --- user/pho/stress2/misc/trim.sh Mon Sep 2 07:56:21 2019 (r351686) +++ user/pho/stress2/misc/trim.sh Mon Sep 2 07:59:26 2019 (r351687) @@ -31,6 +31,8 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 # Run with marcus.cfg on a malloc backed MD with option trim. +# Various panics seen with WiP kernel code. For example: +# panic: Bad tailq head 0xfffff80160cb7170 first->prev != head . ../default.cfg @@ -45,6 +47,7 @@ size="128m" s=0 opt="" [ "$newfs_flags" = "-U" ] && opt="-U -j" +export MAXSWAPPCT=80 for flag in ' ' $opt; do echo "mdconfig -a -t malloc -o reserve -s $size -u $mdstart" mdconfig -a -t malloc -o reserve -s $size -u $mdstart || exit 1 @@ -55,7 +58,7 @@ for flag in ' ' $opt; do mount /dev/md${mdstart}$part $mntpoint || exit 1 chmod 777 $mntpoint - export runRUNTIME=10m + export runRUNTIME=5m export RUNDIR=$mntpoint/stressX su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 From owner-svn-src-user@freebsd.org Mon Sep 2 08:01:35 2019 Return-Path: Delivered-To: svn-src-user@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 F1FDFD5835 for ; Mon, 2 Sep 2019 08:01:34 +0000 (UTC) (envelope-from pho@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 46MMwt3Cjkz4PQW; Mon, 2 Sep 2019 08:01:34 +0000 (UTC) (envelope-from pho@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 13082EFAD; Mon, 2 Sep 2019 08:01:34 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8281XWH064588; Mon, 2 Sep 2019 08:01:33 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8281Xj1064587; Mon, 2 Sep 2019 08:01:33 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909020801.x8281Xj1064587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Sep 2019 08:01:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351688 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351688 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 08:01:35 -0000 Author: pho Date: Mon Sep 2 08:01:33 2019 New Revision: 351688 URL: https://svnweb.freebsd.org/changeset/base/351688 Log: Added a new tmpfs test scenario. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/tmpfs20.sh (contents, props changed) Added: user/pho/stress2/misc/tmpfs20.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/tmpfs20.sh Mon Sep 2 08:01:33 2019 (r351688) @@ -0,0 +1,64 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2019 Dell EMC Isilon +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# +# Run stress2 from a tmpfs file system. +# Hunt for Assertion error_ == 0 failed at /usr/src/sys/vm/vm_map.c:553 + +# "vn_vget_ino_get: 0xfffff80de2e269e0 is not locked but should be" seen: +# https://people.freebsd.org/~pho/stress/log/kostik1219.txt +# Fixed by r351542 + +# $FreeBSD$ + +. ../default.cfg + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +mount | grep -q "on $mntpoint " && umount -f $mntpoint +mount -o size=2g -t tmpfs null $mntpoint || exit 1 +chmod 777 $mntpoint + +cp -r ../../stress2 $mntpoint + +export LOAD=80 +export MAXSWAPPCT=80 +export RUNDIR=$mntpoint/stressX +export runRUNTIME=10m +export runRUNTIME=10m +export rwLOAD=80 +export TESTPROGS=`cd ..; find testcases/ -perm -1 -type f | \ + egrep -v "/run/"` + +here=`pwd` +cd $mntpoint/stress2/misc || exit 1 +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' +cd $here + +umount $mntpoint +exit 0 From owner-svn-src-user@freebsd.org Mon Sep 2 08:02:56 2019 Return-Path: Delivered-To: svn-src-user@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 A9202D5BE0 for ; Mon, 2 Sep 2019 08:02:56 +0000 (UTC) (envelope-from pho@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 46MMyS42rBz4PgS; Mon, 2 Sep 2019 08:02:56 +0000 (UTC) (envelope-from pho@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 6C56AF12F; Mon, 2 Sep 2019 08:02:56 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8282urL067744; Mon, 2 Sep 2019 08:02:56 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8282uqr067743; Mon, 2 Sep 2019 08:02:56 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909020802.x8282uqr067743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Sep 2019 08:02:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351689 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351689 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 08:02:56 -0000 Author: pho Date: Mon Sep 2 08:02:55 2019 New Revision: 351689 URL: https://svnweb.freebsd.org/changeset/base/351689 Log: Added a new nullfs test scenario. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/nullfs27.sh (contents, props changed) Added: user/pho/stress2/misc/nullfs27.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/nullfs27.sh Mon Sep 2 08:02:55 2019 (r351689) @@ -0,0 +1,93 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2019 Dell EMC Isilon +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Run all the rename(2) test scenarios with nullfs. +# Used in connection with WiP work on nullfs. + +. ../default.cfg + +set -e +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart + +mdconfig -a -t swap -s 2g -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto + +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +mp2=${mntpoint}2 +[ -d $mp2 ] || mkdir -p $mp2 +mount | grep -wq $mp2 && umount $mp2 +mount -t nullfs $mntpoint $mp2 +chmod 777 $mp2 +set +e + +export LOAD=80 +export MAXSWAPPCT=80 +export RUNDIR=$mp2/stressX +export runRUNTIME=10m +export rwLOAD=80 +export TESTPROGS=' +testcases/lockf2/lockf2 +testcases/symlink/symlink +testcases/openat/openat +testcases/socket/socket +testcases/rw/rw +testcases/mmap/mmap +testcases/fts/fts +testcases/link/link +testcases/lockf/lockf +testcases/creat/creat +testcases/mkdir/mkdir +testcases/rename/rename +testcases/swap/swap +testcases/mkfifo/mkfifo +testcases/dirnprename/dirnprename +testcases/dirrename/dirrename +' + +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' + +while mount | grep $mp2 | grep -q nullfs; do + umount $mp2 || sleep 1 +done +n=0 +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 + n=$((n + 1)) + [ $n -gt 30 ] && { echo FAIL; status=2; } +done +mdconfig -d -u $mdstart +exit $status From owner-svn-src-user@freebsd.org Tue Sep 3 07:02:03 2019 Return-Path: Delivered-To: svn-src-user@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 7236ACEE19 for ; Tue, 3 Sep 2019 07:02:03 +0000 (UTC) (envelope-from pho@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 46MyYl2Rbhz3wxF; Tue, 3 Sep 2019 07:02:03 +0000 (UTC) (envelope-from pho@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 3869226E64; Tue, 3 Sep 2019 07:02:03 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x83723nv002752; Tue, 3 Sep 2019 07:02:03 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x83723tU002751; Tue, 3 Sep 2019 07:02:03 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909030702.x83723tU002751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 3 Sep 2019 07:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351736 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351736 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Sep 2019 07:02:03 -0000 Author: pho Date: Tue Sep 3 07:02:02 2019 New Revision: 351736 URL: https://svnweb.freebsd.org/changeset/base/351736 Log: Added problem found. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/sort.sh Modified: user/pho/stress2/misc/sort.sh ============================================================================== --- user/pho/stress2/misc/sort.sh Tue Sep 3 06:52:21 2019 (r351735) +++ user/pho/stress2/misc/sort.sh Tue Sep 3 07:02:02 2019 (r351736) @@ -30,6 +30,9 @@ # VM stress. +# "panic: freeing free block: ffff40, size 8, mask 1" seen in WiP code: +# https://people.freebsd.org/~pho/stress/log/sort.txt + [ `sysctl -n vm.swap_total` -eq 0 ] && exit 0 for i in `jot 6`; do From owner-svn-src-user@freebsd.org Tue Sep 3 07:09:04 2019 Return-Path: Delivered-To: svn-src-user@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 D384DCF0CA for ; Tue, 3 Sep 2019 07:09:04 +0000 (UTC) (envelope-from pho@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 46Myjr5HyZz3xPB; Tue, 3 Sep 2019 07:09:04 +0000 (UTC) (envelope-from pho@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 9924026E9F; Tue, 3 Sep 2019 07:09:04 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x83794WH004926; Tue, 3 Sep 2019 07:09:04 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x83794f1004925; Tue, 3 Sep 2019 07:09:04 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201909030709.x83794f1004925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 3 Sep 2019 07:09:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r351738 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 351738 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Sep 2019 07:09:04 -0000 Author: pho Date: Tue Sep 3 07:09:04 2019 New Revision: 351738 URL: https://svnweb.freebsd.org/changeset/base/351738 Log: Disable core dumps. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/chain.sh Modified: user/pho/stress2/misc/chain.sh ============================================================================== --- user/pho/stress2/misc/chain.sh Tue Sep 3 07:02:18 2019 (r351737) +++ user/pho/stress2/misc/chain.sh Tue Sep 3 07:09:04 2019 (r351738) @@ -49,6 +49,6 @@ EOF mycc -o /tmp/chain -I /usr/local/include -L /usr/local/lib -Wall -Wextra \ -O2 -g /tmp/chain.c -lmill || exit 1 -/tmp/chain 1000000 +limits -c 0 /tmp/chain 1000000 rm -f /tmp/chain /tmp/chain.c exit 0 From owner-svn-src-user@freebsd.org Tue Sep 3 14:05:59 2019 Return-Path: Delivered-To: svn-src-user@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 DDD00DC148 for ; Tue, 3 Sep 2019 14:05:59 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7yv0qQsz4P41; Tue, 3 Sep 2019 14:05:59 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 04C5219EF7; Tue, 3 Sep 2019 14:05:53 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 0D43247C7; Sat, 30 Mar 2019 13:59:05 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3BEF5894ED; Sat, 30 Mar 2019 13:59:05 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 19D72478C; Sat, 30 Mar 2019 13:59:05 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E3388478A for ; Sat, 30 Mar 2019 13:59:02 +0000 (UTC) (envelope-from pho@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 B2C9E894E9; Sat, 30 Mar 2019 13:59:02 +0000 (UTC) (envelope-from pho@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 8BD91FC4C; Sat, 30 Mar 2019 13:59:02 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2UDx2W3095844; Sat, 30 Mar 2019 13:59:02 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2UDx2Z4095843; Sat, 30 Mar 2019 13:59:02 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201903301359.x2UDx2Z4095843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345733 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345733 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3BEF5894ED X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:00 -0000 X-Original-Date: Sat, 30 Mar 2019 13:59:02 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:00 -0000 Author: pho Date: Sat Mar 30 13:59:02 2019 New Revision: 345733 URL: https://svnweb.freebsd.org/changeset/base/345733 Log: Added a regression test for problem fixed in r345382. Submitted by: markj@ Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/mprotect.sh (contents, props changed) Added: user/pho/stress2/misc/mprotect.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/mprotect.sh Sat Mar 30 13:59:02 2019 (r345733) @@ -0,0 +1,52 @@ +#!/bin/sh + +# "panic: pmap_demote_pde: page table page for a wired mapping +# is missing" seen. +# Test scenario by Mark Johnston + +# Fixed by r345382 + +# $FreeBSD$ + +. ../default.cfg + +cd /tmp +cat > mprotect.c < + +#include +#include + +int +main(void) +{ + char *addr, c; + size_t i, len; + + len = 2 * 1024 * 1024; + addr = mmap(NULL, 2 * 1024 * 1024, PROT_READ, + MAP_ANON | MAP_ALIGNED_SUPER, -1, 0); + if (addr == MAP_FAILED) + err(1, "mmap"); + if (mlock(addr, len) != 0) /* hopefully this gets a superpage */ + err(1, "mlock"); + if (mprotect(addr, len, PROT_NONE) != 0) + err(1, "mprotect"); + if (mprotect(addr, len, PROT_READ) != 0) + err(1, "mprotect"); + for (i = 0; i < len; i++) /* preemptive superpage mapping */ + c = *(volatile char *)(addr + i); + if (mprotect(addr, 4096, PROT_NONE) != 0) /* trigger demotion */ + err(1, "mprotect"); + if (munlock(addr, len) != 0) + err(1, "munlock"); + + return (0); +} +EOF +mycc -o mprotect -Wall -Wextra -O2 mprotect.c || exit 1 + +./mprotect; s=$? + +rm mprotect.c mprotect +exit $s From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:00 2019 Return-Path: Delivered-To: svn-src-user@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 D47D1DC1B4 for ; Tue, 3 Sep 2019 14:06:00 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7yw1S21z4P5F; Tue, 3 Sep 2019 14:06:00 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id F31CB19F69; Tue, 3 Sep 2019 14:05:53 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E563275D9; Mon, 1 Apr 2019 07:46:45 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 540418A12E; Mon, 1 Apr 2019 07:46:45 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 185EA756F; Mon, 1 Apr 2019 07:46:45 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 43CEE756D for ; Mon, 1 Apr 2019 07:46:42 +0000 (UTC) (envelope-from pho@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 F069B8A129; Mon, 1 Apr 2019 07:46:41 +0000 (UTC) (envelope-from pho@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 E37A7B4B6; Mon, 1 Apr 2019 07:46:41 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x317kfRX036255; Mon, 1 Apr 2019 07:46:41 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x317kf3d036254; Mon, 1 Apr 2019 07:46:41 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904010746.x317kf3d036254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345760 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345760 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 540418A12E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:01 -0000 X-Original-Date: Mon, 1 Apr 2019 07:46:41 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:01 -0000 Author: pho Date: Mon Apr 1 07:46:41 2019 New Revision: 345760 URL: https://svnweb.freebsd.org/changeset/base/345760 Log: Fix the broken "mount -u". Style. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mountro.sh Modified: user/pho/stress2/misc/mountro.sh ============================================================================== --- user/pho/stress2/misc/mountro.sh Sun Mar 31 23:18:12 2019 (r345759) +++ user/pho/stress2/misc/mountro.sh Mon Apr 1 07:46:41 2019 (r345760) @@ -28,16 +28,15 @@ # $FreeBSD$ # - . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 D=$diskimage -dede $D 1m 128 || exit +dd if=/dev/zero of=$D bs=1m count=128 status=none || exit 1 -mount | grep "$mntpoint" | grep -q /md && umount -f $mntpoint -mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart +mount | grep "$mntpoint " | grep -q /md && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } @@ -51,18 +50,17 @@ chmod 777 $mntpoint/stressX export RUNDIR=$mntpoint/stressX export runRUNTIME=4m (cd ..; ./run.sh disk.cfg > /dev/null 2>&1) & -sleep 30 +sleep 10 for i in `jot 10`; do - mount $mntpoint -u -o ro > /dev/null 2>&1 + mount -u -o ro $mntpoint sleep 3 - mount $mntpoint -u -o rw > /dev/null 2>&1 + mount -u -o rw $mntpoint sleep 3 -done -df -i $mntpoint +done > /dev/null 2>&1 -umount -f $mntpoint > /dev/null 2>&1 +umount -f $mntpoint mdconfig -d -u $mdstart rm -f $D -kill `ps -x | grep run.sh | grep -v grep | awk '{print $1}'` +pkill run.sh wait From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:08 2019 Return-Path: Delivered-To: svn-src-user@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 741C2DC3A4 for ; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z30jvcz4PCv; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 741DB1A167; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id DB18215029; Wed, 3 Apr 2019 07:44:44 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 372DB685B6; Wed, 3 Apr 2019 07:44:44 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0E6F114FC5; Wed, 3 Apr 2019 07:44:44 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 9348814FC2; Wed, 3 Apr 2019 07:44:41 +0000 (UTC) (envelope-from pho@holm.cc) Received: from relay01.pair.com (relay01.pair.com [209.68.5.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E4E6685AF; Wed, 3 Apr 2019 07:44:41 +0000 (UTC) (envelope-from pho@holm.cc) Received: from x2.osted.lan (87-58-223-204-dynamic.dk.customer.tdc.net [87.58.223.204]) by relay01.pair.com (Postfix) with ESMTP id C8392D0307B; Wed, 3 Apr 2019 03:44:39 -0400 (EDT) Received: from x2.osted.lan (localhost [127.0.0.1]) by x2.osted.lan (8.15.2/8.15.2) with ESMTPS id x337iWg0066407 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 3 Apr 2019 09:44:33 +0200 (CEST) (envelope-from pho@x2.osted.lan) Received: (from pho@localhost) by x2.osted.lan (8.15.2/8.15.2/Submit) id x337iWun066406; Wed, 3 Apr 2019 09:44:32 +0200 (CEST) (envelope-from pho) From: Peter Holm To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r345840 - user/pho/stress2/misc Message-ID: <20190403074432.GA66279@x2.osted.lan> References: <201904030722.x337Mkt6049518@repo.freebsd.org> <201904030728.x337Sjut025422@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201904030728.x337Sjut025422@gndrsh.dnsmgr.net> User-Agent: Mutt/1.11.1 (2018-12-01) Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 372DB685B6 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:08 -0000 X-Original-Date: Wed, 3 Apr 2019 09:44:32 +0200 X-List-Received-Date: Tue, 03 Sep 2019 14:06:08 -0000 On Wed, Apr 03, 2019 at 12:28:45AM -0700, Rodney W. Grimes wrote: > > Author: pho > > Date: Wed Apr 3 07:22:46 2019 > > New Revision: 345840 > > URL: https://svnweb.freebsd.org/changeset/base/345840 > > > > Log: > > Added tmpfs to the tested file systems. > > Added showing file mapping for RW and RO mounts. > > > > Sponsored by: Dell EMC Isilon > > > > Modified: > > user/pho/stress2/misc/mountu.sh > > > > Modified: user/pho/stress2/misc/mountu.sh > > ============================================================================== > > --- user/pho/stress2/misc/mountu.sh Wed Apr 3 07:09:28 2019 (r345839) > > +++ user/pho/stress2/misc/mountu.sh Wed Apr 3 07:22:46 2019 (r345840) > > @@ -1,9 +1,10 @@ > > #!/bin/sh > > > > # > > -# Copyright (c) 2012 Peter Holm > > -# All rights reserved. > > +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD > > # > > +# Copyright (c) 2019 Dell EMC Isilon > > +# > > Being on the record, it appears as if the date of original > publication has been obliterated and replaced with a newer > date. This is moving the date of expiration of the copyright > forward and has case law that shows this to be the wrong > thing to do. > > You can make it 2012, 2019 but you can not remove the original > publication date. > > I am uncertain how the "you should never remove a copyright" > rule apply here, so there is also that issue. > So, would this be the right thing to do: Copyright (c) 2012 Peter Holm Copyright (c) 2019 Dell EMC Isilon I guess it's to late to just restore the original? - Peter From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:08 2019 Return-Path: Delivered-To: svn-src-user@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 75014DC3A6 for ; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z30hllz4PCt; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 7C8A31A16C; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id D9DA615371; Wed, 3 Apr 2019 07:50:22 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3DEFD69D93; Wed, 3 Apr 2019 07:50:22 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1C12115324; Wed, 3 Apr 2019 07:50:22 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 5843515321; Wed, 3 Apr 2019 07:50:19 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA6DC69D8C; Wed, 3 Apr 2019 07:50:18 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x337oG9X025531; Wed, 3 Apr 2019 00:50:16 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x337oGQO025530; Wed, 3 Apr 2019 00:50:16 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904030750.x337oGQO025530@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345840 - user/pho/stress2/misc In-Reply-To: <20190403074432.GA66279@x2.osted.lan> To: Peter Holm CC: rgrimes@freebsd.org, src-committers@freebsd.org, svn-src-user@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3DEFD69D93 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:08 -0000 X-Original-Date: Wed, 3 Apr 2019 00:50:16 -0700 (PDT) X-List-Received-Date: Tue, 03 Sep 2019 14:06:08 -0000 > On Wed, Apr 03, 2019 at 12:28:45AM -0700, Rodney W. Grimes wrote: > > > Author: pho > > > Date: Wed Apr 3 07:22:46 2019 > > > New Revision: 345840 > > > URL: https://svnweb.freebsd.org/changeset/base/345840 > > > > > > Log: > > > Added tmpfs to the tested file systems. > > > Added showing file mapping for RW and RO mounts. > > > > > > Sponsored by: Dell EMC Isilon > > > > > > Modified: > > > user/pho/stress2/misc/mountu.sh > > > > > > Modified: user/pho/stress2/misc/mountu.sh > > > ============================================================================== > > > --- user/pho/stress2/misc/mountu.sh Wed Apr 3 07:09:28 2019 (r345839) > > > +++ user/pho/stress2/misc/mountu.sh Wed Apr 3 07:22:46 2019 (r345840) > > > @@ -1,9 +1,10 @@ > > > #!/bin/sh > > > > > > # > > > -# Copyright (c) 2012 Peter Holm > > > -# All rights reserved. > > > +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD > > > # > > > +# Copyright (c) 2019 Dell EMC Isilon > > > +# > > > > Being on the record, it appears as if the date of original > > publication has been obliterated and replaced with a newer > > date. This is moving the date of expiration of the copyright > > forward and has case law that shows this to be the wrong > > thing to do. > > > > You can make it 2012, 2019 but you can not remove the original > > publication date. > > > > I am uncertain how the "you should never remove a copyright" > > rule apply here, so there is also that issue. > > > > So, would this be the right thing to do: > > Copyright (c) 2012 Peter Holm > Copyright (c) 2019 Dell EMC Isilon That would be one way to solve this, did you assign in anyway your original copyright to Dell/Emc/Isilon? If so then the norm for that would be: Copyright (c) 2012 Dell EMC Isilon Written by Peter Holm as a work for hire which I do not think is the case here, your simply doing work as there employee now, and that would take the form you used above: Copyright (c) 2012 Peter Holm Copyright (c) 2019 Dell EMC Isilon > > I guess it's to late to just restore the original? I do not see a need to restore it, so long as it ends up in a correct state. > - Peter Thanks for the quick response, -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:07 2019 Return-Path: Delivered-To: svn-src-user@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 69030DC39D for ; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z3078zz4PCk; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 439BA1A150; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 8FA7012C5E; Wed, 3 Apr 2019 06:18:28 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 39E869417C; Wed, 3 Apr 2019 06:18:28 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1ADC012C46; Wed, 3 Apr 2019 06:18:28 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 8533912C44 for ; Wed, 3 Apr 2019 06:18:25 +0000 (UTC) (envelope-from pho@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 5360594177; Wed, 3 Apr 2019 06:18:25 +0000 (UTC) (envelope-from pho@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 294119CA0; Wed, 3 Apr 2019 06:18:25 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x336IPuR011147; Wed, 3 Apr 2019 06:18:25 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x336IPQi011146; Wed, 3 Apr 2019 06:18:25 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904030618.x336IPQi011146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345835 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345835 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 39E869417C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:08 -0000 X-Original-Date: Wed, 3 Apr 2019 06:18:25 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:08 -0000 Author: pho Date: Wed Apr 3 06:18:24 2019 New Revision: 345835 URL: https://svnweb.freebsd.org/changeset/base/345835 Log: Added a test scenario for verifying that timestamps are not update on RO mounts. A regression test for r345800 Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/mountro4.sh (contents, props changed) Added: user/pho/stress2/misc/mountro4.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/mountro4.sh Wed Apr 3 06:18:24 2019 (r345835) @@ -0,0 +1,102 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2019 Dell EMC Isilon +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Check that the time stamps are not updated for a RO mount. + +. ../default.cfg + +f1=$mntpoint/f1 +f2=$mntpoint/f2 +s=0 + +# ufs +mount | grep -q "on $mntpoint " && umount $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +newfs $newfs_flags /dev/md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint || exit 1 +touch $f1 +mount -u -o ro $mntpoint +touch $f2 2>/dev/null && { echo "ufs: ro failed"; s=1; } +d1=`stat -f '%a %m %c' $f1` +sleep 1 +cat $f1 > /dev/null +d2=`stat -f '%a %m %c' $f1` +if [ "$d1" != "$d2" ]; then + echo "ufs: Access time was updated. $d1 != $d2" + s=1 +fi +mount -u -o rw $mntpoint +touch $f2 2>/dev/null || { echo "ufs: rw failed"; s=1; } +umount $mntpoint +mdconfig -d -u $mdstart + +# tmpfs +mount -o size=100m -t tmpfs null $mntpoint || exit 1 +touch $f1 +mount -u -o ro $mntpoint +touch $f2 2>/dev/null && { echo "tmpfs: ro failed"; s=1; } +d1=`stat -f '%a %m %c' $f1` +sleep 1 +cat $f1 > /dev/null +d2=`stat -f '%a %m %c' $f1` +if [ "$d1" != "$d2" ]; then + echo "tmpfs: Access time was updated. $d1 != $d2" + s=1 +fi +mount -u -o rw $mntpoint +touch $f2 2>/dev/null || { echo "tmpfs: rw failed"; s=1; } +umount $mntpoint + +# msdosfs +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs_msdos /dev/md${mdstart}$part > /dev/null +mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1 + +touch $f1 +mount -u -o ro $mntpoint +touch $f2 2>/dev/null && { echo "msdosfs: ro failed"; s=1; } +d1=`stat -f '%a %m %c' $f1` +sleep 1 +cat $f1 > /dev/null +d2=`stat -f '%a %m %c' $f1` +if [ "$d1" != "$d2" ]; then + echo "msdosfs: Access time was updated. $d1 != $d2" + s=1 +fi +mount -u -o rw $mntpoint +touch $f2 2>/dev/null || { echo "msdosfs: rw failed"; s=1; } +umount $mntpoint +mdconfig -d -u $mdstart + +exit $s From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:07 2019 Return-Path: Delivered-To: svn-src-user@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 73808DC3A1 for ; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z30QBDz4PCr; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 6963F1A15F; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id C713B14B56; Wed, 3 Apr 2019 07:28:54 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5689D979BA; Wed, 3 Apr 2019 07:28:54 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1460514B34; Wed, 3 Apr 2019 07:28:54 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 0598814B2E; Wed, 3 Apr 2019 07:28:51 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 499CF979AE; Wed, 3 Apr 2019 07:28:47 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x337SjHu025423; Wed, 3 Apr 2019 00:28:45 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x337Sjut025422; Wed, 3 Apr 2019 00:28:45 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904030728.x337Sjut025422@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345840 - user/pho/stress2/misc In-Reply-To: <201904030722.x337Mkt6049518@repo.freebsd.org> To: Peter Holm CC: src-committers@freebsd.org, svn-src-user@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 5689D979BA X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:08 -0000 X-Original-Date: Wed, 3 Apr 2019 00:28:45 -0700 (PDT) X-List-Received-Date: Tue, 03 Sep 2019 14:06:08 -0000 > Author: pho > Date: Wed Apr 3 07:22:46 2019 > New Revision: 345840 > URL: https://svnweb.freebsd.org/changeset/base/345840 > > Log: > Added tmpfs to the tested file systems. > Added showing file mapping for RW and RO mounts. > > Sponsored by: Dell EMC Isilon > > Modified: > user/pho/stress2/misc/mountu.sh > > Modified: user/pho/stress2/misc/mountu.sh > ============================================================================== > --- user/pho/stress2/misc/mountu.sh Wed Apr 3 07:09:28 2019 (r345839) > +++ user/pho/stress2/misc/mountu.sh Wed Apr 3 07:22:46 2019 (r345840) > @@ -1,9 +1,10 @@ > #!/bin/sh > > # > -# Copyright (c) 2012 Peter Holm > -# All rights reserved. > +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD > # > +# Copyright (c) 2019 Dell EMC Isilon > +# Being on the record, it appears as if the date of original publication has been obliterated and replaced with a newer date. This is moving the date of expiration of the copyright forward and has case law that shows this to be the wrong thing to do. You can make it 2012, 2019 but you can not remove the original publication date. I am uncertain how the "you should never remove a copyright" rule apply here, so there is also that issue. > # Redistribution and use in source and binary forms, with or without > # modification, are permitted provided that the following conditions > # are met: > @@ -42,95 +43,198 @@ > here=`pwd` > cd /tmp > sed '1,/^EOF/d' < $here/$0 > mountu.c > -mycc -o mountu -Wall -Wextra -O2 mountu.c > +mycc -o mountu -Wall -Wextra -O2 mountu.c || exit 1 > rm -f mountu.c > > pstat() { > - pid=`ps a | grep -v grep | grep /tmp/mountu | awk '{print $1}'` > + local pid > + pid=`ps ax | grep -v grep | grep /tmp/mountu | awk '{print $1}'` > [ -n "$pid" ] && procstat -v $pid > } > > +ck() { > + if mount | grep $mntpoint | grep -q "read-only"; then > + if pstat $!| awk "\$2 == \"$map\"" | grep -q " rw-"; then > + echo > + echo "$1 difference" > + mount | grep $mntpoint > + printf "RW mount mapping and RO mount mapping:\n%s\n" "$r" > + pstat $! | awk "\$2 == \"$map\"" > + status=$((status + 1)) > + fi > + else > + echo "$1 mount point RO did not succeed" > + mount | grep $mntpoint > + status=$((status + 1)) > + fi > +} > + > +status=0 > +file=$mntpoint/mountu.sh.file > +mapfile=/tmp/mountu.sh.map > mount | grep -q "$mntpoint " && umount $mntpoint > -mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart > +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart > mdconfig -a -t swap -s 100m -u $mdstart > -bsdlabel -w md${mdstart} auto > -newfs $newfs_flags md${mdstart}${part} > /dev/null > -mount /dev/md${mdstart}${part} $mntpoint > +bsdlabel -w md$mdstart auto > +newfs $newfs_flags md${mdstart}$part > /dev/null > +mount /dev/md${mdstart}$part $mntpoint > chmod 777 $mntpoint > > -/tmp/mountu $mntpoint/file & > - > +# ufs > +exec 5>$mapfile > +/tmp/mountu UFS $file & > +pid=$! > sleep 1 > -if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then > - echo "UFS FAILED" > - pstat > -fi > -wait > +map=`cat $mapfile`; rm $mapfile; exec 5>&- > + > +r=`pstat $! | awk "\\$2 == \"$map\""` > +mount -u -o ro $mntpoint 2>/dev/null || mount -fu -o ro $mntpoint > +ck UFS > +mount -u -o rw $mntpoint > +rm -f $file > +wait $pid > +s=$? > +[ $s -ne 139 ] && { echo "UFS exit status is $s"; status=1; } > while mount | grep -q "$mntpoint "; do > umount $mntpoint || sleep 1 > done > - > mdconfig -d -u $mdstart > > +# nfs > if ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev/null 2>&1; then > - mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw $nfs_export \ > + mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw $nfs_export \ > $mntpoint > - rm -f /tmp/file > - /tmp/mountu $mntpoint/file & > + sleep .2 > + rm -f $file > + /tmp/mountu NFS $file & > + pid=$! > sleep 1 > > - if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then > - echo "NFS FAILED" > - fi > - wait > - umount $mntpoint > + r=`pstat $! | awk "\\$2 == \"$map\""` > + mount -u -o ro $mntpoint 2>/dev/null || > + mount -fu -o ro $mntpoint 2>/dev/null > + ck NFS > + wait $pid > + s=$? > + [ $s -ne 139 ] && { echo "NFS exit status is $s"; status=1; } > + > + mount -u -o rw $mntpoint 2>/dev/null > + sleep .2 > + [ -f $file ] && rm -f $file > + umount $mntpoint || umount $mntpoint > fi > > +# msdos > if [ -x /sbin/mount_msdosfs ]; then > mdconfig -a -t swap -s 100m -u $mdstart > - bsdlabel -w md${mdstart} auto > + bsdlabel -w md$mdstart auto > newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null 2>&1 > mount_msdosfs -m 777 /dev/md${mdstart}$part $mntpoint > - /tmp/mountu $mntpoint/file & > + /tmp/mountu MSDOS $file & > + pid=$! > > sleep 1 > - if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then > - echo "MSDOS FAILED" > - fi > - wait > + r=`pstat $! | awk "\\$2 == \"$map\""` > + mount -u -o ro $mntpoint 2>/dev/null || mount -fu -o ro $mntpoint > + ck MSDOS > + wait $pid > + s=$? > + [ $s -ne 139 ] && { echo "MSDOS exit status is $s"; status=1; } > + mount -u -o rw $mntpoint > + rm -f $file > > while mount | grep -q "$mntpoint "; do > umount $mntpoint || sleep 1 > done > + mdconfig -d -u $mdstart > fi > -rm -f /tmp/mountu /tmp/file > + > +# tmpfs > +mount -t tmpfs null $mntpoint > +chmod 777 $mntpoint > + > +/tmp/mountu TMPFS $file & > +pid=$! > + > +sleep 1 > +r=`pstat $! | awk "\\$2 == \"$map\""` > +mount -u -o ro $mntpoint 2>/dev/null || mount -fu -o ro $mntpoint > +ck TMPFS > +sleep 1 > +mount -u -o rw $mntpoint > +rm -f $file > +wait $pid > +s=$? > +[ $s -ne 139 ] && { echo "TMPFS exit status is $s"; status=1; } > +while mount | grep -q "$mntpoint "; do > + umount $mntpoint || sleep 1 > +done > + > +rm -f /tmp/mountu > exit 0 > EOF > -#include > +/* kib@ noted: > + UFS/NFS/msdosfs reclaim vnode on rw->ro forced remount, and > + change the type of the underying object to OBJT_DEAD, but leave > + the pages on the object queue and installed in the page tables. > + Applications can read/write already mapped pages, but cannot > + page in new pages, cannot observe possible further modifications > + to already mapped pages (if ro->rw remount happen later), and > + their updates to pages are not flushed to file. > + > + It is impossible to mimic this behaviour for tmpfs. > + */ > +#include > +#include > +#include > + > #include > -#include > -#include > -#include > +#include > #include > #include > -#include > -#include > +#include > +#include > +#include > #include > #include > -#include > > #define STARTADDR 0x0U > -#define ADRSPACE 0x0640000U > +#define ADRSPACE 0x0640000U > > +static void > +sighandler(int signo, siginfo_t *si, void *uc1) > +{ > + ucontext_t *uc; > + > + uc = uc1; > + printf("SIG%s at %p, addr %p\n", sys_signame[signo], si->si_addr, > +#if defined(__i386__) > + (void *)uc->uc_mcontext.mc_eip); > +#else > + (void *)uc->uc_mcontext.mc_rip); > +#endif > + exit(1); > +} > + > int > main(int argc __unused, char **argv) > { > - int fd, ps; > + struct passwd *pw; > + struct sigaction sa; > void *p; > size_t len; > - struct passwd *pw; > - char *c, *path; > + int fd; > + char *name, *path; > + volatile char *c; > > + memset(&sa, 0, sizeof(sa)); > + sa.sa_sigaction = sighandler; > + sa.sa_flags = SA_SIGINFO; > + if (sigaction(SIGSEGV, &sa, NULL) == -1) > + err(1, "sigaction(SIGSEGV)"); > + if (sigaction(SIGBUS, &sa, NULL) == -1) > + err(1, "sigaction(SIGBUS)"); > + > if ((pw = getpwnam("nobody")) == NULL) > err(1, "no such user: nobody"); > > @@ -143,7 +247,8 @@ main(int argc __unused, char **argv) > p = (void *)STARTADDR; > len = ADRSPACE; > > - path = argv[1]; > + name = argv[1]; > + path = argv[2]; > if ((fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0622)) == -1) > err(1,"open(%s)", path); > if (ftruncate(fd, len) == -1) > @@ -156,15 +261,25 @@ main(int argc __unused, char **argv) > } > err(1, "mmap(1)"); > } > + dprintf(5, "%p\n", p); > > - c = p; > - ps = getpagesize(); > - for (c = p; (void *)c < p + len; c += ps) { > + for (c = p; (void *)c < p + len; c += PAGE_SIZE) { > *c = 1; > } > > close(fd); > sleep(5); > + fprintf(stderr, "%s: Late read start.\n", name); > + for (c = p; (void *)c < p + len; c += PAGE_SIZE) { > + *c = 1; > + } > + fprintf(stderr, "%s: Late read complete.\n", name); > + > + fprintf(stderr, "%s: Late write start.\n", name); > + for (c = p; (void *)c < p + len; c += PAGE_SIZE) { > + *c = 1; > + } > + fprintf(stderr, "%s: Late write complete.\n", name); > > return (0); > } > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:08 2019 Return-Path: Delivered-To: svn-src-user@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 ABCA9DC3B2 for ; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z31y6Lz4PD1; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 80A201A16E; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 7310615C87; Wed, 3 Apr 2019 08:18:23 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2BDF76B268; Wed, 3 Apr 2019 08:18:23 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1492015C85; Wed, 3 Apr 2019 08:18:23 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E4F2515C83 for ; Wed, 3 Apr 2019 08:18:19 +0000 (UTC) (envelope-from pho@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 996776B262; Wed, 3 Apr 2019 08:18:19 +0000 (UTC) (envelope-from pho@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 70917B127; Wed, 3 Apr 2019 08:18:19 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x338IJmN075869; Wed, 3 Apr 2019 08:18:19 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x338IJfD075868; Wed, 3 Apr 2019 08:18:19 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904030818.x338IJfD075868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345841 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345841 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 2BDF76B268 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:08 -0000 X-Original-Date: Wed, 3 Apr 2019 08:18:19 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:08 -0000 Author: pho Date: Wed Apr 3 08:18:18 2019 New Revision: 345841 URL: https://svnweb.freebsd.org/changeset/base/345841 Log: Restore original copyright notice. Reported by: "Rodney W. Grimes" Modified: user/pho/stress2/misc/mountu.sh Modified: user/pho/stress2/misc/mountu.sh ============================================================================== --- user/pho/stress2/misc/mountu.sh Wed Apr 3 07:22:46 2019 (r345840) +++ user/pho/stress2/misc/mountu.sh Wed Apr 3 08:18:18 2019 (r345841) @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # +# Copyright (c) 2012 Peter Holm # Copyright (c) 2019 Dell EMC Isilon # # Redistribution and use in source and binary forms, with or without From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:14 2019 Return-Path: Delivered-To: svn-src-user@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 28837DC592 for ; Tue, 3 Sep 2019 14:06:14 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z95Cq4z4PLF; Tue, 3 Sep 2019 14:06:13 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 4BFE01A357; Tue, 3 Sep 2019 14:06:02 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E27DA5407; Fri, 5 Apr 2019 07:45:17 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3821183C08; Fri, 5 Apr 2019 07:45:17 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 116F953CC; Fri, 5 Apr 2019 07:45:17 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 1037C53CA for ; Fri, 5 Apr 2019 07:45:14 +0000 (UTC) (envelope-from pho@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 D486283BFE; Fri, 5 Apr 2019 07:45:13 +0000 (UTC) (envelope-from pho@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 A92C1A08D; Fri, 5 Apr 2019 07:45:13 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x357jDM7091690; Fri, 5 Apr 2019 07:45:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x357jDdC091689; Fri, 5 Apr 2019 07:45:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904050745.x357jDdC091689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345905 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345905 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3821183C08 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:14 -0000 X-Original-Date: Fri, 5 Apr 2019 07:45:13 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:14 -0000 Author: pho Date: Fri Apr 5 07:45:13 2019 New Revision: 345905 URL: https://svnweb.freebsd.org/changeset/base/345905 Log: Added a timeout to this test. Do not call pthread_kill(3) with a undefined thread argument. Style fixes. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/signal0.sh Modified: user/pho/stress2/misc/signal0.sh ============================================================================== --- user/pho/stress2/misc/signal0.sh Fri Apr 5 03:37:16 2019 (r345904) +++ user/pho/stress2/misc/signal0.sh Fri Apr 5 07:45:13 2019 (r345905) @@ -47,16 +47,20 @@ rm -f signal0.c cd $odir (cd ../testcases/swap; ./swap -t 5m -i 20 -h -v) > /dev/null 2>&1 & +s=0 +# The timeout was added after r345702, due to a longer runtime for +# an INVARIANTS kernel +start=`date +%s` for i in `jot 500`; do /tmp/signal0 + [ $((`date +%s` - start)) -gt 900 ] && + { echo "Timeout @ loop $i/500"; s=1; break; } done -while pkill -9 swap; do - : -done +while pkill -9 swap; do :; done wait rm -f /tmp/signal0 -exit +exit $s EOF #include @@ -64,32 +68,35 @@ EOF #include #include -void signal_handler(int signum, siginfo_t *si, void *context) { - if (signum != SIGUSR1) { - printf("FAIL bad signal, signum=%d\n", signum); - exit(1); - } +static void +signal_handler(int signum, siginfo_t *si, void *context) { + if (signum != SIGUSR1) { + printf("FAIL bad signal, signum=%d\n", signum); + exit(1); + } } -void *thread_func(void *arg) { - return arg; +static void +*thread_func(void *arg) { + return arg; } -int main(void) { - struct sigaction sa = { 0 }; - sa.sa_flags = SA_SIGINFO; - sa.sa_sigaction = signal_handler; - if (sigfillset(&sa.sa_mask) != 0) abort(); - if (sigaction(SIGUSR1, &sa, NULL) != 0) abort(); - for (int i = 0; i < 10000; i++) { - pthread_t t; - pthread_create(&t, NULL, thread_func, NULL); - pthread_kill(t, SIGUSR1); - /* - Side note. pthread_kill(3) call behaviour is undefined if pthread_create(3) - in the line before failed. - */ +int +main(void) +{ + struct sigaction sa = { 0 }; - } - return 0; + sa.sa_flags = SA_SIGINFO; + sa.sa_sigaction = signal_handler; + if (sigfillset(&sa.sa_mask) != 0) abort(); + if (sigaction(SIGUSR1, &sa, NULL) != 0) abort(); + for (int i = 0; i < 10000; i++) { + pthread_t t; + + if (pthread_create(&t, NULL, thread_func, NULL) == 0) + pthread_kill(t, SIGUSR1); + + } + + return (0); } From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:07 2019 Return-Path: Delivered-To: svn-src-user@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 64BF8DC398 for ; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z30fH9z4PCs; Tue, 3 Sep 2019 14:06:07 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 642311A15D; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id CB6D014A27; Wed, 3 Apr 2019 07:22:50 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3416A97835; Wed, 3 Apr 2019 07:22:50 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 161AC149DF; Wed, 3 Apr 2019 07:22:50 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 0858D149DD for ; Wed, 3 Apr 2019 07:22:47 +0000 (UTC) (envelope-from pho@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 CEBE497831; Wed, 3 Apr 2019 07:22:46 +0000 (UTC) (envelope-from pho@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 AC162A897; Wed, 3 Apr 2019 07:22:46 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x337MkUn049519; Wed, 3 Apr 2019 07:22:46 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x337Mkt6049518; Wed, 3 Apr 2019 07:22:46 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904030722.x337Mkt6049518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345840 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345840 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3416A97835 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:07 -0000 X-Original-Date: Wed, 3 Apr 2019 07:22:46 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:07 -0000 Author: pho Date: Wed Apr 3 07:22:46 2019 New Revision: 345840 URL: https://svnweb.freebsd.org/changeset/base/345840 Log: Added tmpfs to the tested file systems. Added showing file mapping for RW and RO mounts. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mountu.sh Modified: user/pho/stress2/misc/mountu.sh ============================================================================== --- user/pho/stress2/misc/mountu.sh Wed Apr 3 07:09:28 2019 (r345839) +++ user/pho/stress2/misc/mountu.sh Wed Apr 3 07:22:46 2019 (r345840) @@ -1,9 +1,10 @@ #!/bin/sh # -# Copyright (c) 2012 Peter Holm -# All rights reserved. +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD # +# Copyright (c) 2019 Dell EMC Isilon +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -42,95 +43,198 @@ here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > mountu.c -mycc -o mountu -Wall -Wextra -O2 mountu.c +mycc -o mountu -Wall -Wextra -O2 mountu.c || exit 1 rm -f mountu.c pstat() { - pid=`ps a | grep -v grep | grep /tmp/mountu | awk '{print $1}'` + local pid + pid=`ps ax | grep -v grep | grep /tmp/mountu | awk '{print $1}'` [ -n "$pid" ] && procstat -v $pid } +ck() { + if mount | grep $mntpoint | grep -q "read-only"; then + if pstat $!| awk "\$2 == \"$map\"" | grep -q " rw-"; then + echo + echo "$1 difference" + mount | grep $mntpoint + printf "RW mount mapping and RO mount mapping:\n%s\n" "$r" + pstat $! | awk "\$2 == \"$map\"" + status=$((status + 1)) + fi + else + echo "$1 mount point RO did not succeed" + mount | grep $mntpoint + status=$((status + 1)) + fi +} + +status=0 +file=$mntpoint/mountu.sh.file +mapfile=/tmp/mountu.sh.map mount | grep -q "$mntpoint " && umount $mntpoint -mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 100m -u $mdstart -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -/tmp/mountu $mntpoint/file & - +# ufs +exec 5>$mapfile +/tmp/mountu UFS $file & +pid=$! sleep 1 -if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then - echo "UFS FAILED" - pstat -fi -wait +map=`cat $mapfile`; rm $mapfile; exec 5>&- + +r=`pstat $! | awk "\\$2 == \"$map\""` +mount -u -o ro $mntpoint 2>/dev/null || mount -fu -o ro $mntpoint +ck UFS +mount -u -o rw $mntpoint +rm -f $file +wait $pid +s=$? +[ $s -ne 139 ] && { echo "UFS exit status is $s"; status=1; } while mount | grep -q "$mntpoint "; do umount $mntpoint || sleep 1 done - mdconfig -d -u $mdstart +# nfs if ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev/null 2>&1; then - mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw $nfs_export \ + mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw $nfs_export \ $mntpoint - rm -f /tmp/file - /tmp/mountu $mntpoint/file & + sleep .2 + rm -f $file + /tmp/mountu NFS $file & + pid=$! sleep 1 - if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then - echo "NFS FAILED" - fi - wait - umount $mntpoint + r=`pstat $! | awk "\\$2 == \"$map\""` + mount -u -o ro $mntpoint 2>/dev/null || + mount -fu -o ro $mntpoint 2>/dev/null + ck NFS + wait $pid + s=$? + [ $s -ne 139 ] && { echo "NFS exit status is $s"; status=1; } + + mount -u -o rw $mntpoint 2>/dev/null + sleep .2 + [ -f $file ] && rm -f $file + umount $mntpoint || umount $mntpoint fi +# msdos if [ -x /sbin/mount_msdosfs ]; then mdconfig -a -t swap -s 100m -u $mdstart - bsdlabel -w md${mdstart} auto + bsdlabel -w md$mdstart auto newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null 2>&1 mount_msdosfs -m 777 /dev/md${mdstart}$part $mntpoint - /tmp/mountu $mntpoint/file & + /tmp/mountu MSDOS $file & + pid=$! sleep 1 - if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then - echo "MSDOS FAILED" - fi - wait + r=`pstat $! | awk "\\$2 == \"$map\""` + mount -u -o ro $mntpoint 2>/dev/null || mount -fu -o ro $mntpoint + ck MSDOS + wait $pid + s=$? + [ $s -ne 139 ] && { echo "MSDOS exit status is $s"; status=1; } + mount -u -o rw $mntpoint + rm -f $file while mount | grep -q "$mntpoint "; do umount $mntpoint || sleep 1 done + mdconfig -d -u $mdstart fi -rm -f /tmp/mountu /tmp/file + +# tmpfs +mount -t tmpfs null $mntpoint +chmod 777 $mntpoint + +/tmp/mountu TMPFS $file & +pid=$! + +sleep 1 +r=`pstat $! | awk "\\$2 == \"$map\""` +mount -u -o ro $mntpoint 2>/dev/null || mount -fu -o ro $mntpoint +ck TMPFS +sleep 1 +mount -u -o rw $mntpoint +rm -f $file +wait $pid +s=$? +[ $s -ne 139 ] && { echo "TMPFS exit status is $s"; status=1; } +while mount | grep -q "$mntpoint "; do + umount $mntpoint || sleep 1 +done + +rm -f /tmp/mountu exit 0 EOF -#include +/* kib@ noted: + UFS/NFS/msdosfs reclaim vnode on rw->ro forced remount, and + change the type of the underying object to OBJT_DEAD, but leave + the pages on the object queue and installed in the page tables. + Applications can read/write already mapped pages, but cannot + page in new pages, cannot observe possible further modifications + to already mapped pages (if ro->rw remount happen later), and + their updates to pages are not flushed to file. + + It is impossible to mimic this behaviour for tmpfs. + */ +#include +#include +#include + #include -#include -#include -#include +#include #include #include -#include -#include +#include +#include +#include #include #include -#include #define STARTADDR 0x0U -#define ADRSPACE 0x0640000U +#define ADRSPACE 0x0640000U +static void +sighandler(int signo, siginfo_t *si, void *uc1) +{ + ucontext_t *uc; + + uc = uc1; + printf("SIG%s at %p, addr %p\n", sys_signame[signo], si->si_addr, +#if defined(__i386__) + (void *)uc->uc_mcontext.mc_eip); +#else + (void *)uc->uc_mcontext.mc_rip); +#endif + exit(1); +} + int main(int argc __unused, char **argv) { - int fd, ps; + struct passwd *pw; + struct sigaction sa; void *p; size_t len; - struct passwd *pw; - char *c, *path; + int fd; + char *name, *path; + volatile char *c; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = sighandler; + sa.sa_flags = SA_SIGINFO; + if (sigaction(SIGSEGV, &sa, NULL) == -1) + err(1, "sigaction(SIGSEGV)"); + if (sigaction(SIGBUS, &sa, NULL) == -1) + err(1, "sigaction(SIGBUS)"); + if ((pw = getpwnam("nobody")) == NULL) err(1, "no such user: nobody"); @@ -143,7 +247,8 @@ main(int argc __unused, char **argv) p = (void *)STARTADDR; len = ADRSPACE; - path = argv[1]; + name = argv[1]; + path = argv[2]; if ((fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0622)) == -1) err(1,"open(%s)", path); if (ftruncate(fd, len) == -1) @@ -156,15 +261,25 @@ main(int argc __unused, char **argv) } err(1, "mmap(1)"); } + dprintf(5, "%p\n", p); - c = p; - ps = getpagesize(); - for (c = p; (void *)c < p + len; c += ps) { + for (c = p; (void *)c < p + len; c += PAGE_SIZE) { *c = 1; } close(fd); sleep(5); + fprintf(stderr, "%s: Late read start.\n", name); + for (c = p; (void *)c < p + len; c += PAGE_SIZE) { + *c = 1; + } + fprintf(stderr, "%s: Late read complete.\n", name); + + fprintf(stderr, "%s: Late write start.\n", name); + for (c = p; (void *)c < p + len; c += PAGE_SIZE) { + *c = 1; + } + fprintf(stderr, "%s: Late write complete.\n", name); return (0); } From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:29 2019 Return-Path: Delivered-To: svn-src-user@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 7373DDCA08 for ; Tue, 3 Sep 2019 14:06:29 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zS3Xf2z4PbH; Tue, 3 Sep 2019 14:06:28 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 2C69D1A705; Tue, 3 Sep 2019 14:06:09 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id ED612157EA; Tue, 9 Apr 2019 07:36:44 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 34E788027B; Tue, 9 Apr 2019 07:36:44 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 17613157A8; Tue, 9 Apr 2019 07:36:44 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 3709A157A3 for ; Tue, 9 Apr 2019 07:36:41 +0000 (UTC) (envelope-from pho@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 E593380272; Tue, 9 Apr 2019 07:36:40 +0000 (UTC) (envelope-from pho@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 C16F87DB4; Tue, 9 Apr 2019 07:36:40 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x397ae8F069597; Tue, 9 Apr 2019 07:36:40 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x397aetu069596; Tue, 9 Apr 2019 07:36:40 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904090736.x397aetu069596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346047 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 346047 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 34E788027B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; NEURAL_HAM_SHORT(-0.93)[-0.935,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:29 -0000 X-Original-Date: Tue, 9 Apr 2019 07:36:40 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:29 -0000 Author: pho Date: Tue Apr 9 07:36:40 2019 New Revision: 346047 URL: https://svnweb.freebsd.org/changeset/base/346047 Log: Added a msdosfs regression test. PR: 236977 Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/truncate8.sh (contents, props changed) Added: user/pho/stress2/misc/truncate8.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/truncate8.sh Tue Apr 9 07:36:40 2019 (r346047) @@ -0,0 +1,214 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2019 Dell EMC Isilon +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Bug 236977 - [msdosfs] returns cached truncated data +# Fixed by r345847 + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/truncate8.c +mycc -o truncate8 -Wall -Wextra -O0 -g truncate8.c || exit 1 +rm -f truncate8.c +cd $odir + +echo ufs: +mount | grep -q "$mntpoint " && umount $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint + +(cd $mntpoint; /tmp/truncate8) +s=$? +[ $s -ne 0 ] && { echo "UFS exit status is $s"; status=1; } +while mount | grep -q "$mntpoint "; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart + +echo nfs: +if ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev/null 2>&1; then + mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw $nfs_export \ + $mntpoint + sleep .2 + (cd $mntpoint; /tmp/truncate8) + s=$? + [ $s -ne 0 ] && { echo "NFS exit status is $s"; status=1; } + + umount $mntpoint || umount $mntpoint +fi + +echo msdos: +if [ -x /sbin/mount_msdosfs ]; then + mdconfig -a -t swap -s 1g -u $mdstart + bsdlabel -w md$mdstart auto + newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null 2>&1 + mount_msdosfs -m 777 /dev/md${mdstart}$part $mntpoint + + (cd /mnt; /tmp/truncate8) + s=$? + [ $s -ne 0 ] && { echo "MSDOS exit status is $s"; status=1; } + while mount | grep -q "$mntpoint "; do + umount $mntpoint || sleep 1 + done + mdconfig -d -u $mdstart +fi + +echo tmpfs: +mount -t tmpfs null $mntpoint +chmod 777 $mntpoint + +(cd $mntpoint; /tmp/truncate8) +s=$? +[ $s -ne 0 ] && { echo "TMPFS exit status is $s"; status=1; } +while mount | grep -q "$mntpoint "; do + umount $mntpoint || sleep 1 +done + +rm -rf /tmp/truncate8 +exit $status + +EOF +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include + +static volatile u_int *share; + +#define BSIZE 5120 +#define FSIZE (128 * 1024 * 1024) +#define PARALLEL 2 +#define RUNTIME (1 * 60) +#define SYNC 0 + +static void +test(void) +{ + time_t start; + off_t pos; + int fd, i, n, r; + char *buf, name[128]; + + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != PARALLEL) + ; + + srand48(getpid()); + buf = malloc(BSIZE); + for (i = 0; i < (int)sizeof(buf); i++) + buf[i] = 123; + + sprintf(name, "f%05d", getpid()); + if ((fd = open(name, O_RDWR | O_CREAT, 0640)) == -1) + err(1, "%s", name); + for (i = 0; i < FSIZE / BSIZE; i++) + if (write(fd, buf, BSIZE) != BSIZE) + err(1, "write"); + + start = time(NULL); + while (time(NULL) - start < RUNTIME) { + pos = lrand48() % (FSIZE - BSIZE); +// fprintf(stderr, "truncate(%jd)\n", (intmax_t)pos); + if (ftruncate(fd, pos) == -1) + err(1, "ftruncate"); + + if (ftruncate(fd, FSIZE) == -1) + err(1, "ftruncate"); + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek"); + n = 0; + while ((r = read(fd, buf, BSIZE)) == BSIZE) { + n++; + for (i = 0; i < BSIZE; i++) { + if (buf[i] != 0) + errx(1, "Bad read value @ %jd = %d", + (intmax_t)(pos + i), buf[i]); + } + } + if (r == -1) + err(1, "read"); + if (n != (FSIZE - pos) / BSIZE) + fprintf(stderr, "n = %d, target = %d\n", n, (int)(FSIZE - pos) / BSIZE); + } + unlink(name); + + _exit(0); +} + +int +main(void) +{ + pid_t pids[PARALLEL]; + size_t len; + int e, i, status; + + e = 0; + len = PAGE_SIZE; + if ((share = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_SHARED, -1, 0)) == MAP_FAILED) + err(1, "mmap"); + + for (i = 0; i < PARALLEL; i++) { + if ((pids[i] = fork()) == 0) + test(); + if (pids[i] == -1) + err(1, "fork()"); + } + for (i = 0; i < PARALLEL; i++) { + if (waitpid(pids[i], &status, 0) == -1) + err(1, "waitpid(%d)", pids[i]); + if (status != 0) { + if (WIFSIGNALED(status)) + fprintf(stderr, + "pid %d exit signal %d\n", + pids[i], WTERMSIG(status)); + } + e += status == 0 ? 0 : 1; + } + + return (e); +} From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:40 2019 Return-Path: Delivered-To: svn-src-user@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 DAF92DCD55 for ; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zg37Jnz4Pmk; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id D64FA1A9B3; Tue, 3 Sep 2019 14:06:13 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 8402F18BDE; Wed, 10 Apr 2019 22:27:05 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2D0588EE68; Wed, 10 Apr 2019 22:27:05 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 196D618BDC; Wed, 10 Apr 2019 22:27:05 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 1D52D18BDA for ; Wed, 10 Apr 2019 22:27:02 +0000 (UTC) (envelope-from ngie@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 F19678EE65; Wed, 10 Apr 2019 22:27:00 +0000 (UTC) (envelope-from ngie@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 50854F8D; Wed, 10 Apr 2019 22:27:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AMR0Sq010925; Wed, 10 Apr 2019 22:27:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AMR0Ei010924; Wed, 10 Apr 2019 22:27:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904102227.x3AMR0Ei010924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346109 - user/ngie/fix-up-cxxstd/share/mk X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/fix-up-cxxstd/share/mk X-SVN-Commit-Revision: 346109 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 2D0588EE68 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:40 -0000 X-Original-Date: Wed, 10 Apr 2019 22:27:00 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:40 -0000 Author: ngie Date: Wed Apr 10 22:26:59 2019 New Revision: 346109 URL: https://svnweb.freebsd.org/changeset/base/346109 Log: Clarify a comment w.r.t. -std=g++98 and clang++ < 6.x While here, simplify a conditional Modified: user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Modified: user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk ============================================================================== --- user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Wed Apr 10 22:19:47 2019 (r346108) +++ user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Wed Apr 10 22:26:59 2019 (r346109) @@ -31,10 +31,9 @@ CFLAGS+= -std=${CSTD} .if ${COMPILER_TYPE} == "clang" || ${COMPILER_TYPE} == "gcc" .if ${COMPILER_VERSION} >= 60000 CXXSTD?= gnu++14 -.else -# Prior versions of g++ support C++98 with GNU extensions by default. -CXXSTD?= gnu++98 .endif +# Prior versions of clang++/g++ support C++98 with GNU extensions by default. +CXXSTD?= gnu++98 .endif # Assume that the compiler supports at least C++98. CXXSTD?= c++98 From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:39 2019 Return-Path: Delivered-To: svn-src-user@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 70001DCD2A for ; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zf73pkz4PmD; Tue, 3 Sep 2019 14:06:38 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id A9EDE1A999; Tue, 3 Sep 2019 14:06:13 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 66C3017698; Wed, 10 Apr 2019 21:29:41 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 353828C16E; Wed, 10 Apr 2019 21:29:41 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 10C4417696; Wed, 10 Apr 2019 21:29:41 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 818511768C for ; Wed, 10 Apr 2019 21:29:38 +0000 (UTC) (envelope-from ngie@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 3A4FE8C160; Wed, 10 Apr 2019 21:29:38 +0000 (UTC) (envelope-from ngie@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 EAD1355F; Wed, 10 Apr 2019 21:29:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3ALTb2t078807; Wed, 10 Apr 2019 21:29:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3ALTbub078806; Wed, 10 Apr 2019 21:29:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904102129.x3ALTbub078806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346102 - user/ngie/fix-up-cxxstd X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/fix-up-cxxstd X-SVN-Commit-Revision: 346102 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 353828C16E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.94)[-0.936,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:39 -0000 X-Original-Date: Wed, 10 Apr 2019 21:29:37 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:39 -0000 Author: ngie Date: Wed Apr 10 21:29:37 2019 New Revision: 346102 URL: https://svnweb.freebsd.org/changeset/base/346102 Log: Create a temporary branch for testing out jbeich's refinement of r345708 Added: - copied from r346101, head/ Directory Properties: user/ngie/fix-up-cxxstd/ (props changed) From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:39 2019 Return-Path: Delivered-To: svn-src-user@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 D6D79DCD52 for ; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zg2wfWz4Pmg; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id CBC231A9AF; Tue, 3 Sep 2019 14:06:13 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 7E82F1895F; Wed, 10 Apr 2019 22:16:56 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42A918E8D2; Wed, 10 Apr 2019 22:16:56 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1A3441895D; Wed, 10 Apr 2019 22:16:56 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 7A5921895B for ; Wed, 10 Apr 2019 22:16:53 +0000 (UTC) (envelope-from ngie@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 337868E8CE; Wed, 10 Apr 2019 22:16:53 +0000 (UTC) (envelope-from ngie@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 07F88DCF; Wed, 10 Apr 2019 22:16:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AMGqGH005912; Wed, 10 Apr 2019 22:16:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AMGp7e005901; Wed, 10 Apr 2019 22:16:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904102216.x3AMGp7e005901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346107 - in user/ngie/fix-up-cxxstd: lib/libc++ lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh lib/ofed/libibnetdisc share/mk usr.bin/dtc X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in user/ngie/fix-up-cxxstd: lib/libc++ lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh lib/ofed/libibnetdisc share/mk usr.bin/dtc X-SVN-Commit-Revision: 346107 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 42A918E8D2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:40 -0000 X-Original-Date: Wed, 10 Apr 2019 22:16:51 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:40 -0000 Author: ngie Date: Wed Apr 10 22:16:50 2019 New Revision: 346107 URL: https://svnweb.freebsd.org/changeset/base/346107 Log: Set the C++ standard in a manner similar to how it was set, pre-r345708 Some cases overrode -std if specified; some cases would be overridden if specified. Be bug compatible. Modified: user/ngie/fix-up-cxxstd/lib/libc++/Makefile user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile Modified: user/ngie/fix-up-cxxstd/lib/libc++/Makefile ============================================================================== --- user/ngie/fix-up-cxxstd/lib/libc++/Makefile Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/lib/libc++/Makefile Wed Apr 10 22:16:50 2019 (r346107) @@ -76,7 +76,7 @@ CFLAGS+= -nostdinc++ CFLAGS+= -nostdlib CFLAGS+= -D_LIBCPP_BUILDING_LIBRARY CFLAGS+= -DLIBCXXRT -CXXSTD= c++11 +CXXSTD?= c++11 LIBADD+= cxxrt INCSGROUPS= STD EXP EXT Modified: user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile ============================================================================== --- user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile Wed Apr 10 22:16:50 2019 (r346107) @@ -20,6 +20,6 @@ CXXFLAGS+= -nostdinc++ CXXFLAGS+= -nostdlib CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY CXXFLAGS+= -DLIBCXXRT -CXXSTD= c++14 +CXXSTD?= c++14 .include Modified: user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile ============================================================================== --- user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile Wed Apr 10 22:16:50 2019 (r346107) @@ -22,6 +22,6 @@ CXXFLAGS+= -nostdinc++ CXXFLAGS+= -nostdlib CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY CXXFLAGS+= -DLIBCXXRT -CXXSTD= c++14 +CXXSTD?= c++14 .include Modified: user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile ============================================================================== --- user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile Wed Apr 10 22:16:50 2019 (r346107) @@ -22,7 +22,7 @@ SRCS+= libelftc_dem_gnu3.c\ WARNS= 0 CFLAGS+= -isystem ${SRCDIR} -nostdinc++ -CXXSTD= c++11 +CXXSTD?= c++11 VERSION_MAP= ${.CURDIR}/Version.map .include Modified: user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc ============================================================================== --- user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc Wed Apr 10 22:16:50 2019 (r346107) @@ -28,7 +28,7 @@ CXXFLAGS.${file}+= -fno-exceptions -funwind-tables CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY CXXFLAGS+= -fno-rtti -CXXSTD= c++11 +CXXSTD?= c++11 STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC # Probably need to just move this earlier or use CXXFLAGS .if ${MK_DIRDEPS_BUILD} == "yes" Modified: user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile ============================================================================== --- user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile Wed Apr 10 22:16:50 2019 (r346107) @@ -31,6 +31,9 @@ LIBADD= osmcomp ibmad ibumad CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${_spath} CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband +.if ${COMPILER_FEATURES:Mc++11} +CXXSTD= c++11 +.endif VERSION_MAP= ${_spath}/libibnetdisc.map .include Modified: user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk ============================================================================== --- user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk Wed Apr 10 22:16:50 2019 (r346107) @@ -9,4 +9,6 @@ GTESTS_CXXFLAGS+= -frtti # libgmock's, etc, headers. CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private +CXXSTD?= c++11 + NO_WTHREAD_SAFETY= Modified: user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile ============================================================================== --- user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile Wed Apr 10 21:46:59 2019 (r346106) +++ user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile Wed Apr 10 22:16:50 2019 (r346107) @@ -8,6 +8,8 @@ WARNS?= 3 CXXFLAGS+= -fno-rtti -fno-exceptions +CXXSTD= c++11 + NO_SHARED?=NO .include From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:42 2019 Return-Path: Delivered-To: svn-src-user@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 A8942DCE20 for ; Tue, 3 Sep 2019 14:06:42 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zk1w96z4Pph; Tue, 3 Sep 2019 14:06:42 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 1F8A81AA49; Tue, 3 Sep 2019 14:06:14 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id BA36D7FE0; Thu, 11 Apr 2019 18:03:53 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D92B70D11; Thu, 11 Apr 2019 18:03:53 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0DA5E7FAE; Thu, 11 Apr 2019 18:03:53 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id B999A7FA9; Thu, 11 Apr 2019 18:03:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E03870D09; Thu, 11 Apr 2019 18:03:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id F18FC3275; Thu, 11 Apr 2019 18:03:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346108 - user/ngie/fix-up-cxxstd/share/mk To: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org References: <201904102219.x3AMJlRu006058@repo.freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904102219.x3AMJlRu006058@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 4D92B70D11 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.992,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:42 -0000 X-Original-Date: Thu, 11 Apr 2019 11:03:48 -0700 X-List-Received-Date: Tue, 03 Sep 2019 14:06:42 -0000 On 4/10/19 3:19 PM, Enji Cooper wrote: > Author: ngie > Date: Wed Apr 10 22:19:47 2019 > New Revision: 346108 > URL: https://svnweb.freebsd.org/changeset/base/346108 > > Log: > Rework r345708 > > * Default to gnu++14 with clang++ and g++ 6.x+ according to the defaults of > each compile toolchain. > * Do not override user-specified values for `-std=*`. Some ports rely on this > functionality. > > This patch is similar to the one submitted by jbeich, however, it aims to > optimize the latter case by not testing the compiler version, etc, at all. > > Reported by: jbeich One thing I don't understand is why we'd set the value to the default value. If we want to use the compiler's default it seems like we should just not set the flag at all. Trying to keep the list in sync across compiler versions seems fragile. If, OTOH, we want to ensure that FreeBSD only uses C++11 so that in theory any C++11 compiler can compile it, then forcing C++11 even on newer compilers as the original change did would seem to make sense (and seems to be a legitimate reason to force -std). However, trying to just match the compiler's default seems to be a giant NOP, but one that requires ongoing maintenance. Can you describe the goal of what the -std changes are trying to do? -- John Baldwin From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:39 2019 Return-Path: Delivered-To: svn-src-user@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 D57FEDCD4F for ; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zg3298z4Pmj; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id D13861A9B1; Tue, 3 Sep 2019 14:06:13 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 70C0018A81; Wed, 10 Apr 2019 22:19:51 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30CF68EA15; Wed, 10 Apr 2019 22:19:51 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1BF7218A80; Wed, 10 Apr 2019 22:19:51 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 7868918A7E for ; Wed, 10 Apr 2019 22:19:48 +0000 (UTC) (envelope-from ngie@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 329B68EA12; Wed, 10 Apr 2019 22:19:48 +0000 (UTC) (envelope-from ngie@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 0A30BDD2; Wed, 10 Apr 2019 22:19:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AMJlpc006059; Wed, 10 Apr 2019 22:19:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AMJlRu006058; Wed, 10 Apr 2019 22:19:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904102219.x3AMJlRu006058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346108 - user/ngie/fix-up-cxxstd/share/mk X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/fix-up-cxxstd/share/mk X-SVN-Commit-Revision: 346108 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 30CF68EA15 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:40 -0000 X-Original-Date: Wed, 10 Apr 2019 22:19:47 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:40 -0000 Author: ngie Date: Wed Apr 10 22:19:47 2019 New Revision: 346108 URL: https://svnweb.freebsd.org/changeset/base/346108 Log: Rework r345708 * Default to gnu++14 with clang++ and g++ 6.x+ according to the defaults of each compile toolchain. * Do not override user-specified values for `-std=*`. Some ports rely on this functionality. This patch is similar to the one submitted by jbeich, however, it aims to optimize the latter case by not testing the compiler version, etc, at all. Reported by: jbeich Modified: user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Modified: user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk ============================================================================== --- user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Wed Apr 10 22:16:50 2019 (r346107) +++ user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Wed Apr 10 22:19:47 2019 (r346108) @@ -25,16 +25,21 @@ CFLAGS+= -std=iso9899:1999 CFLAGS+= -std=${CSTD} .endif # CSTD -.if ${COMPILER_FEATURES:Mc++11} -CXXSTD?= c++11 -.elif ${COMPILER_TYPE} == "gcc" +# Only pass -std= if not specified to facilitate compatibility with previous +# FreeBSD versions. Third-party packages might specify -std=*. +.if empty(CXXFLAGS:M-std=*) +.if ${COMPILER_TYPE} == "clang" || ${COMPILER_TYPE} == "gcc" +.if ${COMPILER_VERSION} >= 60000 +CXXSTD?= gnu++14 +.else # Prior versions of g++ support C++98 with GNU extensions by default. CXXSTD?= gnu++98 -.else +.endif +.endif # Assume that the compiler supports at least C++98. CXXSTD?= c++98 -.endif CXXFLAGS+= -std=${CXXSTD} +.endif # CXXSTD # -pedantic is problematic because it also imposes namespace restrictions From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:45 2019 Return-Path: Delivered-To: svn-src-user@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 9AF6CDCEC6 for ; Tue, 3 Sep 2019 14:06:45 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zn1gyGz4PsG; Tue, 3 Sep 2019 14:06:45 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 7F5861AB02; Tue, 3 Sep 2019 14:06:16 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 16691E70E; Fri, 12 Apr 2019 05:43:06 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 490998C5A3; Fri, 12 Apr 2019 05:43:05 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 16BFFE6E3; Fri, 12 Apr 2019 05:43:05 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id C7B08E6E1 for ; Fri, 12 Apr 2019 05:43:02 +0000 (UTC) (envelope-from ngie@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 78B468C597; Fri, 12 Apr 2019 05:43:02 +0000 (UTC) (envelope-from ngie@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 532391D26C; Fri, 12 Apr 2019 05:43:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3C5h2db099231; Fri, 12 Apr 2019 05:43:02 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3C5h2vC099230; Fri, 12 Apr 2019 05:43:02 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904120543.x3C5h2vC099230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346148 - user/ngie/fix-up-cxxstd/share/mk X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/fix-up-cxxstd/share/mk X-SVN-Commit-Revision: 346148 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 490998C5A3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:45 -0000 X-Original-Date: Fri, 12 Apr 2019 05:43:02 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:45 -0000 Author: ngie Date: Fri Apr 12 05:43:01 2019 New Revision: 346148 URL: https://svnweb.freebsd.org/changeset/base/346148 Log: Take a more relaxed approach to CXXSTD Only inject `-std=${CXXSTD}` if the value of CXXSTD is not empty. This satisfies the backwards compatibility of bsd.sys.mk, pre-r345708, and the aim of CXXSTD in r345708, without having to hardcode nop values and build unnecessary intelligence of supported C++11 standards in bsd.sys.mk for each compiler. Modified: user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Modified: user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk ============================================================================== --- user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Fri Apr 12 02:27:03 2019 (r346147) +++ user/ngie/fix-up-cxxstd/share/mk/bsd.sys.mk Fri Apr 12 05:43:01 2019 (r346148) @@ -25,21 +25,9 @@ CFLAGS+= -std=iso9899:1999 CFLAGS+= -std=${CSTD} .endif # CSTD -# Only pass -std= if not specified to facilitate compatibility with previous -# FreeBSD versions. Third-party packages might specify -std=*. -.if empty(CXXFLAGS:M-std=*) -.if ${COMPILER_TYPE} == "clang" || ${COMPILER_TYPE} == "gcc" -.if ${COMPILER_VERSION} >= 60000 -CXXSTD?= gnu++14 -.endif -# Prior versions of clang++/g++ support C++98 with GNU extensions by default. -CXXSTD?= gnu++98 -.endif -# Assume that the compiler supports at least C++98. -CXXSTD?= c++98 +.if !empty(CXXSTD) CXXFLAGS+= -std=${CXXSTD} .endif -# CXXSTD # -pedantic is problematic because it also imposes namespace restrictions #CFLAGS+= -pedantic From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:12 2019 Return-Path: Delivered-To: svn-src-user@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 B04DCDD693 for ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J34r4z4QMH; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 0F95F1B277; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 26C4BD72B; Sat, 20 Apr 2019 16:01:11 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 489D5967B2; Sat, 20 Apr 2019 16:01:09 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 24DFDD6C1; Sat, 20 Apr 2019 16:01:09 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id D551FD6BF for ; Sat, 20 Apr 2019 16:01:05 +0000 (UTC) (envelope-from ngie@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 1CFD3967A3; Sat, 20 Apr 2019 16:01:05 +0000 (UTC) (envelope-from ngie@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 D2FFB18500; Sat, 20 Apr 2019 16:01:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3KG14oX046363; Sat, 20 Apr 2019 16:01:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KG14c2046361; Sat, 20 Apr 2019 16:01:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201601.x3KG14c2046361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346446 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346446 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 489D5967B2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:13 -0000 X-Original-Date: Sat, 20 Apr 2019 16:01:04 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:13 -0000 Author: ngie Date: Sat Apr 20 16:01:04 2019 New Revision: 346446 URL: https://svnweb.freebsd.org/changeset/base/346446 Log: Hack away at runtests - Do not rely on local copy of dpkt module. Rely on py-dpkt, instead. The reason for this is that this removes the need for introducing localized fixes to dpkt.py, as upstream has changed significantly in the last few years, and now supports both python 2.x and python 3. - Convert tests to TAP format. This adds improved introspection, as the plain tests have little to no introspection, and kyua lacks python unittest engine support. As such, remove `set -ex`, as it would impede being able to run this test with TAP cleanly. Deleted: user/ngie/bug-237403/tests/sys/opencrypto/dpkt.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/Makefile user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Modified: user/ngie/bug-237403/tests/sys/opencrypto/Makefile ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/Makefile Sat Apr 20 15:57:05 2019 (r346445) +++ user/ngie/bug-237403/tests/sys/opencrypto/Makefile Sat Apr 20 16:01:04 2019 (r346446) @@ -12,12 +12,12 @@ CFLAGS.poly1305_test.c += -I${SRCTOP}/sys/opencrypto ATF_TESTS_C+= blake2_test poly1305_test -PLAIN_TESTS_SH= runtests +TAP_TESTS_SH+= runtests -TEST_METADATA.runtests+= required_programs="python2" +TEST_METADATA.runtests+= required_programs="python" TEST_METADATA.runtests+= required_user="root" -PYMODULES= cryptodev.py cryptodevh.py cryptotest.py dpkt.py +PYMODULES= cryptodev.py cryptodevh.py cryptotest.py ${PACKAGE}FILES+= ${PYMODULES} Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 15:57:05 2019 (r346445) +++ user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:01:04 2019 (r346446) @@ -29,13 +29,18 @@ # $FreeBSD$ # -set -ex +: ${PYTHON=python} if [ ! -d /usr/local/share/nist-kat ]; then - echo 'Skipping, nist-kat package not installed for test vectors.' + echo "1..0 # SKIP: nist-kat package not installed for test vectors" exit 0 fi +if ! $PYTHON -c "from dpkt import dpkt"; then + echo "1..0 # SKIP: py-dpkt package not installed" + exit 0 +fi + loaded_modules= cleanup_tests() { @@ -52,7 +57,11 @@ trap cleanup_tests EXIT INT TERM for required_module in nexus/aesni cryptodev; do if ! kldstat -q -m $required_module; then - kldload ${required_module#nexus/} + module_to_load=${required_module#nexus/} + if ! kldload ${module_to_load}; then + echo "1..0 # SKIP: could not load ${module_to_load}" + exit 0 + fi loaded_modules="$loaded_modules $required_module" fi done @@ -61,6 +70,11 @@ done oldcdas=$(sysctl -e kern.cryptodevallowsoft) sysctl kern.cryptodevallowsoft=1 -python2 $(dirname $0)/cryptotest.py +echo "1..1" +if "$PYTHON" $(dirname $0)/cryptotest.py; then + echo "ok 1" +else + echo "not ok 1" +fi sysctl "$oldcdas" From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:13 2019 Return-Path: Delivered-To: svn-src-user@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 EA0A7DD6A2 for ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J45flz4QMQ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 15D241B27A; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 58FE4D97C; Sat, 20 Apr 2019 16:05:08 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2710696C98; Sat, 20 Apr 2019 16:05:08 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0E282D97B; Sat, 20 Apr 2019 16:05:08 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id ACFE4D979 for ; Sat, 20 Apr 2019 16:05:05 +0000 (UTC) (envelope-from ngie@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 7818096C95; Sat, 20 Apr 2019 16:05:05 +0000 (UTC) (envelope-from ngie@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 526D21867E; Sat, 20 Apr 2019 16:05:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3KG55vI051304; Sat, 20 Apr 2019 16:05:05 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KG55Q2051303; Sat, 20 Apr 2019 16:05:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201605.x3KG55Q2051303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346447 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346447 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 2710696C98 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:13 -0000 X-Original-Date: Sat, 20 Apr 2019 16:05:05 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:13 -0000 Author: ngie Date: Sat Apr 20 16:05:04 2019 New Revision: 346447 URL: https://svnweb.freebsd.org/changeset/base/346447 Log: Use py3 compatible method for catching exceptions Now ancient versions of python used to support catching exceptions in the form `except Exception, exception_object`. This support was removed in py3 (and introduced preemptively in earlier 2.x versions), being replaced by the form `except Exception as exception_object`. Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:01:04 2019 (r346446) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:05:04 2019 (r346447) @@ -113,7 +113,7 @@ def GenTestCase(cname): cipherkey, mac=self._gmacsizes[len(cipherkey)], mackey=cipherkey, crid=crid) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test algorithms the driver does not support. if e.errno != errno.EOPNOTSUPP: raise @@ -122,7 +122,7 @@ def GenTestCase(cname): if mode == 'ENCRYPT': try: rct, rtag = c.encrypt(pt, iv, aad) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test inputs the driver does not support. if e.errno != errno.EINVAL: raise @@ -142,7 +142,7 @@ def GenTestCase(cname): else: try: rpt, rtag = c.decrypt(*args) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test inputs the driver does not support. if e.errno != errno.EINVAL: raise @@ -210,7 +210,7 @@ def GenTestCase(cname): try: c = Crypto(meth, cipherkey, crid=crid) r = curfun(c, pt, iv) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test hashes the driver does not support. if e.errno != errno.EOPNOTSUPP: raise @@ -309,7 +309,7 @@ def GenTestCase(cname): try: c = Crypto(mac=alg, mackey=key, crid=crid) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test hashes the driver does not support. if e.errno != errno.EOPNOTSUPP: raise From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:13 2019 Return-Path: Delivered-To: svn-src-user@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 EA222DD6A3 for ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J3sk2z4QMM; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 26CD51B280; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id BA163DCD4; Sat, 20 Apr 2019 16:16:01 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4022F972CA; Sat, 20 Apr 2019 16:16:01 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1386BDCD2; Sat, 20 Apr 2019 16:16:01 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 3851BDCCF; Sat, 20 Apr 2019 16:15:58 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D7DC0972C2; Sat, 20 Apr 2019 16:15:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x543.google.com with SMTP id z9so3938417pgu.10; Sat, 20 Apr 2019 09:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=/HPFWCiBZeWNZEHQgT8jvHmx4CXuxcXeqraGeopVWGU=; b=TrDk3TVt/op8BRgVtQ/q5jMplmh7v/VAF23dqVyq3OHA4c3vtL/pWb2ygXof7zr8B6 ERY68JMmC/8J+GlljErybBvHb418VV+LncldW+XCLLH6fXKHV4Vo6eRoiwgklhgpSts+ ZTjPuF8MZRxmHDJ+WeZNVFv+IjFfIofiT/qnRCwKvLv2i/ooJvA6XJ17+50OVN6uRdFR BXIWazySgUGE/XtcxzwwoNsdvc/wnSA9uqg4bNg5V2uTTyzgPQEYRP8fnI/34npc2bg1 NyQhZboJ8sQuQ/SD2gWP3pS85Co1seIVG5wqRTvx2ytgEifqhehI7wpZUXPE1vwlqiQ9 Lvnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=/HPFWCiBZeWNZEHQgT8jvHmx4CXuxcXeqraGeopVWGU=; b=a9KrV5p/2FuP6udwBfBc1b72astbXC2hVyIHVrn30d7ivqoifWUz2PDE8fexbXl5LN Nsg0hKVXOkR107Lvz9/IPtFHauF7FGuJbLCi0GBz6HVCFvykS/Uc98SU8izTf8Pd9Fhq wPJLz8L9xyo7sfWTYOGnnnqekhoQG6CzghDzWZ0K1wVJx4cnqwM0oAFTA/l8fpm97Zqq R3lKNsSZ8ffCyMqgAnqD5sMZ/fwi9cEr9+iSnr4O6sQJfrCOi/tQV22I9t1aiO2joYla kzQ4P3gRXuwaoBHl3HZj6W9A7LYK6cXiQDO+v33yZDyFzfpdTZIjo+/r1rLSeJxjDVH+ o06g== X-Gm-Message-State: APjAAAWm/+PaEAIR1HOcU8gS7Y5dqkBNOSf9nHAziJRb+cHia3f7hjfA uJhMFd3zXMaKZFJzk5zjaOLPKDZghEk= X-Google-Smtp-Source: APXvYqyWn5WsH13KLiqpAWV1JeVWkveL+cA2E5oD4nH9IWc6pdmZcJnYFpoXnPgCffzgd2WV8ednug== X-Received: by 2002:a62:480d:: with SMTP id v13mr10691526pfa.125.1555776956581; Sat, 20 Apr 2019 09:15:56 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id h189sm16447158pfc.125.2019.04.20.09.15.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Apr 2019 09:15:55 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto From: Enji Cooper In-Reply-To: <201904201607.x3KG7m4A051487@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201904201607.x3KG7m4A051487@repo.freebsd.org> To: Enji Cooper X-Mailer: Apple Mail (2.3445.102.3) Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 4022F972CA X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:14 -0000 X-Original-Date: Sat, 20 Apr 2019 09:15:55 -0700 X-List-Received-Date: Tue, 03 Sep 2019 14:07:14 -0000 > On Apr 20, 2019, at 9:07 AM, Enji Cooper wrote: >=20 > Author: ngie > Date: Sat Apr 20 16:07:47 2019 > New Revision: 346449 > URL: https://svnweb.freebsd.org/changeset/base/346449 >=20 > Log: > Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify >=20 > Encoding/decoding base_string objects as "hex" was removed in py3 and = replaced > with other methods, one being `binascii.(un)?hexlify`. I accidentally introduced other changes in this commit to cryptodev.py. = Summary is as follows: Py3 changed the default text encoding from ascii strings to Unicode = strings, which requires converting a number of code which working = previously with ascii to use byte (ascii binary, e.g., b=E2=80=99' = prefixed) strings. In order to convert between ascii binary and unicode = strings (which some of the dpkt/crypto APIs require), one must use the = .decode/.encode methods, as described in the Unicode guide: = https://docs.python.org/3/howto/unicode.html. This change introduces a work-in-progress item to use .decode/.encode in = cryptodev.py . It=E2=80=99s not 100% complete, so the tests fail when = converting objects to/from str/bytes objects, like shown below. Cheers, -Enji $ sudo kyua debug -k /usr/tests/sys/opencrypto/Kyuafile runtests:main = 2>&1 | less =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ERROR: test_gcm (__main__.GenTestCase..GendCryptoTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/tests/sys/opencrypto/cryptotest.py", line 77, in test_gcm self.runGCM(i, 'ENCRYPT') File "/usr/tests/sys/opencrypto/cryptotest.py", line 126, in runGCM rct, rtag =3D c.encrypt(pt, iv, aad) File "/usr/tests/sys/opencrypto/cryptodev.py", line 305, in encrypt iv) File "/usr/tests/sys/opencrypto/cryptodev.py", line 232, in _doaead s =3D array.array('B', src.encode("ascii")) AttributeError: 'bytes' object has no attribute =E2=80=98encode' ... =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ERROR: test_gcm (__main__.GenTestCase..GendCryptoTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/tests/sys/opencrypto/cryptotest.py", line 77, in test_gcm self.runGCM(i, 'ENCRYPT') File "/usr/tests/sys/opencrypto/cryptotest.py", line 126, in runGCM rct, rtag =3D c.encrypt(pt, iv, aad) File "/usr/tests/sys/opencrypto/cryptodev.py", line 305, in encrypt iv) File "/usr/tests/sys/opencrypto/cryptodev.py", line 232, in _doaead s =3D array.array('B', src.encode("ascii")) AttributeError: 'bytes' object has no attribute 'encode' From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:14 2019 Return-Path: Delivered-To: svn-src-user@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 111F0DD6A9 for ; Tue, 3 Sep 2019 14:07:13 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J4ZsCz4QMY; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 382671B28B; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id EF06CE29B; Sat, 20 Apr 2019 16:28:21 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4222B97B34; Sat, 20 Apr 2019 16:28:21 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 12EBBE232; Sat, 20 Apr 2019 16:28:21 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 20ACCE229; Sat, 20 Apr 2019 16:28:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0F3097AE9; Sat, 20 Apr 2019 16:28:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (unknown [IPv6:2601:648:8880:1e30:fd9b:9ce6:c8c:cc0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 38DE21CB60; Sat, 20 Apr 2019 16:28:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto To: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org References: <201904201607.x3KG7m4A051487@repo.freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904201607.x3KG7m4A051487@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 4222B97B34 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:14 -0000 X-Original-Date: Sat, 20 Apr 2019 09:28:11 -0700 X-List-Received-Date: Tue, 03 Sep 2019 14:07:14 -0000 On 4/20/19 9:07 AM, Enji Cooper wrote: > Author: ngie > Date: Sat Apr 20 16:07:47 2019 > New Revision: 346449 > URL: https://svnweb.freebsd.org/changeset/base/346449 > > Log: > Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify > > Encoding/decoding base_string objects as "hex" was removed in py3 and replaced > with other methods, one being `binascii.(un)?hexlify`. I have several changes pending in review for these scripts that add new functions, etc. You might want to let those land in head first. I hope to merge them all to head this week. -- John Baldwin From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:14 2019 Return-Path: Delivered-To: svn-src-user@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 004F1DD6A5 for ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J4c8gz4QMZ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 310511B285; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id D0272E182; Sat, 20 Apr 2019 16:28:10 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3FE7997A5B; Sat, 20 Apr 2019 16:28:10 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 11093E150; Sat, 20 Apr 2019 16:28:10 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id D0301E14E for ; Sat, 20 Apr 2019 16:28:06 +0000 (UTC) (envelope-from ngie@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 A1CEF97A54; Sat, 20 Apr 2019 16:28:06 +0000 (UTC) (envelope-from ngie@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 7CA7118A00; Sat, 20 Apr 2019 16:28:06 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3KGS6u9062456; Sat, 20 Apr 2019 16:28:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KGS6Yv062455; Sat, 20 Apr 2019 16:28:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201628.x3KGS6Yv062455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346451 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346451 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3FE7997A5B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:14 -0000 X-Original-Date: Sat, 20 Apr 2019 16:28:06 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:14 -0000 Author: ngie Date: Sat Apr 20 16:28:06 2019 New Revision: 346451 URL: https://svnweb.freebsd.org/changeset/base/346451 Log: Fix up `kern.cryptodevallowsoft` handling - Always ensure `kern.cryptodevallowsoft` is unset when completing the tests, otherwise `/dev/crypto` access could remain on after the tests are complete if interrupted. - Check for errors when setting `kern.cryptodevallowsoft`. While this isn't strictly needed in positive cases, it helps when dealing with the myriad of problems that might ensue because `/dev/crypto` doesn't exist when the sysctl isn't enabled. Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:20:57 2019 (r346450) +++ user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:28:06 2019 (r346451) @@ -48,6 +48,10 @@ cleanup_tests() set +e + if [ -n "$oldcdas" ]; then + sysctl "$oldcdas" 2>/dev/null + fi + # Unload modules in reverse order for loaded_module in $(echo $loaded_modules | tr ' ' '\n' | sort -r); do kldunload $loaded_module @@ -66,9 +70,15 @@ for required_module in nexus/aesni cryptodev; do fi done -# Run software crypto test -oldcdas=$(sysctl -e kern.cryptodevallowsoft) -sysctl kern.cryptodevallowsoft=1 +cdas_sysctl=kern.cryptodevallowsoft +if ! oldcdas=$(sysctl -e $cdas_sysctl); then + echo "1..0 # SKIP: could not resolve sysctl: $cdas_sysctl" + exit 0 +fi +if ! sysctl $cdas_sysctl=1; then + echo "1..0 # SKIP: could not enable /dev/crypto access via $cdas_sysctl sysctl." + exit 0 +fi echo "1..1" if "$PYTHON" $(dirname $0)/cryptotest.py; then @@ -76,5 +86,3 @@ if "$PYTHON" $(dirname $0)/cryptotest.py; then else echo "not ok 1" fi - -sysctl "$oldcdas" From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:13 2019 Return-Path: Delivered-To: svn-src-user@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 D218BDD69D for ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J3lmxz4QML; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 20F291B27E; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 60331DB8E; Sat, 20 Apr 2019 16:07:52 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2CFB196EB9; Sat, 20 Apr 2019 16:07:52 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1D2DFDB8D; Sat, 20 Apr 2019 16:07:52 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 0FCF8DB8A for ; Sat, 20 Apr 2019 16:07:49 +0000 (UTC) (envelope-from ngie@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 B5B8C96EB3; Sat, 20 Apr 2019 16:07:48 +0000 (UTC) (envelope-from ngie@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 920AE18689; Sat, 20 Apr 2019 16:07:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3KG7mtA051489; Sat, 20 Apr 2019 16:07:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KG7m4A051487; Sat, 20 Apr 2019 16:07:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201607.x3KG7m4A051487@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346449 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 2CFB196EB9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:13 -0000 X-Original-Date: Sat, 20 Apr 2019 16:07:48 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:13 -0000 Author: ngie Date: Sat Apr 20 16:07:47 2019 New Revision: 346449 URL: https://svnweb.freebsd.org/changeset/base/346449 Log: Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify Encoding/decoding base_string objects as "hex" was removed in py3 and replaced with other methods, one being `binascii.(un)?hexlify`. Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Sat Apr 20 16:07:29 2019 (r346448) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Sat Apr 20 16:07:47 2019 (r346449) @@ -1,8 +1,9 @@ -#!/usr/local/bin/python2 +#!/usr/bin/env python # # Copyright (c) 2014 The FreeBSD Foundation # Copyright 2014 John-Mark Gurney # All rights reserved. +# Copyright 2019 Enji Cooper # # This software was developed by John-Mark Gurney under # the sponsorship from the FreeBSD Foundation. @@ -32,12 +33,15 @@ from __future__ import print_function import array -import dpkt from fcntl import ioctl import os +import random import signal from struct import pack as _pack +import time +import dpkt + from cryptodevh import * __all__ = [ 'Crypto', 'MismatchError', ] @@ -116,10 +120,12 @@ CIOCFINDDEV = 3223610220 CIOCCRYPTAEAD = 3225445229 def _getdev(): - fd = os.open('/dev/crypto', os.O_RDWR) buf = array.array('I', [0]) - ioctl(fd, CRIOGET, buf, 1) - os.close(fd) + fd = os.open('/dev/crypto', os.O_RDWR) + try: + ioctl(fd, CRIOGET, buf, 1) + finally: + os.close(fd) return buf[0] @@ -128,13 +134,13 @@ _cryptodev = _getdev() def _findop(crid, name): fop = FindOp() fop.crid = crid - fop.name = name + fop.name = name.encode("ascii") s = array.array('B', fop.pack_hdr()) ioctl(_cryptodev, CIOCFINDDEV, s, 1) fop.unpack(s) try: - idx = fop.name.index('\x00') + idx = fop.name.index(b'\x00') name = fop.name[:idx] except ValueError: name = fop.name @@ -223,10 +229,10 @@ class Crypto: caead.flags = CRD_F_IV_EXPLICIT caead.flags = 0 caead.len = len(src) - s = array.array('B', src) + s = array.array('B', src.encode("ascii")) caead.src = caead.dst = s.buffer_info()[0] caead.aadlen = len(aad) - saad = array.array('B', aad) + saad = array.array('B', aad.encode("ascii")) caead.aad = saad.buffer_info()[0] if self._maclen is None: @@ -237,7 +243,7 @@ class Crypto: else: assert len(tag) == self._maclen, \ '%d != %d' % (len(tag), self._maclen) - tag = array.array('B', tag) + tag = array.array('B', tag.encode("ascii")) caead.tag = tag.buffer_info()[0] @@ -252,11 +258,9 @@ class Crypto: return s, tag.tostring() def perftest(self, op, size, timeo=3): - import random - import time inp = array.array('B', (random.randint(0, 255) for x in xrange(size))) - out = array.array('B', inp) + out = array.array('B', inp.encode("ascii")) # prep ioctl cop = CryptOp() @@ -264,7 +268,7 @@ class Crypto: cop.op = op cop.flags = 0 cop.len = len(inp) - s = array.array('B', inp) + s = array.array('B', inp.encode("ascii")) cop.src = s.buffer_info()[0] cop.dst = out.buffer_info()[0] if self._maclen is not None: Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:07:29 2019 (r346448) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:07:47 2019 (r346449) @@ -30,6 +30,8 @@ # from __future__ import print_function + +import binascii import errno import cryptodev import itertools @@ -96,13 +98,13 @@ def GenTestCase(cname): [ 'Count', 'Key', 'IV', 'CT', 'AAD', 'Tag', 'PT', ]): for data in lines: curcnt = int(data['Count']) - cipherkey = data['Key'].decode('hex') - iv = data['IV'].decode('hex') - aad = data['AAD'].decode('hex') - tag = data['Tag'].decode('hex') + cipherkey = binascii.unhexlify(data['Key']) + iv = binascii.unhexlify(data['IV']) + aad = binascii.unhexlify(data['AAD']) + tag = binascii.unhexlify(data['Tag']) if 'FAIL' not in data: - pt = data['PT'].decode('hex') - ct = data['CT'].decode('hex') + pt = binascii.unhexlify(data['PT']) + ct = binascii.unhexlify(data['CT']) if len(iv) != 12: # XXX - isn't supported @@ -128,8 +130,8 @@ def GenTestCase(cname): raise continue rtag = rtag[:len(tag)] - data['rct'] = rct.encode('hex') - data['rtag'] = rtag.encode('hex') + data['rct'] = binascii.hexlify(rct) + data['rtag'] = binascii.hexlify(rtag) self.assertEqual(rct, ct, repr(data)) self.assertEqual(rtag, tag, repr(data)) else: @@ -147,8 +149,8 @@ def GenTestCase(cname): if e.errno != errno.EINVAL: raise continue - data['rpt'] = rpt.encode('hex') - data['rtag'] = rtag.encode('hex') + data['rpt'] = binascii.unhexlify(rpt) + data['rtag'] = binascii.unhexlify(rtag) self.assertEqual(rpt, pt, repr(data)) @@ -167,10 +169,10 @@ def GenTestCase(cname): for data in lines: curcnt = int(data['COUNT']) - cipherkey = data['KEY'].decode('hex') - iv = data['IV'].decode('hex') - pt = data['PLAINTEXT'].decode('hex') - ct = data['CIPHERTEXT'].decode('hex') + cipherkey = binascii.unhexlify(data['KEY']) + iv = binascii.unhexlify(data['IV']) + pt = binascii.unhexlify(data['PLAINTEXT']) + ct = binascii.unhexlify(data['CIPHERTEXT']) if swapptct: pt, ct = ct, pt @@ -196,10 +198,10 @@ def GenTestCase(cname): for data in lines: curcnt = int(data['COUNT']) nbits = int(data['DataUnitLen']) - cipherkey = data['Key'].decode('hex') + cipherkey = binascii.unhexlify(data['Key']) iv = struct.pack('QQ', int(data['DataUnitSeqNumber']), 0) - pt = data['PT'].decode('hex') - ct = data['CT'].decode('hex') + pt = binascii.unhexlify(data['PT']) + ct = binascii.unhexlify(data['CT']) if nbits % 128 != 0: # XXX - mark as skipped @@ -241,10 +243,10 @@ def GenTestCase(cname): for data in lines: curcnt = int(data['COUNT']) key = data['KEYs'] * 3 - cipherkey = key.decode('hex') - iv = data['IV'].decode('hex') - pt = data['PLAINTEXT'].decode('hex') - ct = data['CIPHERTEXT'].decode('hex') + cipherkey = binascii.unhexlify(key) + iv = binascii.unhexlify(data['IV']) + pt = binascii.unhexlify(data['PLAINTEXT']) + ct = binascii.unhexlify(data['CIPHERTEXT']) if swapptct: pt, ct = ct, pt @@ -298,9 +300,9 @@ def GenTestCase(cname): continue for data in lines: - key = data['Key'].decode('hex') - msg = data['Msg'].decode('hex') - mac = data['Mac'].decode('hex') + key = binascii.unhexlify(data['Key']) + msg = binascii.unhexlify(data['Msg']) + mac = binascii.unhexlify(data['Mac']) tlen = int(data['Tlen']) if len(key) > blocksize: From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:14 2019 Return-Path: Delivered-To: svn-src-user@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 879C2DD6D1 for ; Tue, 3 Sep 2019 14:07:13 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J6bl5z4QMp; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 559321B296; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id B8C04E803; Sat, 20 Apr 2019 16:37:15 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38A826848A; Sat, 20 Apr 2019 16:37:15 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1AFF8E7EB; Sat, 20 Apr 2019 16:37:15 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 128D8E7E8; Sat, 20 Apr 2019 16:37:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B5EF568484; Sat, 20 Apr 2019 16:37:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (unknown [IPv6:2601:648:8880:1e30:fd9b:9ce6:c8c:cc0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 027A91CC75; Sat, 20 Apr 2019 16:37:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto To: Enji Cooper Cc: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org References: <201904201607.x3KG7m4A051487@repo.freebsd.org> <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> <153E9E58-3071-46FF-9A8E-61AE7FED49FA@gmail.com> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <876fef44-1b27-75e3-211c-8d8682b9f59b@FreeBSD.org> User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <153E9E58-3071-46FF-9A8E-61AE7FED49FA@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 38A826848A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:15 -0000 X-Original-Date: Sat, 20 Apr 2019 09:37:09 -0700 X-List-Received-Date: Tue, 03 Sep 2019 14:07:15 -0000 On 4/20/19 9:29 AM, Enji Cooper wrote: > >> On Apr 20, 2019, at 9:28 AM, John Baldwin wrote: >> >> On 4/20/19 9:07 AM, Enji Cooper wrote: >>> Author: ngie >>> Date: Sat Apr 20 16:07:47 2019 >>> New Revision: 346449 >>> URL: https://svnweb.freebsd.org/changeset/base/346449 >>> >>> Log: >>> Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify >>> >>> Encoding/decoding base_string objects as "hex" was removed in py3 and replaced >>> with other methods, one being `binascii.(un)?hexlify`. >> >> I have several changes pending in review for these scripts that add new functions, >> etc. You might want to let those land in head first. I hope to merge them all to >> head this week. > > Good to know! Is the code up for review somewhere, so I can get ahead of the pending changes? > Thanks so much for the heads up! You can look at D19778 and then look at its stack of dependencies. I'm waiting for the ports one to hit maintainer timeout which will then unblock the remaining changes. Getting these tests to work with both python 3 and 2 is a useful exercise and appreciated. -- John Baldwin From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:12 2019 Return-Path: Delivered-To: svn-src-user@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 B1334DD696 for ; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J339Lz4QMG; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 052931B273; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 9F067D120; Sat, 20 Apr 2019 15:48:01 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3541395C11; Sat, 20 Apr 2019 15:48:01 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 12DEBD0EB; Sat, 20 Apr 2019 15:48:01 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 1E89AD0E7 for ; Sat, 20 Apr 2019 15:47:58 +0000 (UTC) (envelope-from ngie@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 E391D95C05; Sat, 20 Apr 2019 15:47:57 +0000 (UTC) (envelope-from ngie@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 9B77E1831F; Sat, 20 Apr 2019 15:47:57 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3KFlvQ8038664; Sat, 20 Apr 2019 15:47:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KFlvXU038663; Sat, 20 Apr 2019 15:47:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201547.x3KFlvXU038663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346444 - user/ngie/bug-237403 X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403 X-SVN-Commit-Revision: 346444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3541395C11 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:13 -0000 X-Original-Date: Sat, 20 Apr 2019 15:47:57 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:13 -0000 Author: ngie Date: Sat Apr 20 15:47:57 2019 New Revision: 346444 URL: https://svnweb.freebsd.org/changeset/base/346444 Log: Quick branch for hacking on getting python3 support to work for tests/sys/opencrypto This branch will also convert the test from plain to TAP for improved introspection. Bug 237403 Added: - copied from r346443, head/ Directory Properties: user/ngie/bug-237403/ (props changed) From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:14 2019 Return-Path: Delivered-To: svn-src-user@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 60321DD6C4 for ; Tue, 3 Sep 2019 14:07:13 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J5kP3z4QMk; Tue, 3 Sep 2019 14:07:12 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 3E08C1B28D; Tue, 3 Sep 2019 14:06:32 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 65839E319; Sat, 20 Apr 2019 16:29:43 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2CF9497C16; Sat, 20 Apr 2019 16:29:43 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1AF5FE318; Sat, 20 Apr 2019 16:29:43 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id B6B8AE314; Sat, 20 Apr 2019 16:29:40 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 648BD97C12; Sat, 20 Apr 2019 16:29:40 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x631.google.com with SMTP id f36so3907503plb.5; Sat, 20 Apr 2019 09:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=Jxv8QSIDfgKKm7gTSKko5MGCbKN8Vl6QMGjLDk5vtEc=; b=hcp1Fjkn4NHpWUn9XVZ/b3NQTqgoMHHomVJsfn0S7KgejwE6zke3406kwslIXDmXh/ MwsP5UY0bH3/FuIY59inOSoRS+8Z58678jii4DdbMymHVM21MHLNhLQhhUT+VPUz3+xC 1cc7ChiwvgzNk/yC3uCwBvPpa/3Z/5XrAdYLLFTApdRAmTK1q9fqMO8xUJGM880b9/1C QuTFpBgp3SCnjyJx3+iOyKd886hCVjVK0forP6RBjezP391XO8miOw1HMGHVBrsYXVFD u5WML0v8WNXgu0dDwX1BBJ4iG3yRBaUyYoOo/2Urck/dCnJEhnqOxyye2oIRh8i5ZiLJ SP1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=Jxv8QSIDfgKKm7gTSKko5MGCbKN8Vl6QMGjLDk5vtEc=; b=uJsiqsu8DBwcQVfc0fWCJpoVQyMVAjzxsRJA5lEXnUSNIQ4hNuc3guKwJc1Ot6ncL5 s+sVamZgBV0Lrqvtc0iFRfz03Ub6ULACDa66x5SWwAM2sBJ4AKDaQ8dNpRePp4/UirHF W3ZIveCrPDh+9enizZ4slk0fiGA8Yzd9fO6hEcu2BXPkqh8xLA1vNsi/8VpIscxYJXf8 feX2NdkDYmErlMekDWumTyqnsC0hwKKqw/HnXIsOmXTmOsnYq3iHce+/bV2DbIml9jxL n1uAGv23Jro+tZDNBd0sWTmwT4tIgqHcoMOWcJQcexIpHyU5W8nLGwGtWNmjKxIUNyjM BXOQ== X-Gm-Message-State: APjAAAV0CL0Pdq3hB4cV9dCHfVg6U4on28UDWyaPXcqhWiQ3lVTrKw2a 0xboVOSE31UjuL6/00LbDfrZmttYuOc= X-Google-Smtp-Source: APXvYqwMR8Tel88CX0mMZHd9zOMkU6NADjHomflI68F7RVPNzO+vQEQC/2JnGiufok02d7ya77FWXg== X-Received: by 2002:a17:902:b190:: with SMTP id s16mr4470053plr.83.1555777779031; Sat, 20 Apr 2019 09:29:39 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id f71sm14726351pfc.109.2019.04.20.09.29.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Apr 2019 09:29:38 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto From: Enji Cooper In-Reply-To: <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> Cc: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <153E9E58-3071-46FF-9A8E-61AE7FED49FA@gmail.com> References: <201904201607.x3KG7m4A051487@repo.freebsd.org> <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3445.102.3) Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 2CF9497C16 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:15 -0000 X-Original-Date: Sat, 20 Apr 2019 09:29:37 -0700 X-List-Received-Date: Tue, 03 Sep 2019 14:07:15 -0000 > On Apr 20, 2019, at 9:28 AM, John Baldwin wrote: >=20 > On 4/20/19 9:07 AM, Enji Cooper wrote: >> Author: ngie >> Date: Sat Apr 20 16:07:47 2019 >> New Revision: 346449 >> URL: https://svnweb.freebsd.org/changeset/base/346449 >>=20 >> Log: >> Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify >>=20 >> Encoding/decoding base_string objects as "hex" was removed in py3 = and replaced >> with other methods, one being `binascii.(un)?hexlify`. >=20 > I have several changes pending in review for these scripts that add = new functions, > etc. You might want to let those land in head first. I hope to merge = them all to > head this week. Good to know! Is the code up for review somewhere, so I can get = ahead of the pending changes? Thanks so much for the heads up! -Enji= From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:23 2019 Return-Path: Delivered-To: svn-src-user@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 724BADD9FD for ; Tue, 3 Sep 2019 14:07:23 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80W0yG8z4QY1; Tue, 3 Sep 2019 14:07:23 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id A0CD21B548; Tue, 3 Sep 2019 14:06:37 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 702AD148F2; Mon, 22 Apr 2019 18:43:47 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 275917149D; Mon, 22 Apr 2019 18:43:47 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 11E6A148F0; Mon, 22 Apr 2019 18:43:47 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 411FB148EE for ; Mon, 22 Apr 2019 18:43:44 +0000 (UTC) (envelope-from ngie@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 105F97149A; Mon, 22 Apr 2019 18:43:44 +0000 (UTC) (envelope-from ngie@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 DEF971903F; Mon, 22 Apr 2019 18:43:43 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3MIhhEH079754; Mon, 22 Apr 2019 18:43:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3MIhhh6079753; Mon, 22 Apr 2019 18:43:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904221843.x3MIhhh6079753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346577 - user/ngie/fix-up-cxxstd X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/fix-up-cxxstd X-SVN-Commit-Revision: 346577 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 275917149D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:24 -0000 X-Original-Date: Mon, 22 Apr 2019 18:43:43 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:24 -0000 Author: ngie Date: Mon Apr 22 18:43:43 2019 New Revision: 346577 URL: https://svnweb.freebsd.org/changeset/base/346577 Log: Prune branch, merged as r346574 and r346576 Deleted: user/ngie/fix-up-cxxstd/ From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:25 2019 Return-Path: Delivered-To: svn-src-user@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 DB10DDDABB for ; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80Y2Y65z4Qb9; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 076861B5FE; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 56C21D480; Tue, 23 Apr 2019 22:40:43 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1C88E8E685; Tue, 23 Apr 2019 22:40:43 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0CDD0D47F; Tue, 23 Apr 2019 22:40:43 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E647BD47D for ; Tue, 23 Apr 2019 22:40:39 +0000 (UTC) (envelope-from ngie@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 B336F8E676; Tue, 23 Apr 2019 22:40:39 +0000 (UTC) (envelope-from ngie@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 8FAA73137; Tue, 23 Apr 2019 22:40:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3NMedlT071576; Tue, 23 Apr 2019 22:40:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3NMedLe071575; Tue, 23 Apr 2019 22:40:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904232240.x3NMedLe071575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346611 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346611 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 1C88E8E685 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:26 -0000 X-Original-Date: Tue, 23 Apr 2019 22:40:39 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:26 -0000 Author: ngie Date: Tue Apr 23 22:40:39 2019 New Revision: 346611 URL: https://svnweb.freebsd.org/changeset/base/346611 Log: Chase more needed `.{de,en}code()` -> `binascii.(un)?hexlify` changes Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:37:49 2019 (r346610) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:40:39 2019 (r346611) @@ -401,7 +401,7 @@ class KATParser: yield values def _spdechex(s): - return ''.join(s.split()).decode('hex') + return binascii.hexlify(''.join(s.split())) if __name__ == '__main__': if True: @@ -433,15 +433,15 @@ if __name__ == '__main__': c = Crypto(CRYPTO_AES_ICM, key) enc = c.encrypt(pt, iv) - print('enc:', enc.encode('hex')) - print(' ct:', ct.encode('hex')) + print('enc:', binascii.unhexlify(enc)) + print(' ct:', binascii.unhexlify(ct)) assert ct == enc dec = c.decrypt(ct, iv) - print('dec:', dec.encode('hex')) - print(' pt:', pt.encode('hex')) + print('dec:', binascii.unhexlify(dec)) + print(' pt:', binascii.unhexlify(pt)) assert pt == dec elif False: @@ -454,15 +454,15 @@ if __name__ == '__main__': c = Crypto(CRYPTO_AES_ICM, key) enc = c.encrypt(pt, iv) - print('enc:', enc.encode('hex')) - print(' ct:', ct.encode('hex')) + print('enc:', binascii.hexlify(enc)) + print(' ct:', binascii.hexlify(ct)) assert ct == enc dec = c.decrypt(ct, iv) - print('dec:', dec.encode('hex')) - print(' pt:', pt.encode('hex')) + print('dec:', binascii.hexlify(dec)) + print(' pt:', binascii.hexlify(pt)) assert pt == dec elif False: @@ -474,15 +474,15 @@ if __name__ == '__main__': enc = c.encrypt(pt, iv) - print('enc:', enc.encode('hex')) - print(' ct:', ct.encode('hex')) + print('enc:', binascii.hexlify(enc)) + print(' ct:', binascii.hexlify(ct)) assert ct == enc dec = c.decrypt(ct, iv) - print('dec:', dec.encode('hex')) - print(' pt:', pt.encode('hex')) + print('dec:', binascii.hexlify(dec)) + print(' pt:', binascii.hexlify(pt)) assert pt == dec elif False: @@ -500,26 +500,26 @@ if __name__ == '__main__': enc, enctag = c.encrypt(pt, iv, aad=aad) - print('enc:', enc.encode('hex')) - print(' ct:', ct.encode('hex')) + print('enc:', binascii.hexlify(enc)) + print(' ct:', binascii.hexlify(ct)) assert enc == ct - print('etg:', enctag.encode('hex')) - print('tag:', tag.encode('hex')) + print('etg:', binascii.hexlify(enctag)) + print('tag:', binascii.hexlify(tag)) assert enctag == tag # Make sure we get EBADMSG #enctag = enctag[:-1] + 'a' dec, dectag = c.decrypt(ct, iv, aad=aad, tag=enctag) - print('dec:', dec.encode('hex')) - print(' pt:', pt.encode('hex')) + print('dec:', binascii.hexlify(dec)) + print(' pt:', binascii.hexlify(pt)) assert dec == pt - print('dtg:', dectag.encode('hex')) - print('tag:', tag.encode('hex')) + print('dtg:', binascii.hexlify(dectag)) + print('tag:', binascii.hexlify(tag)) assert dectag == tag elif False: @@ -536,27 +536,27 @@ if __name__ == '__main__': enc, enctag = c.encrypt(pt, iv, aad=aad) - print('enc:', enc.encode('hex')) - print(' ct:', ct.encode('hex')) + print('enc:', binascii.hexlify(enc)) + print(' ct:', binascii.hexlify(ct)) assert enc == ct - print('etg:', enctag.encode('hex')) - print('tag:', tag.encode('hex')) + print('etg:', binascii.hexlify(enctag)) + print('tag:', binascii.hexlify(tag)) assert enctag == tag elif False: for i in xrange(100000): - c = Crypto(CRYPTO_AES_XTS, '1bbfeadf539daedcae33ced497343f3ca1f2474ad932b903997d44707db41382'.decode('hex')) - data = '52a42bca4e9425a25bbc8c8bf6129dec'.decode('hex') - ct = '517e602becd066b65fa4f4f56ddfe240'.decode('hex') + c = Crypto(CRYPTO_AES_XTS, binascii.unhexlify('1bbfeadf539daedcae33ced497343f3ca1f2474ad932b903997d44707db41382')) + data = binascii.unhexlify('52a42bca4e9425a25bbc8c8bf6129dec') + ct = binascii.unhexlify('517e602becd066b65fa4f4f56ddfe240') iv = _pack('QQ', 71, 0) enc = c.encrypt(data, iv) assert enc == ct elif True: - c = Crypto(CRYPTO_AES_XTS, '1bbfeadf539daedcae33ced497343f3ca1f2474ad932b903997d44707db41382'.decode('hex')) - data = '52a42bca4e9425a25bbc8c8bf6129dec'.decode('hex') - ct = '517e602becd066b65fa4f4f56ddfe240'.decode('hex') + c = Crypto(CRYPTO_AES_XTS, binascii.unhexlify('1bbfeadf539daedcae33ced497343f3ca1f2474ad932b903997d44707db41382')) + data = binascii.unhexlify('52a42bca4e9425a25bbc8c8bf6129dec') + ct = binascii.unhexlify('517e602becd066b65fa4f4f56ddfe240') iv = _pack('QQ', 71, 0) enc = c.encrypt(data, iv) @@ -568,7 +568,7 @@ if __name__ == '__main__': #c.perftest(COP_ENCRYPT, 192*1024, reps=30000) else: - key = '1bbfeadf539daedcae33ced497343f3ca1f2474ad932b903997d44707db41382'.decode('hex') + key = binascii.unhexlify('1bbfeadf539daedcae33ced497343f3ca1f2474ad932b903997d44707db41382') print('XTS %d testing:' % (len(key) * 8)) c = Crypto(CRYPTO_AES_XTS, key) for i in [ 8192, 192*1024]: From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:25 2019 Return-Path: Delivered-To: svn-src-user@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 DCB6DDDABF for ; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80Y2bp5z4QbB; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 0D28E1B600; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 041FFD5EF; Tue, 23 Apr 2019 22:43:28 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 405148EA05; Tue, 23 Apr 2019 22:43:28 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 11439D598; Tue, 23 Apr 2019 22:43:28 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 29C98D594 for ; Tue, 23 Apr 2019 22:43:25 +0000 (UTC) (envelope-from ngie@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 D85668E9FC; Tue, 23 Apr 2019 22:43:24 +0000 (UTC) (envelope-from ngie@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 B172832E2; Tue, 23 Apr 2019 22:43:24 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3NMhO90076716; Tue, 23 Apr 2019 22:43:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3NMhOHB076715; Tue, 23 Apr 2019 22:43:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904232243.x3NMhOHB076715@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346612 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346612 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 405148EA05 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.99 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.99)[-0.990,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:26 -0000 X-Original-Date: Tue, 23 Apr 2019 22:43:24 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:26 -0000 Author: ngie Date: Tue Apr 23 22:43:24 2019 New Revision: 346612 URL: https://svnweb.freebsd.org/changeset/base/346612 Log: Ugh. Deal with encoding/decoding UTF-8 strings to bytes as needed I couldn't tell if the type was str in all cases, so conditionally convert it to a bytes object with py3 as needed. Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:40:39 2019 (r346611) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:43:24 2019 (r346612) @@ -199,6 +199,13 @@ class Crypto: pass self._ses = None + @staticmethod + def _to_bytes(val): + if sys.version_info[0] >= 3: + if isinstance(val, str): + return val.encode("ascii") + return val + def _doop(self, op, src, iv): cop = CryptOp() cop.ses = self._ses @@ -210,7 +217,7 @@ class Crypto: if self._maclen is not None: m = array.array('B', [0] * self._maclen) cop.mac = m.buffer_info()[0] - ivbuf = array.array('B', iv) + ivbuf = array.array('B', self._to_bytes(iv)) cop.iv = ivbuf.buffer_info()[0] #print('cop:', cop) @@ -229,10 +236,12 @@ class Crypto: caead.flags = CRD_F_IV_EXPLICIT caead.flags = 0 caead.len = len(src) - s = array.array('B', src.encode("ascii")) + src = self._to_bytes(src) + s = array.array("B", src) caead.src = caead.dst = s.buffer_info()[0] caead.aadlen = len(aad) - saad = array.array('B', aad.encode("ascii")) + aad = self._to_bytes(aad) + saad = array.array('B', aad) caead.aad = saad.buffer_info()[0] if self._maclen is None: @@ -243,7 +252,8 @@ class Crypto: else: assert len(tag) == self._maclen, \ '%d != %d' % (len(tag), self._maclen) - tag = array.array('B', tag.encode("ascii")) + tag = self._to_bytes(tag) + tag = array.array('B', tag) caead.tag = tag.buffer_info()[0] @@ -251,7 +261,7 @@ class Crypto: caead.ivlen = len(iv) caead.iv = ivbuf.buffer_info()[0] - ioctl(_cryptodev, CIOCCRYPTAEAD, str(caead)) + ioctl(_cryptodev, CIOCCRYPTAEAD, self._to_bytes(str(caead))) s = s.tostring() @@ -260,7 +270,7 @@ class Crypto: def perftest(self, op, size, timeo=3): inp = array.array('B', (random.randint(0, 255) for x in xrange(size))) - out = array.array('B', inp.encode("ascii")) + out = array.array('B', self._to_bytes(inp)) # prep ioctl cop = CryptOp() @@ -268,7 +278,7 @@ class Crypto: cop.op = op cop.flags = 0 cop.len = len(inp) - s = array.array('B', inp.encode("ascii")) + s = array.array('B', self._to_bytes(inp)) cop.src = s.buffer_info()[0] cop.dst = out.buffer_info()[0] if self._maclen is not None: @@ -287,7 +297,7 @@ class Crypto: start = time.time() reps = 0 while not exit[0]: - ioctl(_cryptodev, CIOCCRYPT, str(cop)) + ioctl(_cryptodev, CIOCCRYPT, self._to_bytes(str(cop))) reps += 1 end = time.time() From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:26 2019 Return-Path: Delivered-To: svn-src-user@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 0891BDDACD for ; Tue, 3 Sep 2019 14:07:26 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80Y3mzsz4QbT; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 12B2D1B602; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id BE7B5D6CF; Tue, 23 Apr 2019 22:43:52 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 399938EAE9; Tue, 23 Apr 2019 22:43:52 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 10EC8D686; Tue, 23 Apr 2019 22:43:52 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 19B84D680 for ; Tue, 23 Apr 2019 22:43:49 +0000 (UTC) (envelope-from ngie@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 D5B3A8EAE1; Tue, 23 Apr 2019 22:43:48 +0000 (UTC) (envelope-from ngie@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 6E01932E3; Tue, 23 Apr 2019 22:43:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3NMhm3g076780; Tue, 23 Apr 2019 22:43:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3NMhmUQ076779; Tue, 23 Apr 2019 22:43:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904232243.x3NMhmUQ076779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346613 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346613 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 399938EAE9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.99 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.99)[-0.990,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:26 -0000 X-Original-Date: Tue, 23 Apr 2019 22:43:48 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:26 -0000 Author: ngie Date: Tue Apr 23 22:43:47 2019 New Revision: 346613 URL: https://svnweb.freebsd.org/changeset/base/346613 Log: Don't forget sys import! Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:43:24 2019 (r346612) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:43:47 2019 (r346613) @@ -38,6 +38,7 @@ import os import random import signal from struct import pack as _pack +import sys import time import dpkt From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:26 2019 Return-Path: Delivered-To: svn-src-user@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 0EBF1DDAD2 for ; Tue, 3 Sep 2019 14:07:26 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80Y3fyCz4QbM; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 0145C1B5FC; Tue, 3 Sep 2019 14:06:38 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E4846D3BA; Tue, 23 Apr 2019 22:37:53 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 487A48E49A; Tue, 23 Apr 2019 22:37:53 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0AEC2D34E; Tue, 23 Apr 2019 22:37:53 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 80B96D349 for ; Tue, 23 Apr 2019 22:37:50 +0000 (UTC) (envelope-from ngie@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 36D568E492; Tue, 23 Apr 2019 22:37:50 +0000 (UTC) (envelope-from ngie@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 112423128; Tue, 23 Apr 2019 22:37:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3NMbnvC071375; Tue, 23 Apr 2019 22:37:49 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3NMbn9a071373; Tue, 23 Apr 2019 22:37:49 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904232237.x3NMbn9a071373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346610 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346610 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 487A48E49A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:27 -0000 X-Original-Date: Tue, 23 Apr 2019 22:37:49 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:27 -0000 Author: ngie Date: Tue Apr 23 22:37:49 2019 New Revision: 346610 URL: https://svnweb.freebsd.org/changeset/base/346610 Log: KATParser: don't leak `self.fp` As noted by the python 3 interpreter, self.fp is leaked every time KATParser is called (it raises a `ResourceWarning`). Refactor KATParser in order to not leak `self.fp`: * Don't allocate `self.fp` in `__init__()`. Doing so requires adding `self.fp.close()`, and as noted before, makes for very fragile code when the interpreter is tearing down objects (it can result in crashes in some interpreter versions if triggered with the right conditions). Limit `self.fp` allocation/use to context suites ("the with statement") instead, as this is more likely to not cause non-deterministic weirdness issues with the interpreter. * Rename `__iter__` to `__next__` as it was providing `__next__` support and return the KATParser object instead with `__iter__`, as `__iter__` is meant to return an iterator and `__next__` is meant to help iterate over an iterator. Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:34:32 2019 (r346609) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Tue Apr 23 22:37:49 2019 (r346610) @@ -316,11 +316,23 @@ class MismatchError(Exception): class KATParser: def __init__(self, fname, fields): - self.fp = open(fname) self.fields = set(fields) self._pending = None + self.fname = fname + self.fp = None + def __enter__(self): + self.fp = open(self.fname) + return self + + def __exit__(self, exc_type, exc_value, exc_tb): + if self.fp is not None: + self.fp.close() + def __iter__(self): + return self + + def __next__(self): while True: didread = False if self._pending is not None: @@ -331,14 +343,15 @@ class KATParser: didread = True if didread and not i: - return + raise StopIteration - if (i and i[0] == '#') or not i.strip(): - continue - if i[0] == '[': - yield i[1:].split(']', 1)[0], self.fielditer() - else: - raise ValueError('unknown line: %r' % repr(i)) + if not i.startswith('#') and i.strip(): + break + + if i[0] == '[': + yield i[1:].split(']', 1)[0], self.fielditer() + else: + raise ValueError('unknown line: %r' % repr(i)) def eatblanks(self): while True: Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Tue Apr 23 22:34:32 2019 (r346609) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Tue Apr 23 22:37:49 2019 (r346610) @@ -94,8 +94,12 @@ def GenTestCase(cname): else: raise RuntimeError('unknown mode: %r' % repr(mode)) - for bogusmode, lines in cryptodev.KATParser(fname, - [ 'Count', 'Key', 'IV', 'CT', 'AAD', 'Tag', 'PT', ]): + columns = [ 'Count', 'Key', 'IV', 'CT', 'AAD', 'Tag', 'PT', ] + with cryptodev.KATParser(fname, columns) as parser: + self.runGCMWithParser(parser, mode) + + def runGCMWithParser(self, parser, mode): + for _, lines in next(parser): for data in lines: curcnt = int(data['Count']) cipherkey = binascii.unhexlify(data['Key']) @@ -155,9 +159,13 @@ def GenTestCase(cname): repr(data)) def runCBC(self, fname): + columns = [ 'COUNT', 'KEY', 'IV', 'PLAINTEXT', 'CIPHERTEXT', ] + with cryptodev.KATParser(fname, columns) as parser: + self.runCBCWithParser(parser) + + def runCBCWithParser(self, parser): curfun = None - for mode, lines in cryptodev.KATParser(fname, - [ 'COUNT', 'KEY', 'IV', 'PLAINTEXT', 'CIPHERTEXT', ]): + for mode, lines in next(parser): if mode == 'ENCRYPT': swapptct = False curfun = Crypto.encrypt @@ -182,10 +190,14 @@ def GenTestCase(cname): self.assertEqual(r, ct) def runXTS(self, fname, meth): + columns = [ 'COUNT', 'DataUnitLen', 'Key', 'DataUnitSeqNumber', 'PT', + 'CT'] + with cryptodev.KATParser(fname, columns) as parser: + self.runXTSWithParser(parser, meth) + + def runXTSWithParser(self, parser, meth): curfun = None - for mode, lines in cryptodev.KATParser(fname, - [ 'COUNT', 'DataUnitLen', 'Key', 'DataUnitSeqNumber', 'PT', - 'CT' ]): + for mode, lines in next(parser): if mode == 'ENCRYPT': swapptct = False curfun = Crypto.encrypt @@ -228,9 +240,13 @@ def GenTestCase(cname): self.runTDES(i) def runTDES(self, fname): + columns = [ 'COUNT', 'KEYs', 'IV', 'PLAINTEXT', 'CIPHERTEXT', ] + with cryptodev.KATParser(fname, columns) as parser: + self.runTDESWithParser(parser) + + def runTDESWithParser(self, parser): curfun = None - for mode, lines in cryptodev.KATParser(fname, - [ 'COUNT', 'KEYs', 'IV', 'PLAINTEXT', 'CIPHERTEXT', ]): + for mode, lines in next(parser): if mode == 'ENCRYPT': swapptct = False curfun = Crypto.encrypt @@ -271,8 +287,12 @@ def GenTestCase(cname): self.runSHA1HMAC(i) def runSHA1HMAC(self, fname): - for hashlength, lines in cryptodev.KATParser(fname, - [ 'Count', 'Klen', 'Tlen', 'Key', 'Msg', 'Mac' ]): + columns = [ 'Count', 'Klen', 'Tlen', 'Key', 'Msg', 'Mac' ] + with cryptodev.KATParser(fname, columns) as parser: + self.runSHA1HMACWithParser(parser) + + def runSHA1HMACWithParser(self, parser): + for hashlength, lines in next(parser): # E.g., hashlength will be "L=20" (bytes) hashlen = int(hashlength.split("=")[1]) From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:27 2019 Return-Path: Delivered-To: svn-src-user@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 4BECBDDAE5 for ; Tue, 3 Sep 2019 14:07:26 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80Y754fz4Qbg; Tue, 3 Sep 2019 14:07:25 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 5A4A41B61A; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 2B05211086; Wed, 24 Apr 2019 04:44:16 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28860723EF; Wed, 24 Apr 2019 04:44:15 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1218711053; Wed, 24 Apr 2019 04:44:15 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id EBD5A11051 for ; Wed, 24 Apr 2019 04:44:11 +0000 (UTC) (envelope-from ngie@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 977EC723EE; Wed, 24 Apr 2019 04:44:11 +0000 (UTC) (envelope-from ngie@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 6D10C730C; Wed, 24 Apr 2019 04:44:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3O4iBDl066934; Wed, 24 Apr 2019 04:44:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3O4hs4u066890; Wed, 24 Apr 2019 04:43:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904240443.x3O4hs4u066890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346621 - in user/ngie/bug-237403: contrib/sqlite3 contrib/sqlite3/tea contrib/wpa contrib/wpa/hostapd contrib/wpa/hs20/client contrib/wpa/src/ap contrib/wpa/src/common contrib/wpa/src/... X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in user/ngie/bug-237403: contrib/sqlite3 contrib/sqlite3/tea contrib/wpa contrib/wpa/hostapd contrib/wpa/hs20/client contrib/wpa/src/ap contrib/wpa/src/common contrib/wpa/src/crypto contrib/wpa/src/dr... X-SVN-Commit-Revision: 346621 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 28860723EF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:27 -0000 X-Original-Date: Wed, 24 Apr 2019 04:43:54 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:27 -0000 Author: ngie Date: Wed Apr 24 04:43:53 2019 New Revision: 346621 URL: https://svnweb.freebsd.org/changeset/base/346621 Log: MFhead@r346620 Added: user/ngie/bug-237403/contrib/wpa/hostapd/README-MULTI-AP - copied unchanged from r346620, head/contrib/wpa/hostapd/README-MULTI-AP user/ngie/bug-237403/contrib/wpa/src/common/ocv.c - copied unchanged from r346620, head/contrib/wpa/src/common/ocv.c user/ngie/bug-237403/contrib/wpa/src/common/ocv.h - copied unchanged from r346620, head/contrib/wpa/src/common/ocv.h user/ngie/bug-237403/contrib/wpa/src/crypto/sha512.c - copied unchanged from r346620, head/contrib/wpa/src/crypto/sha512.c user/ngie/bug-237403/contrib/wpa/src/utils/const_time.h - copied unchanged from r346620, head/contrib/wpa/src/utils/const_time.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/README-DPP - copied unchanged from r346620, head/contrib/wpa/wpa_supplicant/README-DPP user/ngie/bug-237403/lib/libbe/tests/ - copied from r346620, head/lib/libbe/tests/ user/ngie/bug-237403/lib/libc/powerpc64/string/ - copied from r346620, head/lib/libc/powerpc64/string/ Deleted: user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_old.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_old.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers_wps.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/wpas-test.py Modified: user/ngie/bug-237403/contrib/sqlite3/configure user/ngie/bug-237403/contrib/sqlite3/configure.ac user/ngie/bug-237403/contrib/sqlite3/sqlite3.c user/ngie/bug-237403/contrib/sqlite3/sqlite3.h user/ngie/bug-237403/contrib/sqlite3/tea/configure user/ngie/bug-237403/contrib/sqlite3/tea/configure.ac user/ngie/bug-237403/contrib/wpa/CONTRIBUTIONS user/ngie/bug-237403/contrib/wpa/COPYING user/ngie/bug-237403/contrib/wpa/README user/ngie/bug-237403/contrib/wpa/hostapd/ChangeLog user/ngie/bug-237403/contrib/wpa/hostapd/README user/ngie/bug-237403/contrib/wpa/hostapd/config_file.c user/ngie/bug-237403/contrib/wpa/hostapd/ctrl_iface.c user/ngie/bug-237403/contrib/wpa/hostapd/defconfig user/ngie/bug-237403/contrib/wpa/hostapd/hostapd.conf user/ngie/bug-237403/contrib/wpa/hostapd/hostapd.wpa_psk user/ngie/bug-237403/contrib/wpa/hostapd/hostapd_cli.c user/ngie/bug-237403/contrib/wpa/hostapd/main.c user/ngie/bug-237403/contrib/wpa/hostapd/wps-ap-nfc.py user/ngie/bug-237403/contrib/wpa/hs20/client/Makefile user/ngie/bug-237403/contrib/wpa/hs20/client/est.c user/ngie/bug-237403/contrib/wpa/hs20/client/osu_client.c user/ngie/bug-237403/contrib/wpa/src/ap/acs.c user/ngie/bug-237403/contrib/wpa/src/ap/ap_config.c user/ngie/bug-237403/contrib/wpa/src/ap/ap_config.h user/ngie/bug-237403/contrib/wpa/src/ap/ap_drv_ops.h user/ngie/bug-237403/contrib/wpa/src/ap/authsrv.c user/ngie/bug-237403/contrib/wpa/src/ap/beacon.c user/ngie/bug-237403/contrib/wpa/src/ap/ctrl_iface_ap.c user/ngie/bug-237403/contrib/wpa/src/ap/dfs.c user/ngie/bug-237403/contrib/wpa/src/ap/dhcp_snoop.c user/ngie/bug-237403/contrib/wpa/src/ap/dpp_hostapd.c user/ngie/bug-237403/contrib/wpa/src/ap/dpp_hostapd.h user/ngie/bug-237403/contrib/wpa/src/ap/drv_callbacks.c user/ngie/bug-237403/contrib/wpa/src/ap/eap_user_db.c user/ngie/bug-237403/contrib/wpa/src/ap/fils_hlp.c user/ngie/bug-237403/contrib/wpa/src/ap/hostapd.c user/ngie/bug-237403/contrib/wpa/src/ap/hostapd.h user/ngie/bug-237403/contrib/wpa/src/ap/hs20.c user/ngie/bug-237403/contrib/wpa/src/ap/hw_features.c user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_11.c user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_11.h user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_11_auth.c user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_11_he.c user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_11_shared.c user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_11_vht.c user/ngie/bug-237403/contrib/wpa/src/ap/ieee802_1x.c user/ngie/bug-237403/contrib/wpa/src/ap/neighbor_db.c user/ngie/bug-237403/contrib/wpa/src/ap/neighbor_db.h user/ngie/bug-237403/contrib/wpa/src/ap/rrm.c user/ngie/bug-237403/contrib/wpa/src/ap/sta_info.c user/ngie/bug-237403/contrib/wpa/src/ap/sta_info.h user/ngie/bug-237403/contrib/wpa/src/ap/vlan_full.c user/ngie/bug-237403/contrib/wpa/src/ap/vlan_init.c user/ngie/bug-237403/contrib/wpa/src/ap/wnm_ap.c user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth.c user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth.h user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth_ft.c user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth_glue.c user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth_i.h user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth_ie.c user/ngie/bug-237403/contrib/wpa/src/ap/wpa_auth_ie.h user/ngie/bug-237403/contrib/wpa/src/ap/wps_hostapd.c user/ngie/bug-237403/contrib/wpa/src/common/common_module_tests.c user/ngie/bug-237403/contrib/wpa/src/common/defs.h user/ngie/bug-237403/contrib/wpa/src/common/dpp.c user/ngie/bug-237403/contrib/wpa/src/common/dpp.h user/ngie/bug-237403/contrib/wpa/src/common/hw_features_common.c user/ngie/bug-237403/contrib/wpa/src/common/hw_features_common.h user/ngie/bug-237403/contrib/wpa/src/common/ieee802_11_common.c user/ngie/bug-237403/contrib/wpa/src/common/ieee802_11_common.h user/ngie/bug-237403/contrib/wpa/src/common/ieee802_11_defs.h user/ngie/bug-237403/contrib/wpa/src/common/qca-vendor.h user/ngie/bug-237403/contrib/wpa/src/common/sae.c user/ngie/bug-237403/contrib/wpa/src/common/sae.h user/ngie/bug-237403/contrib/wpa/src/common/version.h user/ngie/bug-237403/contrib/wpa/src/common/wpa_common.c user/ngie/bug-237403/contrib/wpa/src/common/wpa_common.h user/ngie/bug-237403/contrib/wpa/src/common/wpa_ctrl.c user/ngie/bug-237403/contrib/wpa/src/crypto/aes-internal-enc.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto.h user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_gnutls.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_internal-modexp.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_internal.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_libtomcrypt.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_linux.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_nettle.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_openssl.c user/ngie/bug-237403/contrib/wpa/src/crypto/crypto_wolfssl.c user/ngie/bug-237403/contrib/wpa/src/crypto/dh_groups.c user/ngie/bug-237403/contrib/wpa/src/crypto/md4-internal.c user/ngie/bug-237403/contrib/wpa/src/crypto/random.c user/ngie/bug-237403/contrib/wpa/src/crypto/sha1-tlsprf.c user/ngie/bug-237403/contrib/wpa/src/crypto/sha512-internal.c user/ngie/bug-237403/contrib/wpa/src/crypto/tls.h user/ngie/bug-237403/contrib/wpa/src/crypto/tls_gnutls.c user/ngie/bug-237403/contrib/wpa/src/crypto/tls_internal.c user/ngie/bug-237403/contrib/wpa/src/crypto/tls_none.c user/ngie/bug-237403/contrib/wpa/src/crypto/tls_openssl.c user/ngie/bug-237403/contrib/wpa/src/crypto/tls_wolfssl.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver.h user/ngie/bug-237403/contrib/wpa/src/drivers/driver_bsd.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver_common.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver_macsec_linux.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver_nl80211.h user/ngie/bug-237403/contrib/wpa/src/drivers/driver_nl80211_capa.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver_nl80211_event.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver_nl80211_scan.c user/ngie/bug-237403/contrib/wpa/src/drivers/driver_openbsd.c user/ngie/bug-237403/contrib/wpa/src/eap_common/eap_eke_common.c user/ngie/bug-237403/contrib/wpa/src/eap_common/eap_pwd_common.c user/ngie/bug-237403/contrib/wpa/src/eap_common/eap_pwd_common.h user/ngie/bug-237403/contrib/wpa/src/eap_common/eap_sake_common.c user/ngie/bug-237403/contrib/wpa/src/eap_common/eap_sake_common.h user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_config.h user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_fast.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_mschapv2.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_peap.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_pwd.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_sake.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_tls.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_tls_common.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_tls_common.h user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_ttls.c user/ngie/bug-237403/contrib/wpa/src/eap_peer/eap_wsc.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap.h user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_i.h user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_aka.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_gpsk.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_mschapv2.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_pax.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_peap.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_pwd.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_sake.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_sim.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_tls.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_tls_common.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_server_ttls.c user/ngie/bug-237403/contrib/wpa/src/eap_server/eap_tls_common.h user/ngie/bug-237403/contrib/wpa/src/eapol_supp/eapol_supp_sm.c user/ngie/bug-237403/contrib/wpa/src/fst/fst.h user/ngie/bug-237403/contrib/wpa/src/p2p/p2p.c user/ngie/bug-237403/contrib/wpa/src/p2p/p2p.h user/ngie/bug-237403/contrib/wpa/src/p2p/p2p_build.c user/ngie/bug-237403/contrib/wpa/src/p2p/p2p_group.c user/ngie/bug-237403/contrib/wpa/src/p2p/p2p_i.h user/ngie/bug-237403/contrib/wpa/src/p2p/p2p_invitation.c user/ngie/bug-237403/contrib/wpa/src/p2p/p2p_utils.c user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_cp.c user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_cp.h user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_kay.c user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_kay.h user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_kay_i.h user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_key.c user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_key.h user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_secy_ops.c user/ngie/bug-237403/contrib/wpa/src/pae/ieee802_1x_secy_ops.h user/ngie/bug-237403/contrib/wpa/src/radius/radius_client.c user/ngie/bug-237403/contrib/wpa/src/radius/radius_server.c user/ngie/bug-237403/contrib/wpa/src/radius/radius_server.h user/ngie/bug-237403/contrib/wpa/src/rsn_supp/pmksa_cache.c user/ngie/bug-237403/contrib/wpa/src/rsn_supp/tdls.c user/ngie/bug-237403/contrib/wpa/src/rsn_supp/wpa.c user/ngie/bug-237403/contrib/wpa/src/rsn_supp/wpa.h user/ngie/bug-237403/contrib/wpa/src/rsn_supp/wpa_ft.c user/ngie/bug-237403/contrib/wpa/src/rsn_supp/wpa_i.h user/ngie/bug-237403/contrib/wpa/src/rsn_supp/wpa_ie.c user/ngie/bug-237403/contrib/wpa/src/rsn_supp/wpa_ie.h user/ngie/bug-237403/contrib/wpa/src/tls/asn1.c user/ngie/bug-237403/contrib/wpa/src/tls/bignum.c user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_client.c user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_client.h user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_client_read.c user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_client_write.c user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_server.c user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_server.h user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_server_i.h user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_server_read.c user/ngie/bug-237403/contrib/wpa/src/tls/tlsv1_server_write.c user/ngie/bug-237403/contrib/wpa/src/tls/x509v3.c user/ngie/bug-237403/contrib/wpa/src/utils/base64.c user/ngie/bug-237403/contrib/wpa/src/utils/browser.c user/ngie/bug-237403/contrib/wpa/src/utils/common.c user/ngie/bug-237403/contrib/wpa/src/utils/common.h user/ngie/bug-237403/contrib/wpa/src/utils/eloop.c user/ngie/bug-237403/contrib/wpa/src/utils/http_curl.c user/ngie/bug-237403/contrib/wpa/src/utils/json.c user/ngie/bug-237403/contrib/wpa/src/utils/list.h user/ngie/bug-237403/contrib/wpa/src/utils/os_internal.c user/ngie/bug-237403/contrib/wpa/src/utils/os_none.c user/ngie/bug-237403/contrib/wpa/src/utils/os_unix.c user/ngie/bug-237403/contrib/wpa/src/utils/utils_module_tests.c user/ngie/bug-237403/contrib/wpa/src/utils/wpa_debug.c user/ngie/bug-237403/contrib/wpa/src/wps/wps.c user/ngie/bug-237403/contrib/wpa/src/wps/wps.h user/ngie/bug-237403/contrib/wpa/src/wps/wps_attr_build.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_attr_parse.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_attr_parse.h user/ngie/bug-237403/contrib/wpa/src/wps/wps_common.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_defs.h user/ngie/bug-237403/contrib/wpa/src/wps/wps_dev_attr.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_dev_attr.h user/ngie/bug-237403/contrib/wpa/src/wps/wps_enrollee.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_er.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_i.h user/ngie/bug-237403/contrib/wpa/src/wps/wps_registrar.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_upnp.c user/ngie/bug-237403/contrib/wpa/src/wps/wps_validate.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/Android.mk user/ngie/bug-237403/contrib/wpa/wpa_supplicant/ChangeLog user/ngie/bug-237403/contrib/wpa/wpa_supplicant/README user/ngie/bug-237403/contrib/wpa/wpa_supplicant/README-P2P user/ngie/bug-237403/contrib/wpa/wpa_supplicant/android.config user/ngie/bug-237403/contrib/wpa/wpa_supplicant/ap.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/bss.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/bss.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/config.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/config.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/config_file.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/config_ssid.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/ctrl_iface.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/Makefile user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus-wpa_supplicant.conf user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_common.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/defconfig user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dpp_supplicant.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/dpp_supplicant.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/driver_i.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/eapol_test.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/eapol_test.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/events.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/dpp-qrcode.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p-nfc.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_connect.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_disconnect.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_find.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_flush.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_group_add.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_invite.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_listen.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/p2p/p2p_stop_find.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/examples/wps-nfc.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/gas_query.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/gas_query.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/hs20_supplicant.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/hs20_supplicant.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/ibss_rsn.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/interworking.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/main.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/mbo.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/mesh.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/mesh_mpm.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/mesh_rsn.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/notify.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/notify.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/op_classes.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/p2p_supplicant.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/p2p_supplicant.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/rrm.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/scan.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/sme.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/sme.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/systemd/wpa_supplicant.service.in user/ngie/bug-237403/contrib/wpa/wpa_supplicant/utils/log2pcap.py user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wmm_ac.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wnm_sta.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_cli.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant.conf user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpas_glue.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpas_kay.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wps_supplicant.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wps_supplicant.h user/ngie/bug-237403/etc/mtree/BSD.tests.dist user/ngie/bug-237403/lib/libbe/Makefile user/ngie/bug-237403/lib/libbe/be.c user/ngie/bug-237403/lib/libbe/be.h user/ngie/bug-237403/lib/libbe/be_impl.h user/ngie/bug-237403/lib/libbe/libbe.3 user/ngie/bug-237403/lib/libc++/Makefile user/ngie/bug-237403/lib/libc++experimental/Makefile user/ngie/bug-237403/lib/libc++fs/Makefile user/ngie/bug-237403/lib/libc/stdlib/rand.3 user/ngie/bug-237403/lib/libc/stdlib/random.3 user/ngie/bug-237403/lib/libc/tests/sys/sendfile_test.c user/ngie/bug-237403/lib/libcam/tests/libcam_test.c user/ngie/bug-237403/lib/libclang_rt/Makefile user/ngie/bug-237403/lib/libcxxrt/Makefile user/ngie/bug-237403/lib/libgcc_eh/Makefile.inc user/ngie/bug-237403/lib/libkvm/tests/kvm_close_test.c user/ngie/bug-237403/lib/libkvm/tests/kvm_geterr_test.c user/ngie/bug-237403/lib/libkvm/tests/kvm_open2_test.c user/ngie/bug-237403/lib/libkvm/tests/kvm_open_test.c user/ngie/bug-237403/lib/libkvm/tests/kvm_test_common.c user/ngie/bug-237403/lib/libkvm/tests/kvm_test_common.h user/ngie/bug-237403/lib/libsbuf/tests/sbuf_core_test.c user/ngie/bug-237403/lib/libsbuf/tests/sbuf_stdio_test.c user/ngie/bug-237403/lib/libsbuf/tests/sbuf_string_test.c user/ngie/bug-237403/lib/libsbuf/tests/sbuf_test_common.h user/ngie/bug-237403/lib/libsecureboot/h/libsecureboot.h user/ngie/bug-237403/lib/libsecureboot/vectx.c user/ngie/bug-237403/lib/libsecureboot/veopen.c user/ngie/bug-237403/lib/libsecureboot/verify_file.c user/ngie/bug-237403/lib/libvgl/bitmap.c user/ngie/bug-237403/lib/libvgl/main.c user/ngie/bug-237403/lib/libvgl/mouse.c user/ngie/bug-237403/lib/libvgl/simple.c user/ngie/bug-237403/lib/libvgl/vgl.h user/ngie/bug-237403/lib/ofed/libibnetdisc/Makefile user/ngie/bug-237403/sbin/camcontrol/camcontrol.8 user/ngie/bug-237403/sbin/camcontrol/camcontrol.c user/ngie/bug-237403/sbin/ipfw/ipfw.8 user/ngie/bug-237403/share/examples/tests/tests/tap/cp_test.sh user/ngie/bug-237403/share/man/man4/cfiscsi.4 user/ngie/bug-237403/share/man/man4/psm.4 user/ngie/bug-237403/share/man/man5/cd9660.5 user/ngie/bug-237403/share/man/man9/Makefile user/ngie/bug-237403/share/man/man9/ifnet.9 user/ngie/bug-237403/share/mk/bsd.sys.mk user/ngie/bug-237403/share/mk/googletest.test.inc.mk user/ngie/bug-237403/share/zoneinfo/tests/backward_test.sh user/ngie/bug-237403/share/zoneinfo/tests/zoneinfo_common.sh user/ngie/bug-237403/stand/efi/include/efi.h user/ngie/bug-237403/stand/efi/include/efizfs.h user/ngie/bug-237403/stand/efi/libefi/efizfs.c user/ngie/bug-237403/stand/efi/loader/main.c user/ngie/bug-237403/sys/amd64/linux32/syscalls.master user/ngie/bug-237403/sys/arm/broadcom/bcm2835/bcm2835_intr.c user/ngie/bug-237403/sys/arm/broadcom/bcm2835/bcm2836.c user/ngie/bug-237403/sys/cam/scsi/scsi_all.c user/ngie/bug-237403/sys/cam/scsi/scsi_all.h user/ngie/bug-237403/sys/cam/scsi/scsi_da.c user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/io.h user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/bug-237403/sys/conf/NOTES user/ngie/bug-237403/sys/conf/dtb.build.mk user/ngie/bug-237403/sys/conf/kern.post.mk user/ngie/bug-237403/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c user/ngie/bug-237403/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c user/ngie/bug-237403/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.h user/ngie/bug-237403/sys/dev/ath/ath_hal/ah.h user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5210/ar5210.h user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5211/ar5211.h user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5212/ar5212.h user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5416/ar5416.h user/ngie/bug-237403/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c user/ngie/bug-237403/sys/dev/ath/if_ath_rx.c user/ngie/bug-237403/sys/dev/ath/if_ath_rx_edma.c user/ngie/bug-237403/sys/dev/ath/if_athvar.h user/ngie/bug-237403/sys/dev/atkbdc/psm.c user/ngie/bug-237403/sys/dev/cxgbe/common/t4_msg.h user/ngie/bug-237403/sys/dev/cxgbe/t4_main.c user/ngie/bug-237403/sys/dev/cxgbe/tom/t4_tom.c user/ngie/bug-237403/sys/dev/cxgbe/tom/t4_tom.h user/ngie/bug-237403/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/bug-237403/sys/fs/nfs/nfs_commonsubs.c user/ngie/bug-237403/sys/geom/nop/g_nop.c user/ngie/bug-237403/sys/i386/linux/syscalls.master user/ngie/bug-237403/sys/modules/Makefile user/ngie/bug-237403/sys/net/if.c user/ngie/bug-237403/sys/net/if_tun.c user/ngie/bug-237403/sys/net/if_var.h user/ngie/bug-237403/sys/netinet/ip_reass.c user/ngie/bug-237403/sys/netinet/netdump/netdump_client.c user/ngie/bug-237403/sys/netinet/udp_usrreq.c user/ngie/bug-237403/sys/netinet6/frag6.c user/ngie/bug-237403/sys/netinet6/in6_ifattach.c user/ngie/bug-237403/sys/netinet6/ip6_id.c user/ngie/bug-237403/sys/powerpc/aim/trap_subr32.S user/ngie/bug-237403/sys/powerpc/pseries/mmu_phyp.c user/ngie/bug-237403/sys/powerpc/pseries/phyp-hvcall.S user/ngie/bug-237403/sys/powerpc/pseries/phyp_llan.c user/ngie/bug-237403/sys/sys/buf_ring.h user/ngie/bug-237403/sys/vm/vm_map.c user/ngie/bug-237403/tests/sys/geom/class/mirror/component_selection.sh user/ngie/bug-237403/tests/sys/kern/coredump_phnum_test.sh user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py user/ngie/bug-237403/usr.bin/ar/write.c user/ngie/bug-237403/usr.bin/calendar/calendars/calendar.freebsd user/ngie/bug-237403/usr.bin/dtc/Makefile user/ngie/bug-237403/usr.bin/dtc/fdt.cc user/ngie/bug-237403/usr.bin/du/tests/du_test.sh user/ngie/bug-237403/usr.bin/getconf/tests/arch_type.c user/ngie/bug-237403/usr.bin/procstat/tests/procstat_test.sh user/ngie/bug-237403/usr.bin/procstat/tests/while1.c user/ngie/bug-237403/usr.sbin/bhyve/uart_emul.c user/ngie/bug-237403/usr.sbin/sysrc/sysrc.8 user/ngie/bug-237403/usr.sbin/wpa/Makefile.crypto Directory Properties: user/ngie/bug-237403/ (props changed) user/ngie/bug-237403/contrib/sqlite3/ (props changed) user/ngie/bug-237403/contrib/wpa/ (props changed) Modified: user/ngie/bug-237403/contrib/sqlite3/configure ============================================================================== --- user/ngie/bug-237403/contrib/sqlite3/configure Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/sqlite3/configure Wed Apr 24 04:43:53 2019 (r346621) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sqlite 3.27.1. +# Generated by GNU Autoconf 2.69 for sqlite 3.27.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.27.1' -PACKAGE_STRING='sqlite 3.27.1' +PACKAGE_VERSION='3.27.2' +PACKAGE_STRING='sqlite 3.27.2' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.27.1 to adapt to many kinds of systems. +\`configure' configures sqlite 3.27.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1412,7 +1412,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.27.1:";; + short | recursive ) echo "Configuration of sqlite 3.27.2:";; esac cat <<\_ACEOF @@ -1537,7 +1537,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.27.1 +sqlite configure 3.27.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.27.1, which was +It was created by sqlite $as_me 3.27.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2818,7 +2818,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.27.1' + VERSION='3.27.2' cat >>confdefs.h <<_ACEOF @@ -14438,7 +14438,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.27.1, which was +This file was extended by sqlite $as_me 3.27.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14495,7 +14495,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sqlite config.status 3.27.1 +sqlite config.status 3.27.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: user/ngie/bug-237403/contrib/sqlite3/configure.ac ============================================================================== --- user/ngie/bug-237403/contrib/sqlite3/configure.ac Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/sqlite3/configure.ac Wed Apr 24 04:43:53 2019 (r346621) @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.27.1, http://www.sqlite.org) +AC_INIT(sqlite, 3.27.2, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) Modified: user/ngie/bug-237403/contrib/sqlite3/sqlite3.c ============================================================================== --- user/ngie/bug-237403/contrib/sqlite3/sqlite3.c Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/sqlite3/sqlite3.c Wed Apr 24 04:43:53 2019 (r346621) @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.27.1. By combining all the individual C code files into this +** version 3.27.2. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -1162,9 +1162,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.27.1" -#define SQLITE_VERSION_NUMBER 3027001 -#define SQLITE_SOURCE_ID "2019-02-08 13:17:39 0eca3dd3d38b31c92b49ca2d311128b74584714d9e7de895b1a6286ef959a1dd" +#define SQLITE_VERSION "3.27.2" +#define SQLITE_VERSION_NUMBER 3027002 +#define SQLITE_SOURCE_ID "2019-02-25 16:06:06 bd49a8271d650fa89e446b42e513b595a717b9212c91dd384aab871fc1d0f6d7" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -3408,7 +3408,7 @@ SQLITE_API int sqlite3_changes(sqlite3*); ** not. ^Changes to a view that are intercepted by INSTEAD OF triggers ** are not counted. ** -** This the [sqlite3_total_changes(D)] interface only reports the number +** The [sqlite3_total_changes(D)] interface only reports the number ** of rows that changed due to SQL statement run against database ** connection D. Any changes by other database connections are ignored. ** To detect changes against a database file from other database @@ -14937,57 +14937,56 @@ typedef struct VdbeOpList VdbeOpList; #define OP_Sequence 120 /* synopsis: r[P2]=cursor[P1].ctr++ */ #define OP_NewRowid 121 /* synopsis: r[P2]=rowid */ #define OP_Insert 122 /* synopsis: intkey=r[P3] data=r[P2] */ -#define OP_InsertInt 123 /* synopsis: intkey=P3 data=r[P2] */ -#define OP_Delete 124 -#define OP_ResetCount 125 -#define OP_SorterCompare 126 /* synopsis: if key(P1)!=trim(r[P3],P4) goto P2 */ -#define OP_SorterData 127 /* synopsis: r[P2]=data */ -#define OP_RowData 128 /* synopsis: r[P2]=data */ -#define OP_Rowid 129 /* synopsis: r[P2]=rowid */ -#define OP_NullRow 130 -#define OP_SeekEnd 131 -#define OP_SorterInsert 132 /* synopsis: key=r[P2] */ -#define OP_IdxInsert 133 /* synopsis: key=r[P2] */ -#define OP_IdxDelete 134 /* synopsis: key=r[P2@P3] */ -#define OP_DeferredSeek 135 /* synopsis: Move P3 to P1.rowid if needed */ -#define OP_IdxRowid 136 /* synopsis: r[P2]=rowid */ -#define OP_Destroy 137 -#define OP_Clear 138 -#define OP_ResetSorter 139 -#define OP_CreateBtree 140 /* synopsis: r[P2]=root iDb=P1 flags=P3 */ +#define OP_Delete 123 +#define OP_ResetCount 124 +#define OP_SorterCompare 125 /* synopsis: if key(P1)!=trim(r[P3],P4) goto P2 */ +#define OP_SorterData 126 /* synopsis: r[P2]=data */ +#define OP_RowData 127 /* synopsis: r[P2]=data */ +#define OP_Rowid 128 /* synopsis: r[P2]=rowid */ +#define OP_NullRow 129 +#define OP_SeekEnd 130 +#define OP_SorterInsert 131 /* synopsis: key=r[P2] */ +#define OP_IdxInsert 132 /* synopsis: key=r[P2] */ +#define OP_IdxDelete 133 /* synopsis: key=r[P2@P3] */ +#define OP_DeferredSeek 134 /* synopsis: Move P3 to P1.rowid if needed */ +#define OP_IdxRowid 135 /* synopsis: r[P2]=rowid */ +#define OP_Destroy 136 +#define OP_Clear 137 +#define OP_ResetSorter 138 +#define OP_CreateBtree 139 /* synopsis: r[P2]=root iDb=P1 flags=P3 */ +#define OP_SqlExec 140 #define OP_Real 141 /* same as TK_FLOAT, synopsis: r[P2]=P4 */ -#define OP_SqlExec 142 -#define OP_ParseSchema 143 -#define OP_LoadAnalysis 144 -#define OP_DropTable 145 -#define OP_DropIndex 146 -#define OP_DropTrigger 147 -#define OP_IntegrityCk 148 -#define OP_RowSetAdd 149 /* synopsis: rowset(P1)=r[P2] */ -#define OP_Param 150 -#define OP_FkCounter 151 /* synopsis: fkctr[P1]+=P2 */ -#define OP_MemMax 152 /* synopsis: r[P1]=max(r[P1],r[P2]) */ -#define OP_OffsetLimit 153 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */ -#define OP_AggInverse 154 /* synopsis: accum=r[P3] inverse(r[P2@P5]) */ -#define OP_AggStep 155 /* synopsis: accum=r[P3] step(r[P2@P5]) */ -#define OP_AggStep1 156 /* synopsis: accum=r[P3] step(r[P2@P5]) */ -#define OP_AggValue 157 /* synopsis: r[P3]=value N=P2 */ -#define OP_AggFinal 158 /* synopsis: accum=r[P1] N=P2 */ -#define OP_Expire 159 -#define OP_TableLock 160 /* synopsis: iDb=P1 root=P2 write=P3 */ -#define OP_VBegin 161 -#define OP_VCreate 162 -#define OP_VDestroy 163 -#define OP_VOpen 164 -#define OP_VColumn 165 /* synopsis: r[P3]=vcolumn(P2) */ -#define OP_VRename 166 -#define OP_Pagecount 167 -#define OP_MaxPgcnt 168 -#define OP_Trace 169 -#define OP_CursorHint 170 -#define OP_Noop 171 -#define OP_Explain 172 -#define OP_Abortable 173 +#define OP_ParseSchema 142 +#define OP_LoadAnalysis 143 +#define OP_DropTable 144 +#define OP_DropIndex 145 +#define OP_DropTrigger 146 +#define OP_IntegrityCk 147 +#define OP_RowSetAdd 148 /* synopsis: rowset(P1)=r[P2] */ +#define OP_Param 149 +#define OP_FkCounter 150 /* synopsis: fkctr[P1]+=P2 */ +#define OP_MemMax 151 /* synopsis: r[P1]=max(r[P1],r[P2]) */ +#define OP_OffsetLimit 152 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */ +#define OP_AggInverse 153 /* synopsis: accum=r[P3] inverse(r[P2@P5]) */ +#define OP_AggStep 154 /* synopsis: accum=r[P3] step(r[P2@P5]) */ +#define OP_AggStep1 155 /* synopsis: accum=r[P3] step(r[P2@P5]) */ +#define OP_AggValue 156 /* synopsis: r[P3]=value N=P2 */ +#define OP_AggFinal 157 /* synopsis: accum=r[P1] N=P2 */ +#define OP_Expire 158 +#define OP_TableLock 159 /* synopsis: iDb=P1 root=P2 write=P3 */ +#define OP_VBegin 160 +#define OP_VCreate 161 +#define OP_VDestroy 162 +#define OP_VOpen 163 +#define OP_VColumn 164 /* synopsis: r[P3]=vcolumn(P2) */ +#define OP_VRename 165 +#define OP_Pagecount 166 +#define OP_MaxPgcnt 167 +#define OP_Trace 168 +#define OP_CursorHint 169 +#define OP_Noop 170 +#define OP_Explain 171 +#define OP_Abortable 172 /* Properties such as "out2" or "jump" that are specified in ** comments following the "case" for each opcode in the vdbe.c @@ -15016,12 +15015,12 @@ typedef struct VdbeOpList VdbeOpList; /* 104 */ 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,\ /* 112 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ /* 120 */ 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ -/* 128 */ 0x00, 0x10, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,\ -/* 136 */ 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,\ -/* 144 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00,\ -/* 152 */ 0x04, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ -/* 160 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,\ -/* 168 */ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,} +/* 128 */ 0x10, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x10,\ +/* 136 */ 0x10, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00,\ +/* 144 */ 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x04,\ +/* 152 */ 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ +/* 160 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,\ +/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00,} /* The sqlite3P2Values() routine is able to run faster if it knows ** the value of the largest JUMP opcode. The smaller the maximum @@ -19174,7 +19173,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameColumn(Parse*, S SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *, int *); SQLITE_PRIVATE void sqlite3NestedParse(Parse*, const char*, ...); SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3*, int); -SQLITE_PRIVATE void sqlite3CodeRhsOfIN(Parse*, Expr*, int, int); +SQLITE_PRIVATE void sqlite3CodeRhsOfIN(Parse*, Expr*, int); SQLITE_PRIVATE int sqlite3CodeSubselect(Parse*, Expr*); SQLITE_PRIVATE void sqlite3SelectPrep(Parse*, Select*, NameContext*); SQLITE_PRIVATE void sqlite3SelectWrongNumTermsError(Parse *pParse, Select *p); @@ -32139,57 +32138,56 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ /* 120 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"), /* 121 */ "NewRowid" OpHelp("r[P2]=rowid"), /* 122 */ "Insert" OpHelp("intkey=r[P3] data=r[P2]"), - /* 123 */ "InsertInt" OpHelp("intkey=P3 data=r[P2]"), - /* 124 */ "Delete" OpHelp(""), - /* 125 */ "ResetCount" OpHelp(""), - /* 126 */ "SorterCompare" OpHelp("if key(P1)!=trim(r[P3],P4) goto P2"), - /* 127 */ "SorterData" OpHelp("r[P2]=data"), - /* 128 */ "RowData" OpHelp("r[P2]=data"), - /* 129 */ "Rowid" OpHelp("r[P2]=rowid"), - /* 130 */ "NullRow" OpHelp(""), - /* 131 */ "SeekEnd" OpHelp(""), - /* 132 */ "SorterInsert" OpHelp("key=r[P2]"), - /* 133 */ "IdxInsert" OpHelp("key=r[P2]"), - /* 134 */ "IdxDelete" OpHelp("key=r[P2@P3]"), - /* 135 */ "DeferredSeek" OpHelp("Move P3 to P1.rowid if needed"), - /* 136 */ "IdxRowid" OpHelp("r[P2]=rowid"), - /* 137 */ "Destroy" OpHelp(""), - /* 138 */ "Clear" OpHelp(""), - /* 139 */ "ResetSorter" OpHelp(""), - /* 140 */ "CreateBtree" OpHelp("r[P2]=root iDb=P1 flags=P3"), + /* 123 */ "Delete" OpHelp(""), + /* 124 */ "ResetCount" OpHelp(""), + /* 125 */ "SorterCompare" OpHelp("if key(P1)!=trim(r[P3],P4) goto P2"), + /* 126 */ "SorterData" OpHelp("r[P2]=data"), + /* 127 */ "RowData" OpHelp("r[P2]=data"), + /* 128 */ "Rowid" OpHelp("r[P2]=rowid"), + /* 129 */ "NullRow" OpHelp(""), + /* 130 */ "SeekEnd" OpHelp(""), + /* 131 */ "SorterInsert" OpHelp("key=r[P2]"), + /* 132 */ "IdxInsert" OpHelp("key=r[P2]"), + /* 133 */ "IdxDelete" OpHelp("key=r[P2@P3]"), + /* 134 */ "DeferredSeek" OpHelp("Move P3 to P1.rowid if needed"), + /* 135 */ "IdxRowid" OpHelp("r[P2]=rowid"), + /* 136 */ "Destroy" OpHelp(""), + /* 137 */ "Clear" OpHelp(""), + /* 138 */ "ResetSorter" OpHelp(""), + /* 139 */ "CreateBtree" OpHelp("r[P2]=root iDb=P1 flags=P3"), + /* 140 */ "SqlExec" OpHelp(""), /* 141 */ "Real" OpHelp("r[P2]=P4"), - /* 142 */ "SqlExec" OpHelp(""), - /* 143 */ "ParseSchema" OpHelp(""), - /* 144 */ "LoadAnalysis" OpHelp(""), - /* 145 */ "DropTable" OpHelp(""), - /* 146 */ "DropIndex" OpHelp(""), - /* 147 */ "DropTrigger" OpHelp(""), - /* 148 */ "IntegrityCk" OpHelp(""), - /* 149 */ "RowSetAdd" OpHelp("rowset(P1)=r[P2]"), - /* 150 */ "Param" OpHelp(""), - /* 151 */ "FkCounter" OpHelp("fkctr[P1]+=P2"), - /* 152 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"), - /* 153 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"), - /* 154 */ "AggInverse" OpHelp("accum=r[P3] inverse(r[P2@P5])"), - /* 155 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"), - /* 156 */ "AggStep1" OpHelp("accum=r[P3] step(r[P2@P5])"), - /* 157 */ "AggValue" OpHelp("r[P3]=value N=P2"), - /* 158 */ "AggFinal" OpHelp("accum=r[P1] N=P2"), - /* 159 */ "Expire" OpHelp(""), - /* 160 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"), - /* 161 */ "VBegin" OpHelp(""), - /* 162 */ "VCreate" OpHelp(""), - /* 163 */ "VDestroy" OpHelp(""), - /* 164 */ "VOpen" OpHelp(""), - /* 165 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"), - /* 166 */ "VRename" OpHelp(""), - /* 167 */ "Pagecount" OpHelp(""), - /* 168 */ "MaxPgcnt" OpHelp(""), - /* 169 */ "Trace" OpHelp(""), - /* 170 */ "CursorHint" OpHelp(""), - /* 171 */ "Noop" OpHelp(""), - /* 172 */ "Explain" OpHelp(""), - /* 173 */ "Abortable" OpHelp(""), + /* 142 */ "ParseSchema" OpHelp(""), + /* 143 */ "LoadAnalysis" OpHelp(""), + /* 144 */ "DropTable" OpHelp(""), + /* 145 */ "DropIndex" OpHelp(""), + /* 146 */ "DropTrigger" OpHelp(""), + /* 147 */ "IntegrityCk" OpHelp(""), + /* 148 */ "RowSetAdd" OpHelp("rowset(P1)=r[P2]"), + /* 149 */ "Param" OpHelp(""), + /* 150 */ "FkCounter" OpHelp("fkctr[P1]+=P2"), + /* 151 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"), + /* 152 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"), + /* 153 */ "AggInverse" OpHelp("accum=r[P3] inverse(r[P2@P5])"), + /* 154 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"), + /* 155 */ "AggStep1" OpHelp("accum=r[P3] step(r[P2@P5])"), + /* 156 */ "AggValue" OpHelp("r[P3]=value N=P2"), + /* 157 */ "AggFinal" OpHelp("accum=r[P1] N=P2"), + /* 158 */ "Expire" OpHelp(""), + /* 159 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"), + /* 160 */ "VBegin" OpHelp(""), + /* 161 */ "VCreate" OpHelp(""), + /* 162 */ "VDestroy" OpHelp(""), + /* 163 */ "VOpen" OpHelp(""), + /* 164 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"), + /* 165 */ "VRename" OpHelp(""), + /* 166 */ "Pagecount" OpHelp(""), + /* 167 */ "MaxPgcnt" OpHelp(""), + /* 168 */ "Trace" OpHelp(""), + /* 169 */ "CursorHint" OpHelp(""), + /* 170 */ "Noop" OpHelp(""), + /* 171 */ "Explain" OpHelp(""), + /* 172 */ "Abortable" OpHelp(""), }; return azName[i]; } @@ -87935,14 +87933,7 @@ case OP_NewRowid: { /* out2 */ ** This instruction only works on tables. The equivalent instruction ** for indices is OP_IdxInsert. */ -/* Opcode: InsertInt P1 P2 P3 P4 P5 -** Synopsis: intkey=P3 data=r[P2] -** -** This works exactly like OP_Insert except that the key is the -** integer value P3, not the value of the integer stored in register P3. -*/ -case OP_Insert: -case OP_InsertInt: { +case OP_Insert: { Mem *pData; /* MEM cell holding data for the record to be inserted */ Mem *pKey; /* MEM cell holding key for the record */ VdbeCursor *pC; /* Cursor to table into which insert is written */ @@ -87963,16 +87954,11 @@ case OP_InsertInt: { REGISTER_TRACE(pOp->p2, pData); sqlite3VdbeIncrWriteCounter(p, pC); - if( pOp->opcode==OP_Insert ){ - pKey = &aMem[pOp->p3]; - assert( pKey->flags & MEM_Int ); - assert( memIsValid(pKey) ); - REGISTER_TRACE(pOp->p3, pKey); - x.nKey = pKey->u.i; - }else{ - assert( pOp->opcode==OP_InsertInt ); - x.nKey = pOp->p3; - } + pKey = &aMem[pOp->p3]; + assert( pKey->flags & MEM_Int ); + assert( memIsValid(pKey) ); + REGISTER_TRACE(pOp->p3, pKey); + x.nKey = pKey->u.i; if( pOp->p4type==P4_TABLE && HAS_UPDATE_HOOK(db) ){ assert( pC->iDb>=0 ); @@ -96131,7 +96117,39 @@ SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy( return 0; } +#ifndef SQLITE_OMIT_WINDOWFUNC /* +** Walker callback for resolveRemoveWindows(). +*/ +static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){ + if( ExprHasProperty(pExpr, EP_WinFunc) ){ + Window **pp; + for(pp=&pWalker->u.pSelect->pWin; *pp; pp=&(*pp)->pNextWin){ + if( *pp==pExpr->y.pWin ){ + *pp = (*pp)->pNextWin; + break; + } + } + } + return WRC_Continue; +} + +/* +** Remove any Window objects owned by the expression pExpr from the +** Select.pWin list of Select object pSelect. +*/ +static void resolveRemoveWindows(Select *pSelect, Expr *pExpr){ + Walker sWalker; + memset(&sWalker, 0, sizeof(Walker)); + sWalker.xExprCallback = resolveRemoveWindowsCb; + sWalker.u.pSelect = pSelect; + sqlite3WalkExpr(&sWalker, pExpr); +} +#else +# define resolveRemoveWindows(x,y) +#endif + +/* ** pOrderBy is an ORDER BY or GROUP BY clause in SELECT statement pSelect. ** The Name context of the SELECT statement is pNC. zType is either ** "ORDER" or "GROUP" depending on which type of clause pOrderBy is. @@ -96197,19 +96215,10 @@ static int resolveOrderGroupBy( } for(j=0; jpEList->nExpr; j++){ if( sqlite3ExprCompare(0, pE, pSelect->pEList->a[j].pExpr, -1)==0 ){ -#ifndef SQLITE_OMIT_WINDOWFUNC - if( ExprHasProperty(pE, EP_WinFunc) ){ - /* Since this window function is being changed into a reference - ** to the same window function the result set, remove the instance - ** of this window function from the Select.pWin list. */ - Window **pp; - for(pp=&pSelect->pWin; *pp; pp=&(*pp)->pNextWin){ - if( *pp==pE->y.pWin ){ - *pp = (*pp)->pNextWin; - } - } - } -#endif + /* Since this expresion is being changed into a reference + ** to an identical expression in the result set, remove all Window + ** objects belonging to the expression from the Select.pWin list. */ + resolveRemoveWindows(pSelect, pE); pItem->u.x.iOrderByCol = j+1; } } @@ -99181,14 +99190,11 @@ SQLITE_PRIVATE int sqlite3FindInIndex( eType = IN_INDEX_EPH; if( inFlags & IN_INDEX_LOOP ){ pParse->nQueryLoop = 0; - if( pX->pLeft->iColumn<0 && !ExprHasProperty(pX, EP_xIsSelect) ){ - eType = IN_INDEX_ROWID; - } }else if( prRhsHasNull ){ *prRhsHasNull = rMayHaveNull = ++pParse->nMem; } assert( pX->op==TK_IN ); - sqlite3CodeRhsOfIN(pParse, pX, iTab, eType==IN_INDEX_ROWID); + sqlite3CodeRhsOfIN(pParse, pX, iTab); if( rMayHaveNull ){ sqlite3SetHasNullFlag(v, iTab, rMayHaveNull); } @@ -99289,12 +99295,6 @@ SQLITE_PRIVATE void sqlite3VectorErrorMsg(Parse *pPars ** however the cursor number returned might not be the same, as it might ** have been duplicated using OP_OpenDup. ** -** If parameter isRowid is non-zero, then LHS of the IN operator is guaranteed -** to be a non-null integer. In this case, the ephemeral table can be an -** table B-Tree that keyed by only integers. The more general cases uses -** an index B-Tree which can have arbitrary keys, but is slower to both -** read and write. -** ** If the LHS expression ("x" in the examples) is a column value, or ** the SELECT statement returns a column value, then the affinity of that ** column is used to build the index keys. If both 'x' and the @@ -99306,8 +99306,7 @@ SQLITE_PRIVATE void sqlite3VectorErrorMsg(Parse *pPars SQLITE_PRIVATE void sqlite3CodeRhsOfIN( Parse *pParse, /* Parsing context */ Expr *pExpr, /* The IN operator */ - int iTab, /* Use this cursor number */ - int isRowid /* If true, LHS is a rowid */ + int iTab /* Use this cursor number */ ){ int addrOnce = 0; /* Address of the OP_Once instruction at top */ int addr; /* Address of OP_OpenEphemeral instruction */ @@ -99360,14 +99359,12 @@ SQLITE_PRIVATE void sqlite3CodeRhsOfIN( /* Check to see if this is a vector IN operator */ pLeft = pExpr->pLeft; nVal = sqlite3ExprVectorSize(pLeft); - assert( !isRowid || nVal==1 ); /* Construct the ephemeral table that will contain the content of ** RHS of the IN operator. */ pExpr->iTable = iTab; - addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, - pExpr->iTable, (isRowid?0:nVal)); + addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pExpr->iTable, nVal); #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS if( ExprHasProperty(pExpr, EP_xIsSelect) ){ VdbeComment((v, "Result of SELECT %u", pExpr->x.pSelect->selId)); @@ -99375,7 +99372,7 @@ SQLITE_PRIVATE void sqlite3CodeRhsOfIN( VdbeComment((v, "RHS of IN operator")); } #endif - pKeyInfo = isRowid ? 0 : sqlite3KeyInfoAlloc(pParse->db, nVal, 1); + pKeyInfo = sqlite3KeyInfoAlloc(pParse->db, nVal, 1); if( ExprHasProperty(pExpr, EP_xIsSelect) ){ /* Case 1: expr IN (SELECT ...) @@ -99389,7 +99386,6 @@ SQLITE_PRIVATE void sqlite3CodeRhsOfIN( ExplainQueryPlan((pParse, 1, "%sLIST SUBQUERY %d", addrOnce?"":"CORRELATED ", pSelect->selId )); - assert( !isRowid ); /* If the LHS and RHS of the IN operator do not match, that ** error will have been caught long before we reach this point. */ if( ALWAYS(pEList->nExpr==nVal) ){ @@ -99442,10 +99438,8 @@ SQLITE_PRIVATE void sqlite3CodeRhsOfIN( /* Loop through each expression in . */ r1 = sqlite3GetTempReg(pParse); r2 = sqlite3GetTempReg(pParse); - if( isRowid ) sqlite3VdbeAddOp4(v, OP_Blob, 0, r2, 0, "", P4_STATIC); for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){ Expr *pE2 = pItem->pExpr; - int iValToIns; /* If the expression is not constant then we will need to ** disable the test that was generated above that makes sure @@ -99458,20 +99452,9 @@ SQLITE_PRIVATE void sqlite3CodeRhsOfIN( } /* Evaluate the expression and insert it into the temp table */ - if( isRowid && sqlite3ExprIsInteger(pE2, &iValToIns) ){ - sqlite3VdbeAddOp3(v, OP_InsertInt, iTab, r2, iValToIns); - }else{ - r3 = sqlite3ExprCodeTarget(pParse, pE2, r1); - if( isRowid ){ - sqlite3VdbeAddOp2(v, OP_MustBeInt, r3, - sqlite3VdbeCurrentAddr(v)+2); - VdbeCoverage(v); - sqlite3VdbeAddOp3(v, OP_Insert, iTab, r2, r3); - }else{ - sqlite3VdbeAddOp4(v, OP_MakeRecord, r3, 1, r2, &affinity, 1); - sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iTab, r2, r3, 1); - } - } + r3 = sqlite3ExprCodeTarget(pParse, pE2, r1); + sqlite3VdbeAddOp4(v, OP_MakeRecord, r3, 1, r2, &affinity, 1); + sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iTab, r2, r3, 1); } sqlite3ReleaseTempReg(pParse, r1); sqlite3ReleaseTempReg(pParse, r2); @@ -118107,10 +118090,13 @@ SQLITE_PRIVATE void sqlite3CompleteInsertion( pik_flags |= (update_flags & OPFLAG_SAVEPOSITION); #ifdef SQLITE_ENABLE_PREUPDATE_HOOK if( update_flags==0 ){ - sqlite3VdbeAddOp4(v, OP_InsertInt, - iIdxCur+i, aRegIdx[i], 0, (char*)pTab, P4_TABLE + int r = sqlite3GetTempReg(pParse); + sqlite3VdbeAddOp2(v, OP_Integer, 0, r); + sqlite3VdbeAddOp4(v, OP_Insert, + iIdxCur+i, aRegIdx[i], r, (char*)pTab, P4_TABLE ); sqlite3VdbeChangeP5(v, OPFLAG_ISNOOP); + sqlite3ReleaseTempReg(pParse, r); } #endif } @@ -136427,7 +136413,6 @@ static int codeEqualityTerm( if( pLoop->aLTerm[i]->pExpr==pX ){ int iOut = iReg + i - iEq; if( eType==IN_INDEX_ROWID ){ - testcase( nEq>1 ); /* Happens with a UNIQUE index on ROWID */ pIn->addrInTop = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iOut); }else{ int iCol = aiMap ? aiMap[iMap++] : 0; @@ -137189,6 +137174,9 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart( sqlite3VdbeAddOp3(v, OP_SeekRowid, iCur, addrNxt, iRowidReg); VdbeCoverage(v); pLevel->op = OP_Noop; + if( (pTerm->prereqAll & pLevel->notReady)==0 ){ + pTerm->wtFlags |= TERM_CODED; + } }else if( (pLoop->wsFlags & WHERE_IPK)!=0 && (pLoop->wsFlags & WHERE_COLUMN_RANGE)!=0 ){ @@ -217076,7 +217064,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2019-02-08 13:17:39 0eca3dd3d38b31c92b49ca2d311128b74584714d9e7de895b1a6286ef959a1dd", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2019-02-25 16:06:06 bd49a8271d650fa89e446b42e513b595a717b9212c91dd384aab871fc1d0f6d7", -1, SQLITE_TRANSIENT); } /* @@ -221840,9 +221828,9 @@ SQLITE_API int sqlite3_stmt_init( #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ /************** End of stmt.c ************************************************/ -#if __LINE__!=221843 +#if __LINE__!=221831 #undef SQLITE_SOURCE_ID -#define SQLITE_SOURCE_ID "2019-02-08 13:17:39 0eca3dd3d38b31c92b49ca2d311128b74584714d9e7de895b1a6286ef959alt2" +#define SQLITE_SOURCE_ID "2019-02-25 16:06:06 bd49a8271d650fa89e446b42e513b595a717b9212c91dd384aab871fc1d0alt2" #endif /* Return the source-id for this library */ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } Modified: user/ngie/bug-237403/contrib/sqlite3/sqlite3.h ============================================================================== --- user/ngie/bug-237403/contrib/sqlite3/sqlite3.h Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/sqlite3/sqlite3.h Wed Apr 24 04:43:53 2019 (r346621) @@ -123,9 +123,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.27.1" -#define SQLITE_VERSION_NUMBER 3027001 -#define SQLITE_SOURCE_ID "2019-02-08 13:17:39 0eca3dd3d38b31c92b49ca2d311128b74584714d9e7de895b1a6286ef959a1dd" +#define SQLITE_VERSION "3.27.2" +#define SQLITE_VERSION_NUMBER 3027002 +#define SQLITE_SOURCE_ID "2019-02-25 16:06:06 bd49a8271d650fa89e446b42e513b595a717b9212c91dd384aab871fc1d0f6d7" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -2369,7 +2369,7 @@ SQLITE_API int sqlite3_changes(sqlite3*); ** not. ^Changes to a view that are intercepted by INSTEAD OF triggers ** are not counted. ** -** This the [sqlite3_total_changes(D)] interface only reports the number +** The [sqlite3_total_changes(D)] interface only reports the number ** of rows that changed due to SQL statement run against database ** connection D. Any changes by other database connections are ignored. ** To detect changes against a database file from other database Modified: user/ngie/bug-237403/contrib/sqlite3/tea/configure ============================================================================== --- user/ngie/bug-237403/contrib/sqlite3/tea/configure Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/sqlite3/tea/configure Wed Apr 24 04:43:53 2019 (r346621) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sqlite 3.27.1. +# Generated by GNU Autoconf 2.69 for sqlite 3.27.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.27.1' -PACKAGE_STRING='sqlite 3.27.1' +PACKAGE_VERSION='3.27.2' +PACKAGE_STRING='sqlite 3.27.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1303,7 +1303,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.27.1 to adapt to many kinds of systems. +\`configure' configures sqlite 3.27.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1365,7 +1365,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.27.1:";; + short | recursive ) echo "Configuration of sqlite 3.27.2:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.27.1 +sqlite configure 3.27.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1878,7 +1878,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.27.1, which was +It was created by sqlite $as_me 3.27.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9373,7 +9373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.27.1, which was +This file was extended by sqlite $as_me 3.27.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9426,7 +9426,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sqlite config.status 3.27.1 +sqlite config.status 3.27.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: user/ngie/bug-237403/contrib/sqlite3/tea/configure.ac ============================================================================== --- user/ngie/bug-237403/contrib/sqlite3/tea/configure.ac Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/sqlite3/tea/configure.ac Wed Apr 24 04:43:53 2019 (r346621) @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([sqlite], [3.27.1]) +AC_INIT([sqlite], [3.27.2]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. Modified: user/ngie/bug-237403/contrib/wpa/CONTRIBUTIONS ============================================================================== --- user/ngie/bug-237403/contrib/wpa/CONTRIBUTIONS Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/wpa/CONTRIBUTIONS Wed Apr 24 04:43:53 2019 (r346621) @@ -140,7 +140,7 @@ The license terms used for hostap.git files Modified BSD license (no advertisement clause): -Copyright (c) 2002-2018, Jouni Malinen and contributors +Copyright (c) 2002-2019, Jouni Malinen and contributors All Rights Reserved. Redistribution and use in source and binary forms, with or without Modified: user/ngie/bug-237403/contrib/wpa/COPYING ============================================================================== --- user/ngie/bug-237403/contrib/wpa/COPYING Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/wpa/COPYING Wed Apr 24 04:43:53 2019 (r346621) @@ -1,7 +1,7 @@ wpa_supplicant and hostapd -------------------------- -Copyright (c) 2002-2018, Jouni Malinen and contributors +Copyright (c) 2002-2019, Jouni Malinen and contributors All Rights Reserved. Modified: user/ngie/bug-237403/contrib/wpa/README ============================================================================== --- user/ngie/bug-237403/contrib/wpa/README Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/wpa/README Wed Apr 24 04:43:53 2019 (r346621) @@ -1,7 +1,7 @@ wpa_supplicant and hostapd -------------------------- -Copyright (c) 2002-2018, Jouni Malinen and contributors +Copyright (c) 2002-2019, Jouni Malinen and contributors All Rights Reserved. These programs are licensed under the BSD license (the one with Modified: user/ngie/bug-237403/contrib/wpa/hostapd/ChangeLog ============================================================================== --- user/ngie/bug-237403/contrib/wpa/hostapd/ChangeLog Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/wpa/hostapd/ChangeLog Wed Apr 24 04:43:53 2019 (r346621) @@ -1,5 +1,60 @@ ChangeLog for hostapd +2019-04-21 - v2.8 + * SAE changes + - added support for SAE Password Identifier + - changed default configuration to enable only group 19 + (i.e., disable groups 20, 21, 25, 26 from default configuration) and + disable all unsuitable groups completely based on REVmd changes + - improved anti-clogging token mechanism and SAE authentication + frame processing during heavy CPU load; this mitigates some issues + with potential DoS attacks trying to flood an AP with large number + of SAE messages + - added Finite Cyclic Group field in status code 77 responses + - reject use of unsuitable groups based on new implementation guidance + in REVmd (allow only FFC groups with prime >= 3072 bits and ECC + groups with prime >= 256) + - minimize timing and memory use differences in PWE derivation + [https://w1.fi/security/2019-1/] (CVE-2019-9494) + - fixed confirm message validation in error cases + [https://w1.fi/security/2019-3/] (CVE-2019-9496) + * EAP-pwd changes + - minimize timing and memory use differences in PWE derivation + [https://w1.fi/security/2019-2/] (CVE-2019-9495) + - verify peer scalar/element + [https://w1.fi/security/2019-4/] (CVE-2019-9497 and CVE-2019-9498) + - fix message reassembly issue with unexpected fragment + [https://w1.fi/security/2019-5/] + - enforce rand,mask generation rules more strictly + - fix a memory leak in PWE derivation + - disallow ECC groups with a prime under 256 bits (groups 25, 26, and + 27) + * Hotspot 2.0 changes + - added support for release number 3 + - reject release 2 or newer association without PMF + * added support for RSN operating channel validation + (CONFIG_OCV=y and configuration parameter ocv=1) + * added Multi-AP protocol support + * added FTM responder configuration + * fixed build with LibreSSL + * added FT/RRB workaround for short Ethernet frame padding + * fixed KEK2 derivation for FILS+FT + * added RSSI-based association rejection from OCE + * extended beacon reporting functionality + * VLAN changes + - allow local VLAN management with remote RADIUS authentication + - add WPA/WPA2 passphrase/PSK -based VLAN assignment + * OpenSSL: allow systemwide policies to be overridden + * extended PEAP to derive EMSK to enable use with ERP/FILS + * extended WPS to allow SAE configuration to be added automatically + for PSK (wps_cred_add_sae=1) + * fixed FT and SA Query Action frame with AP-MLME-in-driver cases + * OWE: allow Diffie-Hellman Parameter element to be included with DPP + in preparation for DPP protocol extension + * RADIUS server: started to accept ERP keyName-NAI as user identity + automatically without matching EAP database entry + * fixed PTK rekeying with FILS and FT + 2018-12-02 - v2.7 * fixed WPA packet number reuse with replayed messages and key reinstallation Modified: user/ngie/bug-237403/contrib/wpa/hostapd/README ============================================================================== --- user/ngie/bug-237403/contrib/wpa/hostapd/README Wed Apr 24 04:40:24 2019 (r346620) +++ user/ngie/bug-237403/contrib/wpa/hostapd/README Wed Apr 24 04:43:53 2019 (r346621) @@ -2,7 +2,7 @@ hostapd - user space IEEE 802.11 AP and IEEE 802.1X/WP Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2018, Jouni Malinen and contributors +Copyright (c) 2002-2019, Jouni Malinen and contributors All Rights Reserved. This program is licensed under the BSD license (the one with Copied: user/ngie/bug-237403/contrib/wpa/hostapd/README-MULTI-AP (from r346620, head/contrib/wpa/hostapd/README-MULTI-AP) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/bug-237403/contrib/wpa/hostapd/README-MULTI-AP Wed Apr 24 04:43:53 2019 (r346621, copy of r346620, head/contrib/wpa/hostapd/README-MULTI-AP) @@ -0,0 +1,160 @@ +hostapd, wpa_supplicant and the Multi-AP Specification +====================================================== + +This document describes how hostapd and wpa_supplicant can be configured to +support the Multi-AP Specification. + +Introduction to Multi-AP +------------------------ + +The Wi-Fi Alliance Multi-AP Specification is the technical specification for +Wi-Fi CERTIFIED EasyMesh(TM) [1], the Wi-Fi Alliance® certification program for +Multi-AP. It defines control protocols between Wi-Fi® access points (APs) to +join them into a network with centralized control and operation. It is targeted +only at routers (repeaters, gateways, ...), not at clients. Clients are not +involved at all in the protocols. + +Most of the Multi-AP specification falls outside of the scope of +hostapd/wpa_supplicant. hostapd/wpa_supplicant is only involved for the items +summarized below. The rest of the protocol must be implemented by a separate +daemon, e.g., prplMesh [2]. That daemon also needs to communicate with hostapd, +e.g., to get a list of associated clients, but this can be done using the normal +hostapd interfaces. + +hostapd/wpa_supplicant needs to be configured specifically to support: +- the WPS onboarding process; +- configuring backhaul links. + +The text below refers to "Multi-AP Specification v1.0" [3]. + + +Fronthaul and backhaul links +---------------------------- + +In a Multi-AP network, the central controller can configure the BSSs on the +devices that are joined into the network. These are called fronthaul BSSs. +From the point of view of hostapd, there is nothing special about these +fronthaul BSSs. + +In addition to fronthaul BSSs, the controller can also configure backhaul +links. A backhaul link is a link between two access point devices, giving +internet access to access point devices that don't have a wired link. The +Multi-AP specification doesn't dictate this, but typically the backhaul link +will be bridged into a LAN together with (one of) the fronthaul BSS(s) and the +wired Ethernet ports. + +A backhaul link must be treated specially by hostapd and wpa_supplicant. One +side of the backhaul link is configured through the Multi-AP protocol as the +"backhaul STA", i.e., the client side of the link. A backhaul STA is like any +station and is handled appropriately by wpa_supplicant, but two additional +features are required. It must send an additional information element in each +(Re)Association Request frame ([3], section 5.2, paragraph 4). In addition, it +must use 4-address mode for all frames sent over this link ([3], section 14). +Therefore, wpa_supplicant must be configured explicitly as the backhaul STA +role, by setting 'multi_ap_backhaul_sta=1' in the network configuration block +or when configuring the network profile through the control interface. When +'multi_ap_backhaul_sta=1', wpa_supplicant includes the Multi-AP IE in +(Re)Association Request frame and verifies that it is included in the +(Re)Association Response frame. If it is not, association fails. If it is, +wpa_supplicant sets 4-address mode for this interface through a driver +callback. + +The AP side of the backhaul link is called a "backhaul BSS". Such a BSS must +be handled specially by hostapd, because it must add an additional information +element in each (Re)Association Response frame, but only to stations that have +identified themselves as backhaul stations ([3], section 5.2, paragraph 5-6). +This is important because it is possible to use the same BSS and SSID for +fronthaul and backhaul at the same time. The additional information element must +only be used for frames sent to a backhaul STA, not to a normal STA. Also, +frames sent to a backhaul STA must use 4-address mode, while frames sent to a +normal STA (fronthaul, when it's a fronthaul and backhaul BSS) must use +3-address mode. + +A BSS is configured in Multi-AP mode in hostapd by setting the 'multi_ap' +configuration option to 1 (backhaul BSS), 2 (fronthaul BSS), or 3 +(simultaneous backhaul and fronthaul BSS). If this option is set, hostapd +parses the Multi-AP information element in the Association Request frame. If the +station is a backhaul STA and the BSS is configured as a backhaul BSS, +hostapd sets up 4-address mode. Since there may be multiple stations connected +simultaneously, and each of them has a different RA (receiver address), a VLAN +is created for each backhaul STA and it is automatically added to a bridge. +This is the same behavior as for WDS, and the relevant option ('bridge' or +'wds_bridge') applies here as well. + +If 'multi_ap' is 1 (backhaul BSS only), any station that tries to associate +without the Multi-AP information element will be denied. + +If 'multi_ap' is 2 (fronthaul BSS only), any station that tries to associate +with the Multi-AP information element will be denied. That is also the only +difference with 'multi_ap' set to 0: in the latter case, the Multi-AP +information element is simply ignored. + +In summary, this is the end-to-end behavior for a backhaul BSS (i.e., +multi_ap_backhaul_sta=1 in wpa_supplicant on STA, and multi_ap=1 or 3 in +hostapd on AP). Note that point 1 means that hostapd must not be configured +with WPS support on the backhaul BSS (multi_ap=1). hostapd does not check for +that. + +1. Backhaul BSS beacons do not advertise WPS support (other than that, nothing + Multi-AP specific). +2. STA sends Authentication frame (nothing Multi-AP specific). +3. AP sends Authentication frame (nothing Multi-AP specific). +4. STA sends Association Request frame with Multi-AP IE. +5. AP sends Association Response frame with Multi-AP IE. +6. STA and AP both use 4-address mode for Data frames. + + +WPS support +----------- + +WPS requires more special handling. WPS must only be advertised on fronthaul +BSSs, not on backhaul BSSs, so WPS should not be enabled on a backhaul-only +BSS in hostapd.conf. The WPS configuration purely works on the fronthaul BSS. +When a WPS M1 message has an additional subelement that indicates a request for +a Multi-AP backhaul link, hostapd must not respond with the normal fronthaul +BSS credentials; instead, it should respond with the (potentially different) +backhaul BSS credentials. + +To support this, hostapd has the 'multi_ap_backhaul_ssid', +'multi_ap_backhaul_wpa_psk' and 'multi_ap_backhaul_wpa_passphrase' options. +When these are set on an BSS with WPS, they are used instead of the normal +credentials when hostapd receives a WPS M1 message with the Multi-AP IE. Only +WPA2-Personal is supported in the Multi-AP specification, so there is no need +to specify authentication or encryption options. For the backhaul credentials, +per-device PSK is not supported. + +If the BSS is a simultaneous backhaul and fronthaul BSS, there is no need to +specify the backhaul credentials, since the backhaul and fronthaul credentials +are identical. + +To enable the Multi-AP backhaul STA feature when it performs WPS, a new +parameter has been introduced to the WPS_PBC control interface call. When this +"multi_ap=1" option is set, it adds the Multi-AP backhaul subelement to the +Association Request frame and the M1 message. It then configures the new network +profile with 'multi_ap_backhaul_sta=1'. Note that this means that if the AP does +not follow the Multi-AP specification, wpa_supplicant will fail to associate. + +In summary, this is the end-to-end behavior for WPS of a backhaul link (i.e., +multi_ap=1 option is given in the wps_pbc call on the STA side, and multi_ap=2 +and multi_ap_backhaul_ssid and either multi_ap_backhaul_wpa_psk or +multi_ap_backhaul_wpa_passphrase are set to the credentials of a backhaul BSS +in hostapd on Registrar AP). + +1. Fronthaul BSS Beacon frames advertise WPS support (nothing Multi-AP + specific). +2. Enrollee sends Authentication frame (nothing Multi-AP specific). +3. AP sends Authentication frame (nothing Multi-AP specific). +4. Enrollee sends Association Request frame with Multi-AP IE. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Tue Sep 3 14:07:26 2019 Return-Path: Delivered-To: svn-src-user@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 4B3BFDDAE4 for ; Tue, 3 Sep 2019 14:07:26 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N80Z0l9cz4Qbm; Tue, 3 Sep 2019 14:07:26 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 5FC0D1B61C; Tue, 3 Sep 2019 14:06:39 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 709081119C; Wed, 24 Apr 2019 04:45:05 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2DF09724CF; Wed, 24 Apr 2019 04:45:04 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0C4DF11133; Wed, 24 Apr 2019 04:45:04 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 41C7411131 for ; Wed, 24 Apr 2019 04:45:01 +0000 (UTC) (envelope-from ngie@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 113A6724CB; Wed, 24 Apr 2019 04:45:01 +0000 (UTC) (envelope-from ngie@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 00872730D; Wed, 24 Apr 2019 04:45:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3O4j0O8067019; Wed, 24 Apr 2019 04:45:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3O4j0om067018; Wed, 24 Apr 2019 04:45:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904240445.x3O4j0om067018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346622 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346622 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 2DF09724CF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.936,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:27 -0000 X-Original-Date: Wed, 24 Apr 2019 04:45:00 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:07:27 -0000 Author: ngie Date: Wed Apr 24 04:45:00 2019 New Revision: 346622 URL: https://svnweb.freebsd.org/changeset/base/346622 Log: except EnvironmentError, e -> except EnvironmentError as e for py3 compat Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Wed Apr 24 04:43:53 2019 (r346621) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Wed Apr 24 04:45:00 2019 (r346622) @@ -266,7 +266,7 @@ def GenTestCase(cname): mackey=key, maclen=16) r, tag = Crypto.encrypt(c, payload, nonce, aad) - except EnvironmentError, e: + except EnvironmentError as e: if e.errno != errno.EOPNOTSUPP: raise continue @@ -308,7 +308,7 @@ def GenTestCase(cname): key=key, mac=cryptodev.CRYPTO_AES_CCM_CBC_MAC, mackey=key, maclen=16) - except EnvironmentError, e: + except EnvironmentError as e: if e.errno != errno.EOPNOTSUPP: raise continue @@ -412,7 +412,7 @@ def GenTestCase(cname): try: c = Crypto(mac=alg, crid=crid, maclen=hashlen) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test hashes the driver does not support. if e.errno != errno.EOPNOTSUPP: raise