From owner-svn-src-head@freebsd.org Sun May 31 01:12:53 2020 Return-Path: Delivered-To: svn-src-head@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 2FCE52FDA1B; Sun, 31 May 2020 01:12:53 +0000 (UTC) (envelope-from rmacklem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZKzn0Xcgz44mg; Sun, 31 May 2020 01:12:53 +0000 (UTC) (envelope-from rmacklem@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 0DE2F11A77; Sun, 31 May 2020 01:12:53 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V1Cqb0015392; Sun, 31 May 2020 01:12:52 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V1CqKe015391; Sun, 31 May 2020 01:12:52 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005310112.04V1CqKe015391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 31 May 2020 01:12:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361658 - head/sys/rpc X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/rpc X-SVN-Commit-Revision: 361658 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 01:12:53 -0000 Author: rmacklem Date: Sun May 31 01:12:52 2020 New Revision: 361658 URL: https://svnweb.freebsd.org/changeset/base/361658 Log: Add the .h file that describes the operations for the rpctls_syscall. This .h file will be used by the nfs-over-tls daemons to do the system call that was added by r361599. Added: head/sys/rpc/rpcsec_tls.h (contents, props changed) Added: head/sys/rpc/rpcsec_tls.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/rpc/rpcsec_tls.h Sun May 31 01:12:52 2020 (r361658) @@ -0,0 +1,82 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Rick Macklem + * + * 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$ + */ + +#ifndef _RPC_RPCSEC_TLS_H_ +#define _RPC_RPCSEC_TLS_H_ + +/* Operation values for rpctls syscall. */ +#define RPCTLS_SYSC_CLSETPATH 1 +#define RPCTLS_SYSC_CLSOCKET 2 +#define RPCTLS_SYSC_CLSHUTDOWN 3 +#define RPCTLS_SYSC_SRVSETPATH 4 +#define RPCTLS_SYSC_SRVSOCKET 5 +#define RPCTLS_SYSC_SRVSHUTDOWN 6 + +/* System call used by the rpctlscd, rpctlssd daemons. */ +int rpctls_syscall(int, const char *); + +/* Flag bits to indicate certificate results. */ +#define RPCTLS_FLAGS_HANDSHAKE 0x01 +#define RPCTLS_FLAGS_GOTCERT 0x02 +#define RPCTLS_FLAGS_SELFSIGNED 0x04 +#define RPCTLS_FLAGS_VERIFIED 0x08 +#define RPCTLS_FLAGS_DISABLED 0x10 +#define RPCTLS_FLAGS_CERTUSER 0x20 + +/* Error return values for upcall rpcs. */ +#define RPCTLSERR_OK 0 +#define RPCTLSERR_NOCLOSE 1 +#define RPCTLSERR_NOSSL 2 +#define RPCTLSERR_NOSOCKET 3 + +#ifdef _KERNEL +/* Functions that perform upcalls to the rpctlsd daemon. */ +enum clnt_stat rpctls_connect(CLIENT *newclient, struct socket *so, + uint64_t *sslp, uint32_t *reterr); +enum clnt_stat rpctls_cl_handlerecord(uint64_t sec, uint64_t usec, + uint64_t ssl, uint32_t *reterr); +enum clnt_stat rpctls_srv_handlerecord(uint64_t sec, uint64_t usec, + uint64_t ssl, uint32_t *reterr); +enum clnt_stat rpctls_cl_disconnect(uint64_t sec, uint64_t usec, + uint64_t ssl, uint32_t *reterr); +enum clnt_stat rpctls_srv_disconnect(uint64_t sec, uint64_t usec, + uint64_t ssl, uint32_t *reterr); + +/* Initialization function for rpcsec_tls. */ +int rpctls_init(void); + +/* Get TLS information function. */ +bool rpctls_getinfo(u_int *maxlen); + +/* String for AUTH_TLS reply verifier. */ +#define RPCTLS_START_STRING "STARTTLS" + +#endif /* _KERNEL */ + +#endif /* _RPC_RPCSEC_TLS_H_ */ From owner-svn-src-head@freebsd.org Sun May 31 05:02:16 2020 Return-Path: Delivered-To: svn-src-head@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 2FA5432B41C; Sun, 31 May 2020 05:02:16 +0000 (UTC) (envelope-from lwhsu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZR4S0XMzz4P46; Sun, 31 May 2020 05:02:16 +0000 (UTC) (envelope-from lwhsu@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 0D2F21476D; Sun, 31 May 2020 05:02:16 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V52FqY057257; Sun, 31 May 2020 05:02:15 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V52FFA057256; Sun, 31 May 2020 05:02:15 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202005310502.04V52FFA057256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 31 May 2020 05:02:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361660 - head/sys/modules/hyperv/hvsock X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/sys/modules/hyperv/hvsock X-SVN-Commit-Revision: 361660 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 05:02:16 -0000 Author: lwhsu Date: Sun May 31 05:02:15 2020 New Revision: 361660 URL: https://svnweb.freebsd.org/changeset/base/361660 Log: Fix directly building in sys/modules Sponsored by: The FreeBSD Foundation Modified: head/sys/modules/hyperv/hvsock/Makefile Modified: head/sys/modules/hyperv/hvsock/Makefile ============================================================================== --- head/sys/modules/hyperv/hvsock/Makefile Sun May 31 03:44:13 2020 (r361659) +++ head/sys/modules/hyperv/hvsock/Makefile Sun May 31 05:02:15 2020 (r361660) @@ -5,6 +5,7 @@ KMOD= hv_sock SRCS= hv_sock.c SRCS+= hv_sock.h +SRCS+= device_if.h bus_if.h CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \ -I${SRCTOP}/sys/dev/hyperv/vmbus \ From owner-svn-src-head@freebsd.org Sun May 31 09:43:30 2020 Return-Path: Delivered-To: svn-src-head@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 E597F3306DE; Sun, 31 May 2020 09:43:30 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZYJx27G0z3Wms; Sun, 31 May 2020 09:43:28 +0000 (UTC) (envelope-from ohartmann@walstatt.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1590918206; bh=SLVeO+gTejBT/pLrUCjC2NXN2wwCpVzZzXBKW48hu8A=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=JB50eDeOCEYFX/kO8rg5YfWAq2PyB0m0g7D7P2yPcndPdoLfmzdOr2q9ZIF8DR8Es ucC0vcRjCxbDa2bXAE7NNPgBwKte5y3mSniWSXRK7mUfFPn5+v89XaNUzYWldZvQzk dwQb/Lk30p2TEiNZUADVWRhZ2EMwT7ciJos28a3g= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from hermann.fritz.box ([77.183.27.134]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mjj87-1jGP8H1RHf-00lHQK; Sun, 31 May 2020 11:43:26 +0200 Date: Sun, 31 May 2020 11:43:18 +0200 From: "Hartmann, O." To: John Baldwin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361633 - in head/sys: net netipsec Message-ID: <20200531114318.2b415934@hermann.fritz.box> In-Reply-To: <202005291922.04TJMemQ098017@repo.freebsd.org> References: <202005291922.04TJMemQ098017@repo.freebsd.org> Organization: walstatt.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/K9D9Cgo_rXCeD=+Maiy_5WL"; protocol="application/pgp-signature" X-Provags-ID: V03:K1:CxRr1AFzSFlH6AxXMwlIpKXZqCgCL0YSnpz/EzWfxoYbkHsavSL ppp9QQlmauCfB/4FLku0luhsMmgEgZNi36EsM3PcRVkA6Jpjgd0XCuRmsMqzeyl5jNttPOm Y2U/RInQEs6sEf+XFPo3VH4y3zTa+XHsdiE6AvyZc+GeMkWLEPCl56J2I7qEcrq0tB5GhCK te4oIGOpgLwBECeqfIUJQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IhAFclkvXdw=:uIrLLsZntw4B/AXLpC0RRR qS52+nXv1Qos19NRt0BRpkmKVl8Q00uNaXmeX9j//ZWfY52/IwU0k6Q9KUtMuS8Uu4eoEbXT9 PQ2hVWRCJ6BIoGCzfjeyPCNgpQVGdn3N4DtAo5O+nfq+stR6Fo32lqQ1458YOOM2QUWJ7zdEY nKsLPnLi7b7LhHJ9/i0v/FQIzPCQ/ZkwchKbH8tIxKjNW4V1RrP1ortEOiYtWieDu7zTLDOd7 h4NI23quu0n8nqCmDrN1Otd8AyeAJvt2LEPIQeTopMXgIFzWKw5ODAtKOTDJB82RVOfqCmOdx tuWmbAjnUxgOstUWiTjwXVgLeVRG5lTcc1u7zxdFaQzXkqoRTrol2DfEC23RsD7V1CgsfkDpI GMXjdCmUzoJUP9B3+qs4lmmnumj39p9Cwtx/yl86BZIG00y1JE9pTMr6RalaoxAOz9a80ooUU Z3SAy+iT/Jxto4ztsX7cRSmmN/WpVqwlmsYhTWnCFI/nPxDAWjUKW+71uXV1ln9ppSBO7ELCt fd/+k2UsMPnujnmLxryeKPROXSpQf+Ntx72VhLm0AR6vg9Pwl/jDofGMWtGqkeFnHJGwQtjae UbmpIYZtfd3/Wrd8pGqiADG93FVKfCTevpz0XKNRhZAVHAklQSYadJVb1ig60CoW4PDcIzNwB U+2OHDog9f+Pd5HqZ2EurM2KeEiMYsxdWzdQAURqNPwVWNO5WK5HRn3CqAs3dl2vog6V1R6Qy CESLzR0FtuvuafdG96bXPgW4YRmUgkK4Rq9+k6oBPC8iGKGkIJWpFtOXEzx2/5MhWtStjML/D L1jWI8uc4zYTDY21PzKJSVjy9lRzICYR50aAFHz2Vjeh2INo/TxF5v1Hk3r+ZbcOl+DkJKIHM Sv1bQPaeUPA8gvMnTZ6ar3sAWBuwUdBuwjf5BR9lvq8W8Mk2lk0nN1XoSrQBmgLYlFPkHa3KF AlTXOXE4yMf/mpgGTxfUMQ9XuDHR0SPxNyYl6FlY+GLuh2TTEgzrEbcAqA34oWtaKhmP9FMxN BYavenPCOqiwlHZpRTfRuzsj6pwfROH06257YxEZMrDR+DVuE/ZiOOP5W6Sf5gY4bQ2qfzsgv VupfaUG5dLH0V1aldhsb80zTQGxdxcLKbQVIm0IbP4ou2jQne/mQ/itdxknrI4kpFIAfUKLoU hZCRbtQ5HN9bYbML1u8LCJTZVoAv0or6+xjoAAa4Eysf/+FWtsy1LH8OjZniJuhhOPrylE8UY HzOXuHJRj2k56yQGM X-Rspamd-Queue-Id: 49ZYJx27G0z3Wms X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=JB50eDeO; dmarc=none; spf=none (mx1.freebsd.org: domain of ohartmann@walstatt.org has no SPF policy when checking 212.227.17.22) smtp.mailfrom=ohartmann@walstatt.org X-Spamd-Result: default: False [-2.45 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; RWL_MAILSPIKE_POSSIBLE(0.00)[212.227.17.22:from]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[walstatt.org]; NEURAL_HAM_LONG(-0.46)[-0.457]; HAS_ORG_HEADER(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[77.183.27.134:received]; NEURAL_HAM_MEDIUM(-0.82)[-0.817]; DKIM_TRACE(0.00)[gmx.net:+]; NEURAL_HAM_SHORT(-0.68)[-0.678]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[212.227.17.22:from] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 09:43:31 -0000 --Sig_/K9D9Cgo_rXCeD=+Maiy_5WL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Fri, 29 May 2020 19:22:40 +0000 (UTC) John Baldwin wrote: > Author: jhb > Date: Fri May 29 19:22:40 2020 > New Revision: 361633 > URL: https://svnweb.freebsd.org/changeset/base/361633 >=20 > Log: > Consistently include opt_ipsec.h for consumers of > .=20 > This fixes ipsec.ko to include all of IPSEC_DEBUG. > =20 > Reviewed by: imp > MFC after: 2 weeks > Sponsored by: Netflix > Differential Revision: https://reviews.freebsd.org/D25046 >=20 > Modified: > head/sys/net/if_enc.c > head/sys/net/if_ipsec.c > head/sys/netipsec/ipsec.h > head/sys/netipsec/ipsec_mbuf.c > head/sys/netipsec/xform_ah.c > head/sys/netipsec/xform_esp.c > head/sys/netipsec/xform_ipcomp.c >=20 > Modified: head/sys/net/if_enc.c > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_enc.c Fri May 29 19:21:35 2020 > (r361632) +++ head/sys/net/if_enc.c Fri May 29 19:22:40 > 2020 (r361633) @@ -32,6 +32,7 @@ > =20 > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_ipsec.h" > =20 > #include > #include >=20 > Modified: head/sys/net/if_ipsec.c > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_ipsec.c Fri May 29 19:21:35 2020 > (r361632) +++ head/sys/net/if_ipsec.c Fri May 29 19:22:40 > 2020 (r361633) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); > =20 > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_ipsec.h" > =20 > #include > #include >=20 > Modified: head/sys/netipsec/ipsec.h > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netipsec/ipsec.h Fri May 29 19:21:35 2020 > (r361632) +++ head/sys/netipsec/ipsec.h Fri May 29 19:22:40 > 2020 (r361633) @@ -39,11 +39,6 @@ > #ifndef _NETIPSEC_IPSEC_H_ > #define _NETIPSEC_IPSEC_H_ > =20 > -#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE) > -#include "opt_inet.h" > -#include "opt_ipsec.h" > -#endif > - > #include > #include > =20 >=20 > Modified: head/sys/netipsec/ipsec_mbuf.c > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netipsec/ipsec_mbuf.c Fri May 29 19:21:35 > 2020 (r361632) +++ head/sys/netipsec/ipsec_mbuf.c Fri > May 29 19:22:40 2020 (r361633) @@ -32,6 +32,8 @@ > * IPsec-specific mbuf routines. > */ > =20 > +#include "opt_ipsec.h" > + > #include > #include > #include >=20 > Modified: head/sys/netipsec/xform_ah.c > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netipsec/xform_ah.c Fri May 29 19:21:35 > 2020 (r361632) +++ head/sys/netipsec/xform_ah.c Fri May > 29 19:22:40 2020 (r361633) @@ -38,6 +38,7 @@ > */ > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_ipsec.h" > =20 > #include > #include >=20 > Modified: head/sys/netipsec/xform_esp.c > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netipsec/xform_esp.c Fri May 29 19:21:35 > 2020 (r361632) +++ head/sys/netipsec/xform_esp.c Fri > May 29 19:22:40 2020 (r361633) @@ -37,6 +37,7 @@ > */ > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_ipsec.h" > =20 > #include > #include >=20 > Modified: head/sys/netipsec/xform_ipcomp.c > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netipsec/xform_ipcomp.c Fri May 29 19:21:35 > 2020 (r361632) +++ head/sys/netipsec/xform_ipcomp.c Fri > May 29 19:22:40 2020 (r361633) @@ -33,6 +33,7 @@ > /* IP payload compression protocol (IPComp), see RFC 2393 */ > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_ipsec.h" > =20 > #include > #include > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to > "svn-src-head-unsubscribe@freebsd.org" In my case, kernel build (make buildkernel) fails with the comnpiler error shown below while compiling ipsec kernel module. Kernel has IPSEC support enabled. Kind regards, oh [...] --- all_subdir_ipsec --- --- ipsec_mod.o --- /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration of function 'ipsec_support_enable' is invalid in C99 [-Werror,-Wimplicit-function-declaration] ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration of function 'ipsec_support_disable' is invalid in C99 [-Werror,-Wimplicit-function-declaration] ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- Building /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/= ipw_bss/ipw_bss.ko --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: note: did you mean 'ipsec_support_enable'? /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 make[4]: stopped in /usr/src/sys/modules/ipsec --Sig_/K9D9Cgo_rXCeD=+Maiy_5WL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCXtN8NgAKCRA4N1ZZPba5 R+slAP9mYisSDV9d4PSHyPpmlYx/nhzyAcRXcFYhHsYkF1Iq4AEAjCGyYeezL8Wy gIA6nPAr2lcW2uhz2YaHQyufT+CnfQc= =NBKq -----END PGP SIGNATURE----- --Sig_/K9D9Cgo_rXCeD=+Maiy_5WL-- From owner-svn-src-head@freebsd.org Sun May 31 14:43:05 2020 Return-Path: Delivered-To: svn-src-head@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 AE4823364D4; Sun, 31 May 2020 14:43:05 +0000 (UTC) (envelope-from mhorne@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49Zgyd4G6cz4ChD; Sun, 31 May 2020 14:43:05 +0000 (UTC) (envelope-from mhorne@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 8D8111BB5B; Sun, 31 May 2020 14:43:05 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VEh5xH017179; Sun, 31 May 2020 14:43:05 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VEh4p3017174; Sun, 31 May 2020 14:43:04 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202005311443.04VEh4p3017174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Sun, 31 May 2020 14:43:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361661 - in head/sys: arm/arm arm/include arm64/arm64 riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: in head/sys: arm/arm arm/include arm64/arm64 riscv/riscv X-SVN-Commit-Revision: 361661 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 14:43:05 -0000 Author: mhorne Date: Sun May 31 14:43:04 2020 New Revision: 361661 URL: https://svnweb.freebsd.org/changeset/base/361661 Log: Remove remnant of arm's ELF trampoline The trampoline code used for loading gzipped a.out kernels on arm was removed in r350436. A portion of this code allowed for DDB to find the symbol tables when booting without loader(8), and some of this was untouched in the removal. Remove it now. Differential Revision: https://reviews.freebsd.org/D24950 Modified: head/sys/arm/arm/machdep_boot.c head/sys/arm/include/elf.h head/sys/arm64/arm64/machdep_boot.c head/sys/riscv/riscv/machdep.c Modified: head/sys/arm/arm/machdep_boot.c ============================================================================== --- head/sys/arm/arm/machdep_boot.c Sun May 31 05:02:15 2020 (r361660) +++ head/sys/arm/arm/machdep_boot.c Sun May 31 14:43:04 2020 (r361661) @@ -352,13 +352,12 @@ vm_offset_t fake_preload_metadata(struct arm_boot_params *abp __unused, void *dtb_ptr, size_t dtb_size) { -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif vm_offset_t lastaddr; int i = 0; static uint32_t fake_preload[35]; + lastaddr = (vm_offset_t)&end; + fake_preload[i++] = MODINFO_NAME; fake_preload[i++] = strlen("kernel") + 1; strcpy((char*)&fake_preload[i++], "kernel"); @@ -373,21 +372,6 @@ fake_preload_metadata(struct arm_boot_params *abp __un fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); fake_preload[i++] = (uint32_t)&end - KERNVIRTADDR; -#ifdef DDB - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - db_fetch_ksymtab(zstart, zend); - } else -#endif - lastaddr = (vm_offset_t)&end; if (dtb_ptr != NULL) { /* Copy DTB to KVA space and insert it into module chain. */ lastaddr = roundup(lastaddr, sizeof(int)); Modified: head/sys/arm/include/elf.h ============================================================================== --- head/sys/arm/include/elf.h Sun May 31 05:02:15 2020 (r361660) +++ head/sys/arm/include/elf.h Sun May 31 14:43:04 2020 (r361661) @@ -78,12 +78,6 @@ __ElfType(Auxinfo); #define EF_ARM_EABI_VERSION_UNKNOWN 0 #define EF_ARM_EABI_FREEBSD_MIN 4 -/* - * Magic number for the elf trampoline, chosen wisely to be an immediate - * value. - */ -#define MAGIC_TRAMP_NUMBER 0x5c000003 - #define ET_DYN_LOAD_ADDR 0x500000 /* Flags passed in AT_HWCAP. */ Modified: head/sys/arm64/arm64/machdep_boot.c ============================================================================== --- head/sys/arm64/arm64/machdep_boot.c Sun May 31 05:02:15 2020 (r361660) +++ head/sys/arm64/arm64/machdep_boot.c Sun May 31 14:43:04 2020 (r361661) @@ -84,14 +84,12 @@ static char linux_command_line[LBABI_MAX_COMMAND_LINE static vm_offset_t fake_preload_metadata(void *dtb_ptr, size_t dtb_size) { -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif vm_offset_t lastaddr; static char fake_preload[256]; caddr_t preload_ptr; size_t size; + lastaddr = (vm_offset_t)&end; preload_ptr = (caddr_t)&fake_preload[0]; size = 0; @@ -108,25 +106,7 @@ fake_preload_metadata(void *dtb_ptr, size_t dtb_size) PRELOAD_PUSH_VALUE(uint32_t, MODINFO_SIZE); PRELOAD_PUSH_VALUE(uint32_t, sizeof(size_t)); PRELOAD_PUSH_VALUE(uint64_t, (size_t)(&end - VM_MIN_KERNEL_ADDRESS)); -#ifdef DDB - if (*(uint64_t *)VM_MIN_KERNEL_ADDRESS == MAGIC_TRAMP_NUMBER) { - PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA|MODINFOMD_SSYM); - PRELOAD_PUSH_VALUE(uint32_t, sizeof(vm_offset_t)); - PRELOAD_PUSH_VALUE(uint64_t, - *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 4)); - PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA | MODINFOMD_ESYM); - PRELOAD_PUSH_VALUE(uint32_t, sizeof(vm_offset_t)); - PRELOAD_PUSH_VALUE(uint64_t, - *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 8)); - - lastaddr = *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 8); - zend = lastaddr; - zstart = *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 4); - db_fetch_ksymtab(zstart, zend); - } else -#endif - lastaddr = (vm_offset_t)&end; if (dtb_ptr != NULL) { /* Copy DTB to KVA space and insert it into module chain. */ lastaddr = roundup(lastaddr, sizeof(int)); Modified: head/sys/riscv/riscv/machdep.c ============================================================================== --- head/sys/riscv/riscv/machdep.c Sun May 31 05:02:15 2020 (r361660) +++ head/sys/riscv/riscv/machdep.c Sun May 31 14:43:04 2020 (r361661) @@ -729,9 +729,6 @@ vm_offset_t fake_preload_metadata(struct riscv_bootparams *rvbp) { static uint32_t fake_preload[35]; -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif vm_offset_t lastaddr; size_t fake_size, dtb_size; @@ -750,6 +747,7 @@ fake_preload_metadata(struct riscv_bootparams *rvbp) } while (0) fake_size = 0; + lastaddr = (vm_offset_t)&end; PRELOAD_PUSH_VALUE(uint32_t, MODINFO_NAME); PRELOAD_PUSH_STRING("kernel"); @@ -763,24 +761,6 @@ fake_preload_metadata(struct riscv_bootparams *rvbp) PRELOAD_PUSH_VALUE(uint32_t, MODINFO_SIZE); PRELOAD_PUSH_VALUE(uint32_t, sizeof(size_t)); PRELOAD_PUSH_VALUE(uint64_t, (size_t)((vm_offset_t)&end - KERNBASE)); -#ifdef DDB -#if 0 - /* RISCVTODO */ - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - db_fetch_ksymtab(zstart, zend); - } else -#endif -#endif - lastaddr = (vm_offset_t)&end; /* Copy the DTB to KVA space. */ lastaddr = roundup(lastaddr, sizeof(int)); From owner-svn-src-head@freebsd.org Sun May 31 15:22:22 2020 Return-Path: Delivered-To: svn-src-head@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 CC9F233760A; Sun, 31 May 2020 15:22:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Zhqx4TV6z4GRZ; Sun, 31 May 2020 15:22:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id fPmzjMmbt62brfPn1jkdWk; Sun, 31 May 2020 09:22:19 -0600 X-Authority-Analysis: v=2.3 cv=LKf9vKe9 c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=sTwFKg_x9MkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=9BAg3rB5dSc8KMoodngA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id B41E212EA; Sun, 31 May 2020 08:22:16 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 04VFMGul015503; Sun, 31 May 2020 08:22:16 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 04VFMF4U015500; Sun, 31 May 2020 08:22:16 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202005311522.04VFMF4U015500@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Hartmann, O." cc: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361633 - in head/sys: net netipsec In-reply-to: <20200531114318.2b415934@hermann.fritz.box> References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> Comments: In-reply-to "Hartmann, O." message dated "Sun, 31 May 2020 11:43:18 +0200." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 31 May 2020 08:22:15 -0700 X-CMAE-Envelope: MS4wfMHoJGqmYJvHIvZtIKF3SKdvxhKp1sA0yO/Rq3SJB7zD5kbTcSHxiOFDokMzeILTykUcssiVjVLGe1hTLdDhc/pEWmA13g4EChLVj30T5DbwP1GtJgc+ 5oUkAfoj3RcIrpVLANmhZYL7jxTcoj24ks6GNbKQ+401YTZ6X3sppWtkZmQkFWEtyoschvyjXHsllPEng0KMj55GE6obye2g7ESoAz+PZYrw5uGZ6RhWslIW 9L7Q9/JvDOJYhwg0vTTJt/RlU090aCCQwuK+P1exQoN47CFXuM70nFDWcgsLlRkdbA14xts9dpiJdHWR5aySsw== X-Rspamd-Queue-Id: 49Zhqx4TV6z4GRZ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.12) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [0.89 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.12:from]; HAS_XAW(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.125.17:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.12:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.71)[-0.705]; RCVD_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.66)[0.662]; NEURAL_HAM_LONG(-0.36)[-0.364]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; TO_MATCH_ENVRCPT_SOME(0.00)[]; R_SPF_NA(0.00)[no SPF record] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 15:22:22 -0000 In message <20200531114318.2b415934@hermann.fritz.box>, "Hartmann, O." writes: > --Sig_/K9D9Cgo_rXCeD=+Maiy_5WL > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > On Fri, 29 May 2020 19:22:40 +0000 (UTC) > John Baldwin wrote: > > > Author: jhb > > Date: Fri May 29 19:22:40 2020 > > New Revision: 361633 > > URL: https://svnweb.freebsd.org/changeset/base/361633 > >=20 > > Log: > > Consistently include opt_ipsec.h for consumers of > > .=20 > > This fixes ipsec.ko to include all of IPSEC_DEBUG. > > =20 > > Reviewed by: imp > > MFC after: 2 weeks > > Sponsored by: Netflix > > Differential Revision: https://reviews.freebsd.org/D25046 > >=20 > > Modified: > > head/sys/net/if_enc.c > > head/sys/net/if_ipsec.c > > head/sys/netipsec/ipsec.h > > head/sys/netipsec/ipsec_mbuf.c > > head/sys/netipsec/xform_ah.c > > head/sys/netipsec/xform_esp.c > > head/sys/netipsec/xform_ipcomp.c > >=20 > > Modified: head/sys/net/if_enc.c [...] > > > In my case, kernel build (make buildkernel) fails with the comnpiler > error shown below while compiling ipsec kernel module. Kernel has IPSEC > support enabled. > > Kind regards, > oh > > [...] > --- all_subdir_ipsec --- > --- ipsec_mod.o --- > /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration of > function 'ipsec_support_enable' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ > /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration of > function 'ipsec_support_disable' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- > Building > /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/= > ipw_bss/ipw_bss.ko > --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: note: > did you mean 'ipsec_support_enable'? > /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' > declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); > ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 > > make[4]: stopped in /usr/src/sys/modules/ipsec Can you post your kernel config, please. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Sun May 31 15:31:48 2020 Return-Path: Delivered-To: svn-src-head@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 623153376C1; Sun, 31 May 2020 15:31:48 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49Zj2r20rHz4HBQ; Sun, 31 May 2020 15:31:48 +0000 (UTC) (envelope-from emaste@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 402871BEFC; Sun, 31 May 2020 15:31:48 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VFVmKP047415; Sun, 31 May 2020 15:31:48 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VFVmk6047414; Sun, 31 May 2020 15:31:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202005311531.04VFVmk6047414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 31 May 2020 15:31:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361662 - head/contrib/elftoolchain/readelf X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/elftoolchain/readelf X-SVN-Commit-Revision: 361662 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 15:31:48 -0000 Author: emaste Date: Sun May 31 15:31:47 2020 New Revision: 361662 URL: https://svnweb.freebsd.org/changeset/base/361662 Log: readelf: add more DT_FLAGS_1 flags Reference: https://docs.oracle.com/cd/E36784_01/html/E36857/chapter6-42444.html > DF_1_SINGLETON Singleton symbols exist. > DF_1_STUB Object is a stub. > DF_1_PIE Object is a position-independent executable. Sponsored by: The FreeBSD Foundation Modified: head/contrib/elftoolchain/readelf/readelf.c Modified: head/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- head/contrib/elftoolchain/readelf/readelf.c Sun May 31 14:43:04 2020 (r361661) +++ head/contrib/elftoolchain/readelf/readelf.c Sun May 31 15:31:47 2020 (r361662) @@ -2901,6 +2901,9 @@ static struct flag_desc dt_flags_1[] = { { 0x400000, "NORELOC" }, { 0x800000, "SYMINTPOSE" }, { 0x1000000, "GLOBAUDIT" }, + { 0x02000000, "SINGLETON" }, + { 0x04000000, "STUB" }, + { DF_1_PIE, "PIE" }, { 0, NULL } }; From owner-svn-src-head@freebsd.org Sun May 31 17:20:18 2020 Return-Path: Delivered-To: svn-src-head@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 7C7D4339A6A; Sun, 31 May 2020 17:20:18 +0000 (UTC) (envelope-from tijl@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZlS22kY5z4QFW; Sun, 31 May 2020 17:20:18 +0000 (UTC) (envelope-from tijl@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 549CE1D456; Sun, 31 May 2020 17:20:18 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VHKIwC009498; Sun, 31 May 2020 17:20:18 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VHKHDm009496; Sun, 31 May 2020 17:20:17 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202005311720.04VHKHDm009496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 31 May 2020 17:20:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361663 - in head: etc/mtree lib/libxo/encoder/csv lib/libxo/libxo X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: etc/mtree lib/libxo/encoder/csv lib/libxo/libxo X-SVN-Commit-Revision: 361663 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 17:20:18 -0000 Author: tijl Date: Sun May 31 17:20:17 2020 New Revision: 361663 URL: https://svnweb.freebsd.org/changeset/base/361663 Log: Fix installation of libxo encoder modules. Because the install location was hardcoded in the Makefile as /usr/lib/libxo/encoder, the lib32 version was installed over the native version. Replace /usr/lib with ${LIBDIR}. Also define SHLIB_NAME instead of LIB + FILES. This prevents building a static library. MFC after: 2 weeks Modified: head/etc/mtree/BSD.lib32.dist head/lib/libxo/encoder/csv/Makefile head/lib/libxo/libxo/Makefile Modified: head/etc/mtree/BSD.lib32.dist ============================================================================== --- head/etc/mtree/BSD.lib32.dist Sun May 31 15:31:47 2020 (r361662) +++ head/etc/mtree/BSD.lib32.dist Sun May 31 17:20:17 2020 (r361663) @@ -12,5 +12,9 @@ .. i18n .. + libxo + encoder + .. + .. .. .. Modified: head/lib/libxo/encoder/csv/Makefile ============================================================================== --- head/lib/libxo/encoder/csv/Makefile Sun May 31 15:31:47 2020 (r361662) +++ head/lib/libxo/encoder/csv/Makefile Sun May 31 17:20:17 2020 (r361663) @@ -8,30 +8,17 @@ LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/encoder/csv -# We use FILES to install the encoder library under the proper/magic -# name, in the proper/magic directory. libxo looks for encoders from -# "--libxo encoder=name" as "${prefix}/lib/libxo/encoder/${name}.enc" -FILES = libenc_csv.so -FILESNAME_libenc_csv.so= csv.enc -FILESDIR = /usr/lib/libxo/encoder +SHLIBDIR= ${LIBDIR}/libxo/encoder +SHLIB_NAME= csv.enc -LIB= enc_csv -SHLIB_MAJOR=0 -SHLIB_NAME= lib${LIB}.so - SRCS= enc_csv.c CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} -CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" +CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\" LIBADD= util xo LDFLAGS += -L${.OBJDIR:H:H}/libxo WARNS?= 5 -# Need to define a fake "install" target to block the one in bsd.lib.mk, -# since that one will install our lib in the wrong place (/usr/lib/). -install: realinstall - .include -.include Modified: head/lib/libxo/libxo/Makefile ============================================================================== --- head/lib/libxo/libxo/Makefile Sun May 31 15:31:47 2020 (r361662) +++ head/lib/libxo/libxo/Makefile Sun May 31 17:20:17 2020 (r361663) @@ -16,7 +16,7 @@ SHLIB_MAJOR=0 SRCS= libxo.c xo_encoder.c xo_syslog.c CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} -CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" +CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\" INCS= xo.h xo_encoder.h INCSDIR=${INCLUDEDIR}/libxo From owner-svn-src-head@freebsd.org Sun May 31 18:20:24 2020 Return-Path: Delivered-To: svn-src-head@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 2CCE933B00D; Sun, 31 May 2020 18:20:24 +0000 (UTC) (envelope-from markj@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZmnL63tWz4XZ0; Sun, 31 May 2020 18:20:21 +0000 (UTC) (envelope-from markj@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 968A41E38D; Sun, 31 May 2020 18:20:20 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VIKKlL051790; Sun, 31 May 2020 18:20:20 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VIKK4F051789; Sun, 31 May 2020 18:20:20 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202005311820.04VIKK4F051789@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 31 May 2020 18:20:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361664 - head/sys/amd64/linux X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/amd64/linux X-SVN-Commit-Revision: 361664 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 18:20:24 -0000 Author: markj Date: Sun May 31 18:20:20 2020 New Revision: 361664 URL: https://svnweb.freebsd.org/changeset/base/361664 Log: Handle getcpu() calls in vsyscall emulation on amd64. linux_getcpu() has been implemented since r356241. PR: 246339 Submitted by: John Hay MFC after: 1 week Modified: head/sys/amd64/linux/linux_sysvec.c Modified: head/sys/amd64/linux/linux_sysvec.c ============================================================================== --- head/sys/amd64/linux/linux_sysvec.c Sun May 31 17:20:17 2020 (r361663) +++ head/sys/amd64/linux/linux_sysvec.c Sun May 31 18:20:20 2020 (r361664) @@ -683,7 +683,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigse const unsigned long linux_vsyscall_vector[] = { LINUX_SYS_gettimeofday, LINUX_SYS_linux_time, - /* getcpu not implemented */ + LINUX_SYS_linux_getcpu, }; static int From owner-svn-src-head@freebsd.org Sun May 31 18:42:01 2020 Return-Path: Delivered-To: svn-src-head@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 A847033CCE5; Sun, 31 May 2020 18:42:01 +0000 (UTC) (envelope-from mmacy@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZnGK2jbJz4q8J; Sun, 31 May 2020 18:42:01 +0000 (UTC) (envelope-from mmacy@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 CEA371E5BC; Sun, 31 May 2020 18:42:00 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VIg0iC087902; Sun, 31 May 2020 18:42:00 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VIg0WP087901; Sun, 31 May 2020 18:42:00 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202005311842.04VIg0WP087901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sun, 31 May 2020 18:42:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361665 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 361665 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 18:42:01 -0000 Author: mmacy Date: Sun May 31 18:42:00 2020 New Revision: 361665 URL: https://svnweb.freebsd.org/changeset/base/361665 Log: Fix panics when using iflib pseudo device support Reviewed by: gallatin@, hselasky@ MFC after: 1 week Sponsored by: Netgate, Inc. Differential Revision: https://reviews.freebsd.org/D23710 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Sun May 31 18:20:20 2020 (r361664) +++ head/sys/net/iflib.c Sun May 31 18:42:00 2020 (r361665) @@ -4902,6 +4902,7 @@ iflib_pseudo_register(device_t dev, if_shared_ctx_t sc if_setgetcounterfn(ctx->ifc_ifp, iflib_if_get_counter); iflib_add_device_sysctl_post(ctx); ctx->ifc_flags |= IFC_INIT_DONE; + CTX_UNLOCK(ctx); return (0); } _iflib_pre_assert(scctx); @@ -5354,7 +5355,8 @@ iflib_register(if_ctx_t ctx) device_t dev = ctx->ifc_dev; if_t ifp; - _iflib_assert(sctx); + if ((sctx->isc_flags & IFLIB_PSEUDO) == 0) + _iflib_assert(sctx); CTX_LOCK_INIT(ctx); STATE_LOCK_INIT(ctx, device_get_nameunit(ctx->ifc_dev)); From owner-svn-src-head@freebsd.org Sun May 31 21:34:22 2020 Return-Path: Delivered-To: svn-src-head@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 264462F22C1; Sun, 31 May 2020 21:34:22 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49Zs5B0GDcz3ybf; Sun, 31 May 2020 21:34:22 +0000 (UTC) (envelope-from kib@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 0430B20641; Sun, 31 May 2020 21:34:22 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VLYLwR002875; Sun, 31 May 2020 21:34:21 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VLYLEO002874; Sun, 31 May 2020 21:34:21 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202005312134.04VLYLEO002874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 31 May 2020 21:34:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361672 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 361672 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 21:34:22 -0000 Author: kib Date: Sun May 31 21:34:21 2020 New Revision: 361672 URL: https://svnweb.freebsd.org/changeset/base/361672 Log: rtld: Add -p switch to direct exec mode summary line. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sun May 31 20:59:11 2020 (r361671) +++ head/libexec/rtld-elf/rtld.c Sun May 31 21:34:21 2020 (r361672) @@ -5714,12 +5714,12 @@ static void print_usage(const char *argv0) { - rtld_printf("Usage: %s [-h] [-f ] [--] []\n" + rtld_printf("Usage: %s [-h] [-f ] [-p] [--] []\n" "\n" "Options:\n" " -h Display this help message\n" - " -p Search in PATH for named binary\n" " -f Execute instead of searching for \n" + " -p Search in PATH for named binary\n" " -- End of RTLD options\n" " Name of process to execute\n" " Arguments to the executed process\n", argv0); From owner-svn-src-head@freebsd.org Sun May 31 21:38:34 2020 Return-Path: Delivered-To: svn-src-head@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 6ED3A2F22D1; Sun, 31 May 2020 21:38:34 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZsB22F7Hz40BM; Sun, 31 May 2020 21:38:34 +0000 (UTC) (envelope-from imp@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 43BC720B11; Sun, 31 May 2020 21:38:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VLcY0h003140; Sun, 31 May 2020 21:38:34 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VLcYfd003139; Sun, 31 May 2020 21:38:34 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202005312138.04VLcYfd003139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 31 May 2020 21:38:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361673 - head/share/misc X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/share/misc X-SVN-Commit-Revision: 361673 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 21:38:34 -0000 Author: imp Date: Sun May 31 21:38:33 2020 New Revision: 361673 URL: https://svnweb.freebsd.org/changeset/base/361673 Log: Correct the release date for 2.11BSD 2.11BSD was announced on March 14, 1991 in comp.bugs.2bsd by Steven M. Schultz. The document has a 'revised January 1991' date at the top. Patch/1 in the official repo is dated March 31, 1991, and an identical copy of it was posted to comp.bugs.2bsd on May 5, 1991. Patch 2 in 22 parts was likewise posted May 18, 1991. This makes the Feb 1992 date too late. It's possible it's a typo for Feb 1991 since that lines up with the announcement being 2 weeks later. Without an extant copy of the 2.11 tape, however, it's hard to say for sure. Go with the date we have the most independent, direct evidence for, which is the announcement date. Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree ============================================================================== --- head/share/misc/bsd-family-tree Sun May 31 21:34:21 2020 (r361672) +++ head/share/misc/bsd-family-tree Sun May 31 21:38:33 2020 (r361673) @@ -493,7 +493,7 @@ Tenth Edition 1989-10-xx [QCU] 2.9BSD-Seismo 1985-08-xx [SMS] 2.10BSD 1987-04-xx [KKK] 2.10.1BSD 1989-01-xx [SMS] -2.11BSD 1992-02-xx [SMS] +2.11BSD 1991-03-14 [SMS] 2.11BSD rev #430 1999-12-13 [SMS] 32V 1978-1[01]-xx [QCU] 1979-03-26 [TUHS] From owner-svn-src-head@freebsd.org Sun May 31 21:53:16 2020 Return-Path: Delivered-To: svn-src-head@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 36A5A2F315C; Sun, 31 May 2020 21:53:16 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZsW00jnGz41pR; Sun, 31 May 2020 21:53:16 +0000 (UTC) (envelope-from kib@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 13BB620EC4; Sun, 31 May 2020 21:53:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VLrF6k015729; Sun, 31 May 2020 21:53:15 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VLrF0a015727; Sun, 31 May 2020 21:53:15 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202005312153.04VLrF0a015727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 31 May 2020 21:53:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361675 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 361675 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 21:53:16 -0000 Author: kib Date: Sun May 31 21:53:15 2020 New Revision: 361675 URL: https://svnweb.freebsd.org/changeset/base/361675 Log: rtld: Add -v switch to print some useful information about the rtld binary. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.1 head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.1 ============================================================================== --- head/libexec/rtld-elf/rtld.1 Sun May 31 21:43:59 2020 (r361674) +++ head/libexec/rtld-elf/rtld.1 Sun May 31 21:53:15 2020 (r361675) @@ -333,6 +333,8 @@ character, uses the search path provided by the environment variable .Dv PATH to find the binary to execute. +.It Fl v +Display information about this run-time linker binary, then exit. .It Fl - Ends the .Nm Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sun May 31 21:43:59 2020 (r361674) +++ head/libexec/rtld-elf/rtld.c Sun May 31 21:53:15 2020 (r361675) @@ -5613,7 +5613,9 @@ static int parse_args(char* argv[], int argc, bool *use_pathp, int *fdp) { const char *arg; - int fd, i, j, arglen; + char machine[64]; + size_t sz; + int arglen, fd, i, j, mib[2]; char opt; dbg("Parsing command-line arguments"); @@ -5672,6 +5674,24 @@ parse_args(char* argv[], int argc, bool *use_pathp, in break; } else if (opt == 'p') { *use_pathp = true; + } else if (opt == 'v') { + machine[0] = '\0'; + mib[0] = CTL_HW; + mib[1] = HW_MACHINE; + sz = sizeof(machine); + sysctl(mib, nitems(mib), machine, &sz, NULL, 0); + rtld_printf( + "FreeBSD ld-elf.so.1 %s\n" + "FreeBSD_version %d\n" + "Default lib path %s\n" + "Env prefix %s\n" + "Hint file %s\n" + "libmap file %s\n", + machine, + __FreeBSD_version, ld_standard_library_path, + ld_env_prefix, ld_elf_hints_default, + ld_path_libmap_conf); + _exit(0); } else { _rtld_error("Invalid argument: '%s'", arg); print_usage(argv[0]); @@ -5720,6 +5740,7 @@ print_usage(const char *argv0) " -h Display this help message\n" " -f Execute instead of searching for \n" " -p Search in PATH for named binary\n" + " -v Display identification information\n" " -- End of RTLD options\n" " Name of process to execute\n" " Arguments to the executed process\n", argv0); From owner-svn-src-head@freebsd.org Sun May 31 21:56:07 2020 Return-Path: Delivered-To: svn-src-head@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 CCAAC2F3177; Sun, 31 May 2020 21:56:07 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZsZH563Sz41yK; Sun, 31 May 2020 21:56:07 +0000 (UTC) (envelope-from kib@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 A61D620C35; Sun, 31 May 2020 21:56:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VLu7Gu015956; Sun, 31 May 2020 21:56:07 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VLu7oI015955; Sun, 31 May 2020 21:56:07 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202005312156.04VLu7oI015955@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 31 May 2020 21:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361676 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 361676 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 21:56:07 -0000 Author: kib Date: Sun May 31 21:56:07 2020 New Revision: 361676 URL: https://svnweb.freebsd.org/changeset/base/361676 Log: rtld: Fix indent in print_usage(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sun May 31 21:53:15 2020 (r361675) +++ head/libexec/rtld-elf/rtld.c Sun May 31 21:56:07 2020 (r361676) @@ -5735,15 +5735,15 @@ print_usage(const char *argv0) { rtld_printf("Usage: %s [-h] [-f ] [-p] [--] []\n" - "\n" - "Options:\n" - " -h Display this help message\n" - " -f Execute instead of searching for \n" - " -p Search in PATH for named binary\n" - " -v Display identification information\n" - " -- End of RTLD options\n" - " Name of process to execute\n" - " Arguments to the executed process\n", argv0); + "\n" + "Options:\n" + " -h Display this help message\n" + " -f Execute instead of searching for \n" + " -p Search in PATH for named binary\n" + " -v Display identification information\n" + " -- End of RTLD options\n" + " Name of process to execute\n" + " Arguments to the executed process\n", argv0); } /* From owner-svn-src-head@freebsd.org Sun May 31 22:04:56 2020 Return-Path: Delivered-To: svn-src-head@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 582A62F3635; Sun, 31 May 2020 22:04:56 +0000 (UTC) (envelope-from dim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZsmS21rPz42tS; Sun, 31 May 2020 22:04:56 +0000 (UTC) (envelope-from dim@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 4042D2113B; Sun, 31 May 2020 22:04:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VM4u6p022021; Sun, 31 May 2020 22:04:56 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VM4qXG022001; Sun, 31 May 2020 22:04:52 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005312204.04VM4qXG022001@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 31 May 2020 22:04:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libsvn_fs_x lib/libsvn_ra lib... X-SVN-Commit-Revision: 361677 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:04:56 -0000 Author: dim Date: Sun May 31 22:04:51 2020 New Revision: 361677 URL: https://svnweb.freebsd.org/changeset/base/361677 Log: Change Makefiles under usr.bin/svn to make them easier to incrementally update. No functional change intended. MFC after: 2 weeks Modified: head/usr.bin/svn/Makefile head/usr.bin/svn/lib/Makefile head/usr.bin/svn/lib/libapr/Makefile head/usr.bin/svn/lib/libapr_util/Makefile head/usr.bin/svn/lib/libserf/Makefile head/usr.bin/svn/lib/libsvn_client/Makefile head/usr.bin/svn/lib/libsvn_delta/Makefile head/usr.bin/svn/lib/libsvn_diff/Makefile head/usr.bin/svn/lib/libsvn_fs/Makefile head/usr.bin/svn/lib/libsvn_fs_fs/Makefile head/usr.bin/svn/lib/libsvn_fs_util/Makefile head/usr.bin/svn/lib/libsvn_fs_x/Makefile head/usr.bin/svn/lib/libsvn_ra/Makefile head/usr.bin/svn/lib/libsvn_ra_local/Makefile head/usr.bin/svn/lib/libsvn_ra_serf/Makefile head/usr.bin/svn/lib/libsvn_ra_svn/Makefile head/usr.bin/svn/lib/libsvn_repos/Makefile head/usr.bin/svn/lib/libsvn_subr/Makefile head/usr.bin/svn/lib/libsvn_wc/Makefile Modified: head/usr.bin/svn/Makefile ============================================================================== --- head/usr.bin/svn/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -1,8 +1,18 @@ # $FreeBSD$ -SUBDIR= lib .WAIT \ - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ - svnsync svnversion svnmucc svnrdump +SUBDIR= lib \ + .WAIT \ + svn \ + svnadmin \ + svnbench \ + svndumpfilter \ + svnfsfs \ + svnlook \ + svnserve \ + svnsync \ + svnversion \ + svnmucc \ + svnrdump SUBDIR_PARALLEL= .include Modified: head/usr.bin/svn/lib/Makefile ============================================================================== --- head/usr.bin/svn/lib/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -1,9 +1,22 @@ # $FreeBSD$ -SUBDIR= libapr libapr_util libserf \ - libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \ - libsvn_fs_util libsvn_fs_x libsvn_ra libsvn_ra_local libsvn_ra_serf \ - libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc +SUBDIR= libapr \ + libapr_util \ + libserf \ + libsvn_client \ + libsvn_delta \ + libsvn_diff \ + libsvn_fs \ + libsvn_fs_fs \ + libsvn_fs_util \ + libsvn_fs_x \ + libsvn_ra \ + libsvn_ra_local \ + libsvn_ra_serf \ + libsvn_ra_svn \ + libsvn_repos \ + libsvn_subr \ + libsvn_wc SUBDIR_PARALLEL= .include Modified: head/usr.bin/svn/lib/libapr/Makefile ============================================================================== --- head/usr.bin/svn/lib/libapr/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libapr/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -4,31 +4,109 @@ INTERNALLIB= yes LIB= apr -SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c apr_skiplist.c \ - apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \ - apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \ - builtins.c charset.c common.c copy.c dir.c dso.c env.c \ - epoll.c errorcodes.c fileacc.c filedup.c filepath.c \ - filepath_util.c filestat.c flock.c fullrw.c getopt.c \ - global_mutex.c groupinfo.c ia32.c inet_ntop.c inet_pton.c \ - kqueue.c mktemp.c mmap.c multicast.c mutex.c open.c \ - otherchild.c pipe.c poll.c pollcb.c pollset.c port.c \ - ppc.c proc.c proc_mutex.c procsup.c rand.c readwrite.c \ - s390.c seek.c select.c sendrecv.c sha2.c sha2_glue.c \ - shm.c signals.c sockaddr.c socket_util.c sockets.c \ - sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \ - thread_mutex.c thread_rwlock.c threadpriv.c time.c \ - timestr.c userinfo.c version.c waitio.c z_asio.c +SRCS= apr_cpystrn.c \ + apr_fnmatch.c \ + apr_getpass.c \ + apr_hash.c \ + apr_pools.c \ + apr_random.c \ + apr_skiplist.c \ + apr_snprintf.c \ + apr_strings.c \ + apr_strnatcmp.c \ + apr_strtok.c \ + apr_tables.c \ + buffer.c \ + builtins.c \ + charset.c \ + common.c \ + copy.c \ + dir.c \ + dso.c \ + env.c \ + epoll.c \ + errorcodes.c \ + fileacc.c \ + filedup.c \ + filepath.c \ + filepath_util.c \ + filestat.c \ + flock.c \ + fullrw.c \ + getopt.c \ + global_mutex.c \ + groupinfo.c \ + ia32.c \ + inet_ntop.c \ + inet_pton.c \ + kqueue.c \ + mktemp.c \ + mmap.c \ + multicast.c \ + mutex.c \ + open.c \ + otherchild.c \ + pipe.c \ + poll.c \ + pollcb.c \ + pollset.c \ + port.c \ + ppc.c \ + proc.c \ + proc_mutex.c \ + procsup.c \ + rand.c \ + readwrite.c \ + s390.c \ + seek.c \ + select.c \ + sendrecv.c \ + sha2.c \ + sha2_glue.c \ + shm.c \ + signals.c \ + sockaddr.c \ + socket_util.c \ + sockets.c \ + sockopt.c \ + solaris.c \ + start.c \ + tempdir.c \ + thread.c \ + thread_cond.c \ + thread_mutex.c \ + thread_rwlock.c \ + threadpriv.c \ + time.c \ + timestr.c \ + userinfo.c \ + version.c \ + waitio.c \ + z_asio.c -.PATH: ${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \ - ${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \ - ${APR}/mmap/unix ${APR}/network_io/unix ${APR}/passwd \ - ${APR}/poll/unix ${APR}/random/unix ${APR}/shmem/unix \ - ${APR}/strings ${APR}/support/unix ${APR}/tables \ - ${APR}/threadproc/unix ${APR}/time/unix ${APR}/user/unix \ +.PATH: ${APR}/atomic/unix \ + ${APR}/dso/unix \ + ${APR}/file_io/unix \ + ${APR}/locks/unix \ + ${APR}/memory/unix \ + ${APR}/misc/unix \ + ${APR}/mmap/unix \ + ${APR}/network_io/unix \ + ${APR}/passwd \ + ${APR}/poll/unix \ + ${APR}/random/unix \ + ${APR}/shmem/unix \ + ${APR}/strings \ + ${APR}/support/unix \ + ${APR}/tables \ + ${APR}/threadproc/unix \ + ${APR}/time/unix \ + ${APR}/user/unix \ ${APR}/include -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} \ - -I${APR}/include/arch/unix -I${APR}/include +CFLAGS+= -DHAVE_CONFIG_H \ + -I${.CURDIR} \ + -I${APR}/include/arch/unix \ + -I${APR}/include .include Modified: head/usr.bin/svn/lib/libapr_util/Makefile ============================================================================== --- head/usr.bin/svn/lib/libapr_util/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libapr_util/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -5,22 +5,57 @@ INTERNALLIB= yes LIB= apr-util -SRCS= apr_base64.c apr_brigade.c apr_buckets.c apr_buckets_alloc.c \ - apr_buckets_eos.c apr_buckets_file.c apr_buckets_flush.c \ - apr_buckets_heap.c apr_buckets_mmap.c apr_buckets_pipe.c \ - apr_buckets_pool.c apr_buckets_refcount.c apr_buckets_simple.c \ - apr_buckets_socket.c apr_crypto.c apr_date.c apr_dbd.c \ - apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c apr_passwd.c \ - apr_queue.c apr_reslist.c apr_rmm.c apr_sha1.c apr_strmatch.c \ - apr_thread_pool.c apr_uri.c apr_xml.c apu_dso.c apu_version.c \ - crypt_blowfish.c getuuid.c uuid.c xlate.c +SRCS= apr_base64.c \ + apr_brigade.c \ + apr_buckets.c \ + apr_buckets_alloc.c \ + apr_buckets_eos.c \ + apr_buckets_file.c \ + apr_buckets_flush.c \ + apr_buckets_heap.c \ + apr_buckets_mmap.c \ + apr_buckets_pipe.c \ + apr_buckets_pool.c \ + apr_buckets_refcount.c \ + apr_buckets_simple.c \ + apr_buckets_socket.c \ + apr_crypto.c \ + apr_date.c \ + apr_dbd.c \ + apr_hooks.c \ + apr_md4.c \ + apr_md5.c \ + apr_memcache.c \ + apr_passwd.c \ + apr_queue.c \ + apr_reslist.c \ + apr_rmm.c \ + apr_sha1.c \ + apr_strmatch.c \ + apr_thread_pool.c \ + apr_uri.c \ + apr_xml.c \ + apu_dso.c \ + apu_version.c \ + crypt_blowfish.c \ + getuuid.c \ + uuid.c \ + xlate.c -.PATH: ${APRU}/buckets ${APRU}/crypto ${APRU}/dbd \ - ${APRU}/encoding ${APRU}/hooks \ - ${APRU}/memcache ${APRU}/misc ${APRU}/strmatch \ - ${APRU}/uri ${APRU}/xlate ${APRU}/xml ${APRU}/include +.PATH: ${APRU}/buckets \ + ${APRU}/crypto \ + ${APRU}/dbd \ + ${APRU}/encoding \ + ${APRU}/hooks \ + ${APRU}/memcache \ + ${APRU}/misc \ + ${APRU}/strmatch \ + ${APRU}/uri \ + ${APRU}/xlate \ + ${APRU}/xml \ + ${APRU}/include -CFLAGS+= -DHAVE_CONFIG_H \ +CFLAGS+= -DHAVE_CONFIG_H \ -I${.CURDIR} \ -I${APRU}/include/private \ -I${APRU}/include \ @@ -31,8 +66,8 @@ CFLAGS+= -DHAVE_CONFIG_H \ .include .if ${MK_ICONV} == "yes" -CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1 +CFLAGS+= -DHAVE_ICONV_H=1 \ + -DAPU_HAVE_ICONV=1 .endif .include - Modified: head/usr.bin/svn/lib/libserf/Makefile ============================================================================== --- head/usr.bin/svn/lib/libserf/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libserf/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -5,20 +5,44 @@ INTERNALLIB= yes LIB= serf -SRCS= aggregate_buckets.c allocator.c auth.c auth_basic.c \ - auth_digest.c auth_spnego.c auth_spnego_gss.c barrier_buckets.c \ - buckets.c bwtp_buckets.c chunk_buckets.c context.c \ - dechunk_buckets.c deflate_buckets.c file_buckets.c \ - headers_buckets.c incoming.c iovec_buckets.c limit_buckets.c \ - mmap_buckets.c outgoing.c request_buckets.c \ - response_body_buckets.c response_buckets.c simple_buckets.c \ - socket_buckets.c ssl_buckets.c ssltunnel.c +SRCS= aggregate_buckets.c \ + allocator.c \ + auth.c \ + auth_basic.c \ + auth_digest.c \ + auth_spnego.c \ + auth_spnego_gss.c \ + barrier_buckets.c \ + buckets.c \ + bwtp_buckets.c \ + chunk_buckets.c \ + context.c \ + dechunk_buckets.c \ + deflate_buckets.c \ + file_buckets.c \ + headers_buckets.c \ + incoming.c \ + iovec_buckets.c \ + limit_buckets.c \ + mmap_buckets.c \ + outgoing.c \ + request_buckets.c \ + response_body_buckets.c \ + response_buckets.c \ + simple_buckets.c \ + socket_buckets.c \ + ssl_buckets.c \ + ssltunnel.c -.PATH: ${SERF}/buckets ${SERF}/auth ${SERF} +.PATH: ${SERF}/buckets \ + ${SERF}/auth \ + ${SERF} -CFLAGS+= -I${.CURDIR} -I${SERF} \ +CFLAGS+= -I${.CURDIR} \ + -I${SERF} \ -I${.CURDIR}/../libapr \ - -I${APR}/include/arch/unix -I${APR}/include \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ -I${.CURDIR}/../libapr_util \ -I${APRU}/include Modified: head/usr.bin/svn/lib/libsvn_client/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_client/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_client/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,17 +7,57 @@ INTERNALLIB= yes LIB= svn_client -SRCS= add.c blame.c cat.c changelist.c checkout.c cleanup.c \ - cmdline.c commit_util.c commit.c compat_providers.c \ - conflicts.c copy_foreign.c copy.c ctx.c delete.c deprecated.c \ - diff_local.c diff_summarize.c diff.c export.c externals.c \ - import.c info.c iprops.c list.c locking_commands.c log.c \ - merge_elements.c merge.c mergeinfo.c mtcc.c patch.c \ - prop_commands.c ra.c relocate.c repos_diff.c resolved.c \ - revert.c revisions.c shelve.c status.c switch.c update.c \ - upgrade.c url.c util.c version.c +SRCS= add.c \ + blame.c \ + cat.c \ + changelist.c \ + checkout.c \ + cleanup.c \ + cmdline.c \ + commit.c \ + commit_util.c \ + compat_providers.c \ + conflicts.c \ + copy.c \ + copy_foreign.c \ + ctx.c \ + delete.c \ + deprecated.c \ + diff.c \ + diff_local.c \ + diff_summarize.c \ + export.c \ + externals.c \ + import.c \ + info.c \ + iprops.c \ + list.c \ + locking_commands.c \ + log.c \ + merge.c \ + merge_elements.c \ + mergeinfo.c \ + mtcc.c \ + patch.c \ + prop_commands.c \ + ra.c \ + relocate.c \ + repos_diff.c \ + resolved.c \ + revert.c \ + revisions.c \ + shelve.c \ + status.c \ + switch.c \ + update.c \ + upgrade.c \ + url.c \ + util.c \ + version.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_delta/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_delta/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_delta/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,13 +7,29 @@ INTERNALLIB= yes LIB= svn_delta -SRCS= branch.c branch_compat.c branch_migrate.c branch_nested.c \ - branch_repos.c cancel.c compat.c compose_delta.c \ - debug_editor.c default_editor.c deprecated.c \ - depth_filter_editor.c editor.c element.c \ - path_driver.c svndiff.c text_delta.c version.c xdelta.c +SRCS= branch.c \ + branch_compat.c \ + branch_migrate.c \ + branch_nested.c \ + branch_repos.c \ + cancel.c \ + compat.c \ + compose_delta.c \ + debug_editor.c \ + default_editor.c \ + deprecated.c \ + depth_filter_editor.c \ + editor.c \ + element.c \ + path_driver.c \ + svndiff.c \ + text_delta.c \ + version.c \ + xdelta.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_diff/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_diff/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_diff/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,11 +7,22 @@ INTERNALLIB= yes LIB= svn_diff -SRCS= binary_diff.c deprecated.c diff.c diff3.c diff4.c \ - diff_file.c diff_memory.c diff_tree.c lcs.c parse-diff.c \ - token.c util.c +SRCS= binary_diff.c \ + deprecated.c \ + diff.c \ + diff3.c \ + diff4.c \ + diff_file.c \ + diff_memory.c \ + diff_tree.c \ + lcs.c \ + parse-diff.c \ + token.c \ + util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ @@ -20,4 +31,3 @@ CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/ -I${APRU}/include .include - Modified: head/usr.bin/svn/lib/libsvn_fs/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,9 +7,14 @@ INTERNALLIB= yes LIB= svn_fs -SRCS= access.c deprecated.c editor.c fs-loader.c +SRCS= access.c \ + deprecated.c \ + editor.c \ + fs-loader.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_fs_fs/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs_fs/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs_fs/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,13 +7,33 @@ INTERNALLIB= yes LIB= svn_fs_fs -SRCS= cached_data.c caching.c dag.c dump-index.c fs.c fs_fs.c \ - hotcopy.c id.c index.c load-index.c lock.c low_level.c \ - pack.c recovery.c rep-cache.c rev_file.c revprops.c \ - stats.c temp_serializer.c transaction.c tree.c util.c \ +SRCS= cached_data.c \ + caching.c \ + dag.c \ + dump-index.c \ + fs.c \ + fs_fs.c \ + hotcopy.c \ + id.c \ + index.c \ + load-index.c \ + lock.c \ + low_level.c \ + pack.c \ + recovery.c \ + rep-cache.c \ + rev_file.c \ + revprops.c \ + stats.c \ + temp_serializer.c \ + transaction.c \ + tree.c \ + util.c \ verify.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_fs_util/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs_util/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs_util/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -9,7 +9,9 @@ LIB= svn_fs_util SRCS= fs-util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_fs_x/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs_x/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs_x/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,14 +7,37 @@ INTERNALLIB= yes LIB= svn_fs_x -SRCS= batch_fsync.c cached_data.c caching.c changes.c \ - dag_cache.c dag.c fs.c fs_id.c fs_x.c \ - hotcopy.c id.c index.c lock.c low_level.c noderevs.c pack.c \ - recovery.c rep-cache.c reps.c rev_file.c revprops.c \ - string_table.c temp_serializer.c transaction.c tree.c \ - util.c verify.c +SRCS= batch_fsync.c \ + cached_data.c \ + caching.c \ + changes.c \ + dag.c \ + dag_cache.c \ + fs.c \ + fs_id.c \ + fs_x.c \ + hotcopy.c \ + id.c \ + index.c \ + lock.c \ + low_level.c \ + noderevs.c \ + pack.c \ + recovery.c \ + rep-cache.c \ + reps.c \ + rev_file.c \ + revprops.c \ + string_table.c \ + temp_serializer.c \ + transaction.c \ + tree.c \ + util.c \ + verify.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,10 +7,16 @@ INTERNALLIB= yes LIB= svn_ra -SRCS= compat.c debug_reporter.c deprecated.c editor.c \ - ra_loader.c util.c +SRCS= compat.c \ + debug_reporter.c \ + deprecated.c \ + editor.c \ + ra_loader.c \ + util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra_local/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra_local/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra_local/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,9 +7,12 @@ INTERNALLIB= yes LIB= svn_ra_local -SRCS= ra_plugin.c split_url.c +SRCS= ra_plugin.c \ + split_url.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra_serf/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra_serf/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra_serf/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,15 +7,40 @@ INTERNALLIB= yes LIB= svn_ra_serf -SRCS= blame.c blncache.c commit.c eagain_bucket.c \ - get_deleted_rev.c get_file.c get_lock.c getdate.c \ - getlocations.c getlocationsegments.c getlocks.c \ - inherited_props.c list.c lock.c log.c merge.c mergeinfo.c \ - multistatus.c options.c property.c replay.c \ - request_body.c sb_bucket.c serf.c stat.c stream_bucket.c \ - update.c util.c util_error.c xml.c +SRCS= blame.c \ + blncache.c \ + commit.c \ + eagain_bucket.c \ + get_deleted_rev.c \ + get_file.c \ + get_lock.c \ + getdate.c \ + getlocations.c \ + getlocationsegments.c \ + getlocks.c \ + inherited_props.c \ + list.c \ + lock.c \ + log.c \ + merge.c \ + mergeinfo.c \ + multistatus.c \ + options.c \ + property.c \ + replay.c \ + request_body.c \ + sb_bucket.c \ + serf.c \ + stat.c \ + stream_bucket.c \ + update.c \ + util.c \ + util_error.c \ + xml.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra_svn/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra_svn/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra_svn/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,10 +7,20 @@ INTERNALLIB= yes LIB= svn_ra_svn -SRCS= client.c cram.c cyrus_auth.c deprecated.c editorp.c \ - internal_auth.c marshal.c streams.c wrapped_sasl.c version.c +SRCS= client.c \ + cram.c \ + cyrus_auth.c \ + deprecated.c \ + editorp.c \ + internal_auth.c \ + marshal.c \ + streams.c \ + version.c \ + wrapped_sasl.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_repos/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_repos/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_repos/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,13 +7,32 @@ INTERNALLIB= yes LIB= svn_repos -SRCS= authz.c authz_info.c authz_parse.c \ - config_pool.c commit.c compat.c config_file.c delta.c \ - deprecated.c dump.c fs-wrap.c hooks.c load-fs-vtable.c \ - list.c load.c log.c node_tree.c notify.c replay.c reporter.c \ - repos.c rev_hunt.c +SRCS= authz.c \ + authz_info.c \ + authz_parse.c \ + commit.c \ + compat.c \ + config_file.c \ + config_pool.c \ + delta.c \ + deprecated.c \ + dump.c \ + fs-wrap.c \ + hooks.c \ + list.c \ + load-fs-vtable.c \ + load.c \ + log.c \ + node_tree.c \ + notify.c \ + replay.c \ + reporter.c \ + repos.c \ + rev_hunt.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_subr/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_subr/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_subr/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,29 +7,96 @@ INTERNALLIB= yes LIB= svn_subr -SRCS= adler32.c atomic.c auth.c base64.c bit_array.c \ - cache-inprocess.c cache-membuffer.c cache-memcache.c \ - cache.c cache-null.c cache_config.c checksum.c cmdline.c \ - compat.c compress_lz4.c compress_zlib.c \ - config.c config_auth.c config_file.c \ - config_win.c crypto.c ctype.c date.c debug.c \ - deprecated.c dirent_uri.c dso.c \ - encode.c eol.c error.c fnv1a.c \ - gpg_agent.c hash.c io.c iter.c lock.c log.c lz4.c \ - macos_keychain.c magic.c md5.c mergeinfo.c mutex.c nls.c \ - object_pool.c opt.c packed_data.c path.c \ - pool.c prefix_string.c prompt.c properties.c quoprint.c \ - root_pools.c simple_providers.c skel.c sorts.c spillbuf.c \ - sqlite.c sqlite3wrapper.c ssl_client_cert_providers.c \ - ssl_client_cert_pw_providers.c ssl_server_trust_providers.c \ - stream.c string.c subst.c sysinfo.c target.c \ - temp_serializer.c time.c token.c types.c user.c \ - username_providers.c utf.c utf8proc.c \ - utf_validate.c utf_width.c validate.c version.c \ - win32_crashrpt.c win32_crypto.c win32_xlate.c \ - x509info.c x509parse.c xml.c +SRCS= adler32.c \ + atomic.c \ + auth.c \ + base64.c \ + bit_array.c \ + cache-inprocess.c \ + cache-membuffer.c \ + cache-memcache.c \ + cache-null.c \ + cache.c \ + cache_config.c \ + checksum.c \ + cmdline.c \ + compat.c \ + compress_lz4.c \ + compress_zlib.c \ + config.c \ + config_auth.c \ + config_file.c \ + config_win.c \ + crypto.c \ + ctype.c \ + date.c \ + debug.c \ + deprecated.c \ + dirent_uri.c \ + dso.c \ + encode.c \ + eol.c \ + error.c \ + fnv1a.c \ + gpg_agent.c \ + hash.c \ + io.c \ + iter.c \ + lock.c \ + log.c \ + lz4.c \ + macos_keychain.c \ + magic.c \ + md5.c \ + mergeinfo.c \ + mutex.c \ + nls.c \ + object_pool.c \ + opt.c \ + packed_data.c \ + path.c \ + pool.c \ + prefix_string.c \ + prompt.c \ + properties.c \ + quoprint.c \ + root_pools.c \ + simple_providers.c \ + skel.c \ + sorts.c \ + spillbuf.c \ + sqlite.c \ + sqlite3wrapper.c \ + ssl_client_cert_providers.c \ + ssl_client_cert_pw_providers.c \ + ssl_server_trust_providers.c \ + stream.c \ + string.c \ + subst.c \ + sysinfo.c \ + target.c \ + temp_serializer.c \ + time.c \ + token.c \ + types.c \ + user.c \ + username_providers.c \ + utf.c \ + utf8proc.c \ + utf_validate.c \ + utf_width.c \ + validate.c \ + version.c \ + win32_crashrpt.c \ + win32_crypto.c \ + win32_xlate.c \ + x509info.c \ + x509parse.c \ + xml.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ @@ -39,4 +106,3 @@ CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/ -I${SQLITE} .include - Modified: head/usr.bin/svn/lib/libsvn_wc/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_wc/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_wc/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,17 +7,48 @@ INTERNALLIB= yes LIB= svn_wc -SRCS= adm_crawler.c adm_files.c adm_ops.c \ - ambient_depth_filter_editor.c cleanup.c conflicts.c \ - context.c copy.c crop.c delete.c deprecated.c diff_editor.c \ - diff_local.c entries.c externals.c info.c lock.c merge.c \ - node.c old-and-busted.c props.c questions.c relocate.c \ - revert.c revision_status.c status.c translate.c \ - tree_conflicts.c update_editor.c upgrade.c util.c \ - wc_db.c wc_db_pristine.c wc_db_update_move.c wc_db_util.c \ - wc_db_wcroot.c wcroot_anchor.c workqueue.c +SRCS= adm_crawler.c \ + adm_files.c \ + adm_ops.c \ + ambient_depth_filter_editor.c \ + cleanup.c \ + conflicts.c \ + context.c \ + copy.c \ + crop.c \ + delete.c \ + deprecated.c \ + diff_editor.c \ + diff_local.c \ + entries.c \ + externals.c \ + info.c \ + lock.c \ + merge.c \ + node.c \ + old-and-busted.c \ + props.c \ + questions.c \ + relocate.c \ + revert.c \ + revision_status.c \ + status.c \ + translate.c \ + tree_conflicts.c \ + update_editor.c \ + upgrade.c \ + util.c \ + wc_db.c \ + wc_db_pristine.c \ + wc_db_update_move.c \ + wc_db_util.c \ + wc_db_wcroot.c \ + wcroot_anchor.c \ + workqueue.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ From owner-svn-src-head@freebsd.org Sun May 31 22:12:59 2020 Return-Path: Delivered-To: svn-src-head@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 185EB2F3C01; Sun, 31 May 2020 22:12:59 +0000 (UTC) (envelope-from dim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49Zsxl02c2z43Wh; Sun, 31 May 2020 22:12:59 +0000 (UTC) (envelope-from dim@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 EFF732104F; Sun, 31 May 2020 22:12:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VMCwIh027906; Sun, 31 May 2020 22:12:58 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VMCvid027894; Sun, 31 May 2020 22:12:57 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005312212.04VMCvid027894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 31 May 2020 22:12:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361678 - in head: contrib/apr contrib/apr/atomic/unix contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/unix contrib/apr/include contrib/apr/include/arch/unix contrib/apr/inclu... X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head: contrib/apr contrib/apr/atomic/unix contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/unix contrib/apr/include contrib/apr/include/arch/unix contrib/apr/include/private contrib/apr/lo... X-SVN-Commit-Revision: 361678 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:12:59 -0000 Author: dim Date: Sun May 31 22:12:56 2020 New Revision: 361678 URL: https://svnweb.freebsd.org/changeset/base/361678 Log: Update apr to 1.7.0. See contrib/apr/CHANGES for a summary of changes. MFC after: 2 weeks X-MFC-With: r361677 Added: head/contrib/apr/atomic/unix/builtins64.c - copied unchanged from r361671, vendor/apr/dist/atomic/unix/builtins64.c head/contrib/apr/atomic/unix/mutex64.c - copied unchanged from r361671, vendor/apr/dist/atomic/unix/mutex64.c head/contrib/apr/encoding/apr_encode.c - copied unchanged from r361671, vendor/apr/dist/encoding/apr_encode.c head/contrib/apr/include/apr_cstr.h - copied unchanged from r361671, vendor/apr/dist/include/apr_cstr.h head/contrib/apr/include/apr_encode.h - copied unchanged from r361671, vendor/apr/dist/include/apr_encode.h head/contrib/apr/include/apr_perms_set.h - copied unchanged from r361671, vendor/apr/dist/include/apr_perms_set.h head/contrib/apr/include/private/ - copied from r361671, vendor/apr/dist/include/private/ head/contrib/apr/poll/unix/wakeup.c - copied unchanged from r361671, vendor/apr/dist/poll/unix/wakeup.c head/contrib/apr/strings/apr_cstr.c - copied unchanged from r361671, vendor/apr/dist/strings/apr_cstr.c head/usr.bin/svn/lib/libapr/apr_escape_test_char.h (contents, props changed) Modified: head/contrib/apr/CHANGES head/contrib/apr/CMakeLists.txt head/contrib/apr/Makefile.in head/contrib/apr/Makefile.win head/contrib/apr/NOTICE head/contrib/apr/NWGNUmakefile head/contrib/apr/apr.dsp head/contrib/apr/apr.mak head/contrib/apr/apr.spec head/contrib/apr/atomic/unix/ia32.c head/contrib/apr/atomic/unix/mutex.c head/contrib/apr/atomic/unix/ppc.c head/contrib/apr/atomic/unix/s390.c head/contrib/apr/atomic/unix/solaris.c head/contrib/apr/build-outputs.mk head/contrib/apr/buildconf head/contrib/apr/config.layout head/contrib/apr/configure head/contrib/apr/configure.in head/contrib/apr/docs/APRDesign.html head/contrib/apr/docs/canonical_filenames.html head/contrib/apr/docs/incomplete_types head/contrib/apr/docs/pool-design.html head/contrib/apr/encoding/apr_escape.c head/contrib/apr/file_io/unix/copy.c head/contrib/apr/file_io/unix/dir.c head/contrib/apr/file_io/unix/flock.c head/contrib/apr/file_io/unix/pipe.c head/contrib/apr/file_io/unix/readwrite.c head/contrib/apr/file_io/unix/seek.c head/contrib/apr/include/apr.h.in head/contrib/apr/include/apr.hnw head/contrib/apr/include/apr.hw head/contrib/apr/include/apr.hwc head/contrib/apr/include/apr_allocator.h head/contrib/apr/include/apr_atomic.h head/contrib/apr/include/apr_errno.h head/contrib/apr/include/apr_escape.h head/contrib/apr/include/apr_file_info.h head/contrib/apr/include/apr_file_io.h head/contrib/apr/include/apr_general.h head/contrib/apr/include/apr_global_mutex.h head/contrib/apr/include/apr_hash.h head/contrib/apr/include/apr_network_io.h head/contrib/apr/include/apr_poll.h head/contrib/apr/include/apr_portable.h head/contrib/apr/include/apr_proc_mutex.h head/contrib/apr/include/apr_shm.h head/contrib/apr/include/apr_skiplist.h head/contrib/apr/include/apr_strings.h head/contrib/apr/include/apr_tables.h head/contrib/apr/include/apr_thread_mutex.h head/contrib/apr/include/apr_thread_proc.h head/contrib/apr/include/apr_time.h head/contrib/apr/include/apr_version.h head/contrib/apr/include/arch/unix/apr_arch_atomic.h head/contrib/apr/include/arch/unix/apr_arch_networkio.h head/contrib/apr/include/arch/unix/apr_arch_poll_private.h head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h head/contrib/apr/include/arch/unix/apr_arch_shm.h head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h head/contrib/apr/include/arch/unix/apr_arch_threadproc.h head/contrib/apr/include/arch/unix/apr_private.h.in head/contrib/apr/libapr.dsp head/contrib/apr/libapr.mak head/contrib/apr/locks/unix/global_mutex.c head/contrib/apr/locks/unix/proc_mutex.c head/contrib/apr/locks/unix/thread_cond.c head/contrib/apr/locks/unix/thread_mutex.c head/contrib/apr/memory/unix/apr_pools.c head/contrib/apr/misc/unix/errorcodes.c head/contrib/apr/misc/unix/rand.c head/contrib/apr/network_io/unix/multicast.c head/contrib/apr/network_io/unix/sockaddr.c head/contrib/apr/network_io/unix/sockets.c head/contrib/apr/network_io/unix/sockopt.c head/contrib/apr/poll/unix/epoll.c head/contrib/apr/poll/unix/kqueue.c head/contrib/apr/poll/unix/poll.c head/contrib/apr/poll/unix/pollcb.c head/contrib/apr/poll/unix/pollset.c head/contrib/apr/poll/unix/port.c head/contrib/apr/poll/unix/select.c head/contrib/apr/poll/unix/z_asio.c head/contrib/apr/shmem/unix/shm.c head/contrib/apr/strings/apr_cpystrn.c head/contrib/apr/strings/apr_fnmatch.c head/contrib/apr/strings/apr_snprintf.c head/contrib/apr/tables/apr_skiplist.c head/contrib/apr/tables/apr_tables.c head/contrib/apr/threadproc/unix/proc.c head/contrib/apr/threadproc/unix/signals.c head/contrib/apr/tools/gen_test_char.c head/usr.bin/svn/lib/libapr/Makefile Directory Properties: head/contrib/apr/ (props changed) Modified: head/contrib/apr/CHANGES ============================================================================== --- head/contrib/apr/CHANGES Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/CHANGES Sun May 31 22:12:56 2020 (r361678) @@ -1,179 +1,61 @@ -*- coding: utf-8 -*- -Changes for APR 1.5.2 +Changes for APR 1.7.0 - *) SECURITY: CVE-2015-1829 (cve.mitre.org) - APR applications using APR named pipe support on Windows can be - vulnerable to a pipe squatting attack from a local process; the extent - of the vulnerability, when present, depends on the application. - Initial analysis and report was provided by John Hernandez of Casaba - Security via HP SSRT Security Alert. [Yann Ylavic] + *) apr_dir_read: [Unix] Dropped the preference of the dirread_r() flavor + for dirread(), because the former is both deprecated and unneeded. + [Yann Ylavic, William Rowe] - *) apr_atomic: Fix errors when building on Visual Studio 2013 while - maintaining the ability to build on Visual Studio 6 with Windows - Server 2003 R2 SDK. PR 57191. [Gregg Smith] + *) apr_file_info: [Win32 only] Treat only "name surrogate" reparse points + as symlinks, and not other reparse tag types. PR47630 + [Oleg Liatte ] - *) Switch to generic atomics for early/unpatched Solaris 10 not exporting - some atomic functions. PR 55418. [Yann Ylavic] + *) Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the + case of apparently equivilant long and long long types. [William Rowe] - *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files - per process. PR 57677. [Jeff Trawick] + *) Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski] - *) apr_escape: Correctly calculate the size of the returned string in - apr_escape_path and set the correct return value in case we actually - escape the string. [] PR 57230. + *) Signals: Allow handling of SIGUSR2 in apr_signal_thread. [Yann Ylavic] - *) pollcb on Windows: Handle calls with no file/socket descriptors. - Follow up to PR 49882. [Jeff Trawick, Yann Ylavic] + *) Atomics: Support for 64bit ints. [Jim Jagielski] - *) apr_poll(cb): fix error paths returned values and leaks. [Yann Ylavic] + *) Add the apr_encode_* API that implements RFC4648 and RFC7515 + compliant BASE64, BASE64URL, BASE32, BASE32HEX and BASE16 + encode/decode functions. [Graham Leggett] - *) apr_thread_cond_*wait() on BeOS: Fix broken logic. PR 45800. - [Jochen Voss (no e-mail)] + *) rand: Use arc4random_buf() on BSD platforms and getrandom() on Linux, + when available. [Christian Weisgerber ] + *) apr_sockaddr_ip_getbuf, apr_sockaddr_ip_get: Append "%zone" for + IPv6 link-local addresses. [Joe Orton] - *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not - returning IPv4 addresses if any IPv6 addresses were returned. - [Eric Covener] + *) Locks: add a --disable-timedlocks config option in case users + encounter more platforms where it fails [Nick Kew]. - *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and - later. [Jeff Trawick] + *) apr_allocator, apr_pools: Add apr_allocator_page_size() and + apr_allocator_min_order_set() to respectively get the (system's) page size + in use and set the minimum allocation size for an allocator (expressed in + 2^order pages). [Yann Ylavic] - *) apr_global_mutex/apr_proc_mutex: Resolve failures with the - POSIX sem implementation in environments which receive signals. - [Jeff Trawick] + *) locks: provide portable implementations of timedlock()s for + posix-sems, sysv-sems and pthreads for those platforms that + lack native versions (eg: OSX/macOS). [Jim Jagielski] - *) apr_skiplist: Fix potential corruption of skiplists leading to - results or crashes. [Takashi Sato , Eric Covener] - PR 56654. + *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock(). + [Yann Ylavic] - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] +Changes for APR 1.6.x and later: -Changes for APR 1.5.1 + *) http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CHANGES?view=markup - *) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross- - process pthread mutexes. [Yann Ylavic ] +Changes for APR 1.5.x and later: - *) When using shmget-based shared memory, the ID used for ftok is - now an APR hash of the filename instead of the constant '1'. - We do this to help avoid collisions. PR 53996 [Jim Jagielski] - - *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski] - - *) Fix POSIX shared memory (shm_open) use for named shared memory. - Includes adding '--enable-posix-shm' to force POSIX shm if - available, and OS X compatibility. PR 55928. - [Jozef Hatala , Jim Jagielski] - - *) Fix race condition when calling apr_dir_make_recursive from - multiple threads on Windows. - [Bert Huijben] - - *) Fix apr_escape.c compilation errors on EBCDIC platforms. - [Eric Covener] - - *) FreeBSD 10: Correct a regression in 1.5.0 which affected non- - blocking sockets in some applications, including httpd. [Jeff - Trawick] - - *) Windows cmake build: Fix incorrect installation of some .pdb - files. Fix incorrect use of some logic intended for Windows 9x, - including legacy filesystem interfaces and dynamic loading of - some Windows APIs. [Jeff Trawick] - - *) apr_skiplist: Add compatibility with C++ applications. - [Jeff Trawick] - - *) Correct a regression in 1.5.0 which affected out-of-tree - builds on Unix. [Rainer Jung] - - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] - -Changes for APR 1.5.0 - - *) Fix Linux kernel version check to recognize more versions, - including versions 3.10 and later. PR 55690. [Joe Orton, - Arfrever Frehtes Taifersar Arahesis ] - - *) Add apr_sockaddr_is_wildcard() to check if a socket address - refers to the wildcard address for the protocol family (e.g., - 0.0.0.0/INADDR_ANY for IPv4). [Jeff Trawick] - - *) apr_file_dup2() on Windows: Fix debug RTL assertion when - attempting to _commit(stdout) or _commit(stderr). [Mike Rumph - ] - - *) apr_socket_connect() on Windows: Handle WSAEISCONN. PR 48736. - [, Jeff Trawick] - - *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames] - - *) Windows: Don't obtain a mutex for buffered file I/O unless the - file was opened with the APR_FOPEN_XTHREAD flag. [Ivan Zhakov - ] - - *) Windows: Create named shared memory segments under the "Local" - namespace if the caller is unprivileged, fixing an inability of - unprivileged callers to use apr_shm_create() with named shared - memory segments under recent Windows. As before, shared memory - segments are created under the "Global" namespace for privileged - callers. Add apr_shm_create_ex() and apr_shm_attach_ex(), which - provide the ability to override the normal namespace selection. - [Jeff Trawick] - - *) Update compile settings for MINT OS. PR 47181. [Alan Hourihane - ] - - *) Files and pipes on Windows: Don't create an unused pollset when - files and pipes are opened. [Mladen Turk] - - *) apr_socket_timeout_set() on Windows: If the socket was in a non- - blocking state before, disable that setting so that timeouts work. - [Jeff Trawick] - - *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146. - [Ruediger Pluem] - - *) Add the apr_escape interface. [Graham Leggett] - - *) Cygwin build fixes. PRs 51016 and 55586. [Carlo Bramini - ] - - *) Add apr_skiplist family. [Jim Jagielski] - - *) Add experimental cmake-based build system for Windows. Refer to - README.cmake for more information. [Jeff Trawick, Tom Donovan] - - *) Add the apr_table_getm() call, which transparently handles the - merging of keys with multiple values. [Graham Leggett] - - *) Add apr_hash_this_key(), apr_hash_this_key_len(), and - apr_hash_this_val() for easier access to those attributes from - a hash iterator. [Hyrum K. Wright ] - - *) MinGW/MSYS: Support shared builds of APR, other general improvements - to support of this toolchain. PR 46175. [Carlo Bramini - ] - - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] - - *) apr_socket_opt_set: Add support for APR_SO_BROADCAST. PR 46389. - [Armin Müller ] - - *) Enable platform specific support for the opening of a file or - pipe in non-blocking mode through the APR_FOPEN_NONBLOCK flag. - [Graham Leggett] + *) http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?view=markup Changes for APR 1.4.x and later: Modified: head/contrib/apr/CMakeLists.txt ============================================================================== --- head/contrib/apr/CMakeLists.txt Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/CMakeLists.txt Sun May 31 22:12:56 2020 (r361678) @@ -87,6 +87,7 @@ INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES}) SET(APR_PUBLIC_HEADERS_STATIC include/apr_allocator.h include/apr_atomic.h + include/apr_cstr.h include/apr_dso.h include/apr_env.h include/apr_errno.h @@ -102,6 +103,7 @@ SET(APR_PUBLIC_HEADERS_STATIC include/apr_lib.h include/apr_mmap.h include/apr_network_io.h + include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h @@ -179,11 +181,13 @@ SET(APR_SOURCES poll/unix/pollcb.c poll/unix/pollset.c poll/unix/select.c + poll/unix/wakeup.c random/unix/apr_random.c random/unix/sha2.c random/unix/sha2_glue.c shmem/win32/shm.c strings/apr_cpystrn.c + strings/apr_cstr.c strings/apr_fnmatch.c strings/apr_snprintf.c strings/apr_strings.c Modified: head/contrib/apr/Makefile.in ============================================================================== --- head/contrib/apr/Makefile.in Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/Makefile.in Sun May 31 22:12:56 2020 (r361678) @@ -63,6 +63,8 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ +datadir=@datadir@ installbuilddir=@installbuilddir@ # Create apr-config script suitable for the install tree Modified: head/contrib/apr/Makefile.win ============================================================================== --- head/contrib/apr/Makefile.win Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/Makefile.win Sun May 31 22:12:56 2020 (r361678) @@ -18,8 +18,6 @@ # # ARCH="Win32 Release" # ARCH="Win32 Debug" -# ARCH="Win32 Release9x" -# ARCH="Win32 Debug9x" # ARCH="x64 Release" # ARCH="x64 Debug" # @@ -66,14 +64,6 @@ LIBSOSPATH=LibR SLNARCH=Debug|Win32 ARCHOSPATH=Debug LIBSOSPATH=LibD -!ELSEIF "$(ARCH)" == "Win32 Release9x" -SLNARCH=Release9x|Win32 -ARCHOSPATH=9x\Release -LIBSOSPATH=9x\LibR -!ELSEIF "$(ARCH)" == "Win32 Debug9x" -SLNARCH=Debug9x|Win32 -ARCHOSPATH=9x\Debug -LIBSOSPATH=9x\LibD !ELSEIF "$(ARCH)" == "x64 Release" SLNARCH=Release|x64 ARCHOSPATH=x64\Release Modified: head/contrib/apr/NOTICE ============================================================================== --- head/contrib/apr/NOTICE Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/NOTICE Sun May 31 22:12:56 2020 (r361678) @@ -1,5 +1,5 @@ Apache Portable Runtime -Copyright (c) 2000-2015 The Apache Software Foundation. +Copyright (c) 2000-2019 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: head/contrib/apr/NWGNUmakefile ============================================================================== --- head/contrib/apr/NWGNUmakefile Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/NWGNUmakefile Sun May 31 22:12:56 2020 (r361678) @@ -362,6 +362,7 @@ FILES_lib_objs = \ $(OBJDIR)/userinfo.o \ $(OBJDIR)/version.o \ $(OBJDIR)/waitio.o \ + $(OBJDIR)/wakeup.o \ $(EOLIST) Modified: head/contrib/apr/apr.dsp ============================================================================== --- head/contrib/apr/apr.dsp Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/apr.dsp Sun May 31 22:12:56 2020 (r361678) @@ -19,8 +19,6 @@ CFG=apr - Win32 Release !MESSAGE !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -45,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -69,7 +67,7 @@ LIB32=link.exe -lib # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -79,53 +77,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"LibD\apr-1.lib" -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "9x\LibR" -# PROP BASE Intermediate_Dir "9x\LibR" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "9x\LibR" -# PROP Intermediate_Dir "9x\LibR" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"9x\LibR\apr-1.lib" - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "9x\LibD" -# PROP BASE Intermediate_Dir "9x\LibD" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "9x\LibD" -# PROP Intermediate_Dir "9x\LibD" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"9x\LibD\apr-1.lib" - !ELSEIF "$(CFG)" == "apr - x64 Release" # PROP BASE Use_MFC 0 @@ -139,7 +90,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "x64\LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -163,7 +114,7 @@ LIB32=link.exe -lib # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -179,8 +130,6 @@ LIB32=link.exe -lib # Name "apr - Win32 Release" # Name "apr - Win32 Debug" -# Name "apr - Win32 Release9x" -# Name "apr - Win32 Debug9x" # Name "apr - x64 Release" # Name "apr - x64 Debug" # Begin Group "Source Files" @@ -193,6 +142,10 @@ LIB32=link.exe -lib SOURCE=.\atomic\win32\apr_atomic.c # End Source File +# Begin Source File + +SOURCE=.\atomic\win32\apr_atomic64.c +# End Source File # End Group # Begin Group "dso" @@ -207,6 +160,11 @@ SOURCE=.\dso\win32\dso.c # PROP Default_Filter "" # Begin Source File +SOURCE=.\encoding\apr_encode.c + +# End Source File +# Begin Source File + SOURCE=.\encoding\apr_escape.c # End Source File @@ -439,6 +397,10 @@ SOURCE=.\poll\unix\pollset.c SOURCE=.\poll\unix\select.c # End Source File +# Begin Source File + +SOURCE=.\poll\unix\wakeup.c +# End Source File # End Group # Begin Group "random" @@ -473,6 +435,10 @@ SOURCE=.\strings\apr_cpystrn.c # End Source File # Begin Source File +SOURCE=.\strings\apr_cstr.c +# End Source File +# Begin Source File + SOURCE=.\strings\apr_fnmatch.c # End Source File # Begin Source File @@ -642,26 +608,6 @@ InputPath=.\include\apr.hw # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - !ELSEIF "$(CFG)" == "apr - x64 Release" # Begin Custom Build - Creating apr.h from apr.hw @@ -708,76 +654,48 @@ SOURCE=.\include\apr_errno.h # Begin Source File SOURCE=.\include\apr_escape.h -# End Source File -# Begin Source File -SOURCE=.\include\apr_escape.h +!IF "$(CFG)" == "libapr - Win32 Release" -!IF "$(CFG)" == "apr - Win32 Release" - # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibR\gen_test_char /Fe.\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c + .\Release\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Debug" +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibD\gen_test_char /Fe.\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c + .\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" +!ELSEIF "$(CFG)" == "libapr - x64 Release" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibR\gen_test_char /Fe.\9x\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\9x\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c + .\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" +!ELSEIF "$(CFG)" == "libapr - x64 Debug" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h -InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibD\gen_test_char /Fe.\9x\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\9x\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - x64 Release" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -InputPath=.\include\apr_escape.h -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibR\gen_test_char /Fe.\x64\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - x64 Debug" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibD\gen_test_char /Fe.\x64\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c + .\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build Modified: head/contrib/apr/apr.mak ============================================================================== --- head/contrib/apr/apr.mak Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/apr.mak Sun May 31 22:12:56 2020 (r361678) @@ -4,7 +4,7 @@ CFG=apr - Win32 Release !MESSAGE No configuration specified. Defaulting to apr - Win32 Release. !ENDIF -!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - Win32 Release9x" && "$(CFG)" != "apr - Win32 Debug9x" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" +!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,8 +15,6 @@ CFG=apr - Win32 Release !MESSAGE !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -29,6 +27,9 @@ NULL= NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "apr - Win32 Release" OUTDIR=.\LibR @@ -37,14 +38,17 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -ALL : ".\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -115,49 +119,14 @@ CLEAN : -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -166,7 +135,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -208,19 +179,21 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ + "$(INTDIR)\sockets.obj" \ "$(INTDIR)\sockopt.obj" \ "$(INTDIR)\apr_getpass.obj" \ "$(INTDIR)\poll.obj" \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ "$(INTDIR)\select.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -251,14 +224,17 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -ALL : ".\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -329,49 +305,14 @@ CLEAN : -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -380,7 +321,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -422,233 +365,21 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_skiplist.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -OUTDIR=.\9x\LibR -INTDIR=.\9x\LibR -# Begin Custom Macros -OutDir=.\9x\LibR -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\apr_escape.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sun May 31 22:15:34 2020 Return-Path: Delivered-To: svn-src-head@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 A8F0E2F38D9; Sun, 31 May 2020 22:15:34 +0000 (UTC) (envelope-from rmacklem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49Zt0k3xD1z43wL; Sun, 31 May 2020 22:15:34 +0000 (UTC) (envelope-from rmacklem@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 8255221156; Sun, 31 May 2020 22:15:34 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VMFYHX028594; Sun, 31 May 2020 22:15:34 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VMFYMt028593; Sun, 31 May 2020 22:15:34 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005312215.04VMFYMt028593@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 31 May 2020 22:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361679 - head/include X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/include X-SVN-Commit-Revision: 361679 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:15:34 -0000 Author: rmacklem Date: Sun May 31 22:15:34 2020 New Revision: 361679 URL: https://svnweb.freebsd.org/changeset/base/361679 Log: Update the Makefile to copy rpcsec_tls.h to /usr/include/rpc. Modified: head/include/Makefile Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Sun May 31 22:12:56 2020 (r361678) +++ head/include/Makefile Sun May 31 22:15:34 2020 (r361679) @@ -234,6 +234,8 @@ copies: .PHONY .META .endif .endfor cd ${SRCTOP}/sys/rpc; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rpcsec_tls.h \ + ${SDESTDIR}${INCLUDEDIR}/rpc ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \ ${SDESTDIR}${INCLUDEDIR}/rpc cd ${SRCTOP}/sys/teken; \ @@ -367,7 +369,7 @@ symlinks: .PHONY .META ${SDESTDIR}${INCLUDEDIR}/isofs/cd9660; \ done cd ${SRCTOP}/sys/rpc; \ - for h in types.h; do \ + for h in rpcsec_tls.h types.h; do \ ${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/rpc/$$h \ ${SDESTDIR}${INCLUDEDIR}/rpc; \ done From owner-svn-src-head@freebsd.org Sun May 31 22:37:34 2020 Return-Path: Delivered-To: svn-src-head@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 03C672F3BEF; Sun, 31 May 2020 22:37:34 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZtV56KGwz45Wd; Sun, 31 May 2020 22:37:33 +0000 (UTC) (envelope-from kib@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 B634E211EF; Sun, 31 May 2020 22:37:33 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VMbXX1041104; Sun, 31 May 2020 22:37:33 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VMbXHm041103; Sun, 31 May 2020 22:37:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202005312237.04VMbXHm041103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 31 May 2020 22:37:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361680 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 361680 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:37:34 -0000 Author: kib Date: Sun May 31 22:37:33 2020 New Revision: 361680 URL: https://svnweb.freebsd.org/changeset/base/361680 Log: rtld: Add -b option to allow to specify image name different from arg0. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.1 head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.1 ============================================================================== --- head/libexec/rtld-elf/rtld.1 Sun May 31 22:15:34 2020 (r361679) +++ head/libexec/rtld-elf/rtld.1 Sun May 31 22:37:33 2020 (r361680) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2017 +.Dd June 1, 2020 .Dt RTLD 1 .Os .Sh NAME @@ -302,6 +302,7 @@ Execution options may be specified. The syntax of the direct invocation is .Bd -ragged -offset indent .Pa /libexec/ld-elf.so.1 +.Op Fl b Ar exe .Op Fl f Ar fd .Op Fl p .Op Fl - @@ -311,6 +312,17 @@ The syntax of the direct invocation is .Pp The options are: .Bl -tag -width indent +.It Fl b Ar exe +Use the executable +.Fa exe +instead of +.Fa image_path +for activation. +If this option is specified, +.Ar image_path +is only used to provide the +.Va argv[0] +value to the program. .It Fl f Ar fd File descriptor .Ar fd Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sun May 31 22:15:34 2020 (r361679) +++ head/libexec/rtld-elf/rtld.c Sun May 31 22:37:33 2020 (r361680) @@ -136,7 +136,8 @@ static void objlist_put_after(Objlist *, Obj_Entry *, static void objlist_remove(Objlist *, Obj_Entry *); static int open_binary_fd(const char *argv0, bool search_in_path, const char **binpath_res); -static int parse_args(char* argv[], int argc, bool *use_pathp, int *fdp); +static int parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, + const char **argv0); static int parse_integer(const char *); static void *path_enumerate(const char *, path_enum_proc, const char *, void *); static void print_usage(const char *argv0); @@ -467,8 +468,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr } dbg("opening main program in direct exec mode"); if (argc >= 2) { - rtld_argc = parse_args(argv, argc, &search_in_path, &fd); - argv0 = argv[rtld_argc]; + rtld_argc = parse_args(argv, argc, &search_in_path, &fd, &argv0); explicit_fd = (fd != -1); binpath = NULL; if (!explicit_fd) @@ -5610,17 +5610,20 @@ open_binary_fd(const char *argv0, bool search_in_path, * Parse a set of command-line arguments. */ static int -parse_args(char* argv[], int argc, bool *use_pathp, int *fdp) +parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, + const char **argv0) { const char *arg; char machine[64]; size_t sz; int arglen, fd, i, j, mib[2]; char opt; + bool seen_b, seen_f; dbg("Parsing command-line arguments"); *use_pathp = false; *fdp = -1; + seen_b = seen_f = false; for (i = 1; i < argc; i++ ) { arg = argv[i]; @@ -5647,7 +5650,21 @@ parse_args(char* argv[], int argc, bool *use_pathp, in if (opt == 'h') { print_usage(argv[0]); _exit(0); + } else if (opt == 'b') { + if (seen_f) { + _rtld_error("Both -b and -f specified"); + rtld_die(); + } + i++; + *argv0 = argv[i]; + seen_b = true; + break; } else if (opt == 'f') { + if (seen_b) { + _rtld_error("Both -b and -f specified"); + rtld_die(); + } + /* * -f XX can be used to specify a * descriptor for the binary named at @@ -5671,6 +5688,7 @@ parse_args(char* argv[], int argc, bool *use_pathp, in rtld_die(); } *fdp = fd; + seen_f = true; break; } else if (opt == 'p') { *use_pathp = true; @@ -5700,6 +5718,8 @@ parse_args(char* argv[], int argc, bool *use_pathp, in } } + if (!seen_b) + *argv0 = argv[i]; return (i); } @@ -5734,10 +5754,12 @@ static void print_usage(const char *argv0) { - rtld_printf("Usage: %s [-h] [-f ] [-p] [--] []\n" + rtld_printf( + "Usage: %s [-h] [-b ] [-f ] [-p] [--] []\n" "\n" "Options:\n" " -h Display this help message\n" + " -b Execute instead of , arg0 is \n" " -f Execute instead of searching for \n" " -p Search in PATH for named binary\n" " -v Display identification information\n" From owner-svn-src-head@freebsd.org Sun May 31 22:40:42 2020 Return-Path: Delivered-To: svn-src-head@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 65D742F4711; Sun, 31 May 2020 22:40:42 +0000 (UTC) (envelope-from dim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZtYk2KWrz45jC; Sun, 31 May 2020 22:40:42 +0000 (UTC) (envelope-from dim@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 4AD6921332; Sun, 31 May 2020 22:40:42 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VMegiK041460; Sun, 31 May 2020 22:40:42 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VMeeEN041329; Sun, 31 May 2020 22:40:40 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005312240.04VMeeEN041329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 31 May 2020 22:40:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361681 - in head/usr.bin/svn: svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc svnrdump svnserve svnsync svnversion X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head/usr.bin/svn: svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc svnrdump svnserve svnsync svnversion X-SVN-Commit-Revision: 361681 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:40:42 -0000 Author: dim Date: Sun May 31 22:40:39 2020 New Revision: 361681 URL: https://svnweb.freebsd.org/changeset/base/361681 Log: Change more Makefiles under usr.bin/svn to make them easier to incrementally update. No functional change intended. MFC after: 2 weeks X-MFC-With: r361677 Modified: head/usr.bin/svn/svn/Makefile head/usr.bin/svn/svnadmin/Makefile head/usr.bin/svn/svnbench/Makefile head/usr.bin/svn/svndumpfilter/Makefile head/usr.bin/svn/svnfsfs/Makefile head/usr.bin/svn/svnlook/Makefile head/usr.bin/svn/svnmucc/Makefile head/usr.bin/svn/svnrdump/Makefile head/usr.bin/svn/svnserve/Makefile head/usr.bin/svn/svnsync/Makefile head/usr.bin/svn/svnversion/Makefile Modified: head/usr.bin/svn/svn/Makefile ============================================================================== --- head/usr.bin/svn/svn/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svn/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -2,54 +2,111 @@ .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svn +.PATH: ${SVNDIR}/svn -PROG= svn${SVNLITE} +PROG= svn${SVNLITE} -SRCS= add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \ - checkout-cmd.c cl-conflicts.c cleanup-cmd.c commit-cmd.c \ - conflict-callbacks.c copy-cmd.c delete-cmd.c deprecated.c \ - diff-cmd.c export-cmd.c file-merge.c help-cmd.c import-cmd.c \ - info-cmd.c list-cmd.c lock-cmd.c log-cmd.c merge-cmd.c \ - mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \ - propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \ - props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \ - resolved-cmd.c revert-cmd.c \ - shelve-cmd.c status-cmd.c similarity.c status.c \ - svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c +SRCS= add-cmd.c \ + auth-cmd.c \ + blame-cmd.c \ + cat-cmd.c \ + changelist-cmd.c \ + checkout-cmd.c \ + cl-conflicts.c \ + cleanup-cmd.c \ + commit-cmd.c \ + conflict-callbacks.c \ + copy-cmd.c \ + delete-cmd.c \ + deprecated.c \ + diff-cmd.c \ + export-cmd.c \ + file-merge.c \ + help-cmd.c \ + import-cmd.c \ + info-cmd.c \ + list-cmd.c \ + lock-cmd.c \ + log-cmd.c \ + merge-cmd.c \ + mergeinfo-cmd.c \ + mkdir-cmd.c \ + move-cmd.c \ + notify.c \ + patch-cmd.c \ + propdel-cmd.c \ + propedit-cmd.c \ + propget-cmd.c \ + proplist-cmd.c \ + props.c \ + propset-cmd.c \ + relocate-cmd.c \ + resolve-cmd.c \ + resolved-cmd.c \ + revert-cmd.c \ + shelve-cmd.c \ + status-cmd.c \ + similarity.c \ + status.c \ + svn.c \ + switch-cmd.c \ + unlock-cmd.c \ + update-cmd.c \ + upgrade-cmd.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ - ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ - ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ - ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + magic \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_WC} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) Modified: head/usr.bin/svn/svnadmin/Makefile ============================================================================== --- head/usr.bin/svn/svnadmin/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnadmin/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,33 +4,44 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnadmin +.PATH: ${SVNDIR}/svnadmin -PROG= svn${SVNLITE}admin +PROG= svn${SVNLITE}admin -SRCS= svnadmin.c +SRCS= svnadmin.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnbench/Makefile ============================================================================== --- head/usr.bin/svn/svnbench/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnbench/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,45 +4,71 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnbench +.PATH: ${SVNDIR}/svnbench -PROG= svn${SVNLITE}bench +PROG= svn${SVNLITE}bench -SRCS= help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \ - null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c +SRCS= help-cmd.c \ + notify.c \ + null-blame-cmd.c \ + null-export-cmd.c \ + null-info-cmd.c \ + null-list-cmd.c \ + null-log-cmd.c \ + svnbench.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread +LIBADD+= bsdxml \ + sqlite3 \ + z \ + magic \ + crypto \ + ssl \ + pthread -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ - ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ - ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ - ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_WC} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svndumpfilter/Makefile ============================================================================== --- head/usr.bin/svn/svndumpfilter/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svndumpfilter/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,33 +4,45 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svndumpfilter +.PATH: ${SVNDIR}/svndumpfilter -PROG= svn${SVNLITE}dumpfilter +PROG= svn${SVNLITE}dumpfilter -SRCS= svndumpfilter.c +SRCS= svndumpfilter.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z crypt pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypt \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnfsfs/Makefile ============================================================================== --- head/usr.bin/svn/svnfsfs/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnfsfs/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,33 +4,47 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnfsfs +.PATH: ${SVNDIR}/svnfsfs -PROG= svn${SVNLITE}fsfs +PROG= svn${SVNLITE}fsfs -SRCS= dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c +SRCS= dump-index-cmd.c \ + load-index-cmd.c \ + stats-cmd.c \ + svnfsfs.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnlook/Makefile ============================================================================== --- head/usr.bin/svn/svnlook/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnlook/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,34 +4,46 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnlook +.PATH: ${SVNDIR}/svnlook -PROG= svn${SVNLITE}look +PROG= svn${SVNLITE}look -SRCS= svnlook.c +SRCS= svnlook.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnmucc/Makefile ============================================================================== --- head/usr.bin/svn/svnmucc/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnmucc/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,42 +4,60 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnmucc +.PATH: ${SVNDIR}/svnmucc -PROG= svn${SVNLITE}mucc +PROG= svn${SVNLITE}mucc -SRCS= svnmucc.c +SRCS= svnmucc.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \ - ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \ - ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \ - ${LIBAPR_UTIL} ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnrdump/Makefile ============================================================================== --- head/usr.bin/svn/svnrdump/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnrdump/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,43 +4,65 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnrdump +.PATH: ${SVNDIR}/svnrdump -PROG= svn${SVNLITE}rdump +PROG= svn${SVNLITE}rdump -SRCS= dump_editor.c load_editor.c svnrdump.c util.c +SRCS= dump_editor.c \ + load_editor.c \ + svnrdump.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ - ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ - ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ - ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_WC} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnserve/Makefile ============================================================================== --- head/usr.bin/svn/svnserve/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnserve/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,39 +4,59 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnserve +.PATH: ${SVNDIR}/svnserve -PROG= svn${SVNLITE}serve +PROG= svn${SVNLITE}serve -SRCS= cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c +SRCS= cyrus_auth.c \ + log-escape.c \ + logger.c \ + serve.c \ + svnserve.c \ + winservice.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ - ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnsync/Makefile ============================================================================== --- head/usr.bin/svn/svnsync/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnsync/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,39 +4,57 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnsync +.PATH: ${SVNDIR}/svnsync -PROG= svn${SVNLITE}sync +PROG= svn${SVNLITE}sync -SRCS= svnsync.c sync.c +SRCS= svnsync.c \ + sync.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ - ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include Modified: head/usr.bin/svn/svnversion/Makefile ============================================================================== --- head/usr.bin/svn/svnversion/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnversion/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,29 +4,40 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnversion +.PATH: ${SVNDIR}/svnversion -PROG= svn${SVNLITE}version +PROG= svn${SVNLITE}version -SRCS= svnversion.c +SRCS= svnversion.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \ - ${LIBSERF} ${LIBAPR_UTIL} ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_WC} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include From owner-svn-src-head@freebsd.org Sun May 31 22:46:33 2020 Return-Path: Delivered-To: svn-src-head@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 01C0E2F48D8; Sun, 31 May 2020 22:46:33 +0000 (UTC) (envelope-from rmacklem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZthS5z0pz46c5; Sun, 31 May 2020 22:46:32 +0000 (UTC) (envelope-from rmacklem@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 C84142179D; Sun, 31 May 2020 22:46:32 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VMkWXK047252; Sun, 31 May 2020 22:46:32 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VMkWc2047251; Sun, 31 May 2020 22:46:32 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005312246.04VMkWc2047251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 31 May 2020 22:46:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361682 - head/include X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/include X-SVN-Commit-Revision: 361682 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:46:33 -0000 Author: rmacklem Date: Sun May 31 22:46:32 2020 New Revision: 361682 URL: https://svnweb.freebsd.org/changeset/base/361682 Log: Oops, I didn't notice the "cd" is needed for each install line. Modified: head/include/Makefile Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Sun May 31 22:40:39 2020 (r361681) +++ head/include/Makefile Sun May 31 22:46:32 2020 (r361682) @@ -236,6 +236,7 @@ copies: .PHONY .META cd ${SRCTOP}/sys/rpc; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rpcsec_tls.h \ ${SDESTDIR}${INCLUDEDIR}/rpc + cd ${SRCTOP}/sys/rpc; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \ ${SDESTDIR}${INCLUDEDIR}/rpc cd ${SRCTOP}/sys/teken; \ From owner-svn-src-head@freebsd.org Sun May 31 22:56:59 2020 Return-Path: Delivered-To: svn-src-head@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 11A7B2F4DA8; Sun, 31 May 2020 22:56:59 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-QB1-obe.outbound.protection.outlook.com (mail-eopbgr660076.outbound.protection.outlook.com [40.107.66.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZtwV0B9Jz47SD; Sun, 31 May 2020 22:56:57 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WziZvnsC3Efv4g3/lV8w62qGbdefSFomkoXdsX1Cc2ycEwVUH4LOp+sxywJ9M9TCkYpf/1L87sAYa46yRS0gLpOtFx5Hoxc3OvDKIQVM9UlJAHj6KYoKSYivqFHVF8qlKgas5OeaRQ/Q4+0PMBFmjRMm2P0zYvyawROkYLxwHU34ZzmVr1oq8oqE+OeI4vuhUkwi7g06sXHLOubv+yMEkCKzgECrGRuBvNOHxOQcFzegd85iWunnYqXxJw/MthMb8XFUeNuDNLqA+oM4OMjh/kfOxxIS7hhxByaHry8FOY1kzgedMHIBjo2BEoeSSqgsu+YWS92md4ZZ7z6jYx5nRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SMRPEYVPhWuDg68uW7VngwTyCN4nIWdLKyvo0F9IEew=; b=jGVyNWnVYYx9PeNVbvtQBDDtkwJqQmHZDCc4DJ9i4deaCbzI2U7T+nQbtWNHe/VZKTScPF/PIEotXV6SVZg4VD2FQDFiyaL9ftZr/fHkdPXDNonn1zVaWLIVZMYkoTDSKwlCPUpOORFmXP1cULA4kPvMt02l4MwYJitZiSrJmTc4PyOLNk4uvvBOG2qPAQzL+zpJhuNZeRjzjXe1knXnebvMTnCN8KLGOu8t+zrR2e2C87WJWpSab1WHNjV2itn8T29EKUteFhyOFcZTxBvqh1E+K7qZD4bASieEn9kE2BhiVqmb7sHabg3I0UyowkVSAI5Z4AGUqK9yPagtE5rWUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=uoguelph.ca; dmarc=pass action=none header.from=uoguelph.ca; dkim=pass header.d=uoguelph.ca; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uoguelph.ca; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SMRPEYVPhWuDg68uW7VngwTyCN4nIWdLKyvo0F9IEew=; b=eLYiwMete+u8V5WDEXnUYfrutuX7+1OWI4cOxgPCCEeTF6rJKpzqSsTtCdKsppsRMvV+JrLoyy2IPyThbfd01jCXI05pAtQ7tb27Taxx3KU2k3UKZDkmu9kbgufuuLmUSaZHNlPE+b+s3v6vHD2cV15N4AbLJzRER/RpcyWlwF6f5eQHdmA3SgqEaCQdBjk6lwwBfB8v2gC/vrnsnJreOXh24MHVXQ78V0it4Y1/ipaTug1JpqqAhl57fmEbpmSE2WI4LjqabpVVdiZKA+DaVArmNwx90DfAOS+SAzKF30tnEhxZJkVPn99BSOrFBZ4PCh/UUeHpLWqnOC4YCWSIng== Received: from QB1PR01MB3649.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:32::26) by QB1PR01MB2740.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:38::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17; Sun, 31 May 2020 22:56:56 +0000 Received: from QB1PR01MB3649.CANPRD01.PROD.OUTLOOK.COM ([fe80::dd96:945c:b6ee:ffa2]) by QB1PR01MB3649.CANPRD01.PROD.OUTLOOK.COM ([fe80::dd96:945c:b6ee:ffa2%6]) with mapi id 15.20.3045.024; Sun, 31 May 2020 22:56:56 +0000 From: Rick Macklem To: Rick Macklem , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r361682 - head/include Thread-Topic: svn commit: r361682 - head/include Thread-Index: AQHWN51cHWLMXBa9xkeyZ6psIV/puKjCzTX/ Date: Sun, 31 May 2020 22:56:56 +0000 Message-ID: References: <202005312246.04VMkWc2047251@repo.freebsd.org> In-Reply-To: <202005312246.04VMkWc2047251@repo.freebsd.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 83cb5974-dd97-4fc6-654e-08d805b5eb0e x-ms-traffictypediagnostic: QB1PR01MB2740: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 0420213CCD x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6IRwmPIiNdrDAlyNTrA6fwg4QJFBpFNiXfdnAU0rBb3eSPkm9DYvZUcptraKM8auuMuEeHTxCRXzB3hLLGN81ZZ6j0P+4QfwmQK01Hq/PkNr0WH465fNVChUiZ4ur5fwU8b56D7JAfIhdILnm/itqRSeE2npshT2rgj0Bq3VGqKFcSksUN3l6SQFuxDnyBXxSGFEfK3DVTOchIErqOTXnMN5l2l77de0mUO9Bj62G9TGdc5MmKMPOIsT9V2q80MyMqctXNEm/RaEd7Mz8o9lyWkJz8y7JZ6mluMSawTa1g6eOWIwhn2T8Mz4kjiDqjPv+MPcNTAaSsOFWl58PynQ7Cf17dzsfh+bOj6bzHHBFAe6ZsFgeqjBn5AqkGZNYDriVkq5oBDwFagl64+yyZ60Iw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:QB1PR01MB3649.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFTY:; SFS:(346002)(376002)(366004)(136003)(396003)(39850400004)(966005)(478600001)(7696005)(33656002)(8676002)(450100002)(6506007)(76116006)(9686003)(86362001)(5660300002)(8936002)(52536014)(66446008)(186003)(64756008)(66476007)(66946007)(2906002)(66556008)(83380400001)(316002)(786003)(110136005)(55016002)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: okteQ3GYWBLCRt2zUaobsYb0XsjZ9omhYbrsQWj1DNz64hQPZiq23ofY2O8LMxC2T2ASPI09m+Z3UdotkRU3pRJ+M7yS/Tw8JMDALi100C7ZwsZlTEDYcx20PnE0i2KPJYbK1bQOApPpxDc9Q3+NV/BcPmiXOGYYChH8c267K35tC9HwLoc9nEkSUQRa7JIoN8rIr366fTdsi63eo4bjDvdsgjTItenn8bMFeg7kja1ZIOYktFeI6z06GmV6JP6k+MSa2++QtCYOh3hVpjgzvYpSI120PAD3AnFrK8Qmb/FWk8fVSJgZE/zFgznZhRyMeqVnOMRqxWlIIKy0KD4oA7MKtxduFIGTiFB76ZQNGqq8YEIlEjMjPAPEPOkgJkUb69/ygM0WF8/htJKFO4uUurmw8R2Cee0dvoq/YJa7PbWuQDHUMZjSMMA5dyGRfwiYkEXH+JSJ8HrZEO915I5N+Md/GZDdJGk/KDw092bfFnk/2HLeWXhVYLkLJ7xawWwzAtMMC1ZC7+FI6x7g+88/Sm9yV009y4rSTM3xCbSD0m4= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-Network-Message-Id: 83cb5974-dd97-4fc6-654e-08d805b5eb0e X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2020 22:56:56.2564 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sNiR7ii8iCHiZ7k4Xmzik9LGOV8EE+zcuok5tD6T66XK2ZD3R9dYUuz5/5phT0F2VPQE+TZFgZFawgWRc2KK/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: QB1PR01MB2740 X-Rspamd-Queue-Id: 49ZtwV0B9Jz47SD X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8075, ipnet:40.64.0.0/10, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:56:59 -0000 >Author: rmacklem=0A= >Date: Sun May 31 22:46:32 2020=0A= >New Revision: 361682=0A= >URL: https://svnweb.freebsd.org/changeset/base/361682=0A= >=0A= >Log:=0A= > Oops, I didn't notice the "cd" is needed for each install line.=0A= >=0A= >Modified:=0A= > head/include/Makefile=0A= >=0A= >Modified: head/include/Makefile=0A= >=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=3D=3D=3D= =3D=3D=3D=3D=3D=0A= >--- head/include/Makefile Sun May 31 22:40:39 2020 (r361681)= =0A= >+++ head/include/Makefile Sun May 31 22:46:32 2020 (r361682)= =0A= >@@ -236,6 +236,7 @@ copies: .PHONY .META=0A= > cd ${SRCTOP}/sys/rpc; \=0A= > ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rpcsec_= tls.h \=0A= > ${SDESTDIR}${INCLUDEDIR}/rpc=0A= Or would it be preferable to put a line continuation "\" here instead of ad= ding=0A= the second "cd .."?=0A= =0A= >+ cd ${SRCTOP}/sys/rpc; \=0A= > ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h= \=0A= > ${SDESTDIR}${INCLUDEDIR}/rpc=0A= > cd ${SRCTOP}/sys/teken; \=0A= =0A= rick=0A= ps: I'll admit I tried to do a "make buildworld" but it was still building = clang=0A= after 7 hours, so I gave up...=0A= From owner-svn-src-head@freebsd.org Mon Jun 1 01:25:20 2020 Return-Path: Delivered-To: svn-src-head@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 8F9BF2F74FC; Mon, 1 Jun 2020 01:25:20 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZyCh1WGvz4Jb0; Mon, 1 Jun 2020 01:25:20 +0000 (UTC) (envelope-from kevans@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 2AF1E23425; Mon, 1 Jun 2020 01:25:20 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0511PKl9044667; Mon, 1 Jun 2020 01:25:20 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0511PJw3044666; Mon, 1 Jun 2020 01:25:19 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006010125.0511PJw3044666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 1 Jun 2020 01:25:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361683 - head/usr.sbin/certctl X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/usr.sbin/certctl X-SVN-Commit-Revision: 361683 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 01:25:20 -0000 Author: kevans Date: Mon Jun 1 01:25:19 2020 New Revision: 361683 URL: https://svnweb.freebsd.org/changeset/base/361683 Log: certctl: fix test syntax test doesn't understand &&, but it does understand -a. MFC after: 1 week Modified: head/usr.sbin/certctl/certctl.sh Modified: head/usr.sbin/certctl/certctl.sh ============================================================================== --- head/usr.sbin/certctl/certctl.sh Sun May 31 22:46:32 2020 (r361682) +++ head/usr.sbin/certctl/certctl.sh Mon Jun 1 01:25:19 2020 (r361683) @@ -102,7 +102,7 @@ do_scan() [ -d "$CPATH" ] || continue echo "Scanning $CPATH for certificates..." for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do - [ -e "$CPATH/$CFILE" && $UNPRIV -eq 0 ] || continue + [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue [ $VERBOSE -gt 0 ] && echo "Reading $CFILE" "$CFUNC" "$CPATH/$CFILE" done From owner-svn-src-head@freebsd.org Mon Jun 1 01:37:52 2020 Return-Path: Delivered-To: svn-src-head@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 C4CE52F81B6 for ; Mon, 1 Jun 2020 01:37:52 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZyV84rqnz4L1N for ; Mon, 1 Jun 2020 01:37:52 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 9B1862AC45 for ; Mon, 1 Jun 2020 01:37:52 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f49.google.com with SMTP id dp10so3754609qvb.10 for ; Sun, 31 May 2020 18:37:52 -0700 (PDT) X-Gm-Message-State: AOAM5326ZXF4wyFlUB5HMSHcu5YPJZ6Pkn64wjlyPueiaQiFF3h8f4X2 RC4rW0jAIMp9NHLWrLMyKhLTjRodRX+3V2sibYI= X-Received: by 2002:a0c:c2c2:: with SMTP id c2mt18683534qvi.150.1590975472201; Sun, 31 May 2020 18:37:52 -0700 (PDT) MIME-Version: 1.0 References: <202006010125.0511PJw3044666@repo.freebsd.org> In-Reply-To: <202006010125.0511PJw3044666@repo.freebsd.org> From: Kyle Evans Date: Sun, 31 May 2020 20:37:41 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361683 - head/usr.sbin/certctl Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 01:37:52 -0000 n Sun, May 31, 2020 at 8:25 PM Kyle Evans wrote: > > Author: kevans > Date: Mon Jun 1 01:25:19 2020 > New Revision: 361683 > URL: https://svnweb.freebsd.org/changeset/base/361683 > > Log: > certctl: fix test syntax > > test doesn't understand &&, but it does understand -a. > > MFC after: 1 week > Sorry, this was a pretty low-quality commit message; && is a shell construct, so the previous version lead to a lot of spam as the [ invocation was split and the ] terminator lost. > Modified: > head/usr.sbin/certctl/certctl.sh > > Modified: head/usr.sbin/certctl/certctl.sh > ============================================================================== > --- head/usr.sbin/certctl/certctl.sh Sun May 31 22:46:32 2020 (r361682) > +++ head/usr.sbin/certctl/certctl.sh Mon Jun 1 01:25:19 2020 (r361683) > @@ -102,7 +102,7 @@ do_scan() > [ -d "$CPATH" ] || continue > echo "Scanning $CPATH for certificates..." > for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do > - [ -e "$CPATH/$CFILE" && $UNPRIV -eq 0 ] || continue > + [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue > [ $VERBOSE -gt 0 ] && echo "Reading $CFILE" > "$CFUNC" "$CPATH/$CFILE" > done From owner-svn-src-head@freebsd.org Mon Jun 1 02:54:11 2020 Return-Path: Delivered-To: svn-src-head@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 86D5F2F984B; Mon, 1 Jun 2020 02:54:11 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b0BC2m0wz4QXL; Mon, 1 Jun 2020 02:54:11 +0000 (UTC) (envelope-from kevans@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 59B2824443; Mon, 1 Jun 2020 02:54:11 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0512sBkE000163; Mon, 1 Jun 2020 02:54:11 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0512sBV0000162; Mon, 1 Jun 2020 02:54:11 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006010254.0512sBV0000162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 1 Jun 2020 02:54:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361684 - head/usr.bin/svn/lib/libapr X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/usr.bin/svn/lib/libapr X-SVN-Commit-Revision: 361684 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 02:54:11 -0000 Author: kevans Date: Mon Jun 1 02:54:10 2020 New Revision: 361684 URL: https://svnweb.freebsd.org/changeset/base/361684 Log: apr: build some needed emulated 64-bit atomic bits after r361678 This should fix the build on armv{6,7}, mips, and mips64, which all need emulated 64-bit atomics for apr. X-MFC-With: r361678 Modified: head/usr.bin/svn/lib/libapr/Makefile Modified: head/usr.bin/svn/lib/libapr/Makefile ============================================================================== --- head/usr.bin/svn/lib/libapr/Makefile Mon Jun 1 01:25:19 2020 (r361683) +++ head/usr.bin/svn/lib/libapr/Makefile Mon Jun 1 02:54:10 2020 (r361684) @@ -19,6 +19,7 @@ SRCS= apr_cpystrn.c \ apr_tables.c \ buffer.c \ builtins.c \ + builtins64.c \ charset.c \ common.c \ copy.c \ @@ -45,6 +46,7 @@ SRCS= apr_cpystrn.c \ mmap.c \ multicast.c \ mutex.c \ + mutex64.c \ open.c \ otherchild.c \ pipe.c \ From owner-svn-src-head@freebsd.org Mon Jun 1 03:37:59 2020 Return-Path: Delivered-To: svn-src-head@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 883AB2FADA2; Mon, 1 Jun 2020 03:37:59 +0000 (UTC) (envelope-from peter@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b18l37cGz4V4K; Mon, 1 Jun 2020 03:37:59 +0000 (UTC) (envelope-from peter@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 66C8F24D9F; Mon, 1 Jun 2020 03:37:59 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0513bxEK025997; Mon, 1 Jun 2020 03:37:59 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0513bx0N025996; Mon, 1 Jun 2020 03:37:59 GMT (envelope-from peter@FreeBSD.org) Message-Id: <202006010337.0513bx0N025996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Mon, 1 Jun 2020 03:37:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361685 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: peter X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 361685 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 03:37:59 -0000 Author: peter Date: Mon Jun 1 03:37:58 2020 New Revision: 361685 URL: https://svnweb.freebsd.org/changeset/base/361685 Log: Clarify which hints file is the source of an error message. PR: 246688 Submitted by: Ashish Gupta MFC after: 1 week Modified: head/sys/kern/kern_linker.c Modified: head/sys/kern/kern_linker.c ============================================================================== --- head/sys/kern/kern_linker.c Mon Jun 1 02:54:10 2020 (r361684) +++ head/sys/kern/kern_linker.c Mon Jun 1 03:37:58 2020 (r361685) @@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con * XXX: we need to limit this number to some reasonable value */ if (vattr.va_size > LINKER_HINTS_MAX) { - printf("hints file too large %ld\n", (long)vattr.va_size); + printf("linker.hints file too large %ld\n", (long)vattr.va_size); goto bad; } hints = malloc(vattr.va_size, M_TEMP, M_WAITOK); @@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con intp = (int *)hints; ival = *intp++; if (ival != LINKER_HINTS_VERSION) { - printf("hints file version mismatch %d\n", ival); + printf("linker.hints file version mismatch %d\n", ival); goto bad; } bufend = hints + vattr.va_size; From owner-svn-src-head@freebsd.org Mon Jun 1 06:10:25 2020 Return-Path: Delivered-To: svn-src-head@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 DF65332B157; Mon, 1 Jun 2020 06:10:25 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b4Xd5Zzpz4CXX; Mon, 1 Jun 2020 06:10:25 +0000 (UTC) (envelope-from adrian@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 B639026B27; Mon, 1 Jun 2020 06:10:25 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0516APWf017802; Mon, 1 Jun 2020 06:10:25 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0516APxk017801; Mon, 1 Jun 2020 06:10:25 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006010610.0516APxk017801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 1 Jun 2020 06:10:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361687 - head/sys/dev/ath X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/ath X-SVN-Commit-Revision: 361687 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 06:10:25 -0000 Author: adrian Date: Mon Jun 1 06:10:25 2020 New Revision: 361687 URL: https://svnweb.freebsd.org/changeset/base/361687 Log: [ath] Don't re-program the beacon timers if we miss a beacon in software-beacon STA mode. This is something I added a few years ago to handle resyncing the beacon if we miss a beacon or need to sync after association/reassociation/powersave. However, if we're doing STA+AP mode (eg DWDS) then we don't want to reprogram the beacons here; this may upset normal AP operation. I missed checking for the sc->sc_swbmiss flag so I was reinitialising the beacon timers after every beacon miss / TSFOOR option, and that isn't likely good. This plus ensuring that STA's are created with "-beacon" to disable BMISS/TSFOOR processing will hopefully quieten some of the issues I've seen with missed beacons / TSFOOR (out of range) interrupts coming in when operating in STA mode. Tested: * AR9380/AR9580, STA+AP modes Modified: head/sys/dev/ath/if_ath_rx.c Modified: head/sys/dev/ath/if_ath_rx.c ============================================================================== --- head/sys/dev/ath/if_ath_rx.c Mon Jun 1 05:14:01 2020 (r361686) +++ head/sys/dev/ath/if_ath_rx.c Mon Jun 1 06:10:25 2020 (r361687) @@ -447,9 +447,17 @@ ath_recv_mgmt(struct ieee80211_node *ni, struct mbuf * (unsigned int) (nexttbtt >> 10), (int32_t) tsf_beacon - (int32_t) nexttbtt + tsf_intval); - /* We only do syncbeacon on STA VAPs; not on IBSS */ + /* + * We only do syncbeacon on STA VAPs; not on IBSS; + * but don't do it with swbmiss enabled or we + * may end up overwriting AP mode beacon config. + * + * The driver (and net80211) should be smarter about + * this.. + */ if (vap->iv_opmode == IEEE80211_M_STA && sc->sc_syncbeacon && + (!sc->sc_swbmiss) && ni == vap->iv_bss && (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP)) { DPRINTF(sc, ATH_DEBUG_BEACON, From owner-svn-src-head@freebsd.org Mon Jun 1 06:18:36 2020 Return-Path: Delivered-To: svn-src-head@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 80E2732B79A; Mon, 1 Jun 2020 06:18:36 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49b4k334Bvz4Cy7; Mon, 1 Jun 2020 06:18:35 +0000 (UTC) (envelope-from ohartmann@walstatt.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1590992313; bh=5eNx+Ws/eIIY1/SmLO/0+rQSj62YWQnAMend/x7Ltt8=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=MkXVCYDUFvhgxIRpZXdK4jlnrks8WfW+1qnv1tPTLF+b9K5jnXBDT30t8vh37oCwG kJoJ1T7GU56Kg2Vg4mS6dsMp7KsPr/j9RgHxwvmy3Q/sBeH0/I9Ya+dUQ9buKcLTRb LbchzB2O/mMBMaRJFNEQBTg4QpOxpJFnUOXeTwcc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from hermann.fritz.box ([77.11.115.59]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MfpOd-1j4Lwn2drt-00gEt3; Mon, 01 Jun 2020 08:18:32 +0200 Date: Mon, 1 Jun 2020 08:18:24 +0200 From: "Hartmann, O." To: "Hartmann, O." Cc: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361633 - in head/sys: net netipsec Message-ID: <20200601081810.79c9fb1d@hermann.fritz.box> In-Reply-To: <20200531114318.2b415934@hermann.fritz.box> References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> Organization: walstatt.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/OrJnGUcm8Wr1o6kmQJCtzC4"; protocol="application/pgp-signature" X-Provags-ID: V03:K1:l+IRWm4Q1IDTcGuzY0DujcpWraVIsI5XTZz48G1hb1i0t9I6hC4 p8lMD3+NT+MNMvXhvb+zmZnS2mi97JFcL19I63MfYg2A9Fa3nUHn6kuQ3kDLTazTW6Gp0bz Jikr1YA/a+KzrCX9Pw5tVv3L1x4goWFoXiHyZAQjkXKqJ4PYg+C6rNm9a7HT5C3wGJpuNFw IN7tkISQWJkN9+x/9tzwQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:4j9GdYTnaRg=:SXCNnqcS18EtoFb1CYf8Vv DCAcoDbCf1O/bcSEq2fOEO5lKqKhBEAc70riFT1w8gruleyzWDntu5LpLI6HA01YMIGtrvkZQ iciwNW2lgh7p7eJgWt9TuVvb2/eMrDppXmLbtpzxpb30lkrKm5rmNCN4xaNe01srCe1AXnLQs 6vEahBcyPiAR4PETv7VuOEM5uhS2TRx0M2/heELhhXLpegUvEFr15MAOD3Uh8uG0Jm6C6ml5e poo5tqc62iXc4uTb0ZHL4rFPHXGbSOXiiMbGI5Mpn6raknJKqB79QWT4tKk6MK2l4TYjHzaSm zX02xXspez+6JIkLymDKXxQSWElhtt/t2hX7soEq5PiZrvgCrFCKpWRb0WGjJNgZmQMlmmheV B6oLjz4gvxAfBlHcEFXPpWtSEft/X6FUJ5g2RKCDDEezxOHi7v4fhUbF0eVHPR8Pkcg36VBGw wazfGRqZVzI8rPs/sA6laeemC0AOvXihSwaeq+GOoIypazHLwnkmOnGRxTO01glBSuvuZjGsW JdqSiABswF4snt4MwxYpsGgY9gIZ/IPIhDEEWVpLDGDcNTvvJ5PQL2V/VYSWq+0kbhDv2KloD adPMikouQFpapM+DkkVWRWr7Qn373hgR/Z44uhB+8x/h/vfqer1TPxmewapj94jqlSrzEwWtO MrLbIz7uCrLOYFZROuMKQG+SiHdyJqjkXTEXe8J1NPRkByiWQEp5c9hkps6n/nxhXLRka7jGt 2RSmPzvxmxSb7IWH2g+5PNI50TDvO0Q0hANue3iLA10VuvgDt4w9jnx/KbXtVvoyMBi3bZCd4 ONUXZRgJpoe8SJm/4HAZ01f+fKmJPajABChffc8j+QsceJwSiM75XojLWOGfelUdaxkHYEIGR OiduWNKHK8+dXHPsAJSWnp6PwHFH0B+ktdamU2hvIW2Ot24ECfMSc87XsBGPD9wwkgsFLXkfw UVViysNk95+IB1gRtjIZH61pB+2ST0YGUZKryhVsZcUhwR1lDZ4ni5kcTZ2WPqJ030b6KVQFy 0hyemc2Novy1XDYosDXBhTMKXSPSsNNVI6vcNmneoHVkr0+97SYACpZiNinET05pTIB1xuGZu Sv0cJT9C1ylkOfxnoa8q4MdujV7+8lURbwMT5GtiLMhjYa6/UJ9rrnY0oEYsMEngIwUXf7TBd 08vta2DSATBF33K45sQBKAp9nP4icJbaV3CwHYKKmf5I/YeK/oWC/0o7+yQSogOsLrDbiKpcC qzNtP69DizyNzTAkl X-Rspamd-Queue-Id: 49b4k334Bvz4Cy7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=MkXVCYDU; dmarc=none; spf=none (mx1.freebsd.org: domain of ohartmann@walstatt.org has no SPF policy when checking 212.227.15.19) smtp.mailfrom=ohartmann@walstatt.org X-Spamd-Result: default: False [-2.33 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RWL_MAILSPIKE_NEUTRAL(0.00)[212.227.15.19:from]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-0.89)[-0.886]; NEURAL_HAM_LONG(-0.84)[-0.841]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[walstatt.org]; RCPT_COUNT_FIVE(0.00)[5]; HAS_ORG_HEADER(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[77.11.115.59:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmx.net:+]; NEURAL_HAM_SHORT(-0.11)[-0.108]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; RCVD_TLS_ALL(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[212.227.15.19:from] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 06:18:36 -0000 --Sig_/OrJnGUcm8Wr1o6kmQJCtzC4 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 31 May 2020 11:43:18 +0200 "Hartmann, O." wrote: > On Fri, 29 May 2020 19:22:40 +0000 (UTC) > John Baldwin wrote: >=20 > > Author: jhb > > Date: Fri May 29 19:22:40 2020 > > New Revision: 361633 > > URL: https://svnweb.freebsd.org/changeset/base/361633 > >=20 > > Log: > > Consistently include opt_ipsec.h for consumers of > > .=20 > > This fixes ipsec.ko to include all of IPSEC_DEBUG. > > =20 > > Reviewed by: imp > > MFC after: 2 weeks > > Sponsored by: Netflix > > Differential Revision: https://reviews.freebsd.org/D25046 > >=20 > > Modified: > > head/sys/net/if_enc.c > > head/sys/net/if_ipsec.c > > head/sys/netipsec/ipsec.h > > head/sys/netipsec/ipsec_mbuf.c > > head/sys/netipsec/xform_ah.c > > head/sys/netipsec/xform_esp.c > > head/sys/netipsec/xform_ipcomp.c > >=20 > > Modified: head/sys/net/if_enc.c > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/net/if_enc.c Fri May 29 19:21:35 2020 > > (r361632) +++ head/sys/net/if_enc.c Fri May 29 19:22:40 > > 2020 (r361633) @@ -32,6 +32,7 @@ > > =20 > > #include "opt_inet.h" > > #include "opt_inet6.h" > > +#include "opt_ipsec.h" > > =20 > > #include > > #include > >=20 > > Modified: head/sys/net/if_ipsec.c > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/net/if_ipsec.c Fri May 29 19:21:35 2020 > > (r361632) +++ head/sys/net/if_ipsec.c Fri May 29 19:22:40 > > 2020 (r361633) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); > > =20 > > #include "opt_inet.h" > > #include "opt_inet6.h" > > +#include "opt_ipsec.h" > > =20 > > #include > > #include > >=20 > > Modified: head/sys/netipsec/ipsec.h > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/netipsec/ipsec.h Fri May 29 19:21:35 2020 > > (r361632) +++ head/sys/netipsec/ipsec.h Fri May 29 19:22:40 > > 2020 (r361633) @@ -39,11 +39,6 @@ > > #ifndef _NETIPSEC_IPSEC_H_ > > #define _NETIPSEC_IPSEC_H_ > > =20 > > -#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE) > > -#include "opt_inet.h" > > -#include "opt_ipsec.h" > > -#endif > > - > > #include > > #include > > =20 > >=20 > > Modified: head/sys/netipsec/ipsec_mbuf.c > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/netipsec/ipsec_mbuf.c Fri May 29 19:21:35 > > 2020 (r361632) +++ head/sys/netipsec/ipsec_mbuf.c Fri > > May 29 19:22:40 2020 (r361633) @@ -32,6 +32,8 @@ > > * IPsec-specific mbuf routines. > > */ > > =20 > > +#include "opt_ipsec.h" > > + > > #include > > #include > > #include > >=20 > > Modified: head/sys/netipsec/xform_ah.c > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/netipsec/xform_ah.c Fri May 29 19:21:35 > > 2020 (r361632) +++ head/sys/netipsec/xform_ah.c Fri > > May 29 19:22:40 2020 (r361633) @@ -38,6 +38,7 @@ > > */ > > #include "opt_inet.h" > > #include "opt_inet6.h" > > +#include "opt_ipsec.h" > > =20 > > #include > > #include > >=20 > > Modified: head/sys/netipsec/xform_esp.c > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/netipsec/xform_esp.c Fri May 29 19:21:35 > > 2020 (r361632) +++ head/sys/netipsec/xform_esp.c Fri > > May 29 19:22:40 2020 (r361633) @@ -37,6 +37,7 @@ > > */ > > #include "opt_inet.h" > > #include "opt_inet6.h" > > +#include "opt_ipsec.h" > > =20 > > #include > > #include > >=20 > > Modified: head/sys/netipsec/xform_ipcomp.c > > =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=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/netipsec/xform_ipcomp.c Fri May 29 19:21:35 > > 2020 (r361632) +++ head/sys/netipsec/xform_ipcomp.c > > Fri May 29 19:22:40 2020 (r361633) @@ -33,6 +33,7 @@ > > /* IP payload compression protocol (IPComp), see RFC 2393 */ > > #include "opt_inet.h" > > #include "opt_inet6.h" > > +#include "opt_ipsec.h" > > =20 > > #include > > #include > > _______________________________________________ > > svn-src-head@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-src-head > > To unsubscribe, send any mail to > > "svn-src-head-unsubscribe@freebsd.org" =20 >=20 >=20 > In my case, kernel build (make buildkernel) fails with the comnpiler > error shown below while compiling ipsec kernel module. Kernel has > IPSEC support enabled. >=20 > Kind regards, > oh >=20 > [...] > --- all_subdir_ipsec --- > --- ipsec_mod.o --- > /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration > of function 'ipsec_support_enable' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ > /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration > of function 'ipsec_support_disable' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- > Building > /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwf= w/ipw_bss/ipw_bss.ko > --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: > note: did you mean 'ipsec_support_enable'? > /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' > declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); > ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 >=20 > make[4]: stopped in /usr/src/sys/modules/ipsec FYI: IPSEC is statically built into the kernel via "options IPSEC" --Sig_/OrJnGUcm8Wr1o6kmQJCtzC4 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCXtSdsQAKCRA4N1ZZPba5 R8FqAQDYX0a5cvd5FPLl82ieEIcIe9xnh2WcZn0VLAYTq2imcQEA5vS9EHO9ONzQ g0P3d2BfjbDILjM6QyfZz/cuV/kxOAU= =xPOk -----END PGP SIGNATURE----- --Sig_/OrJnGUcm8Wr1o6kmQJCtzC4-- From owner-svn-src-head@freebsd.org Mon Jun 1 09:01:14 2020 Return-Path: Delivered-To: svn-src-head@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 9D50932F2D3; Mon, 1 Jun 2020 09:01:14 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b8Kk3kCsz4Rk7; Mon, 1 Jun 2020 09:01:14 +0000 (UTC) (envelope-from bapt@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 7AB358E1D; Mon, 1 Jun 2020 09:01:14 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05191E6G023383; Mon, 1 Jun 2020 09:01:14 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05191EWi023381; Mon, 1 Jun 2020 09:01:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202006010901.05191EWi023381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 1 Jun 2020 09:01:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361688 - in head/usr.bin/diff: . tests X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/usr.bin/diff: . tests X-SVN-Commit-Revision: 361688 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 09:01:14 -0000 Author: bapt Date: Mon Jun 1 09:01:13 2020 New Revision: 361688 URL: https://svnweb.freebsd.org/changeset/base/361688 Log: Restore compatibility with GNU diff regarding --label Various options to "diff(1)" show filenames, and traditionally make use of the "--label" parameter, if set. Restore this behaviour in BSD diff. While here add a regression test PR: 244533 Submitted by: Jamie Landeg-Jones MFC after: 3 days Modified: head/usr.bin/diff/diff.c head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/diff.c ============================================================================== --- head/usr.bin/diff/diff.c Mon Jun 1 06:10:25 2020 (r361687) +++ head/usr.bin/diff/diff.c Mon Jun 1 09:01:13 2020 (r361688) @@ -465,6 +465,9 @@ print_only(const char *path, size_t dirlen, const char void print_status(int val, char *path1, char *path2, const char *entry) { + if (label[0] != NULL) path1 = label[0]; + if (label[1] != NULL) path2 = label[1]; + switch (val) { case D_BINARY: printf("Binary files %s%s and %s%s differ\n", Modified: head/usr.bin/diff/tests/diff_test.sh ============================================================================== --- head/usr.bin/diff/tests/diff_test.sh Mon Jun 1 06:10:25 2020 (r361687) +++ head/usr.bin/diff/tests/diff_test.sh Mon Jun 1 09:01:13 2020 (r361688) @@ -12,6 +12,7 @@ atf_test_case b230049 atf_test_case Bflag atf_test_case tabsize atf_test_case conflicting_format +atf_test_case label simple_body() { @@ -195,6 +196,17 @@ conflicting_format_body() atf_check -s exit:1 -o ignore -e ignore diff --normal --normal A B } +label_body() +{ + printf "\tA\n" > A + + atf_check -o inline:"Files hello and world are identical\n" \ + -s exit:0 diff --label hello --label world -s A A + + atf_check -o inline:"Binary files hello and world differ\n" \ + -s exit:1 diff --label hello --label world `which diff` `which ls` +} + atf_init_test_cases() { atf_add_test_case simple @@ -209,4 +221,5 @@ atf_init_test_cases() atf_add_test_case Bflag atf_add_test_case tabsize atf_add_test_case conflicting_format + atf_add_test_case label } From owner-svn-src-head@freebsd.org Mon Jun 1 09:09:37 2020 Return-Path: Delivered-To: svn-src-head@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 B888932F1DF; Mon, 1 Jun 2020 09:09:37 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b8WP4QwNz4ShT; Mon, 1 Jun 2020 09:09:37 +0000 (UTC) (envelope-from bapt@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 793368CA5; Mon, 1 Jun 2020 09:09:37 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05199bMD028864; Mon, 1 Jun 2020 09:09:37 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05199blo028862; Mon, 1 Jun 2020 09:09:37 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202006010909.05199blo028862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 1 Jun 2020 09:09:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361689 - in head/usr.bin/diff: . tests X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/usr.bin/diff: . tests X-SVN-Commit-Revision: 361689 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 09:09:37 -0000 Author: bapt Date: Mon Jun 1 09:09:36 2020 New Revision: 361689 URL: https://svnweb.freebsd.org/changeset/base/361689 Log: diff: restore compatibility with GNU diff regarding -N option When -N is used the missing files are treated as empty. PR: 233402 Submitted by: Fehmi Noyan Isi Reported by: Roman Neuhauser MFC after: 3 days Differential Revision: D25081 Modified: head/usr.bin/diff/diff.c head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/diff.c ============================================================================== --- head/usr.bin/diff/diff.c Mon Jun 1 09:01:13 2020 (r361688) +++ head/usr.bin/diff/diff.c Mon Jun 1 09:09:36 2020 (r361689) @@ -27,6 +27,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -351,13 +352,33 @@ main(int argc, char **argv) if (strcmp(argv[0], "-") == 0) { fstat(STDIN_FILENO, &stb1); gotstdin = 1; - } else if (stat(argv[0], &stb1) != 0) - err(2, "%s", argv[0]); + } else if (stat(argv[0], &stb1) != 0) { + if (!Nflag || errno != ENOENT) + err(2, "%s", argv[0]); + dflags |= D_EMPTY1; + memset(&stb1, 0, sizeof(struct stat)); + } + if (strcmp(argv[1], "-") == 0) { fstat(STDIN_FILENO, &stb2); gotstdin = 1; - } else if (stat(argv[1], &stb2) != 0) - err(2, "%s", argv[1]); + } else if (stat(argv[1], &stb2) != 0) { + if (!Nflag || errno != ENOENT) + err(2, "%s", argv[1]); + dflags |= D_EMPTY2; + memset(&stb2, 0, sizeof(stb2)); + stb2.st_mode = stb1.st_mode; + } + + if (dflags & D_EMPTY1 && dflags & D_EMPTY2){ + warn("%s", argv[0]); + warn("%s", argv[1]); + exit(2); + } + + if (stb1.st_mode == 0) + stb1.st_mode = stb2.st_mode; + if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) errx(2, "can't compare - to a directory"); set_argstr(oargv, argv); Modified: head/usr.bin/diff/tests/diff_test.sh ============================================================================== --- head/usr.bin/diff/tests/diff_test.sh Mon Jun 1 09:01:13 2020 (r361688) +++ head/usr.bin/diff/tests/diff_test.sh Mon Jun 1 09:09:36 2020 (r361689) @@ -10,6 +10,7 @@ atf_test_case side_by_side atf_test_case brief_format atf_test_case b230049 atf_test_case Bflag +atf_test_case Nflag atf_test_case tabsize atf_test_case conflicting_format atf_test_case label @@ -165,6 +166,15 @@ Bflag_body() atf_check -s exit:1 -o file:"$(atf_get_srcdir)/Bflag_F.out" diff -B E F } +Nflag_body() +{ + atf_check -x 'printf "foo" > A' + + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 +} + tabsize_body() { printf "\tA\n" > A @@ -219,6 +229,7 @@ atf_init_test_cases() atf_add_test_case brief_format atf_add_test_case b230049 atf_add_test_case Bflag + atf_add_test_case Nflag atf_add_test_case tabsize atf_add_test_case conflicting_format atf_add_test_case label From owner-svn-src-head@freebsd.org Mon Jun 1 09:15:16 2020 Return-Path: Delivered-To: svn-src-head@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 4451F32F670; Mon, 1 Jun 2020 09:15:16 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b8dw0Zynz4T69; Mon, 1 Jun 2020 09:15:16 +0000 (UTC) (envelope-from bapt@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 0AF8C8E52; Mon, 1 Jun 2020 09:15:16 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0519FFcO034852; Mon, 1 Jun 2020 09:15:15 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0519FFZB034851; Mon, 1 Jun 2020 09:15:15 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202006010915.0519FFZB034851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 1 Jun 2020 09:15:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361690 - head/usr.bin/diff X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/usr.bin/diff X-SVN-Commit-Revision: 361690 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 09:15:16 -0000 Author: bapt Date: Mon Jun 1 09:15:15 2020 New Revision: 361690 URL: https://svnweb.freebsd.org/changeset/base/361690 Log: Document long version of -b option PR: 234195 Submitted by: Fehmi Noyan Isi Reported by: Andras Farkas MFC after: 3 days Modified: head/usr.bin/diff/diff.1 Modified: head/usr.bin/diff/diff.1 ============================================================================== --- head/usr.bin/diff/diff.1 Mon Jun 1 09:09:36 2020 (r361689) +++ head/usr.bin/diff/diff.1 Mon Jun 1 09:15:15 2020 (r361690) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd February 13, 2020 +.Dd June 1, 2020 .Dt DIFF 1 .Os .Sh NAME @@ -330,7 +330,7 @@ Use of this option forces to produce a diff. .It Fl B Fl -ignore-blank-lines Causes chunks that include only blank lines to be ignored. -.It Fl b +.It Fl b -ignore-space-change Causes trailing blanks (spaces and tabs) to be ignored, and other strings of blanks to compare equal. .It Fl d -minimal From owner-svn-src-head@freebsd.org Mon Jun 1 10:08:19 2020 Return-Path: Delivered-To: svn-src-head@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 58054330AD4; Mon, 1 Jun 2020 10:08:19 +0000 (UTC) (envelope-from dim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b9q71g3yz4YYs; Mon, 1 Jun 2020 10:08:19 +0000 (UTC) (envelope-from dim@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 1B49E9B9E; Mon, 1 Jun 2020 10:08:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051A8I47065467; Mon, 1 Jun 2020 10:08:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051A8IsE065465; Mon, 1 Jun 2020 10:08:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202006011008.051A8IsE065465@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Jun 2020 10:08:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361691 - head/usr.bin/svn/lib/libapr X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: head/usr.bin/svn/lib/libapr X-SVN-Commit-Revision: 361691 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 10:08:19 -0000 Author: dim Date: Mon Jun 1 10:08:18 2020 New Revision: 361691 URL: https://svnweb.freebsd.org/changeset/base/361691 Log: Follow-up r361678 (update apr to 1.7.0) by also regenerating the apr internal headers through the upstream configure script, with some minor custom tweaks. MFC after: 2 weeks X-MFC-With: r361677 Modified: head/usr.bin/svn/lib/libapr/apr.h head/usr.bin/svn/lib/libapr/apr_private.h Modified: head/usr.bin/svn/lib/libapr/apr.h ============================================================================== --- head/usr.bin/svn/lib/libapr/apr.h Mon Jun 1 09:15:15 2020 (r361690) +++ head/usr.bin/svn/lib/libapr/apr.h Mon Jun 1 10:08:18 2020 (r361691) @@ -95,6 +95,7 @@ #define APR_HAVE_STDLIB_H 1 #define APR_HAVE_STRING_H 1 #define APR_HAVE_STRINGS_H 1 +#define APR_HAVE_INTTYPES_H 1 #define APR_HAVE_SYS_IOCTL_H 1 #define APR_HAVE_SYS_SENDFILE_H 0 #define APR_HAVE_SYS_SIGNAL_H 1 @@ -170,16 +171,25 @@ #include #endif -#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) +#if APR_HAVE_STDINT_H +#ifdef __cplusplus /* C99 7.18.4 requires that stdint.h only exposes INT64_C * and UINT64_C for C++ implementations if this is defined: */ +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS #endif - -#if APR_HAVE_STDINT_H +/* C++ needs this too for PRI*NN formats: */ +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS +#endif +#endif /* __cplusplus */ #include #endif +#if APR_HAVE_INTTYPES_H +#include +#endif + #if APR_HAVE_SYS_WAIT_H #include #endif @@ -199,6 +209,13 @@ #endif #endif +/* __APPLE__ is now the official pre-defined macro for macOS */ +#ifdef __APPLE__ +#undef DARWIN +#undef DARWIN_10 +#define DARWIN +#define DARWIN_10 +#endif /* __APPLE__ */ #ifdef __cplusplus extern "C" { @@ -219,10 +236,10 @@ extern "C" { #define APR_HAVE_SHMEM_BEOS 0 #define APR_USE_SHMEM_MMAP_TMP 0 -#define APR_USE_SHMEM_MMAP_SHM 1 +#define APR_USE_SHMEM_MMAP_SHM 0 #define APR_USE_SHMEM_MMAP_ZERO 0 #define APR_USE_SHMEM_SHMGET_ANON 0 -#define APR_USE_SHMEM_SHMGET 0 +#define APR_USE_SHMEM_SHMGET 1 #define APR_USE_SHMEM_MMAP_ANON 1 #define APR_USE_SHMEM_BEOS 0 @@ -237,7 +254,7 @@ extern "C" { #define APR_HAS_SYSVSEM_SERIALIZE 1 #define APR_HAS_POSIXSEM_SERIALIZE 1 #define APR_HAS_FCNTL_SERIALIZE 1 -#define APR_HAS_PROC_PTHREAD_SERIALIZE 0 +#define APR_HAS_PROC_PTHREAD_SERIALIZE 1 #define APR_PROCESS_LOCK_IS_GLOBAL 0 @@ -247,6 +264,7 @@ extern "C" { #define APR_HAVE_INET_ADDR 1 #define APR_HAVE_INET_NETWORK 1 #define APR_HAVE_IPV6 1 +#define APR_HAVE_SOCKADDR_UN 1 #define APR_HAVE_MEMMOVE 1 #define APR_HAVE_SETRLIMIT 1 #define APR_HAVE_SIGACTION 1 @@ -273,7 +291,7 @@ extern "C" { #define APR_HAS_FORK 1 #define APR_HAS_RANDOM 1 #define APR_HAS_OTHER_CHILD 1 -#define APR_HAS_DSO 0 +#define APR_HAS_DSO 1 #define APR_HAS_SO_ACCEPTFILTER 1 #define APR_HAS_UNICODE_FS 0 #define APR_HAS_PROC_INVOKED 0 @@ -281,6 +299,7 @@ extern "C" { #define APR_HAS_LARGE_FILES 0 #define APR_HAS_XTHREAD_FILES 0 #define APR_HAS_OS_UUID 1 +#define APR_HAS_TIMEDLOCKS 1 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0 @@ -340,31 +359,35 @@ typedef unsigned int apr_uint32_t; */ #ifdef DARWIN_10 #undef APR_SIZEOF_VOIDP -#undef INT64_C -#undef UINT64_C +#undef APR_INT64_C +#undef APR_UINT64_C #ifdef __LP64__ typedef long apr_int64_t; typedef unsigned long apr_uint64_t; #define APR_SIZEOF_VOIDP 8 - #define INT64_C(v) (v ## L) - #define UINT64_C(v) (v ## UL) + #define APR_INT64_C(v) (v ## L) + #define APR_UINT64_C(v) (v ## UL) #else typedef long long apr_int64_t; typedef unsigned long long apr_uint64_t; #define APR_SIZEOF_VOIDP 4 - #define INT64_C(v) (v ## LL) - #define UINT64_C(v) (v ## ULL) + #define APR_INT64_C(v) (v ## LL) + #define APR_UINT64_C(v) (v ## ULL) #endif #else typedef __int64_t apr_int64_t; typedef __uint64_t apr_uint64_t; + + /* Mechanisms to properly type numeric literals */ + #define APR_INT64_C(val) INT64_C(val) + #define APR_UINT64_C(val) UINT64_C(val) #endif typedef size_t apr_size_t; typedef ssize_t apr_ssize_t; typedef off_t apr_off_t; typedef socklen_t apr_socklen_t; -typedef unsigned int apr_ino_t; +typedef __ino_t apr_ino_t; #if APR_SIZEOF_VOIDP == 8 typedef apr_uint64_t apr_uintptr_t; @@ -380,10 +403,6 @@ typedef apr_uint32_t apr_uintptr_t; #else #error Unknown byte order. #endif - -/* Mechanisms to properly type numeric literals */ -#define APR_INT64_C(val) INT64_C(val) -#define APR_UINT64_C(val) UINT64_C(val) #ifdef INT16_MIN #define APR_INT16_MIN INT16_MIN Modified: head/usr.bin/svn/lib/libapr/apr_private.h ============================================================================== --- head/usr.bin/svn/lib/libapr/apr_private.h Mon Jun 1 09:15:15 2020 (r361690) +++ head/usr.bin/svn/lib/libapr/apr_private.h Mon Jun 1 10:08:18 2020 (r361691) @@ -11,6 +11,9 @@ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ +/* Define if apr_allocator should use guard pages */ +/* #undef APR_ALLOCATOR_GUARD_PAGES */ + /* Define if apr_allocator should use mmap */ /* #undef APR_ALLOCATOR_USES_MMAP */ @@ -21,6 +24,9 @@ /* Define as function used for conversion of strings to apr_off_t */ #define APR_OFF_T_STRFN strtol +/* Define if pool functions should abort if concurrent usage is detected */ +/* #undef APR_POOL_CONCURRENCY_CHECK */ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -30,7 +36,7 @@ /* #undef C_ALLOCA */ /* Define to path of random device */ -#define DEV_RANDOM "/dev/urandom" +/* #undef DEV_RANDOM */ /* Define if struct dirent has an inode member */ #define DIRENT_INODE d_fileno @@ -39,7 +45,7 @@ #define DIRENT_TYPE d_type /* Define if DSO support uses dlfcn.h */ -/* #undef DSO_USE_DLFCN */ +#define DSO_USE_DLFCN 1 /* Define if DSO support uses dyld.h */ /* #undef DSO_USE_DYLD */ @@ -86,6 +92,12 @@ /* Define if accept4 function is supported */ #define HAVE_ACCEPT4 1 +/* Define to 1 if you have the `acquire_sem' function. */ +/* #undef HAVE_ACQUIRE_SEM */ + +/* Define to 1 if you have the `acquire_sem_etc' function. */ +/* #undef HAVE_ACQUIRE_SEM_ETC */ + /* Define if async i/o supports message q's */ /* #undef HAVE_AIO_MSGQ */ @@ -96,6 +108,9 @@ */ /* #undef HAVE_ALLOCA_H */ +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1 @@ -128,6 +143,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define to 1 if you have the declaration of `SYS_getrandom', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_GETRANDOM 1 + /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you don't. */ #define HAVE_DECL_SYS_SIGLIST 1 @@ -163,7 +182,7 @@ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `fdatasync' function. */ -/* #undef HAVE_FDATASYNC */ +#define HAVE_FDATASYNC 1 /* Define to 1 if you have the `flock' function. */ #define HAVE_FLOCK 1 @@ -216,6 +235,9 @@ /* Define to 1 if you have the `getpwuid_r' function. */ #define HAVE_GETPWUID_R 1 +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + /* Define to 1 if you have the `getrlimit' function. */ #define HAVE_GETRLIMIT 1 @@ -231,6 +253,12 @@ /* Define if hstrerror is present */ /* #undef HAVE_HSTRERROR */ +/* Define to 1 if you have the `if_indextoname' function. */ +#define HAVE_IF_INDEXTONAME 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -264,6 +292,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_RANDOM_H */ + /* Define to 1 if you have the `localtime_r' function. */ #define HAVE_LOCALTIME_R 1 @@ -279,6 +310,9 @@ /* Define if MAP_ANON is defined in sys/mman.h */ #define HAVE_MAP_ANON 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MEMCHECK_H */ + /* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 @@ -300,6 +334,9 @@ /* Define to 1 if you have the `mmap64' function. */ /* #undef HAVE_MMAP64 */ +/* Define to 1 if you have the `mprotect' function. */ +#define HAVE_MPROTECT 1 + /* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 @@ -321,6 +358,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_NET_ERRNO_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_NET_IF_H 1 + /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 @@ -351,6 +391,9 @@ /* Define to 1 if you have the `pthread_attr_setguardsize' function. */ #define HAVE_PTHREAD_ATTR_SETGUARDSIZE 1 +/* Define to 1 if you have the `pthread_condattr_setpshared' function. */ +#define HAVE_PTHREAD_CONDATTR_SETPSHARED 1 + /* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 @@ -364,8 +407,14 @@ #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 /* Define if cross-process robust mutexes are available */ -/* #undef HAVE_PTHREAD_MUTEX_ROBUST */ +#define HAVE_PTHREAD_MUTEX_ROBUST 1 +/* Define if non-posix/portable cross-process robust mutexes are available */ +/* #undef HAVE_PTHREAD_MUTEX_ROBUST_NP */ + +/* Define to 1 if you have the `pthread_mutex_timedlock' function. */ +#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1 + /* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */ #define HAVE_PTHREAD_PROCESS_SHARED 1 @@ -402,12 +451,21 @@ /* Define to 1 if you have the `semget' function. */ #define HAVE_SEMGET 1 +/* Define to 1 if you have the `semop' function. */ +#define HAVE_SEMOP 1 + +/* Define to 1 if you have the `semtimedop' function. */ +/* #undef HAVE_SEMTIMEDOP */ + /* Define to 1 if you have the `sem_close' function. */ #define HAVE_SEM_CLOSE 1 /* Define to 1 if you have the `sem_post' function. */ #define HAVE_SEM_POST 1 +/* Define to 1 if you have the `sem_timedwait' function. */ +#define HAVE_SEM_TIMEDWAIT 1 + /* Define if SEM_UNDO is defined in sys/sem.h */ #define HAVE_SEM_UNDO 1 @@ -591,6 +649,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_POLL_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RANDOM_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_RESOURCE_H 1 @@ -618,6 +679,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SYSCALL_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_SYSCTL_H 1 @@ -693,6 +757,12 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_UUID_UUID_H */ +/* Compile in valgrind support */ +/* #undef HAVE_VALGRIND */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_H */ + /* Define if C compiler supports VLA */ #define HAVE_VLA 1 @@ -711,8 +781,7 @@ /* Define for z/OS pthread API nuances */ /* #undef HAVE_ZOS_PTHREADS */ -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Define if EAI_ error codes from getaddrinfo are negative */ @@ -748,8 +817,8 @@ /* Define if pthread_getspecific() has two args */ /* #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS */ -/* Define if readdir is thread safe */ -/* #undef READDIR_IS_THREAD_SAFE */ +/* Modern readdir is thread safe */ +#define READDIR_IS_THREAD_SAFE 1 /* Define to 1 if the `setpgrp' function takes no argument. */ /* #undef SETPGRP_VOID */ @@ -761,7 +830,11 @@ #define SIZEOF_CHAR 1 /* The size of ino_t */ +#if __FreeBSD__ >= 12 +#define SIZEOF_INO_T 8 +#else #define SIZEOF_INO_T 4 +#endif /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -810,6 +883,9 @@ /* Define if SysV semaphores affect threads within the process */ /* #undef SYSVSEM_IS_GLOBAL */ +/* Define system call of random */ +#define SYS_RANDOM "getrandom" + /* Define if use of generic atomics is requested */ /* #undef USE_ATOMICS_GENERIC */ @@ -822,6 +898,9 @@ /* Define if 4.2BSD-style flock() will be used */ #define USE_FLOCK_SERIALIZE 1 +/* Define if pthread pshared mutex will be used */ +/* #undef USE_PROC_PTHREAD_SERIALIZE */ + /* Define if BeOS areas will be used */ /* #undef USE_SHMEM_BEOS */ @@ -832,7 +911,7 @@ #define USE_SHMEM_MMAP_ANON 1 /* Define if mmap() via POSIX.1 shm_open() on temporary file will be used */ -#define USE_SHMEM_MMAP_SHM 1 +/* #undef USE_SHMEM_MMAP_SHM */ /* Define if Classical mmap() on temporary file will be used */ /* #undef USE_SHMEM_MMAP_TMP */ @@ -847,7 +926,7 @@ /* #undef USE_SHMEM_OS2_ANON */ /* Define if SysV IPC shmget() will be used */ -/* #undef USE_SHMEM_SHMGET */ +#define USE_SHMEM_SHMGET 1 /* Define if SysV IPC shmget() will be used */ /* #undef USE_SHMEM_SHMGET_ANON */ From owner-svn-src-head@freebsd.org Mon Jun 1 10:14:48 2020 Return-Path: Delivered-To: svn-src-head@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 8161B331385; Mon, 1 Jun 2020 10:14:48 +0000 (UTC) (envelope-from dim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49b9yc37scz4ZWT; Mon, 1 Jun 2020 10:14:48 +0000 (UTC) (envelope-from dim@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 4CA8E9C2C; Mon, 1 Jun 2020 10:14:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051AEmtK071927; Mon, 1 Jun 2020 10:14:48 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051AEjDn071913; Mon, 1 Jun 2020 10:14:45 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202006011014.051AEjDn071913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Jun 2020 10:14:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361692 - in head: contrib/apr-util contrib/apr-util/buckets contrib/apr-util/crypto contrib/apr-util/dbd contrib/apr-util/dbd/unsupported contrib/apr-util/dbm/sdbm contrib/apr-util/inc... X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head: contrib/apr-util contrib/apr-util/buckets contrib/apr-util/crypto contrib/apr-util/dbd contrib/apr-util/dbd/unsupported contrib/apr-util/dbm/sdbm contrib/apr-util/include contrib/apr-util/inc... X-SVN-Commit-Revision: 361692 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 10:14:48 -0000 Author: dim Date: Mon Jun 1 10:14:45 2020 New Revision: 361692 URL: https://svnweb.freebsd.org/changeset/base/361692 Log: Update apr-util to 1.6.1. See contrib/apr-util/CHANGES for a summary of changes. MFC after: 2 weeks X-MFC-With: r361677 Added: head/contrib/apr-util/CMakeLists.txt - copied unchanged from r361691, vendor/apr-util/dist/CMakeLists.txt head/contrib/apr-util/README.FREETDS - copied unchanged from r361691, vendor/apr-util/dist/README.FREETDS head/contrib/apr-util/README.cmake - copied unchanged from r361691, vendor/apr-util/dist/README.cmake head/contrib/apr-util/crypto/apr_crypto_commoncrypto.c - copied unchanged from r361691, vendor/apr-util/dist/crypto/apr_crypto_commoncrypto.c head/contrib/apr-util/crypto/apr_siphash.c - copied unchanged from r361691, vendor/apr-util/dist/crypto/apr_siphash.c head/contrib/apr-util/dbd/unsupported/ - copied from r361691, vendor/apr-util/dist/dbd/unsupported/ head/contrib/apr-util/include/apr_ldap.hwc - copied unchanged from r361691, vendor/apr-util/dist/include/apr_ldap.hwc head/contrib/apr-util/include/apr_redis.h - copied unchanged from r361691, vendor/apr-util/dist/include/apr_redis.h head/contrib/apr-util/include/apr_siphash.h - copied unchanged from r361691, vendor/apr-util/dist/include/apr_siphash.h head/contrib/apr-util/include/apu.hwc - copied unchanged from r361691, vendor/apr-util/dist/include/apu.hwc head/contrib/apr-util/redis/ - copied from r361691, vendor/apr-util/dist/redis/ head/contrib/apr-util/test/testredis.c - copied unchanged from r361691, vendor/apr-util/dist/test/testredis.c head/contrib/apr-util/test/testsiphash.c - copied unchanged from r361691, vendor/apr-util/dist/test/testsiphash.c Deleted: head/contrib/apr-util/dbd/NWGNUdbdfreetds head/contrib/apr-util/dbd/apr_dbd_freetds.c Modified: head/contrib/apr-util/CHANGES head/contrib/apr-util/LICENSE head/contrib/apr-util/Makefile.in head/contrib/apr-util/Makefile.win head/contrib/apr-util/NOTICE head/contrib/apr-util/NWGNUmakefile head/contrib/apr-util/README head/contrib/apr-util/apr-util.spec head/contrib/apr-util/aprutil.dsw head/contrib/apr-util/apu-config.in head/contrib/apr-util/buckets/apr_buckets_alloc.c head/contrib/apr-util/buckets/apr_buckets_file.c head/contrib/apr-util/build-outputs.mk head/contrib/apr-util/build.conf head/contrib/apr-util/buildconf head/contrib/apr-util/configure head/contrib/apr-util/configure.in head/contrib/apr-util/crypto/apr_crypto.c head/contrib/apr-util/crypto/apr_crypto_nss.c head/contrib/apr-util/crypto/apr_crypto_openssl.c head/contrib/apr-util/crypto/crypt_blowfish.c head/contrib/apr-util/dbd/NWGNUmakefile head/contrib/apr-util/dbd/apr_dbd.c head/contrib/apr-util/dbm/sdbm/sdbm.c head/contrib/apr-util/dbm/sdbm/sdbm_pair.c head/contrib/apr-util/include/apr_buckets.h head/contrib/apr-util/include/apr_crypto.h head/contrib/apr-util/include/apr_dbd.h head/contrib/apr-util/include/apr_xml.h head/contrib/apr-util/include/apu.h.in head/contrib/apr-util/include/apu.hnw head/contrib/apr-util/include/apu.hw head/contrib/apr-util/include/apu_version.h head/contrib/apr-util/include/private/apr_crypto_internal.h head/contrib/apr-util/include/private/apu_config.h.in head/contrib/apr-util/memcache/apr_memcache.c head/contrib/apr-util/test/Makefile.in head/contrib/apr-util/test/Makefile.win head/contrib/apr-util/test/NWGNUaputest head/contrib/apr-util/test/abts_tests.h head/contrib/apr-util/test/testall.dsw head/contrib/apr-util/test/testcrypto.c head/contrib/apr-util/test/testutil.h head/contrib/apr-util/xml/apr_xml.c head/usr.bin/svn/lib/libapr_util/apu.h head/usr.bin/svn/lib/libapr_util/apu_config.h Directory Properties: head/contrib/apr-util/ (props changed) Modified: head/contrib/apr-util/CHANGES ============================================================================== --- head/contrib/apr-util/CHANGES Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/CHANGES Mon Jun 1 10:14:45 2020 (r361692) @@ -1,141 +1,62 @@ -*- coding: utf-8 -*- -Changes with APR-util 1.5.4 +Changes with APR-util 1.6.1 - *) MySQL driver: Fix incorrect handling of bad parameter in the - driver support for apr_dbd_transaction_end(). PR 56330. - [Weiqiang Li ] + *) Win32: Add function exports from new apr_crypto API's missing in 1.6.0. - *) apr_crypto_get_driver(): Fix invalid storage reference on error path. - [Philip Martin ] + *) Win32: Introduce XML_PARSER build-time variable to select the expat + library name to be linked to libaprutil-1.dll. See Makefile.win - *) Fix compile failure for Android. PR 56627. [Fredrik Fornwall - , Jeff Trawick] + *) Win32: Removed lingering xml/xml.dsp project forked from the expat + Project in the 1.9x era. Use expat's maintained build schema instead, + prior to building apr-util. - *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t - [Tom Donovan] + *) apr_crypto: Fix compatibility with LibreSSL. PR 61596. + [Bernard Spil , Yann Ylavic] - *) Windows cmake build: Fix incompatiblities with Visual Studio - generators with all cmake versions, and the NMake Makefile generator - with cmake 2.8.12 and later. PR 56616 and other bugs. [Jeff Trawick, - Bert Huijben] + *) sdbm: better database/page validation to fail cleanly when corrupted. + [Yann Ylavic] - *) Fix detection of Berkeley DB 6.0. PR 55277. - [Lars Wendler ] +Changes with APR-util 1.6.0 - *) Improve platform detection for bundled expat by updating - config.guess and config.sub. [Rainer Jung] + *) The expat dependency of apr-util is no longer built with apr-util. + Install expat (including development headers and libraries) first + before building apr-util. [https://libexpat.github.io/] -Changes with APR-util 1.5.3 + *) Mark apr_dbd_freetds as unsupported, and remove it from all builds + [Nick Kew] - *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587. - [Carlo Bramini ] + *) Update MySQL build to stop using libmysqlclient_r. + [Petr Sumbera ] - *) Add experimental cmake-based build system for Windows. Refer to - README.cmake for more information. [Jeff Trawick, Tom Donovan] + *) apr_buckets: Add apr_bucket_file_set_buf_size() which allows to configure + the size of the buffer used to read files. [Yann Ylavic] - *) Fix warnings in odbc driver on 64bit systems. - PR 55197 [Tom Donovan] + *) apr_crypto: avoid excessive iteration in bcrypt hash. + [Hanno Böck ] - *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi - Gacogne ] + *) apr_siphash: Implement keyed hash function SipHash. [Yann Ylavic] - *) Add support for Berkeley DB 6.0. [Rainer Jung] + *) apr_crypto: Add apr_crypto_key() function which supports keys + generated from a passphrase or a raw secret provided by the caller. + Deprecate apr_crypto_passphrase(). [Graham Leggett] - *) Improve platform detection for bundled expat by updating - config.guess and config.sub. [Rainer Jung] + *) apr_crypto_nss: Ensure the SECItem returned by PK11_ParamFromIV + is properly freed. [Graham Leggett] -Changes with APR-util 1.5.2 + *) apr_crypto: Don't cache the driver if initialisation fails. This + stops the second and subsequent attempt to use the API from failing + claiming the library is not initialised. [Graham Leggett] - *) Windows: Add command line makefiles. [Gregg Smith] + *) apr_crypto: Add a native CommonCrypto implementation for iOS and OSX + where OpenSSL has been deprecated. [Graham Leggett] - *) apr_uri_parse(): Do not accept invalid characters in the scheme. - Per RFC 3986 3.3, enforce that the first segment of a relative path does - not contain a colon. PR 52479. [Stefan Fritsch] + *) apr_xml_to_text: Add style APR_XML_X2T_PARSED to maintain a + consistent namespace prefix. [Jari Urpalainen + ] - *) Fix memory leak in hook sorting function. PR 51256. - [] +Changes with APR-util 1.5.x and later: - *) Speedup md5 calculation by avoiding some copying on little endian - architectures. PR 49011. [Stefan Fritsch, Stefan Fuhrmann - ] - - *) Use heap memory for crypt in apr_password_validate(), to reduce stack - usage. PR 54572. [Stefan Fritsch] - - *) Fix password validation failure for all crypt and crypt_r based - algorithms. PR 54603. [Harvey Eneman ] - - *) Fix syntax error in crypto/apr_passwd.c on non-glibc systems. PR 54275. - [Stefan Fritsch] - - *) Fix potential data corruption in apr_brigade_write() and friends if - the last bucket of the brigade is a heap bucket that has been split, - and there are still references to the next part of the original bucket - in use. [Stefan Fritsch] - - *) Remove duplicated logic in apr_brigade_puts(). PR 53740. [Christophe - Jaillet ] - - *) apr_crypto: If --with-crypto is passed to configure but no crypto - libraries are enabled, autodetect available libraries. [Jeff Trawick] - - *) memcache: Fix dead server retry logic. [Gavin Shelley ] - -Changes with APR-util 1.5.1 - - *) testmemcache: Fix crash. PR 52705. [Peter Poeml ] - - *) MinGW: Support shared builds of apr-util when apr is shared. - PR 46175. [Carlo Bramini , Jeff Trawick] - - *) Add support for Berkeley DB 5.2 and 5.3. Simplify detection script. - PR 53684. [Rainer Jung] - - *) configure: Allow to specify library specific custom linker flags - via the LDADD_XXX variables. [Rainer Jung] - - *) apr_password_validate(): Fix intermittent errors on systems - such as FreeBSD where the crypt() function is used. - (Broken only in 1.5.0) [Jeff Trawick] - - *) Improve platform detection for bundled expat by updating - config.guess and config.sub. [Rainer Jung] - -Changes with APR-util 1.5.0 - - *) dbd_pgsql_escape: Use PQescapeStringConn. [Nick Kew] - - *) apr_password_validate, apr_bcrypt_encode: Add support for bcrypt encoded - passwords. The bcrypt implementation uses code from crypt_blowfish - written by Solar Designer . apr_bcrypt_encode creates - hashes with "$2y$" prefix, but apr_password_validate also accepts the old - prefix "$2a$". PR 49288. [Stefan Fritsch] - - *) APR dbd: Allow to use apr_dbd_get_row() with a different pool than - apr_dbd_select(). PR 53533. [] - - *) APR dbd FreeTDS support: Fix spurious API errors caused by uninitialized - fields. [TROY.LIU 劉春偉 ] - - *) apr_password_validate: Increase maximum hash string length to allow - more than 9999 rounds with sha512-crypt. PR 53410. [Stefan Fritsch] - - *) Fix segfaults in crypt() and crypt_r() failure modes. - PR 47272. [Arkadiusz Miskiewicz ] - - *) apr_crypto: Ensure that the if/else that governs the static - initialisation of each crypto driver works when the first driver - isn't in use. [Graham Leggett] - - *) apr_crypto: Ensure the *driver variable is initialised when a statically - compiled library is initialised for the first time. [Graham Leggett] - - *) apr_crypto: Ensure the *driver variable is initialised when the library - has already been loaded. Fix ported from apr_dbd. [Graham Leggett] - - *) apr_crypto: Move the static initialisation of DRIVER_LOAD from - apr_crypto_init() to apr_crypto_get_driver(), so that we don't lose - the parameters. [Graham Leggett] + *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?view=markup Changes with APR-util 1.4.x and later: Copied: head/contrib/apr-util/CMakeLists.txt (from r361691, vendor/apr-util/dist/CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/apr-util/CMakeLists.txt Mon Jun 1 10:14:45 2020 (r361692, copy of r361691, vendor/apr-util/dist/CMakeLists.txt) @@ -0,0 +1,355 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Read README.cmake before using this. + +PROJECT(APR-Util C) + +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + +FIND_PACKAGE(OpenSSL) + +FIND_PACKAGE(expat) + +OPTION(APU_HAVE_CRYPTO "Crypto support" OFF) +OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON) +OPTION(APR_HAS_LDAP "LDAP support" ON) +OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) +OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) +OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) +SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files") +SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with") + +IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") + MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.") +ENDIF() +FOREACH(onelib ${APR_LIBRARIES}) + IF(NOT EXISTS ${onelib}) + MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.") + ENDIF() +ENDFOREACH() + +IF(APU_HAVE_CRYPTO) +IF(NOT OPENSSL_FOUND) + MESSAGE(FATAL_ERROR "OpenSSL is the only supported crypto implementation, and it wasn't found!") +ENDIF() +ENDIF() + +# create 1-or-0 representation of feature tests for apu.h + +SET(apu_have_crypto_10 0) +SET(apu_have_apr_iconv_10 0) # not yet implemented +SET(apr_has_ldap_10 0) + +IF(APU_HAVE_CRYPTO) + SET(apu_have_crypto_10 1) +ENDIF() + +IF(APR_HAS_LDAP) + SET(apr_has_ldap_10 1) +ENDIF() + +IF(NOT EXPAT_FOUND) + MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!") +ENDIF() + +SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) +SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) + +SET(LDAP_LIBRARIES) +IF(APR_HAS_LDAP) + SET(LDAP_LIBRARIES wldap32) +ENDIF() + +CONFIGURE_FILE(include/apu.hwc + ${PROJECT_BINARY_DIR}/apu.h) +CONFIGURE_FILE(include/apr_ldap.hwc + ${PROJECT_BINARY_DIR}/apr_ldap.h) +# "COPYONLY" just because anything else isn't implemented ;) +CONFIGURE_FILE(include/private/apu_config.hw + ${PROJECT_BINARY_DIR}/apu_config.h + COPYONLY) +CONFIGURE_FILE(include/private/apu_select_dbm.hw + ${PROJECT_BINARY_DIR}/apu_select_dbm.h + COPYONLY) +CONFIGURE_FILE(include/apu_want.hw + ${PROJECT_BINARY_DIR}/apu_want.h + COPYONLY) + +# Generated .h files are stored in PROJECT_BINARY_DIR, not the +# source tree. +# +# BROKEN: not searching PROJECT_BINARY_DIR first, so you have to +# manually delete apu.h in PROJECT_SOURCE_DIR/include if +# you've generated apu.h before using a different build + +SET(APR_INCLUDE_DIRECTORIES + ${PROJECT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/private + ${APR_INCLUDE_DIR} +) + +INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR}) + +SET(APR_PUBLIC_HEADERS_STATIC + include/apr_anylock.h + include/apr_base64.h + include/apr_buckets.h + include/apr_crypto.h + include/apr_date.h + include/apr_dbd.h + include/apr_dbm.h + include/apr_hooks.h + include/apr_ldap_init.h + include/apr_ldap_option.h + include/apr_ldap_rebind.h + include/apr_ldap_url.h + include/apr_md4.h + include/apr_md5.h + include/apr_memcache.h + include/apr_optional.h + include/apr_optional_hooks.h + include/apr_queue.h + include/apr_redis.h + include/apr_reslist.h + include/apr_rmm.h + include/apr_sdbm.h + include/apr_sha1.h + include/apr_siphash.h + include/apr_strmatch.h + include/apr_thread_pool.h + include/apr_uri.h + include/apr_uuid.h + include/apr_xlate.h + include/apr_xml.h + include/apu_errno.h + include/apu_version.h +) + +# apu_config.h and apu_select_dbm.h are private +SET(APR_PUBLIC_HEADERS_GENERATED + ${PROJECT_BINARY_DIR}/apu.h + ${PROJECT_BINARY_DIR}/apr_ldap.h + ${PROJECT_BINARY_DIR}/apu_want.h +) + +SET(APR_SOURCES + buckets/apr_brigade.c + buckets/apr_buckets.c + buckets/apr_buckets_alloc.c + buckets/apr_buckets_eos.c + buckets/apr_buckets_file.c + buckets/apr_buckets_flush.c + buckets/apr_buckets_heap.c + buckets/apr_buckets_mmap.c + buckets/apr_buckets_pipe.c + buckets/apr_buckets_pool.c + buckets/apr_buckets_refcount.c + buckets/apr_buckets_simple.c + buckets/apr_buckets_socket.c + crypto/apr_crypto.c + crypto/apr_md4.c + crypto/apr_md5.c + crypto/apr_passwd.c + crypto/apr_sha1.c + crypto/apr_siphash.c + crypto/crypt_blowfish.c + crypto/getuuid.c + crypto/uuid.c + dbd/apr_dbd.c + dbm/apr_dbm.c + dbm/apr_dbm_sdbm.c + dbm/sdbm/sdbm.c + dbm/sdbm/sdbm_hash.c + dbm/sdbm/sdbm_lock.c + dbm/sdbm/sdbm_pair.c + encoding/apr_base64.c + hooks/apr_hooks.c + memcache/apr_memcache.c + misc/apr_date.c + misc/apr_queue.c + misc/apr_reslist.c + misc/apr_rmm.c + misc/apr_thread_pool.c + misc/apu_dso.c + misc/apu_version.c + redis/apr_redis.c + strmatch/apr_strmatch.c + uri/apr_uri.c + xlate/xlate.c + xml/apr_xml.c +) + +IF(APR_HAS_LDAP) + SET(APR_SOURCES ${APR_SOURCES} ldap/apr_ldap_stub.c ldap/apr_ldap_url.c) +ENDIF() + +SET(APR_TEST_SOURCES + test/abts.c + test/testbuckets.c + test/testcrypto.c + test/testdate.c + test/testdbd.c + test/testdbm.c + test/testldap.c + test/testmd4.c + test/testmd5.c + test/testmemcache.c + test/testpass.c + test/testqueue.c + test/testredis.c + test/testreslist.c + test/testrmm.c + test/testsiphash.c + test/teststrmatch.c + test/testuri.c + test/testutil.c + test/testuuid.c + test/testxlate.c + test/testxml.c +) + +SET(install_targets) +SET(install_bin_pdb) +SET(dbd_drivers) + +# Note: The WINNT definition on some targets is used only by libaprutil.rc. + +# libaprutil-1 is shared, aprutil-1 is static +ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc) +SET(install_targets ${install_targets} libaprutil-1) +SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb) +TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) +SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT") + +ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) +SET(install_targets ${install_targets} aprutil-1) +TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) +SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC") + +IF(APU_HAVE_CRYPTO) + IF(NOT OPENSSL_FOUND) + MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build") + ENDIF() + ADD_LIBRARY(apr_crypto_openssl-1 SHARED crypto/apr_crypto_openssl.c libaprutil.rc) + SET(install_targets ${install_targets} apr_crypto_openssl-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb) + SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}") + SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") + SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl") + TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES}) +ENDIF() + +IF(APU_HAVE_ODBC) + ADD_LIBRARY(apr_dbd_odbc-1 SHARED dbd/apr_dbd_odbc.c libaprutil.rc) + SET(install_targets ${install_targets} apr_dbd_odbc-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_dbd_odbc-1.pdb) + SET(dbd_drivers ${dbd_drivers} odbc) + TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32) + SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver) + SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT") + SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc") +ENDIF() + +IF(APR_HAS_LDAP) + ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c + ldap/apr_ldap_rebind.c libaprutil.rc) + SET(install_targets ${install_targets} apr_ldap-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb) + TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES}) + SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") + SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap") + SET(apr_ldap_libraries apr_ldap-1) +ELSE() + SET(apr_ldap_libraries) +ENDIF() + +IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() + # Create a "check" target that displays test program output to the console. + ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose) + + # copy data files to build directory so that we can run programs from there + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory + ${PROJECT_BINARY_DIR}/data) + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml + ${PROJECT_BINARY_DIR}/data/billion-laughs.xml) + + IF(TEST_STATIC_LIBS) + SET(whichapr aprutil-1) + SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC") + ELSE() + SET(whichapr libaprutil-1) + SET(apiflag) + ENDIF() + + ADD_EXECUTABLE(testall ${APR_TEST_SOURCES}) + TARGET_LINK_LIBRARIES(testall ${whichapr} ${apr_ldap_libraries} ${XMLLIB_LIBRARIES} ${LDAP_LIBRARIES}) + IF(apiflag) + SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag}) + ENDIF() + ADD_TEST(NAME testall COMMAND testall) + + ADD_EXECUTABLE(dbd test/dbd.c) + TARGET_LINK_LIBRARIES(dbd ${whichapr}) + IF(apiflag) + SET_TARGET_PROPERTIES(dbd PROPERTIES COMPILE_FLAGS ${apiflag}) + ENDIF() + + # dbd is run multiple times with different parameters. + FOREACH(somedbd ${dbd_drivers}) + ADD_TEST(NAME dbd-${somedbd} COMMAND dbd ${somedbd}) + ENDFOREACH() + +ENDIF (APR_BUILD_TESTAPR) + +# Installation + +INSTALL(TARGETS ${install_targets} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + +IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin + CONFIGURATIONS RelWithDebInfo Debug) +ENDIF() + +INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) + +STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) +MESSAGE(STATUS "") +MESSAGE(STATUS "") +MESSAGE(STATUS "APR-Util configuration summary:") +MESSAGE(STATUS "") +MESSAGE(STATUS " Build type ...................... : ${CMAKE_BUILD_TYPE}") +MESSAGE(STATUS " Install .pdb (if available)...... : ${INSTALL_PDB}") +MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") +MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") +MESSAGE(STATUS " APR include directory ........... : ${APR_INCLUDE_DIR}") +MESSAGE(STATUS " APR libraries ................... : ${APR_LIBRARIES}") +MESSAGE(STATUS " DBD ODBC driver ................. : ${APU_HAVE_ODBC}") +MESSAGE(STATUS " APU_HAVE_CRYPTO ................. : ${APU_HAVE_CRYPTO}") +MESSAGE(STATUS " APR_HAS_LDAP .................... : ${APR_HAS_LDAP}") +MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") +IF(TEST_STATIC_LIBS) +MESSAGE(STATUS " (testing static libraries)") +ELSE() +MESSAGE(STATUS " (testing dynamic libraries)") +ENDIF() Modified: head/contrib/apr-util/LICENSE ============================================================================== --- head/contrib/apr-util/LICENSE Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/LICENSE Mon Jun 1 10:14:45 2020 (r361692) @@ -312,6 +312,22 @@ For the crypto\apr_md4.c component: * documentation and/or software. */ +For the crypto\crypt_blowfish.c(.h) component: + + * Written by Solar Designer in 1998-2011. + * No copyright is claimed, and the software is hereby placed in the public + * domain. In case this attempt to disclaim copyright and place the software + * in the public domain is deemed null and void, then the software is + * Copyright (c) 1998-2011 Solar Designer and it is hereby released to the + * general public under the following terms: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted. + * + * There's ABSOLUTELY NO WARRANTY, express or implied. + + See crypto/crypt_blowfish.c for more information. + For the include\apr_md4.h component: * Modified: head/contrib/apr-util/Makefile.in ============================================================================== --- head/contrib/apr-util/Makefile.in Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/Makefile.in Mon Jun 1 10:14:45 2020 (r361692) @@ -15,8 +15,8 @@ APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@ APRUTIL_LIBS = @APRUTIL_LIBS@ TARGET_LIB = lib@APRUTIL_LIBNAME@.la -INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@ -EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@ +INSTALL_SUBDIRS = @APR_ICONV_DIR@ +EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config INSTALL = @INSTALL@ @@ -35,7 +35,6 @@ LDADD_dbd_oracle = @LDADD_dbd_oracle@ LDADD_dbd_sqlite2 = @LDADD_dbd_sqlite2@ LDADD_dbd_sqlite3 = @LDADD_dbd_sqlite3@ LDADD_dbd_mysql = @LDADD_dbd_mysql@ -LDADD_dbd_freetds = @LDADD_dbd_freetds@ LDADD_dbd_odbc = @LDADD_dbd_odbc@ LDADD_dbm_db = @LDADD_dbm_db@ LDADD_dbm_gdbm = @LDADD_dbm_gdbm@ @@ -43,6 +42,7 @@ LDADD_dbm_ndbm = @LDADD_dbm_ndbm@ LDADD_ldap = @LDADD_ldap@ LDADD_crypto_openssl = @LDADD_crypto_openssl@ LDADD_crypto_nss = @LDADD_crypto_nss@ +LDADD_crypto_commoncrypto = @LDADD_crypto_commoncrypto@ TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(APU_MODULES) @@ -50,7 +50,7 @@ TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(A @INCLUDE_RULES@ @INCLUDE_OUTPUTS@ -CLEAN_SUBDIRS = test @APR_ICONV_DIR@ @APR_XML_DIR@ +CLEAN_SUBDIRS = test @APR_ICONV_DIR@ CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out DISTCLEAN_TARGETS = config.cache config.log config.status libtool \ Modified: head/contrib/apr-util/Makefile.win ============================================================================== --- head/contrib/apr-util/Makefile.win Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/Makefile.win Mon Jun 1 10:14:45 2020 (r361692) @@ -51,6 +51,13 @@ # # CRYPTO_LIST="nss openssl" # +# Provide the XML_PARSER argument after configuring LIB and INCLUDE with +# the expat path of the corresponding xml parser, e.g. libexpatMT to choose +# static, or libexpat (default) to choose the dynamic library for aprutil-1.dll +# (Static libaprutil-1.lib always presumes libexpatMT with XML_STATIC flag.) +# +# XML_PARSER="libexpat" +# # For example; # # nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean @@ -73,6 +80,20 @@ USEDSW=1 PREFIX=..\apr-dist +!IF EXIST("..\openssl") +!IF EXIST("..\openssl\libcrypto.lib") +SSLOPT=_HAVE_OSSL110=1 +!ENDIF +!ENDIF + +# Legacy default (and unwise alternative) for libapr-1.dll is libexpatMT +XML_PARSER="libexpat" +!IF "$(XML_PARSER)" == "libexpat" +XMLOPT=XML_PARSER=$(XML_PARSER) +!ELSE +XMLOPT=XML_PARSER=$(XML_PARSER) XML_OPTIONS="/D XML_STATIC" +!ENDIF + !IF [$(COMSPEC) /c cl /nologo /? \ | $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0 ARCH=x64 Release @@ -197,11 +218,9 @@ buildall: BUILD_MODE="$(ARCH)" BIND_MODE=shared cd .. !ENDIF - cd $(APU_PATH)\xml\expat\lib - $(MAKE) $(MAKEOPT) -f xml.mak CFG="xml - $(ARCH)" RECURSE=0 $(CTARGET) - cd ..\..\.. - $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET) - $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET) + cd $(APU_PATH) + $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET) cd ldap $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET) cd .. @@ -215,7 +234,7 @@ buildall: cd .. cd crypto for %d in ($(CRYPTO_LIST) x) do if not %d == x \ - $(MAKE) $(MAKEOPT) -f apr_crypto_%d.mak CFG="apr_crypto_%d - $(ARCH)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) -f apr_crypto_%d.mak CFG="apr_crypto_%d - $(ARCH)" RECURSE=0 $(CTARGET) cd .. !ELSEIF $(USESLN) == 1 @@ -306,7 +325,7 @@ checkapr: checkapu: cd $(APU_PATH) cd test - $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \ + $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \ OUTDIR=$(LIBSPATH) APROUTDIR=$(LIBSOSPATH) \ APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \ Modified: head/contrib/apr-util/NOTICE ============================================================================== --- head/contrib/apr-util/NOTICE Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/NOTICE Mon Jun 1 10:14:45 2020 (r361692) @@ -1,5 +1,5 @@ Apache Portable Runtime Utility Library -Copyright (c) 2000-2014 The Apache Software Foundation. +Copyright (c) 2000-2016 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: head/contrib/apr-util/NWGNUmakefile ============================================================================== --- head/contrib/apr-util/NWGNUmakefile Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/NWGNUmakefile Mon Jun 1 10:14:45 2020 (r361692) @@ -261,9 +261,11 @@ FILES_lib_objs = \ $(OBJDIR)/apr_memcache.o \ $(OBJDIR)/apr_passwd.o \ $(OBJDIR)/apr_queue.o \ + $(OBJDIR)/apr_redis.o \ $(OBJDIR)/apr_reslist.o \ $(OBJDIR)/apr_rmm.o \ $(OBJDIR)/apr_sha1.o \ + $(OBJDIR)/apr_siphash.o \ $(OBJDIR)/apu_version.o \ $(OBJDIR)/getuuid.o \ $(OBJDIR)/uuid.o \ @@ -296,7 +298,7 @@ install :: nlms FORCE # Any specialized rules here # -vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate:xml +vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:redis:misc:strmatch:uri:xlate:xml # # Include the 'tail' makefile that has targets that depend on variables defined Modified: head/contrib/apr-util/README ============================================================================== --- head/contrib/apr-util/README Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/README Mon Jun 1 10:14:45 2020 (r361692) @@ -34,7 +34,7 @@ Apache Portable Runtime Utility Library README String filename-style pattern matching URI Parsing Charset translation (iconv based) - XML parsing (expat based) + XML parsing (expat) For a more complete list, please refer to the following URLs: @@ -66,7 +66,7 @@ for your compiled code. Similarly, the bindings for p such as Oracle (--with-oracle option) must also be explicitly enabled. On windows, selection of supported drivers is via the environment values -DBD_LIST (for freetds, mysql, oracle, pgsql, sqlite2 and/or sqlite3) +DBD_LIST (for mysql, oracle, pgsql, sqlite2 and/or sqlite3) and DBM_LIST (db and/or gdbm). DBD odbc and DBM sdbm are unconditionally compiled and installed, do not include these in the list. Copied: head/contrib/apr-util/README.FREETDS (from r361691, vendor/apr-util/dist/README.FREETDS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/apr-util/README.FREETDS Mon Jun 1 10:14:45 2020 (r361692, copy of r361691, vendor/apr-util/dist/README.FREETDS) @@ -0,0 +1,11 @@ +The APR DBD Driver for FreeTDS has been removed from the build. +It is known to have problems, and we are not able to maintain it. + +The source code is still available. If you want it and are able +to manage maintenance for yourself, you can patch the build and +work through issues that affect you, but you're on your own. + +We expect that for most users, the ODBC driver will serve as +an alternative. + +Sorry. Copied: head/contrib/apr-util/README.cmake (from r361691, vendor/apr-util/dist/README.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/apr-util/README.cmake Mon Jun 1 10:14:45 2020 (r361692, copy of r361691, vendor/apr-util/dist/README.cmake) @@ -0,0 +1,139 @@ +Experimental cmake-based build support for APR-Util on Microsoft Windows + +Status +------ + +This build support is currently intended only for Microsoft Windows. +Only Windows NT-based systems can be targeted. (The traditional +Windows build support for APR can target Windows 9x as well.) + +This build support is experimental. Specifically, + +* It does not support all features of APR-Util. +* Some components may not be built correctly and/or in a manner + compatible with the previous Windows build support. +* Build interfaces, such as the mechanisms which are used to enable + optional functionality or specify prerequisites, may change from + release to release as feedback is received from users and bugs and + limitations are resolved. + +Important: Refer to the "Known Bugs and Limitations" section for further + information. + + It is beyond the scope of this document to document or explain + how to utilize the various cmake features, such as different + build backends or provisions for finding support libraries. + + Please refer to the cmake documentation for additional information + that applies to building any project with cmake. + +Prerequisites +------------- + +The following tools must be in PATH: + +* cmake, version 2.8 or later + cmake version 3.1.3 or later is required to work with current OpenSSL + releases. (OpenSSL is an optional prerequisite of APR-Util.) +* If using a command-line compiler: compiler and linker and related tools + (Refer to the cmake documentation for more information.) + +The following support libraries are mandatory: + +* APR 1.4.x or APR 1.5.x, built with cmake + +Optional support libraries allow optional features of APR to be enabled: + +* OpenSSL +* many others potentially, though the build support isn't currently + implemented + +How to build +------------ + +1. cd to a clean directory for building (i.e., don't build in your + source tree) + +2. Some cmake backends may want your compile tools in PATH. (Hint: "Visual + Studio Command Prompt") + +3. set CMAKE_LIBRARY_PATH=d:\path\to\prereq1\lib;d:\path\to\prereq2\lib;... + +4. set CMAKE_INCLUDE_PATH=d:\path\to\prereq1\include;d:\path\to\prereq2\include;... + +5. cmake -G "some backend, like 'NMake Makefiles'" + -DCMAKE_INSTALL_PREFIX=d:/path/to/aprinst + -DAPR-Util-specific-flags + d:/path/to/aprutilsource + + If APR 1.x was installed to a different directory than APR-Util, + also pass these additional arguments: + + -DAPR_INCLUDE_DIR=d:/path/to/apr1inst/include + -DAPR_LIBRARIES=d:/path/to/apr1inst/lib/libapr-1.lib + + Alternately, use cmake-gui and update settings in the GUI. + + APR-Util feature flags: + + APU_HAVE_CRYPTO Build crypt support (only the OpenSSL + implementation is currently supported) + Default: OFF + APU_HAVE_ODBC Build ODBC DBD driver + Default: ON + APR_BUILD_TESTAPR Build APR-Util test suite + Default: OFF + TEST_STATIC_LIBS Build the test suite to test the APR static + library instead of the APR dynamic library. + Default: OFF + In order to build the test suite against both + static and dynamic libraries, separate builds + will be required, one with TEST_STATIC_LIBS + set to ON. + INSTALL_PDB Install .pdb files if generated. + Default: ON + + CMAKE_C_FLAGS_RELEASE, _DEBUG, _RELWITHDEBINFO, _MINSIZEREL + + CMAKE_BUILD_TYPE + + For NMake Makefiles the choices are at least DEBUG, RELEASE, + RELWITHDEBINFO, and MINSIZEREL + Other backends make have other selections. + +6. build using chosen backend (e.g., "nmake install") + +Known Bugs and Limitations +-------------------------- + +* If include/apu.h or other generated files have been created in the source + directory by another build system, they will be used unexpectedly and + cause the build to fail. +* Options should be provided for remaining features, along with finding any + necessary libraries + + DBM: + . APU_HAVE_GDBM + . APU_HAVE_NDBM + . APU_HAVE_DB + + DBD: + . APU_HAVE_PGSQL + . APU_HAVE_MYSQL + . APU_HAVE_SQLITE3 + . APU_HAVE_SQLITE2 + . APU_HAVE_ORACLE + + CRYPTO: + . APU_HAVE_NSS + + XLATE, APU_HAVE_ICONV (no way to consume an apr-iconv build yet) +* Static builds of APR modules are not supported. +* CHANGES/LICENSE/NOTICE is not installed, unlike Makefile.win. + (But unlike Makefile.win we want to call them APR-Util-CHANGES.txt + and so on.) But perhaps that is a job for a higher-level script. + +Generally: + +* Many APR-Util features have not been tested with this build. +* Developers need to examine the existing Windows build in great detail and see + what is missing from the cmake-based build, whether a feature or some build + nuance. +* Any feedback you can provide on your experiences with this build will be + helpful. Modified: head/contrib/apr-util/apr-util.spec ============================================================================== --- head/contrib/apr-util/apr-util.spec Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/apr-util.spec Mon Jun 1 10:14:45 2020 (r361692) @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.5.4 +Version: 1.6.1 Release: 1 License: Apache Software License Group: System Environment/Libraries @@ -70,16 +70,6 @@ Requires: apr-util = %{version}-%{release} This package provides the SQLite driver for the apr-util DBD (database abstraction) interface. -%package freetds -Group: Development/Libraries -Summary: APR utility library FreeTDS DBD driver -BuildRequires: freetds-devel -Requires: apr-util = %{version}-%{release} - -%description freetds -This package provides the FreeTDS driver for the apr-util DBD -(database abstraction) interface. - %package odbc Group: Development/Libraries Summary: APR utility library ODBC DBD driver @@ -124,7 +114,7 @@ This package provides crypto support for apr-util base %configure --with-apr=%{_prefix} \ --includedir=%{_includedir}/apr-%{apuver} \ --with-ldap --without-gdbm \ - --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \ + --with-sqlite3 --with-pgsql --with-mysql --with-odbc \ --with-berkeley-db \ --with-crypto --with-openssl --with-nss \ --without-sqlite2 @@ -176,10 +166,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite* -%files freetds -%defattr(-,root,root,-) -%{_libdir}/apr-util-%{apuver}/apr_dbd_freetds* - %files odbc %defattr(-,root,root,-) %{_libdir}/apr-util-%{apuver}/apr_dbd_odbc* @@ -203,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libaprutil-%{apuver}.so %{_libdir}/pkgconfig/apr-util-%{apuver}.pc %{_includedir}/apr-%{apuver}/*.h -%doc --parents html +%doc html %changelog * Tue Jun 22 2004 Graham Leggett 1.0.0-1 Modified: head/contrib/apr-util/aprutil.dsw ============================================================================== --- head/contrib/apr-util/aprutil.dsw Mon Jun 1 10:08:18 2020 (r361691) +++ head/contrib/apr-util/aprutil.dsw Mon Jun 1 10:14:45 2020 (r361692) @@ -51,24 +51,6 @@ Package=<4> ############################################################################### -Project: "apr_dbd_freetds"=".\dbd\apr_dbd_freetds.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libapr - End Project Dependency - Begin Project Dependency - Project_Dep_Name libaprutil - End Project Dependency -}}} - -############################################################################### - Project: "apr_dbd_mysql"=".\dbd\apr_dbd_mysql.dsp" - Package Owner=<4> Package=<5> @@ -275,9 +257,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name apriconv End Project Dependency - Begin Project Dependency - Project_Dep_Name xml - End Project Dependency }}} ############################################################################### @@ -383,9 +362,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libapriconv_ces_modules End Project Dependency - Begin Project Dependency - Project_Dep_Name xml - End Project Dependency }}} ############################################################################### @@ -449,18 +425,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libapr End Project Dependency -}}} - -############################################################################### - -Project: "xml"=".\xml\expat\lib\xml.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Mon Jun 1 10:27:07 2020 Return-Path: Delivered-To: svn-src-head@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 D10113314D1; Mon, 1 Jun 2020 10:27:07 +0000 (UTC) (envelope-from dim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bBDq559cz4bJD; Mon, 1 Jun 2020 10:27:07 +0000 (UTC) (envelope-from dim@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 8FF44A096; Mon, 1 Jun 2020 10:27:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051AR73M078448; Mon, 1 Jun 2020 10:27:07 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051AR6JJ078441; Mon, 1 Jun 2020 10:27:06 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202006011027.051AR6JJ078441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Jun 2020 10:27:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361693 - in head: contrib/subversion contrib/subversion/doc contrib/subversion/doc/programmer contrib/subversion/doc/user contrib/subversion/subversion contrib/subversion/subversion/in... X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head: contrib/subversion contrib/subversion/doc contrib/subversion/doc/programmer contrib/subversion/doc/user contrib/subversion/subversion contrib/subversion/subversion/include contrib/subversion/... X-SVN-Commit-Revision: 361693 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 10:27:07 -0000 Author: dim Date: Mon Jun 1 10:27:05 2020 New Revision: 361693 URL: https://svnweb.freebsd.org/changeset/base/361693 Log: Update Subversion to 1.14.0 LTS. See contrib/subversion/CHANGES for a summary of changes, or for a more thorough overview: https://subversion.apache.org/docs/release-notes/1.14 NOTE: there is no need to dump and reload repositories, and the working copy format is still the same as Subversion 1.8 through 1.13. Relnotes: yes MFC after: 2 weeks X-MFC-With: r361677 Added: head/contrib/subversion/.swig_pl_checked - copied unchanged from r361678, vendor/subversion/dist/.swig_pl_checked head/contrib/subversion/.swig_py_checked - copied unchanged from r361678, vendor/subversion/dist/.swig_py_checked head/contrib/subversion/.swig_rb_checked - copied unchanged from r361678, vendor/subversion/dist/.swig_rb_checked head/contrib/subversion/subversion/include/private/svn_client_shelf.h - copied unchanged from r361678, vendor/subversion/dist/subversion/include/private/svn_client_shelf.h head/contrib/subversion/subversion/include/private/svn_client_shelf2.h - copied unchanged from r361678, vendor/subversion/dist/subversion/include/private/svn_client_shelf2.h head/contrib/subversion/subversion/include/private/svn_dirent_uri_private.h - copied unchanged from r361678, vendor/subversion/dist/subversion/include/private/svn_dirent_uri_private.h head/contrib/subversion/subversion/include/svn_opt_impl.h - copied unchanged from r361678, vendor/subversion/dist/subversion/include/svn_opt_impl.h head/contrib/subversion/subversion/include/svn_types_impl.h - copied unchanged from r361678, vendor/subversion/dist/subversion/include/svn_types_impl.h head/contrib/subversion/subversion/libsvn_client/layout.c - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/layout.c head/contrib/subversion/subversion/libsvn_client/shelf.c - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/shelf.c head/contrib/subversion/subversion/libsvn_client/shelf2.c - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/shelf2.c head/contrib/subversion/subversion/libsvn_client/wc_editor.c - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/wc_editor.c head/contrib/subversion/subversion/libsvn_repos/dump_editor.c - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_repos/dump_editor.c head/contrib/subversion/subversion/svn/filesize.c - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/filesize.c head/contrib/subversion/subversion/svn/shelf-cmd.c - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf-cmd.c head/contrib/subversion/subversion/svn/shelf-cmd.h - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf-cmd.h head/contrib/subversion/subversion/svn/shelf2-cmd.c - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf2-cmd.c head/contrib/subversion/subversion/svn/shelf2-cmd.h - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf2-cmd.h Deleted: head/contrib/subversion/doc/programmer/gtest-guide.txt head/contrib/subversion/subversion/libsvn_client/copy_foreign.c head/contrib/subversion/subversion/libsvn_client/shelve.c head/contrib/subversion/subversion/svn/shelve-cmd.c Modified: head/contrib/subversion/.editorconfig head/contrib/subversion/CHANGES head/contrib/subversion/COMMITTERS head/contrib/subversion/INSTALL head/contrib/subversion/LICENSE head/contrib/subversion/Makefile.in head/contrib/subversion/NOTICE head/contrib/subversion/aclocal.m4 head/contrib/subversion/autogen.sh head/contrib/subversion/build-outputs.mk head/contrib/subversion/build.conf head/contrib/subversion/configure head/contrib/subversion/configure.ac head/contrib/subversion/doc/doxygen.conf head/contrib/subversion/doc/user/svn-best-practices.html head/contrib/subversion/gen-make.py head/contrib/subversion/get-deps.sh head/contrib/subversion/subversion/include/private/svn_branch.h head/contrib/subversion/subversion/include/private/svn_client_mtcc.h head/contrib/subversion/subversion/include/private/svn_client_private.h head/contrib/subversion/subversion/include/private/svn_dep_compat.h head/contrib/subversion/subversion/include/private/svn_diff_tree.h head/contrib/subversion/subversion/include/private/svn_element.h head/contrib/subversion/subversion/include/private/svn_fs_fs_private.h head/contrib/subversion/subversion/include/private/svn_repos_private.h head/contrib/subversion/subversion/include/private/svn_sorts_private.h head/contrib/subversion/subversion/include/private/svn_subr_private.h head/contrib/subversion/subversion/include/private/svn_wc_private.h head/contrib/subversion/subversion/include/svn_client.h head/contrib/subversion/subversion/include/svn_config.h head/contrib/subversion/subversion/include/svn_delta.h head/contrib/subversion/subversion/include/svn_diff.h head/contrib/subversion/subversion/include/svn_dirent_uri.h head/contrib/subversion/subversion/include/svn_error_codes.h head/contrib/subversion/subversion/include/svn_fs.h head/contrib/subversion/subversion/include/svn_opt.h head/contrib/subversion/subversion/include/svn_props.h head/contrib/subversion/subversion/include/svn_ra.h head/contrib/subversion/subversion/include/svn_ra_svn.h head/contrib/subversion/subversion/include/svn_repos.h head/contrib/subversion/subversion/include/svn_time.h head/contrib/subversion/subversion/include/svn_types.h head/contrib/subversion/subversion/include/svn_utf.h head/contrib/subversion/subversion/include/svn_version.h head/contrib/subversion/subversion/include/svn_wc.h head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in head/contrib/subversion/subversion/libsvn_auth_kwallet/kwallet.cpp head/contrib/subversion/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in head/contrib/subversion/subversion/libsvn_client/add.c head/contrib/subversion/subversion/libsvn_client/blame.c head/contrib/subversion/subversion/libsvn_client/client.h head/contrib/subversion/subversion/libsvn_client/commit.c head/contrib/subversion/subversion/libsvn_client/commit_util.c head/contrib/subversion/subversion/libsvn_client/conflicts.c head/contrib/subversion/subversion/libsvn_client/copy.c head/contrib/subversion/subversion/libsvn_client/delete.c head/contrib/subversion/subversion/libsvn_client/deprecated.c head/contrib/subversion/subversion/libsvn_client/diff.c head/contrib/subversion/subversion/libsvn_client/diff_local.c head/contrib/subversion/subversion/libsvn_client/diff_summarize.c head/contrib/subversion/subversion/libsvn_client/export.c head/contrib/subversion/subversion/libsvn_client/info.c head/contrib/subversion/subversion/libsvn_client/libsvn_client.pc.in head/contrib/subversion/subversion/libsvn_client/list.c head/contrib/subversion/subversion/libsvn_client/merge.c head/contrib/subversion/subversion/libsvn_client/mtcc.c head/contrib/subversion/subversion/libsvn_client/patch.c head/contrib/subversion/subversion/libsvn_client/ra.c head/contrib/subversion/subversion/libsvn_client/repos_diff.c head/contrib/subversion/subversion/libsvn_client/revert.c head/contrib/subversion/subversion/libsvn_client/revisions.c head/contrib/subversion/subversion/libsvn_client/status.c head/contrib/subversion/subversion/libsvn_client/update.c head/contrib/subversion/subversion/libsvn_client/upgrade.c head/contrib/subversion/subversion/libsvn_client/util.c head/contrib/subversion/subversion/libsvn_delta/branch.c head/contrib/subversion/subversion/libsvn_delta/branch_compat.c head/contrib/subversion/subversion/libsvn_delta/compat.c head/contrib/subversion/subversion/libsvn_delta/debug_editor.c head/contrib/subversion/subversion/libsvn_delta/deprecated.c head/contrib/subversion/subversion/libsvn_delta/element.c head/contrib/subversion/subversion/libsvn_delta/libsvn_delta.pc.in head/contrib/subversion/subversion/libsvn_delta/path_driver.c head/contrib/subversion/subversion/libsvn_diff/diff_file.c head/contrib/subversion/subversion/libsvn_diff/diff_tree.c head/contrib/subversion/subversion/libsvn_diff/libsvn_diff.pc.in head/contrib/subversion/subversion/libsvn_diff/parse-diff.c head/contrib/subversion/subversion/libsvn_fs/fs-loader.c head/contrib/subversion/subversion/libsvn_fs/fs-loader.h head/contrib/subversion/subversion/libsvn_fs/libsvn_fs.pc.in head/contrib/subversion/subversion/libsvn_fs_base/fs.c head/contrib/subversion/subversion/libsvn_fs_base/libsvn_fs_base.pc.in head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h head/contrib/subversion/subversion/libsvn_fs_fs/dag.c head/contrib/subversion/subversion/libsvn_fs_fs/dump-index.c head/contrib/subversion/subversion/libsvn_fs_fs/fs.c head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.h head/contrib/subversion/subversion/libsvn_fs_fs/id.c head/contrib/subversion/subversion/libsvn_fs_fs/index.c head/contrib/subversion/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in head/contrib/subversion/subversion/libsvn_fs_fs/load-index.c head/contrib/subversion/subversion/libsvn_fs_fs/low_level.c head/contrib/subversion/subversion/libsvn_fs_fs/pack.c head/contrib/subversion/subversion/libsvn_fs_fs/recovery.c head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.sql head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c head/contrib/subversion/subversion/libsvn_fs_fs/revprops.c head/contrib/subversion/subversion/libsvn_fs_fs/revprops.h head/contrib/subversion/subversion/libsvn_fs_fs/stats.c head/contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.c head/contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.h head/contrib/subversion/subversion/libsvn_fs_fs/transaction.c head/contrib/subversion/subversion/libsvn_fs_fs/tree.c head/contrib/subversion/subversion/libsvn_fs_fs/verify.c head/contrib/subversion/subversion/libsvn_fs_util/libsvn_fs_util.pc.in head/contrib/subversion/subversion/libsvn_fs_x/cached_data.c head/contrib/subversion/subversion/libsvn_fs_x/changes.c head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.c head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.h head/contrib/subversion/subversion/libsvn_fs_x/fs.c head/contrib/subversion/subversion/libsvn_fs_x/fs_x.c head/contrib/subversion/subversion/libsvn_fs_x/libsvn_fs_x.pc.in head/contrib/subversion/subversion/libsvn_fs_x/low_level.c head/contrib/subversion/subversion/libsvn_fs_x/pack.c head/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h head/contrib/subversion/subversion/libsvn_fs_x/revprops.c head/contrib/subversion/subversion/libsvn_fs_x/temp_serializer.c head/contrib/subversion/subversion/libsvn_fs_x/transaction.c head/contrib/subversion/subversion/libsvn_fs_x/tree.c head/contrib/subversion/subversion/libsvn_fs_x/verify.c head/contrib/subversion/subversion/libsvn_ra/compat.c head/contrib/subversion/subversion/libsvn_ra/deprecated.c head/contrib/subversion/subversion/libsvn_ra/libsvn_ra.pc.in head/contrib/subversion/subversion/libsvn_ra/ra_loader.c head/contrib/subversion/subversion/libsvn_ra/ra_loader.h head/contrib/subversion/subversion/libsvn_ra/wrapper_template.h head/contrib/subversion/subversion/libsvn_ra_local/libsvn_ra_local.pc.in head/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c head/contrib/subversion/subversion/libsvn_ra_serf/commit.c head/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c head/contrib/subversion/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in head/contrib/subversion/subversion/libsvn_ra_serf/list.c head/contrib/subversion/subversion/libsvn_ra_serf/lock.c head/contrib/subversion/subversion/libsvn_ra_serf/options.c head/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h head/contrib/subversion/subversion/libsvn_ra_serf/replay.c head/contrib/subversion/subversion/libsvn_ra_serf/serf.c head/contrib/subversion/subversion/libsvn_ra_serf/update.c head/contrib/subversion/subversion/libsvn_ra_serf/util.c head/contrib/subversion/subversion/libsvn_ra_svn/client.c head/contrib/subversion/subversion/libsvn_ra_svn/editorp.c head/contrib/subversion/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in head/contrib/subversion/subversion/libsvn_ra_svn/protocol head/contrib/subversion/subversion/libsvn_repos/authz.c head/contrib/subversion/subversion/libsvn_repos/authz.h head/contrib/subversion/subversion/libsvn_repos/authz_info.c head/contrib/subversion/subversion/libsvn_repos/authz_parse.c head/contrib/subversion/subversion/libsvn_repos/commit.c head/contrib/subversion/subversion/libsvn_repos/config_file.c head/contrib/subversion/subversion/libsvn_repos/config_file.h head/contrib/subversion/subversion/libsvn_repos/delta.c head/contrib/subversion/subversion/libsvn_repos/deprecated.c head/contrib/subversion/subversion/libsvn_repos/dump.c head/contrib/subversion/subversion/libsvn_repos/fs-wrap.c head/contrib/subversion/subversion/libsvn_repos/libsvn_repos.pc.in head/contrib/subversion/subversion/libsvn_repos/list.c head/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c head/contrib/subversion/subversion/libsvn_repos/load.c head/contrib/subversion/subversion/libsvn_repos/log.c head/contrib/subversion/subversion/libsvn_repos/replay.c head/contrib/subversion/subversion/libsvn_repos/repos.c head/contrib/subversion/subversion/libsvn_subr/cmdline.c head/contrib/subversion/subversion/libsvn_subr/compress_lz4.c head/contrib/subversion/subversion/libsvn_subr/config_file.c head/contrib/subversion/subversion/libsvn_subr/config_keys.inc head/contrib/subversion/subversion/libsvn_subr/config_win.c head/contrib/subversion/subversion/libsvn_subr/deprecated.c head/contrib/subversion/subversion/libsvn_subr/dirent_uri.c head/contrib/subversion/subversion/libsvn_subr/error.c head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c head/contrib/subversion/subversion/libsvn_subr/internal_statements.h head/contrib/subversion/subversion/libsvn_subr/io.c head/contrib/subversion/subversion/libsvn_subr/iter.c head/contrib/subversion/subversion/libsvn_subr/libsvn_subr.pc.in head/contrib/subversion/subversion/libsvn_subr/lz4/lz4.c head/contrib/subversion/subversion/libsvn_subr/lz4/lz4internal.h head/contrib/subversion/subversion/libsvn_subr/mergeinfo.c head/contrib/subversion/subversion/libsvn_subr/object_pool.c head/contrib/subversion/subversion/libsvn_subr/opt.c head/contrib/subversion/subversion/libsvn_subr/pool.c head/contrib/subversion/subversion/libsvn_subr/sorts.c head/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c head/contrib/subversion/subversion/libsvn_subr/ssl_client_cert_pw_providers.c head/contrib/subversion/subversion/libsvn_subr/stream.c head/contrib/subversion/subversion/libsvn_subr/sysinfo.c head/contrib/subversion/subversion/libsvn_subr/utf.c head/contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c head/contrib/subversion/subversion/libsvn_subr/version.c head/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c head/contrib/subversion/subversion/libsvn_subr/win32_crypto.c head/contrib/subversion/subversion/libsvn_subr/x509info.c head/contrib/subversion/subversion/libsvn_subr/x509parse.c head/contrib/subversion/subversion/libsvn_wc/README head/contrib/subversion/subversion/libsvn_wc/conflicts.c head/contrib/subversion/subversion/libsvn_wc/conflicts.h head/contrib/subversion/subversion/libsvn_wc/deprecated.c head/contrib/subversion/subversion/libsvn_wc/diff_local.c head/contrib/subversion/subversion/libsvn_wc/entries.c head/contrib/subversion/subversion/libsvn_wc/libsvn_wc.pc.in head/contrib/subversion/subversion/libsvn_wc/node.c head/contrib/subversion/subversion/libsvn_wc/props.c head/contrib/subversion/subversion/libsvn_wc/questions.c head/contrib/subversion/subversion/libsvn_wc/revert.c head/contrib/subversion/subversion/libsvn_wc/tree_conflicts.c head/contrib/subversion/subversion/libsvn_wc/update_editor.c head/contrib/subversion/subversion/libsvn_wc/upgrade.c head/contrib/subversion/subversion/libsvn_wc/wc-checks.h head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h head/contrib/subversion/subversion/libsvn_wc/wc-queries.h head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql head/contrib/subversion/subversion/libsvn_wc/wc.h head/contrib/subversion/subversion/libsvn_wc/wc_db.c head/contrib/subversion/subversion/libsvn_wc/wc_db.h head/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c head/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c head/contrib/subversion/subversion/libsvn_wc/wcroot_anchor.c head/contrib/subversion/subversion/svn/auth-cmd.c head/contrib/subversion/subversion/svn/blame-cmd.c head/contrib/subversion/subversion/svn/cl.h head/contrib/subversion/subversion/svn/conflict-callbacks.c head/contrib/subversion/subversion/svn/diff-cmd.c head/contrib/subversion/subversion/svn/help-cmd.c head/contrib/subversion/subversion/svn/info-cmd.c head/contrib/subversion/subversion/svn/list-cmd.c head/contrib/subversion/subversion/svn/log-cmd.c head/contrib/subversion/subversion/svn/merge-cmd.c head/contrib/subversion/subversion/svn/notify.c head/contrib/subversion/subversion/svn/propset-cmd.c head/contrib/subversion/subversion/svn/resolve-cmd.c head/contrib/subversion/subversion/svn/revert-cmd.c head/contrib/subversion/subversion/svn/svn.c head/contrib/subversion/subversion/svn/util.c head/contrib/subversion/subversion/svn_private_config.h.in head/contrib/subversion/subversion/svnadmin/svnadmin.c head/contrib/subversion/subversion/svnbench/cl.h head/contrib/subversion/subversion/svnbench/help-cmd.c head/contrib/subversion/subversion/svnbench/svnbench.c head/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c head/contrib/subversion/subversion/svnfsfs/dump-index-cmd.c head/contrib/subversion/subversion/svnfsfs/load-index-cmd.c head/contrib/subversion/subversion/svnfsfs/stats-cmd.c head/contrib/subversion/subversion/svnfsfs/svnfsfs.c head/contrib/subversion/subversion/svnlook/svnlook.c head/contrib/subversion/subversion/svnmucc/svnmucc.c head/contrib/subversion/subversion/svnrdump/dump_editor.c head/contrib/subversion/subversion/svnrdump/load_editor.c head/contrib/subversion/subversion/svnrdump/svnrdump.c head/contrib/subversion/subversion/svnrdump/svnrdump.h head/contrib/subversion/subversion/svnrdump/util.c head/contrib/subversion/subversion/svnserve/logger.c head/contrib/subversion/subversion/svnserve/logger.h head/contrib/subversion/subversion/svnserve/serve.c head/contrib/subversion/subversion/svnserve/svnserve.c head/contrib/subversion/subversion/svnsync/svnsync.c head/contrib/subversion/subversion/svnversion/svnversion.c head/contrib/subversion/win-tests.py head/usr.bin/svn/lib/libsvn_client/Makefile head/usr.bin/svn/lib/libsvn_repos/Makefile head/usr.bin/svn/svn/Makefile head/usr.bin/svn/svn_private_config.h Directory Properties: head/contrib/subversion/ (props changed) Modified: head/contrib/subversion/.editorconfig ============================================================================== --- head/contrib/subversion/.editorconfig Mon Jun 1 10:14:45 2020 (r361692) +++ head/contrib/subversion/.editorconfig Mon Jun 1 10:27:05 2020 (r361693) @@ -7,3 +7,13 @@ indent_style = space indent_size = 2 insert_final_newline = true trim_trailing_whitespace = false + +[**/Makefile*] +indent_style = tab + +[build-outputs.mk] +indent_style = tab + +[build/generator/templates/build-outputs.mk.ezt] +indent_style = tab + Copied: head/contrib/subversion/.swig_pl_checked (from r361678, vendor/subversion/dist/.swig_pl_checked) ============================================================================== Copied: head/contrib/subversion/.swig_py_checked (from r361678, vendor/subversion/dist/.swig_py_checked) ============================================================================== Copied: head/contrib/subversion/.swig_rb_checked (from r361678, vendor/subversion/dist/.swig_rb_checked) ============================================================================== Modified: head/contrib/subversion/CHANGES ============================================================================== --- head/contrib/subversion/CHANGES Mon Jun 1 10:14:45 2020 (r361692) +++ head/contrib/subversion/CHANGES Mon Jun 1 10:27:05 2020 (r361693) @@ -1,5 +1,355 @@ +# To view a revision listed as (rXXXXXXX), visit: +# https://svn.apache.org/rXXXXXXX +# +# To view an issue listed as (issue #XXXX), visit: +# https://subversion.apache.org/issue-XXXX + +Version 1.14.0 +(6 May 2020, from /branches/1.14.x) +https://svn.apache.org/repos/asf/subversion/tags/1.14.0 + + User-visible changes: + - Minor new features and improvements: + * Experimental shelving feature is now disabled by default (r1875039) + * Reinstate support for experimental shelving v2 from SVN 1.11 (r1875037) + * Introduce 'svnadmin build-repcache' command (r1875921 et al) + + - Client-side improvements and bugfixes: + * Add 'changelist' option to 'svn info --show-item' (r1869481) + * Allow simultaneous use of 'svn log' --quiet and --diff options (r1871916) + * Fix 'svn info' for file that was inside replaced directory (issue #4837) + * Don't abort if the server redirects to a non-canonical URL (r1873375) + * Fix merge assertion failure in svn_sort__array_insert (issue #4840) + * Escape filenames when invoking $SVN_EDITOR (r1874057 et al) + * Small performance optimization for FSFS rep-cache.db (r1875918) + * Fix a crash seen when using git-svn with kwallet (r1875680) + + - Server-side improvements and bugfixes: + * Fix 'svnadmin load --normalize-props' for versioned properties (r1868203) + * mailer.py: prevent SMTP errors from impeding later emails (issue #1804) + * mailer.py: Add option to specify the SMTP port to connect to (r1872398) + * Make svn-backup-dump.py work on Python 3 + * validate-files.py: Fix handling for non-ASCII characters (r1874393) + * Fix an undefined behavior problem in FSFS caching code (r1876054) + + Developer-visible changes: + * Require at least version 1.5 of APR (r1874094) + * Support Python3 in the py-swig bindings; requires py3c (r1869354 et al) + * Support building with SWIG 4 on Python 3.x (r1869853) + * Fix svnserveautocheck for Python 3 (r1868151) + * contribulyze.py: Support Python 3 in addition to Python 2 (r1871211) + * Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7 (r1876020) + +Version 1.13.0 +(30 Oct 2019, from /branches/1.13.x) +https://svn.apache.org/repos/asf/subversion/tags/1.13.0 + + User-visible changes: + - Minor new features and improvements: + * New 'svnadmin rev-size' command to report revision size (r1857624) + * In 'svn help', hide experimental commands and global options (issue #4828) + * Add a hint about mod_dav_svn misconfiguration (r1866738) + * Performance improvement for 'svn st' etc., in WC SQLite DB (r1865523) + + - Client-side bugfixes: + * Windows: avoid delays in SSL certificate validation override (r1863018) + * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) + * Fix "svn diff --changelist ARG" broken in subdirectories (issue #4822) + * Fix misleading 'redirect cycle' error on a non-repository URL (r1866899) + + - Server-side bugfixes: + * svnserve: Report some errors that we previously ignored (r1866062) + * Make server code more resilient to malformed paths and URLs (r1866318 et al) + * Make dump stream parser more resilient to malformed dump stream (r1866951) + * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) + + - Client-side and server-side bugfixes: + * Fix excessive memory usage in some cases reading binary data (r1866950) + * Win32: fix svn_io_file_rename2() spinning in a retry loop (r1865518) + + - Other tool improvements and bugfixes: + * svn_load_dirs.pl: do not show password; fix cleanup (r1863262, r1863392) + + Developer-visible changes: + * New svn_fs_ioctl() API for FSFS stats, dump/load index, rev-size (r1857435) + + +Version 1.12.2 +(24 Jul 2019, from /branches/1.12.x) +https://svn.apache.org/repos/asf/subversion/tags/1.12.2 + + User-visible changes: + * Fix conflict resolver bug: local and incoming edits swapped. (r1863285) + * Fix memory lifetime problem in a libsvn_wc error code path. (r1863287) + * Faster Windows file existence checks, improving 'svn st' etc. (r1863289) + + Developer-visible changes: + * Allow generating Visual Studio 2019 projects (r1863286) + * Fix build with APR 1.7.0. (r1860377) + * Fix building Subversion with Visual Studio 2005 and 2008. (r1863288) + * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863290) + + +Version 1.12.1 +(Not released; see changes for 1.12.2.) + + +Version 1.12.0 +(12 Apr 2019, from /branches/1.12.x) +https://svn.apache.org/repos/asf/subversion/tags/1.12.0 + + User-visible changes: + - Major new features: + + - Minor new features and improvements: + * 'move vs. move' merge conflicts can now be resolved (r1846851, r1851913) + * 'svn --version --verbose' shows loaded libraries on Linux (r1843774) + * 'svnrdump' can read/write a file instead of stdin/stdout (r1844906) + * 'svn list' tries to not truncate the author's name (r1847384 et al.) + * 'svn list' can show sizes in base-2 unit suffixes (r1847384 et al.) + * 'svn info' shows the size of files in the repository (r1847441 et al.) + * 'svn cleanup' can remove read-only directories (#4806, r1854072 et al.) + + - Client-side bugfixes: + * Repos-to-WC copy with --parents works with absent target (r1843888) + * Repos-to-WC copy from foreign repo with peg/operative revs (#4785) + + - Server-side bugfixes: + * Ignore empty group definitions in authz files (#4802, r1851687) + + - Client-side and server-side bugfixes: + + - Other tool improvements and bugfixes: + * svnauthz: warn about empty groups in authz files (#4803, r1851823) + * Storing passwords in plain text on disk is disabled by default (r1845377) + + Developer-visible changes: + - General: + * Updated the required libtool version to 2.x (r1845716) + * get-deps.sh: Remove references to Googlemock and Googletest (r1849200) + * All C++ code is compiled in C++11 mode by default (r1849202) + + - Bindings: + * JavaHL: Fixed potential core dump in ISVNClient.diff (r1845408) + * JavaHL: Let clients decode file contents from ISVNClient.blame (r1851333) + + +Version 1.11.1 +(11 Jan 2019, from /branches/1.11.x) +http://svn.apache.org/repos/asf/subversion/tags/1.11.1 + + User-visible changes: + - Minor new features and improvements: + * Conflict resolver support for added vs unversioned file (r1845577) + * Conflict resolver support for unversioned directories (r1846299) + * Improve help for 'svn add' and the '-N' option (r1842814 et al.) + * Improve display of Mac OS name in 'svn --version --verbose' (r1842334) + + - Client-side bugfixes: + * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768) + * Fix: foreign repo copy with peg/operative revisions (#4785) + * Fix: foreign repo copy of file adding mergeinfo (#4792) + * Fix: assertion failure using -rPREV on a working copy at r0 (#4532) + * Fix: tree conflict message ends a sentence with a colon (#4717) + + - Server-side bugfixes: + * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn + * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791) + * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882) + * Fix crash in mod_http2 (#4782) + + - Other tool improvements and bugfixes: + * svndumpfilter: Clarify error messages by including node path (r1845261) + + - Bindings bugfixes: + * JavaHL: Fix crash in client code when using external diff (r1845408) + + Developer-visible changes: + - General: + * Fix build on systems without python in $PATH (r1845555) + * Fix compiler warnings about indentation (r1845556 et al.) + + - API changes: + (none) + + +Version 1.11.0 +(30 Oct 2018, from /branches/1.11.x) +http://svn.apache.org/repos/asf/subversion/tags/1.11.0 + + User-visible changes: + - Major new features: + * Shelving is no longer based on patch files (experimental) (issue #3625) + * Checkpointing (experimental) (issue #3626) + * Viewspec output command (experimental) (issue #4753) + + - Minor new features and improvements: + * Improvements to tree conflict resolution (issue #4694 #4766 ...) + * 'patch' can now read non-pretty-printed svn:mergeinfo diffs (r1822151) + * Better error when http:// URL is not a Subversion repository (r1825302) + * Add 'schedule' and 'depth' items to 'svn info --show-item' (r1827032) + * Allow the client cert password to be saved (r1836762) + + - Client-side bugfixes: + * Fix a crash in a repo:WC summary diff of a local copy (r1835218) + * Fix double diff headers (r1836746) + * Tree conflict resolver: avoid endless scan in some cases (r1839662) + + - Server-side bugfixes: + * svnadmin dump shouldn't canonicalize svn:date (issue #4767) + * 'svnadmin verify --keep-going --quiet' shows an error summary (r1837790) + * Let 'svnadmin recover' prune the rep-cache even if disabled (r1838813) + + - Client-side and server-side bugfixes: + * Fix pattern-matching of top level path in listing with search (r1830599) + * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1836306) + + - Other tool improvements and bugfixes: + * tools/client-side/bash_completion: Add '--password-from-stdin' (r1820045) + + Developer-visible changes: + - General: + * new tool: tools/dist/edit-N-log-messages (r1819207) + * tools/dev/unix-build/Makefile.svn: various fixes + * Expose the diff option 'pretty_print_mergeinfo' in APIs (r1822014) + * In 'revert' APIs, choose whether to delete schedule-add nodes (r1822534) + + - Bindings: + * Fix Python binding fs.FileDiff behaviour with python-future (r1823802) + * Fix Python unit test, fs.SubversionFSTestCase, on Windows (r1824410) + * Bump minimum JDK version required for JavaHL to 1.8 (r1831895) + * Enable building against Java 10 (r1841180 et al) + * Fix a potential crash in JavaHL (issue #4764) + + +Version 1.10.6 +(24 Jul 2019, from /branches/1.10.x) +https://svn.apache.org/repos/asf/subversion/tags/1.10.6 + + User-visible changes: + * Allow the use of empty groups in authz rules. (r1854883) + * Fix conflict resolver case with move vs move conflicts. (r1863297) + * Fix #4760: Missing children in svnadmin dump --include/exclude. (r1863298) + * Fix #4793: authz rights from inverted access selectors. (r1854882) + * Fix conflict resolver bug: local and incoming edits swapped. (r1863300) + * Fix #4806: Remove on-disk trees with read-only dirs. (r1863299) + * Fix memory lifetime problem in a libsvn_wc error code path. (r1863302) + * No tree conflict when 'svn up' deletes unmodified dir with unversioned items. (r1863296) + * Remove a useless common ancestor search from conflict resolver. (r1863294) + + Developer-visible changes: + * Allow generating Visual Studio 2019 projects (r1863304) + * Fix a use-after-free in mod_dav_svn's logging of FS warnings. (r1863292) + * Fix "unused static function" warning in release-mode builds. (r1854884) + * Fix build with APR 1.7.0. (r1863303) + * Fix issue #4804: spurious SQLite-related test failures. (r1863295) + * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863305) + * Silence a deprecation warning from amalgamated SQLite on macOS. (r1863291) + + +Version 1.10.5 +(Not released; see changes for 1.10.6.) + + +Version 1.10.4 +(11 Jan 2019, from /branches/1.10.x) +http://svn.apache.org/repos/asf/subversion/tags/1.10.4 + + User-visible changes: + - Minor new features and improvements: + * Conflict resolver support for added vs unversioned file (r1845577) + * Conflict resolver support for unversioned directories (r1846299) + + - Client-side bugfixes: + * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768) + * Fix: foreign repo copy with peg/operative revisions (#4785) + * Fix: foreign repo copy of file adding mergeinfo (#4792) + * Fix: assertion failure using -rPREV on a working copy at r0 (#4532) + * Fix: tree conflict message ends a sentence with a colon (#4717) + + - Server-side bugfixes: + * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn + * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791) + * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882) + * Fix crash in mod_http2 (#4782) + + - Other tool improvements and bugfixes: + * svndumpfilter: Clarify error messages by including node path (r1845261) + + - Bindings bugfixes: + * JavaHL: Fix crash in client code when using external diff (r1845408) + + Developer-visible changes: + - General: + * Fix build on systems without python in $PATH (r1845555) + + - API changes: + (none) + + +Version 1.10.3 +(10 Oct 2018, from /branches/1.10.x) +http://svn.apache.org/repos/asf/subversion/tags/1.10.3 + + User-visible changes: + - Minor new features and improvements: + * Store the HTTPS client cert password (r1842578) + + - Client-side bugfixes: + * Fix shelving when custom diff command is configured (issue #4758) + * Fix conflict resolver crashes (issue #4744, r1842581, r1842582, r1842583) + * Fix conflict resolver endless scan in some cases (r1842586) + * Fix "Accept incoming deletion" on locally deleted file (issue #4739) + * Fix "resolver adds unrelated moves to move target list" (issue #4766) + + - Server-side bugfixes: + * Reject bad PUT before CHECKOUT in v1 HTTP protocol (r1841281) + * Let 'svnadmin recover' prune the rep-cache even if disabled (r1842585) + + - Client-side and server-side bugfixes: + * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1841282) + + - Other tool improvements and bugfixes: + * 'svnadmin verify --keep-going --quiet' shows an error summary (r1842584) + * Fix error in german translation for 'svn help merge' (r1837038) + + Developer-visible changes: + - General: + * Python tests use the current python executable (r1842626) + + +Version 1.10.2 +(20 Jul 2018, from /branches/1.10.x) +http://svn.apache.org/repos/asf/subversion/tags/1.10.2 + + User-visible changes: + - Client-side bugfixes: + * Correctly claim to offer Gnome Keyring support with libsecret (r1831142) + * Fix segfault using Gnome Keyring with libsecret (r1835782) + * Fix JavaHL local refs capacity warning when unparsing externals (r1831143) + * Since on Windows Subversion does not handle symlinks, never check for reparse points (r1835701) + * Prune externals after 'update --set-depth=exclude' (r1835702) + * Fix issue #4740, "conflict resolver searches too far back ..." (r1835703) + - Server-side bugfixes: + * Fix regression issue #4741: authz group refers to multiple groups (r1831220) + + Developer-visible changes: + - General: + * Regression test and FSFS checksum test, part of issue #4722 (r1828043) + * Explicit error on configure --without-lz4 or --without-utf8proc (r1831604) + * configure.ac: Fix regression relating to path to 'rdoc' (r1833486) + * Ensure consistent use of $PYTHON during build and test (r1833487) + * Fix libsvn_auth_gnome_keyring.pc when built using libsecret (r1835781) + - Bindings: + * Fix regression in use of pre-generated Swig bindings in release builds (r1833488) + + +Version 1.10.1 +(Not released; see changes for 1.10.2.) + + Version 1.10.0 -(?? ??? 2018, from /branches/1.10.x) +(13 Apr 2018, from /branches/1.10.x) http://svn.apache.org/repos/asf/subversion/tags/1.10.0 See the 1.10 release notes for a more verbose overview of the changes since @@ -8,7 +358,7 @@ the 1.9 release: https://subversion.apache.org/docs/r User-visible changes: - Major new features: * Better interactive conflict resolution for tree conflicts (r1687489 et al) - * Wilcards and improved performance in path-based authorization (r1776832) + * Wildcards and improved performance in path-based authorization (r1776832) * New experimental 'svn shelve' command (issue #3625) - Minor new features and improvements: * svnbench: Show time taken & bytes transferred (r1703383, r1710586) @@ -29,7 +379,7 @@ the 1.9 release: https://subversion.apache.org/docs/r * ra_serf: Adjustments for serf versions with HTTP/2 support (r1716400) * ra_serf: Send svndiff1 deltas during commit (r1704317, r1704613, r1791290) * ra_serf: Stream svndiff deltas w/o creating temporary files (r1803143 et al) - * ra_serf: Don't necessarily request full MERGE reponses (r1806017 et al) + * ra_serf: Don't necessarily request full MERGE responses (r1806017 et al) * 'svn patch': Parse binary diffs in git-style patches (r1703925) * 'svnadmin info' now reports latest revision in the repository (r1697953) * ra_svn: Various performance-related tweaks (r1694490) @@ -286,6 +636,102 @@ the 1.9 release: https://subversion.apache.org/docs/r * Ruby: Detect versions up to 2.4 (r1806570) +Version 1.9.12 +(24 Jul 2019, from /branches/1.9.x) +https://svn.apache.org/repos/asf/subversion/tags/1.9.12 + + User-visible changes: + * No tree conflict when 'svn up' deletes unmodified dir with unversioned items. (r1863309) + + Developer-visible changes: + * Allow generating Visual Studio 2019 projects (r1863311) + * Fix a use-after-free in mod_dav_svn's logging of FS warnings. (r1863307) + * Fix "unused static function" warning in release-mode builds. (r1854881) + * Fix build with APR 1.7.0. (r1863310) + * Fix issue #4804: spurious SQLite-related test failures. (r1863308) + * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863312) + * Silence a deprecation warning from amalgamated SQLite on macOS. (r1863306) + + +Version 1.9.11 +(Not released; see changes for 1.9.12.) + + +Version 1.9.10 +(11 Jan 2019, from /branches/1.9.x) +http://svn.apache.org/repos/asf/subversion/tags/1.9.10 + + User-visible changes: + - Client-side bugfixes: + * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768) + * Fix: foreign repo copy with peg/operative revisions (#4785) + * Fix: assertion failure using -rPREV on a working copy at r0 (#4532) + * Fix: german translation for 'svn help merge' (r1837037) + * Fix: prune externals after 'update --set-depth=exclude' (r1830883 et al.) + * Fix: detection of GPG-agent (r1794166 et al.) + * Fix: null updates don't update last-changed-revision (#4700) + * Fix: merge "Unable to parse reversed revision range" (#4686) + + - Server-side bugfixes: + * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791) + * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882) + * Fix: crash in mod_http2 (#4782) + * Fix: 'svnadmin upgrade' of BDB: Error out on too-new formats (r1804013) + * Fix: Enforce v1 HTTP protocol: error if PUT before CHECKOUT (r1833465) + * Fix: Let 'svnadmin recover' prune rep-cache even if disabled (r1838813) + * Add test and FSFS checksum verification for issue #4722 (r1826720 et al.) + + - Other tool improvements and bugfixes: + * Install 'fsfs-stats' wrapper for 1.8 compat (r1802032 et al.) + * Note that 'tools/client-side/detach.py' doesn't work on 1.8+ (r1696722) + + - Bindings bugfixes: + * JavaHL: Fix crash in client code when using external diff (r1845408) + * JavaHL: SSL server trust prompt: allow accepting temporarily (r1820718) + + Developer-visible changes: + - General: + (none) + + - API changes: + (none) + + +Version 1.9.9 +(20 Jul 2018, from /branches/1.9.x) +http://svn.apache.org/repos/asf/subversion/tags/1.9.9 + + User-visible changes: + - Client-side bugfixes: + * Fix SEGV for 'svn export -rN WC' with relative externals (r1803755) + * Fix issue #4677: 'svn up' after a directory replaced a file (r1814248) + * Fix segfault when no home directory is available (r1819199) + * Performance: Make 'svn info' fast on old repository revisions (r1827690) + * Fix RA-serf problem with proxy username and password (r1833571) + + - Server-side bugfixes: + * svnadmin: Fix false errors on some valid LOCK_PATH arguments (r1803754) + * Fix crash when exiting 'svnserve --config-file' (r1824405) + * Fix issue #4722: false "filesystem is corrupt" error on commit (r1827688) + * Reword confusing "nested" wording in an httpd.conf warning (r1835700) + + - Bindings bugfixes: + * swig-py: svn.core.Stream supports raw binary file-like objects (r1820620) + * swig-rb: Don't crash if svn_md5_digest_to_cstring returns NULL (r1823805) + + Developer-visible changes: + - General: + * Fix CVE-2017-9800: Malicious server can execute arbitrary command on client (r1804698) + * Fix test failure if compile- and run-time HTTPD versions differ (r1820523) + + - API changes: + (none) + + +Version 1.9.8 +(Not released; see changes for 1.9.9.) + + Version 1.9.7 (10 Aug 2017, from /branches/1.9.x) http://svn.apache.org/repos/asf/subversion/tags/1.9.7 @@ -883,7 +1329,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0 * cache: fix premature eviction due to 64-bit underflows (r1567996 et al) * svnserve: fix potential integer overflow in Cyrus SASL support (r1570434) * bdb: fix potential integer overflow and underflow (r1570701) - * bdb: prevent silent propogation of some corruption (r1570778) + * bdb: prevent silent propagation of some corruption (r1570778) * svnadmin hotcopy: do not corrupt db/current contents when copying old FSFS repos (r1603485) * svnadmin hotcopy: don't produce broken copies when a concurrent pack @@ -1143,7 +1589,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0 ranges (r1569731) * svn_rangelist_inheritable2() and svn_mergeinfo_inheritable2(): fix a pool lifetime issue (r1569764) - * new APIs to support cancelation during unified diff output and + * new APIs to support cancellation during unified diff output and allow the context size to be specified (r1570149 et al) * APIs related to retrieving logs are now documented to be unlimited when a negative value is passed for the limit (r1570330, 1570335) @@ -1261,7 +1707,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0 * swig-py: Add close to the core.Stream class (r1619077) * javahl: add example clients that use the authn API (r1640533) * swig-py: implement dump stream parser (r1642813) - * swig-pl: remove some unneded cleanup code that triggered a cleanup + * swig-pl: remove some unneeded cleanup code that triggered a cleanup failure on windows (r1643072) * swig-pl: make cancel_func, cancel_baton parameter pairs work (r1648852) * javahl: expose whitespace diff parameters to blame method (issue #4475) @@ -1592,7 +2038,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.9 - Client-side bugfixes: * log: use proper peg revision over DAV (r1568872) * upgrade: allow upgrading from 1.7 with exclusive locks (r1572102 et al) - * proplist: resolve inconsitent inherited property results (r1575270 et al) + * proplist: resolve inconsistent inherited property results (r1575270 et al) * increase minimal timestamp sleep from 1ms to 10ms (r1581305 et al) * merge: automatic merge confused by subtree merge (issue #4481) * propget: report proper error on invalid revision for url (r1586255) @@ -1634,7 +2080,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.9 Developer-visible changes: - General: * improve consistency checks of DAV inherited property requests (r1498000) - * fix ocassional failure in autoprop_tests.py (r1567752) + * fix occasional failure in autoprop_tests.py (r1567752) * avoid duplicate sqlite analyze information rows (r1571214) * add Mavericks to our sysinfo output (r1573088) * bump copyright years to 2014 (r1555403) @@ -1687,7 +2133,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.8 Developer-visible changes: - General: - * fix ocassional failure of check_tests.py 12 (r1496127 et al) + * fix occasional failure of check_tests.py 12 (r1496127 et al) * fix failure with SQLite 3.8.1-3.8.3 when built with SQLITE_ENABLE_STAT3/4 due to bug in SQLite (r1567286, r1567392) * specify SQLite defaults that can be changed when SQLite is built @@ -1793,7 +2239,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.3 - Client- and server-side bugfixes: * translation updates for Swedish * enforce strict version equality between tools and libraries (r1502267) - * consistently output revisions as "r%ld" in error messags (r1499044 et al) + * consistently output revisions as "r%ld" in error messages (r1499044 et al) - Client-side bugfixes: * status: always use absolute paths in XML output (issue #4398) @@ -2372,7 +2818,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.7.18 Developer-visible changes: - General: - * fix ocassional failure in checkout_tests.py test 12. (r1496127) + * fix occasional failure in checkout_tests.py test 12. (r1496127) * disable building ZLib's assembly optimizations on Windows. @@ -2987,7 +3433,7 @@ the 1.6 release: http://subversion.apache.org/docs/re * fixed: wc-to-wc copy of a switch source (issue #1802) * fixed: 'svn st' reports symlinks as obstructed items (issue #2284) * fixed: 'cd e:\; svn up e:\' fails (issue #2556) - * fixed: svn aborts on commiting from root dir on windows (issue #3346) + * fixed: svn aborts on committing from root dir on windows (issue #3346) * fixed: removing a dir scheduled for deletion corrupts wc (issue #2741) * fixed: 'svn cleanup' fails on obstructed paths (issue #2867) * fixed: case-only renames resulting from merges don't work (issue #3115) @@ -3024,7 +3470,7 @@ the 1.6 release: http://subversion.apache.org/docs/re * fixed: 'svn info' returns parent info on missing dirs (issue #3178) * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919) * fixed: 'svn --version' fails with non-existent $HOME (issue #3947) - * fixed: unforced export silently overwites existing file (issue #3799) + * fixed: unforced export silently overwrites existing file (issue #3799) * fixed: reverse merge which adds subtree mergeinfo fails (issue #3978) * fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963) * fixed: 'svn up' updates file externals in target siblings (issue #3819) @@ -3368,7 +3814,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.6.11 Developer-visible changes: * disable checks for wc-ng working copies when running the test suite * on Windows, don't ignore move operation error codes (r896915) - * more precise reporting of errors occuring with sqlite init (r927323, -8) + * more precise reporting of errors occurring with sqlite init (r927323, -8) * ensure rangelist APIs are commutative (r923389, -91) @@ -5720,7 +6166,7 @@ http://svn.apache.org/repos/asf/subversion/tags/0.28.2 twice as slow and lose all concurrent-client scalability. This is a temporary fix for a larger design problem. See issue - http://subversion.tigris.org/issues/show_bug.cgi?id=1499 + https://issues.apache.org/jira/browse/SVN-1499 Version 0.28.1 @@ -6731,7 +7177,7 @@ Version 0.9 (released 15 Feb 2002, revision 1302) - no more 'path styles' in path library - rewrite bootstrapping code for python test framework - rewrite commandline app's help-system and alias-system - - feedback table replaced with notfication callback + - feedback table replaced with notification callback - rewrite sorting of hashes - svnadmin internal rewrite - faster post-update processing Modified: head/contrib/subversion/COMMITTERS ============================================================================== --- head/contrib/subversion/COMMITTERS Mon Jun 1 10:14:45 2020 (r361692) +++ head/contrib/subversion/COMMITTERS Mon Jun 1 10:27:05 2020 (r361693) @@ -27,7 +27,7 @@ Blanket commit access: dlr Daniel Rall mbk Mark Benedetto King jaa Jani Averbach - julianfoad Julian Foad + julianfoad Julian Foad jszakmeister John Szakmeister ehu Erik Hülsmann breser Ben Reser @@ -61,6 +61,9 @@ Blanket commit access: astieger Andreas Stieger jamessan James McCoy luke1410 Stefan Hett + troycurtisjr Troy Curtis, Jr + hartmannathan Nathan Hartman + futatuki Yasuhito Futatsuki [[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]] @@ -87,6 +90,7 @@ Partial committers who have asked to be listed as dorm rassilon Bill Tutt (Win32, COM, issue-1003-dev br.) pll Paul lussier (releases) rdonch Роман Донченко (Swig-Python b.) + karolszk Karol Szkudlarek (po: pl) Commit access for specific areas: @@ -103,7 +107,6 @@ Commit access for specific areas: rschupp Roderich Schupp (Swig bindings) stilor Alexey Neyman (Python bindings, svn-vendor.py) - troycurtisjr Troy Curtis, Jr (Swig bindings) Packages: @@ -179,7 +182,6 @@ Commit access for specific areas: oyvindmo Øyvind Møll (po: nb) sunny256 Øyvind A. Holm (po: nb) jzgoda Jaroslaw Zgoda (po: pl) - karolszk Karol Szkudlarek (po: pl) plasma Wei-Hon Chen (po: zh_TW) jihuang June-Yen Huang (po: zh_TW) [EMAIL IS BOUNCING] Modified: head/contrib/subversion/INSTALL ============================================================================== --- head/contrib/subversion/INSTALL Mon Jun 1 10:14:45 2020 (r361692) +++ head/contrib/subversion/INSTALL Mon Jun 1 10:27:05 2020 (r361693) @@ -3,7 +3,7 @@ A Quick Guide ====================================== -$LastChangedDate: 2017-12-25 04:00:08 +0000 (Mon, 25 Dec 2017) $ +$LastChangedDate: 2020-02-17 03:49:42 +0000 (Mon, 17 Feb 2020) $ Contents: @@ -23,8 +23,8 @@ Contents: III. BUILDING A SUBVERSION SERVER A. Setting Up Apache Httpd - B. Making and Installing the Subversion Server - C. Configuring Apache for Subversion + B. Making and Installing the Subversion Apache Server Module + C. Configuring Apache Httpd for Subversion D. Running and Testing E. Alternative: 'svnserve' and ra_svn @@ -96,6 +96,11 @@ I. INTRODUCTION These diff streams are used everywhere -- over the network, in the repository, and in the client's working copy. + * utf8proc (REQUIRED for client and server) + + Subversion uses utf8proc for UTF-8 support, including Unicode + normalization. + * Apache Serf (OPTIONAL for client) The Apache Serf library allows the Subversion client to send HTTP @@ -116,21 +121,21 @@ I. INTRODUCTION * Netwide Assembler (OPTIONAL for client and server) - The Netwide Assembler (NASM) is used to build the (optionally) + The Netwide Assembler (NASM) is used to build the (optional) assembler modules of OpenSSL. As of OpenSSL 1.1.0 NASM is the only supported assembler. - * Berkeley DB (OPTIONAL for client and server) + * Berkeley DB (DEPRECATED and OPTIONAL for client and server) - There are two different repository 'back-end' - implementations. One implementation stores data in a flat - filesystem (known as FSFS); the other implementation stores - data in a Berkeley DB database (known as BDB). When you - create a repository, you have the option of specifying a - storage back-end. The Berkeley DB back-end will only be - available if the BDB libraries are discovered at compile - time. The Berkeley DB back-end has been deprecated and - is not recommend. + When you create a repository, you have the option of + specifying a storage 'back-end' implementation. Currently, + there are two options. The newer and recommended one, known + as FSFS, does not require Berkeley DB. FSFS stores data in a + flat filesystem. The older implementation, known as BDB, has + been deprecated and is not recommended for new repositories, + but is still available. BDB stores data in a Berkeley DB + database. This back-end will only be available if the BDB + libraries are discovered at compile time. * libsasl (OPTIONAL for client and server) @@ -147,10 +152,16 @@ I. INTRODUCTION for other languages, you need to have those languages available at build time. - * KDELibs, GNOME Keyring (OPTIONAL for client) + * py3c (OPTIONAL, but REQUIRED for Python bindings) + The Python 3 Compatibility Layer for C Extensions is required + to build the Python language bindings. + + * KDE Framework 5, libsecret, GNOME Keyring (OPTIONAL for client) + Subversion contains optional support for storing passwords in - KWallet (KDE 4) or GNOME Keyring. + KWallet via KDE Framework 5 libraries (preferred) or kdelibs4, + and GNOME Keyring via libsecret (preferred) or GNOME APIs. * libmagic (OPTIONAL) @@ -160,12 +171,8 @@ I. INTRODUCTION configured via auto-props or the mime-types-file option take precedence. - * Googlemock aka Gmock (OPTIONAL) - This optional package is used by the tests for Subversions' - C++ bindings. - C. Dependencies in Detail Subversion depends on a number of third party tools and libraries. @@ -199,7 +206,7 @@ I. INTRODUCTION commands described in section II.B before installing the following. - 1. Apache Portable Runtime 1.3 or newer (REQUIRED) + 1. Apache Portable Runtime 1.5 or newer (REQUIRED) Whenever you want to build any part of Subversion, you need the Apache Portable Runtime (APR) and the APR Utility (APR-util) @@ -253,22 +260,55 @@ I. INTRODUCTION configure script. - 2. Zlib (REQUIRED) + 2. SQLite (REQUIRED) - Subversion's binary-differencing engine depends on zlib for - compression. Most Unix systems have libz pre-installed, but - if you need it, you can get it from + Subversion requires SQLite version 3.8.2 or above. You can meet this + dependency several ways: + * Use an SQLite amalgamation file. + * Specify an SQLite installation to use. + * Let Subversion find an installed SQLite. - http://www.zlib.net/ + To use an SQLite-provided amalgamation, just drop sqlite3.c into + Subversion's sqlite-amalgamation/ directory, or point to it with the + --with-sqlite configure option. This file also ships with the Subversion + dependencies distribution, or you can download it from SQLite: + https://www.sqlite.org/download.html - 3. autoconf 2.59 or newer (Unix only) + 3. Zlib (REQUIRED) + + Subversion's binary-differencing engine depends on zlib for + compression. Most Unix systems have libz pre-installed, but if + you need it, you can get it from + + http://www.zlib.net/ + + + 4. utf8proc (REQUIRED) + + Subversion uses utf8proc for UTF-8 support. Configure will + attempt to locate utf8proc by default using pkg-config and known + paths. + + If it is installed in a non-standard location, then use: + + --with-utf8proc=/path/to/libutf8proc + + Alternatively, a copy of utf8proc comes bundled with the + Subversion sources. If configure should use the bundled copy, + use: + + --with-utf8proc=internal + + + 5. autoconf 2.59 or newer (Unix only) + This is required only if you plan to build from the latest source (see section II.B). Generally only developers would be doing this. - 4. libtool 1.4 or newer (Unix only) + 6. libtool 1.4 or newer (Unix only) This is required only if you plan to build from the latest source (see section II.B). @@ -277,7 +317,7 @@ I. INTRODUCTION newer. The autogen.sh script knows about that. - 5. Apache Serf library 1.3.4 or newer (OPTIONAL) + 7. Apache Serf library 1.3.4 or newer (OPTIONAL) If you want your client to be able to speak to an Apache server (via a http:// or https:// URL), you must link against @@ -292,13 +332,14 @@ I. INTRODUCTION instead. Apache Serf can be obtained via your system's package distribution - system or directly from http://code.google.com/p/serf/. + system or directly from https://serf.apache.org/. For more information on Apache Serf and Subversion's ra_serf, see the file subversion/libsvn_ra_serf/README. - 6. OpenSSL (OPTIONAL) + 8. OpenSSL (OPTIONAL) + ### needs some updates. I think Apache Serf automagically handles ### finding OpenSSL, but we may need more docco here. and w.r.t ### zlib. @@ -343,18 +384,26 @@ I. INTRODUCTION https://www.openssl.org/ - 7. Berkeley DB 4.X (OPTIONAL) + 9. Berkeley DB 4.X (DEPRECATED and OPTIONAL) - Berkeley DB is needed to build a Subversion server that supports - the BDB repository filesystem, or to access a BDB repository on - local disk. If you will only use the FSFS repository filesystem, - or if you are building a Subversion client that will only speak - to remote (networked) repositories, you don't need it. + You need the Berkeley DB libraries only if you are building a + Subversion server that supports the older BDB repository storage + back-end, or a Subversion client that can access local BDB + repositories via the file:// URI scheme. - The current recommended version is 4.4.20 or newer, which brings - auto-recovery functionality to the Berkeley DB database - environment. + The BDB back-end has been deprecated and is not recommended for + new repositories. BDB may be removed in Subversion 2.0. We + recommend the newer FSFS back-end for all new repositories. + FSFS does not require the Berkeley DB libraries. + If in doubt, the 'svnadmin info' command, added in Subversion + 1.9, can identify whether an existing repository uses BDB or + FSFS. + + The current recommended version of Berkeley DB is 4.4.20 or + newer, which brings auto-recovery functionality to the Berkeley + DB database environment. + If you must use an older version of Berkeley DB, we *strongly* recommend using 4.3 or 4.2 over the 4.1 or 4.0 versions. Not only are these significantly faster and more stable, but they @@ -386,7 +435,7 @@ I. INTRODUCTION Look in the "Releases > Windows > Windows BDB" section. - 8. Cyrus SASL library (OPTIONAL) + 10. Cyrus SASL library (OPTIONAL) If the Simple Authentication and Security Layer (SASL) library is detected on your system, then the Subversion client and @@ -397,7 +446,7 @@ I. INTRODUCTION http://freshmeat.net/projects/cyrussasl/ - 9. Apache Web Server 2.2.X or newer (OPTIONAL) + 11. Apache Web Server 2.2.X or newer (OPTIONAL) (https://httpd.apache.org/download.cgi) @@ -410,78 +459,103 @@ I. INTRODUCTION is done: See section III for details. - 10. Python 2.7 or newer (https://www.python.org/) (OPTIONAL) + 12. Python 3.x or newer (https://www.python.org/) (OPTIONAL) - If you want to run "make check" or build from the latest source - under Unix/Windows as described in section II.B, II.E and III.D, - install Python 2.7 or higher on your system. The majority of the - test suite is written in Python, as is part of Subversion's build - system. + Subversion does not require Python for its basic operation. + However, Python is required for building and testing Subversion + and for using Subversion's SWIG Python bindings or hook scripts + coded in Python. - Note that Python 3.x is not supported and most likely won't work. + The majority of Subversion's test suite is written in Python, as + is part of Subversion's build system. + In more detail, Python is required to do any of the following: - 11. Perl 5.8 or newer (Windows only) (OPTIONAL) + * Use the SWIG Python bindings. + * Use the ctypes Python bindings. + * Use hook scripts coded in Python. + * Build Subversion from a tarball on Unix-like systems and run + Subversion's test suite as described in section II.B. + * Build Subversion on Windows as described in section II.E. + * Build Subversion from a working copy checked out from + Subversion's own repository (whether or not running the test + suite). + * Build the SWIG Python bindings. + * Build the ctypes Python bindings. + * Testing as described in section III.D. - To build Subversion under any of the MS Windows platforms, you - will also need Perl 5.8 or newer to run apr-util's w32locatedb.pl - script. + The Python bindings are used by: + * Third-party programs (e.g., ViewVC) + * Scripts distributed with Subversion itself in the tools/ + subdirectory. + * Any in-house scripts you may have. - 12. SQLite (REQUIRED) + Python is NOT required to do any of the following: - Subversion requires SQLite version 3.8.2 or above. You can meet this - dependency several ways: - * Use an SQLite amalgamation file. - * Specify an SQLite installation to use. - * Let Subversion find an installed SQLite. + * Use the core command-line binaries (svn, svnadmin, svnsync, + etc.) + * Use Subversion's C libraries. + * Use any of Subversion's other language bindings. + * Build Subversion from a tarball on Unix-like systems without + running Subversion's test suite - To use an SQLite-provided amalgamation, just drop sqlite3.c into - Subversion's sqlite-amalgamation/ directory, or point to it with the - --with-sqlite configure option. This file also ships with the Subversion - dependencies distribution, or you can download it from SQLite: + Although this section calls for Python 3.x, Subversion still + technically works with Python 2.7. However, Support for Python + 2.7 is being phased out. As of 1 January 2020, Python 2.7 has + reached end of life. All users are strongly encouraged to move + to Python 3. - https://www.sqlite.org/download.html + 13. Perl 5.8 or newer (Windows only) (OPTIONAL) - 13. pkg-config (Unix only, OPTIONAL) + To build Subversion under any of the MS Windows platforms, you + will also need Perl 5.8 or newer to run apr-util's w32locatedb.pl + script. + + 14. pkg-config (Unix only, OPTIONAL) + Subversion uses pkg-config to find appropriate options used at build time. - 14. D-Bus (Unix only, OPTIONAL) + 15. D-Bus (Unix only, OPTIONAL) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Mon Jun 1 11:03:10 2020 Return-Path: Delivered-To: svn-src-head@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 EB04F331E5A; Mon, 1 Jun 2020 11:03:10 +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 49bC2Q3RSdz4f5d; Mon, 1 Jun 2020 11:03:09 +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 051B32t9012109; Mon, 1 Jun 2020 04:03:02 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 051B32gH012108; Mon, 1 Jun 2020 04:03:02 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006011103.051B32gH012108@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361685 - head/sys/kern In-Reply-To: <202006010337.0513bx0N025996@repo.freebsd.org> To: Peter Wemm Date: Mon, 1 Jun 2020 04:03:02 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49bC2Q3RSdz4f5d X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 11:03:11 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: peter > Date: Mon Jun 1 03:37:58 2020 > New Revision: 361685 > URL: https://svnweb.freebsd.org/changeset/base/361685 > > Log: > Clarify which hints file is the source of an error message. Better correction could be to use the variable storing the name that is used. > > PR: 246688 > Submitted by: Ashish Gupta > MFC after: 1 week > > Modified: > head/sys/kern/kern_linker.c > > Modified: head/sys/kern/kern_linker.c > ============================================================================== > --- head/sys/kern/kern_linker.c Mon Jun 1 02:54:10 2020 (r361684) > +++ head/sys/kern/kern_linker.c Mon Jun 1 03:37:58 2020 (r361685) > @@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con > * XXX: we need to limit this number to some reasonable value > */ > if (vattr.va_size > LINKER_HINTS_MAX) { > - printf("hints file too large %ld\n", (long)vattr.va_size); > + printf("linker.hints file too large %ld\n", (long)vattr.va_size); + printf("%s file too large %ld\n", linker_hintfile, (long)vattr.va_size); > goto bad; > } > hints = malloc(vattr.va_size, M_TEMP, M_WAITOK); > @@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con > intp = (int *)hints; > ival = *intp++; > if (ival != LINKER_HINTS_VERSION) { > - printf("hints file version mismatch %d\n", ival); > + printf("linker.hints file version mismatch %d\n", ival); Ditto. > goto bad; > } > bufend = hints + vattr.va_size; > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Mon Jun 1 15:02:42 2020 Return-Path: Delivered-To: svn-src-head@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 F250D339302; Mon, 1 Jun 2020 15:02:41 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bJLn64rjz4456; Mon, 1 Jun 2020 15:02:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C5853103D9; Mon, 1 Jun 2020 15:02:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f54.google.com with SMTP id r16so141575qvm.6; Mon, 01 Jun 2020 08:02:41 -0700 (PDT) X-Gm-Message-State: AOAM532lfXFlCPVyhmSs17aZSxiAJ2jh6BaWGMvLrLHxxWGvL2ME3KvF wTZIyUuS8RPrIDd0w7NkN++8VlQwAW7VdTj0gp0= X-Google-Smtp-Source: ABdhPJzXv5gFY8AHjyFYjV2p3a3NYXZCVob2kCvnk1OD4y+hOQKwcndrPeF1VTcLx+LAY4NBxLnq72eQj6KAj40bll0= X-Received: by 2002:a0c:f1c7:: with SMTP id u7mr21415391qvl.181.1591023761170; Mon, 01 Jun 2020 08:02:41 -0700 (PDT) MIME-Version: 1.0 References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> <20200601081810.79c9fb1d@hermann.fritz.box> In-Reply-To: <20200601081810.79c9fb1d@hermann.fritz.box> From: Kyle Evans Date: Mon, 1 Jun 2020 10:02:29 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361633 - in head/sys: net netipsec To: "Hartmann, O." Cc: John Baldwin , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 15:02:42 -0000 On Mon, Jun 1, 2020 at 1:18 AM Hartmann, O. wrote: > > On Sun, 31 May 2020 11:43:18 +0200 > "Hartmann, O." wrote: > > > On Fri, 29 May 2020 19:22:40 +0000 (UTC) > > John Baldwin wrote: > > > > > Author: jhb > > > Date: Fri May 29 19:22:40 2020 > > > New Revision: 361633 > > > URL: https://svnweb.freebsd.org/changeset/base/361633 > > > > > > Log: > > > Consistently include opt_ipsec.h for consumers of > > > . > > > This fixes ipsec.ko to include all of IPSEC_DEBUG. > > > > > [... snip ...] > > > > [...] > > --- all_subdir_ipsec --- > > --- ipsec_mod.o --- > > /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration > > of function 'ipsec_support_enable' is invalid in C99 > > [-Werror,-Wimplicit-function-declaration] > > ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ > > /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration > > of function 'ipsec_support_disable' is invalid in C99 > > [-Werror,-Wimplicit-function-declaration] > > ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- > > Building > > /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/ipw_bss/ipw_bss.ko > > --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: > > note: did you mean 'ipsec_support_enable'? > > /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' > > declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); > > ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 > > > > make[4]: stopped in /usr/src/sys/modules/ipsec > > FYI: IPSEC is statically built into the kernel via "options IPSEC" This is the same failure as we're seeing on LINT kernels, which also have both. I've got a tentative diff at [0] that teaches the modules to cope with the possibility, but I haven't thought too much on how useful the result is. IIRC we're building the modules into the kernel anyways in this scenario, so the result probably just won't load because it's already loaded. [0] https://people.freebsd.org/~kevans.ipsec.diff From owner-svn-src-head@freebsd.org Mon Jun 1 15:32:14 2020 Return-Path: Delivered-To: svn-src-head@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 5CFA6339741; Mon, 1 Jun 2020 15:32:14 +0000 (UTC) (envelope-from markj@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bK0t1tpTz46Kd; Mon, 1 Jun 2020 15:32:14 +0000 (UTC) (envelope-from markj@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 3BF4AD7C2; Mon, 1 Jun 2020 15:32:14 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051FWEJx068123; Mon, 1 Jun 2020 15:32:14 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051FWEAJ068122; Mon, 1 Jun 2020 15:32:14 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202006011532.051FWEAJ068122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 1 Jun 2020 15:32:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361694 - head/lib/libcasper/services/cap_fileargs X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/lib/libcasper/services/cap_fileargs X-SVN-Commit-Revision: 361694 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 15:32:14 -0000 Author: markj Date: Mon Jun 1 15:32:13 2020 New Revision: 361694 URL: https://svnweb.freebsd.org/changeset/base/361694 Log: cap_fileargs: Fix a descriptor leak in the service process. The service handler for fileargs_open() tries to pre-open multiple files and pass descriptors for each back to the sandboxed process in a single message. This is to amortize the cost of round-trips between the two processes. The service process adds a "cache" nvlist to the reply to "open", containing file descriptors for pre-opened files. However, when adding that nvlist to the reply, it was making a copy, effectively leaking the cached descriptors. While here, fix spelling in a local variable name. PR: 241226 Reviewed by: oshogbo MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25095 Modified: head/lib/libcasper/services/cap_fileargs/cap_fileargs.c Modified: head/lib/libcasper/services/cap_fileargs/cap_fileargs.c ============================================================================== --- head/lib/libcasper/services/cap_fileargs/cap_fileargs.c Mon Jun 1 10:27:05 2020 (r361693) +++ head/lib/libcasper/services/cap_fileargs/cap_fileargs.c Mon Jun 1 15:32:13 2020 (r361694) @@ -500,7 +500,7 @@ open_file(const char *name) static void fileargs_add_cache(nvlist_t *nvlout, const nvlist_t *limits, - const char *curent_name) + const char *current_name) { int type, i, fd; void *cookie; @@ -527,9 +527,9 @@ fileargs_add_cache(nvlist_t *nvlout, const nvlist_t *l break; } - if (type != NV_TYPE_NULL || - (curent_name != NULL && strcmp(fname, curent_name) == 0)) { - curent_name = NULL; + if (type != NV_TYPE_NULL || (current_name != NULL && + strcmp(fname, current_name) == 0)) { + current_name = NULL; i--; continue; } @@ -553,7 +553,7 @@ fileargs_add_cache(nvlist_t *nvlout, const nvlist_t *l nvlist_add_binary(new, "stat", &sb, sizeof(sb)); } - nvlist_add_nvlist(nvlout, fname, new); + nvlist_move_nvlist(nvlout, fname, new); } cacheposition = cookie; lastname = fname; From owner-svn-src-head@freebsd.org Mon Jun 1 15:37:45 2020 Return-Path: Delivered-To: svn-src-head@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 613623398FA for ; Mon, 1 Jun 2020 15:37:45 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound2k.ore.mailhop.org (outbound2k.ore.mailhop.org [54.148.219.64]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49bK7D6XCtz46nG for ; Mon, 1 Jun 2020 15:37:44 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1591025863; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=Yje7v8pFQs6YKXKMQYMuIaOdQSqq91OZX9FTDQjxIBTk82JcomNNRbEfcVFLV3up6hxvKh+mJSFXr svajOzhq52GclYoPXF9CWpui3BdOzHzQ+H83jPZHYsAcgr/BizSO3W3gz1dIYOihD98DS7xYLuZx46 F5cqopEh8KUm/GEPVxyEUw8HRzZzdd0qMeTMGkFIfvqnJDyy1xg06iEG6sE+Iss39keysjxKId53sP 7/D6vXzcQVp6shgDMkxbitlXmkQ0GTBCVncFmiWXCK7NHPWErXegkgpfbuc5bv+2HWorqrbX+xXSgd 88fHq881rZugxJ5QlKw+I2wvGkqNyAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=072X3xQ0txyIAQB9OdqTy4/77lJb/UUp1NqJ9MFOyN0=; b=NvmeOZTeOGvwpaNHagz6lYcKgrDcGHm+lwOYuvp2FPkbcG98sJcMp5jUu514HAuwPt6GkGQCkce51 HqSFajBv3+hYaMQ+rYa23kTbsOVEukmGNlJdqVLh+v636QGoFl86xINTcG3xmsYVBal5Ql0VDOjLL0 pVXhX6rgfQNghBO2xI5r6bcAzauqFBShZ8R3aE2qqsVrISyFXiDPrKXMfNgRbpKDBdxAsbFkpMQR9P AD8EJZn2oz89307nxUHL9DZbRjHVZFQrTi+74ndzoKDAag1X51XgJRJxU2sq+A7k36TpU3VBSwygdK xNp+1fEm3TplKal5gnRQVkf6WuyNKlQ== ARC-Authentication-Results: i=1; outbound4.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=072X3xQ0txyIAQB9OdqTy4/77lJb/UUp1NqJ9MFOyN0=; b=FMEc0g1JKu5QmjoubdPsY1VUykePHkP7K3Pf1TIa77ABcn24YXZ3QYKm//97fyNGEKn8SbHTlA2g7 ZzreVjC+HIguMMksfIgLyxiJbYcADlVyMzCF5J65bt7UgMAGY/sEemfAZ8W6D2Ki9oDa1UigdHJprA 0Nb2F/VI9V94TibPvUqdinXGP+X0Fyqsa4C/xpv6CTy57lGBbCEKMt+IVgr6iZm8abMoCHKKZCMaLF opsQqU4xbQo7wkpOOqUzyb+lG68q2y+ie5RFNVPEHBO6gVIV1rHhy7A7fvThDKo2rmTR6TiAgwoOOY +PxzH6Agymwk9v9gG1g94d+zJ7vDwzw== X-MHO-RoutePath: aGlwcGll X-MHO-User: d46aa709-a41d-11ea-a067-6d02e42e573a X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (c-67-177-211-60.hsd1.co.comcast.net [67.177.211.60]) by outbound4.ore.mailhop.org (Halon) with ESMTPSA id d46aa709-a41d-11ea-a067-6d02e42e573a; Mon, 01 Jun 2020 15:37:42 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id 051Fbfh3060850; Mon, 1 Jun 2020 09:37:41 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <304bb13cb6e80791f8924a573355a3643d614184.camel@freebsd.org> Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... From: Ian Lepore To: Dimitry Andric , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Mon, 01 Jun 2020 09:37:41 -0600 In-Reply-To: <202005312204.04VM4qXG022001@repo.freebsd.org> References: <202005312204.04VM4qXG022001@repo.freebsd.org> Content-Type: text/plain; charset="ASCII" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bK7D6XCtz46nG X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:16509, ipnet:54.148.0.0/15, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 15:37:45 -0000 On Sun, 2020-05-31 at 22:04 +0000, Dimitry Andric wrote: > Author: dim > Date: Sun May 31 22:04:51 2020 > New Revision: 361677 > URL: https://svnweb.freebsd.org/changeset/base/361677 > > Log: > Change Makefiles under usr.bin/svn to make them easier to > incrementally > update. No functional change intended. > > MFC after: 2 weeks > I wish we could get style.Makefile(9) updated to mandate this 1-per- line style when listing sources, dirs, etc, when the number of items is greater than N, where N is something like 3-6 filenames. Otherwise the requirement to sort the names alphabetically pretty much mandates that many lines of the file will change just to insert one or two new files, and that makes it all but impossible to figure out from a diff what actually changed. -- Ian > [...] > -SUBDIR= lib .WAIT \ > - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ > - svnsync svnversion svnmucc svnrdump > +SUBDIR= lib \ > + .WAIT \ > + svn \ > + svnadmin \ > + svnbench \ > + svndumpfilter \ > + svnfsfs \ > + svnlook \ > + svnserve \ > + svnsync \ > + svnversion \ > + svnmucc \ > + svnrdump > SUBDIR_PARALLEL= > From owner-svn-src-head@freebsd.org Mon Jun 1 15:58:23 2020 Return-Path: Delivered-To: svn-src-head@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 1991433A7A7; Mon, 1 Jun 2020 15:58:23 +0000 (UTC) (envelope-from mjg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bKb2704Sz49Yp; Mon, 1 Jun 2020 15:58:22 +0000 (UTC) (envelope-from mjg@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 E6CB0DD48; Mon, 1 Jun 2020 15:58:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051FwMVH080926; Mon, 1 Jun 2020 15:58:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051FwMwt080925; Mon, 1 Jun 2020 15:58:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202006011558.051FwMwt080925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 1 Jun 2020 15:58:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361695 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 361695 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 15:58:23 -0000 Author: mjg Date: Mon Jun 1 15:58:22 2020 New Revision: 361695 URL: https://svnweb.freebsd.org/changeset/base/361695 Log: Remove ->f_label from struct file The field was added in r141137 in 2005 and is unused. It avoidably grows a struct which is NOFREE and easily gets hundreds of thousands of instances. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D25036 Modified: head/sys/sys/file.h Modified: head/sys/sys/file.h ============================================================================== --- head/sys/sys/file.h Mon Jun 1 15:32:13 2020 (r361694) +++ head/sys/sys/file.h Mon Jun 1 15:58:22 2020 (r361695) @@ -200,10 +200,6 @@ struct file { * DFLAG_SEEKABLE specific fields */ off_t f_offset; - /* - * Mandatory Access control information. - */ - void *f_label; /* Place-holder for MAC label. */ }; #define f_cdevpriv f_vnun.fvn_cdevpriv From owner-svn-src-head@freebsd.org Mon Jun 1 16:10:45 2020 Return-Path: Delivered-To: svn-src-head@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 59EBD33AC14; Mon, 1 Jun 2020 16:10:45 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bKsK1nhcz4BS5; Mon, 1 Jun 2020 16:10:45 +0000 (UTC) (envelope-from vmaffione@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 38CF4E048; Mon, 1 Jun 2020 16:10:45 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051GAjFu087164; Mon, 1 Jun 2020 16:10:45 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051GAjbG087163; Mon, 1 Jun 2020 16:10:45 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006011610.051GAjbG087163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Mon, 1 Jun 2020 16:10:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361696 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361696 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 16:10:45 -0000 Author: vmaffione Date: Mon Jun 1 16:10:44 2020 New Revision: 361696 URL: https://svnweb.freebsd.org/changeset/base/361696 Log: netmap: vtnet: fix RX virtqueue initialization bug The vtnet_netmap_rxq_populate() function erroneously assumed that kring->nr_hwcur = 0, i.e. the kring was in the initial state. However, this is not always the case: for example, when a vtnet reinit is triggered by some changes in the interface flags or capenable. This patch changes the behaviour of vtnet_netmap_kring_refill() so that it always starts publishing the netmap buffers starting from the current value of kring->nr_hwcur. MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 1 15:58:22 2020 (r361695) +++ head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 1 16:10:44 2020 (r361696) @@ -232,14 +232,20 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int fl return 0; } +/* + * Publish (up to) num netmap receive buffers to the host, + * starting from the first one that the user made available + * (kring->nr_hwcur). + */ static int -vtnet_netmap_kring_refill(struct netmap_kring *kring, u_int nm_i, u_int head) +vtnet_netmap_kring_refill(struct netmap_kring *kring, u_int num) { struct netmap_adapter *na = kring->na; struct ifnet *ifp = na->ifp; struct netmap_ring *ring = kring->ring; u_int ring_nr = kring->ring_id; u_int const lim = kring->nkr_num_slots - 1; + u_int nm_i = kring->nr_hwcur; /* device-specific */ struct vtnet_softc *sc = ifp->if_softc; @@ -250,7 +256,7 @@ vtnet_netmap_kring_refill(struct netmap_kring *kring, struct sglist_seg ss[2]; struct sglist sg = { ss, 0, 0, 2 }; - for (; nm_i != head; nm_i = nm_next(nm_i, lim)) { + for (; num > 0; nm_i = nm_next(nm_i, lim), num--) { struct netmap_slot *slot = &ring->slot[nm_i]; uint64_t paddr; void *addr = PNMB(na, slot, &paddr); @@ -302,10 +308,11 @@ vtnet_netmap_rxq_populate(struct vtnet_rxq *rxq) kring->nr_pending_mode == NKR_NETMAP_ON)) return -1; - /* Expose all the RX netmap buffers. Note that the number of - * netmap slots in the RX ring matches the maximum number of - * 2-elements sglist that the RX virtqueue can accommodate. */ - error = vtnet_netmap_kring_refill(kring, 0, na->num_rx_desc); + /* Expose all the RX netmap buffers we can. In case of no indirect + * buffers, the number of netmap slots in the RX ring matches the + * maximum number of 2-elements sglist that the RX virtqueue can + * accommodate. */ + error = vtnet_netmap_kring_refill(kring, na->num_rx_desc); virtqueue_notify(rxq->vtnrx_vq); return error < 0 ? ENXIO : 0; @@ -381,7 +388,12 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl */ nm_i = kring->nr_hwcur; /* netmap ring index */ if (nm_i != head) { - int nm_j = vtnet_netmap_kring_refill(kring, nm_i, head); + int howmany = head - nm_i; + int nm_j; + + if (howmany < 0) + howmany += kring->nkr_num_slots; + nm_j = vtnet_netmap_kring_refill(kring, howmany); if (nm_j < 0) return nm_j; kring->nr_hwcur = nm_j; From owner-svn-src-head@freebsd.org Mon Jun 1 16:12:10 2020 Return-Path: Delivered-To: svn-src-head@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 711C533AE8F; Mon, 1 Jun 2020 16:12:10 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bKty2NdWz4BR5; Mon, 1 Jun 2020 16:12:10 +0000 (UTC) (envelope-from vmaffione@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 4CF00E40C; Mon, 1 Jun 2020 16:12:10 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051GCAah091208; Mon, 1 Jun 2020 16:12:10 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051GCAfQ091207; Mon, 1 Jun 2020 16:12:10 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006011612.051GCAfQ091207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Mon, 1 Jun 2020 16:12:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361697 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361697 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 16:12:10 -0000 Author: vmaffione Date: Mon Jun 1 16:12:09 2020 New Revision: 361697 URL: https://svnweb.freebsd.org/changeset/base/361697 Log: netmap: if_vtnet: replace vtnet_free_used() The functionality contained in this function is duplicated, as it is already available in vtnet_txq_free_mbufs() and vtnet_rxq_free_mbufs(). MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 1 16:10:44 2020 (r361696) +++ head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 1 16:12:09 2020 (r361697) @@ -52,37 +52,6 @@ vtnet_netmap_queue_on(struct vtnet_softc *sc, enum txr na->tx_rings[idx]->nr_mode == NKR_NETMAP_ON); } -static void -vtnet_free_used(struct virtqueue *vq, int netmap_bufs, enum txrx t, int idx) -{ - void *cookie; - int deq = 0; - - while ((cookie = virtqueue_dequeue(vq, NULL)) != NULL) { - if (netmap_bufs) { - /* These are netmap buffers: there is nothing to do. */ - } else { - /* These are mbufs that we need to free. */ - struct mbuf *m; - - if (t == NR_TX) { - struct vtnet_tx_header *txhdr = cookie; - m = txhdr->vth_mbuf; - m_freem(m); - uma_zfree(vtnet_tx_header_zone, txhdr); - } else { - m = cookie; - m_freem(m); - } - } - deq++; - } - - if (deq) - nm_prinf("%d sgs dequeued from %s-%d (netmap=%d)", - deq, nm_txrx2str(t), idx, netmap_bufs); -} - /* Register and unregister. */ static int vtnet_netmap_reg(struct netmap_adapter *na, int state) @@ -113,18 +82,13 @@ vtnet_netmap_reg(struct netmap_adapter *na, int state) for (i = 0; i < sc->vtnet_act_vq_pairs; i++) { struct vtnet_txq *txq = &sc->vtnet_txqs[i]; struct vtnet_rxq *rxq = &sc->vtnet_rxqs[i]; - struct netmap_kring *kring; VTNET_TXQ_LOCK(txq); - kring = NMR(na, NR_TX)[i]; - vtnet_free_used(txq->vtntx_vq, - kring->nr_mode == NKR_NETMAP_ON, NR_TX, i); + vtnet_txq_free_mbufs(txq); VTNET_TXQ_UNLOCK(txq); VTNET_RXQ_LOCK(rxq); - kring = NMR(na, NR_RX)[i]; - vtnet_free_used(rxq->vtnrx_vq, - kring->nr_mode == NKR_NETMAP_ON, NR_RX, i); + vtnet_rxq_free_mbufs(rxq); VTNET_RXQ_UNLOCK(rxq); } vtnet_init_locked(sc); From owner-svn-src-head@freebsd.org Mon Jun 1 16:14:30 2020 Return-Path: Delivered-To: svn-src-head@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 452B333AEB1; Mon, 1 Jun 2020 16:14:30 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bKxf184nz4C5d; Mon, 1 Jun 2020 16:14:30 +0000 (UTC) (envelope-from vmaffione@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 226CDE1A6; Mon, 1 Jun 2020 16:14:30 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051GEU6h092768; Mon, 1 Jun 2020 16:14:30 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051GEUig092767; Mon, 1 Jun 2020 16:14:30 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006011614.051GEUig092767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Mon, 1 Jun 2020 16:14:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361698 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361698 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 16:14:30 -0000 Author: vmaffione Date: Mon Jun 1 16:14:29 2020 New Revision: 361698 URL: https://svnweb.freebsd.org/changeset/base/361698 Log: netmap: if_vtnet: avoid netmap ring wraparound netmap assumes the one "slot" is left unused to distinguish the empty ring and full ring conditions. This assumption was violated by vtnet_netmap_rxq_populate(). MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 1 16:12:09 2020 (r361697) +++ head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 1 16:14:29 2020 (r361698) @@ -275,8 +275,8 @@ vtnet_netmap_rxq_populate(struct vtnet_rxq *rxq) /* Expose all the RX netmap buffers we can. In case of no indirect * buffers, the number of netmap slots in the RX ring matches the * maximum number of 2-elements sglist that the RX virtqueue can - * accommodate. */ - error = vtnet_netmap_kring_refill(kring, na->num_rx_desc); + * accommodate (minus 1 to avoid netmap ring wraparound). */ + error = vtnet_netmap_kring_refill(kring, na->num_rx_desc - 1); virtqueue_notify(rxq->vtnrx_vq); return error < 0 ? ENXIO : 0; From owner-svn-src-head@freebsd.org Mon Jun 1 16:40:27 2020 Return-Path: Delivered-To: svn-src-head@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 2BDDF33BE19; Mon, 1 Jun 2020 16:40:27 +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 49bLWZ4dkZz4Dsd; Mon, 1 Jun 2020 16:40:26 +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 051GeOnA013241; Mon, 1 Jun 2020 09:40:24 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 051GeOaf013240; Mon, 1 Jun 2020 09:40:24 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006011640.051GeOaf013240@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... In-Reply-To: <304bb13cb6e80791f8924a573355a3643d614184.camel@freebsd.org> To: Ian Lepore Date: Mon, 1 Jun 2020 09:40:24 -0700 (PDT) CC: Dimitry Andric , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49bLWZ4dkZz4Dsd X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 16:40:27 -0000 > On Sun, 2020-05-31 at 22:04 +0000, Dimitry Andric wrote: > > Author: dim > > Date: Sun May 31 22:04:51 2020 > > New Revision: 361677 > > URL: https://svnweb.freebsd.org/changeset/base/361677 > > > > Log: > > Change Makefiles under usr.bin/svn to make them easier to > > incrementally > > update. No functional change intended. > > > > MFC after: 2 weeks > > > > I wish we could get style.Makefile(9) updated to mandate this 1-per- > line style when listing sources, dirs, etc, when the number of items is > greater than N, where N is something like 3-6 filenames. Otherwise the > requirement to sort the names alphabetically pretty much mandates that > many lines of the file will change just to insert one or two new files, > and that makes it all but impossible to figure out from a diff what > actually changed. I like this idea, though rather than 3-6 filenames I propose it to be anything longer than 3 lines, which is kinda about when the pain point should start. See the immediate SUBDIR below, it is 11 items on 2ish/3 lines, and any change would worst case be a 3 line diff. This probably covers a large portion of the tree. I particularly do not like massive amounts of vertical white space which this would create, but lacking an automated tool this is probably a reasonable compromise. If we did it everywhere it would mean lots of scrolling when working on rather simple makefiles. > -- Ian > > > > [...] > > -SUBDIR= lib .WAIT \ > > - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ > > - svnsync svnversion svnmucc svnrdump > > +SUBDIR= lib \ > > + .WAIT \ > > + svn \ > > + svnadmin \ > > + svnbench \ > > + svndumpfilter \ > > + svnfsfs \ > > + svnlook \ > > + svnserve \ > > + svnsync \ > > + svnversion \ > > + svnmucc \ > > + svnrdump > > SUBDIR_PARALLEL= > > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Mon Jun 1 18:43:52 2020 Return-Path: Delivered-To: svn-src-head@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 2124C33EAE5; Mon, 1 Jun 2020 18:43:52 +0000 (UTC) (envelope-from freqlabs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bPG0093nz4R15; Mon, 1 Jun 2020 18:43:52 +0000 (UTC) (envelope-from freqlabs@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 00DD2FCCB; Mon, 1 Jun 2020 18:43:52 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051Ihpvg085855; Mon, 1 Jun 2020 18:43:51 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051IhpMM085854; Mon, 1 Jun 2020 18:43:51 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202006011843.051IhpMM085854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Mon, 1 Jun 2020 18:43:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361699 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 361699 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 18:43:52 -0000 Author: freqlabs Date: Mon Jun 1 18:43:51 2020 New Revision: 361699 URL: https://svnweb.freebsd.org/changeset/base/361699 Log: Assign default security flavor when converting old export args vfs_export requires security flavors be explicitly listed when exporting as of r360900. Use the default AUTH_SYS flavor when converting old export args to ensure compatibility with the legacy mount syscall. Reported by: rmacklem Reviewed by: rmacklem Approved by: mav (mentor) MFC after: 3 days Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D25045 Modified: head/sys/kern/vfs_mount.c Modified: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Mon Jun 1 16:14:29 2020 (r361698) +++ head/sys/kern/vfs_mount.c Mon Jun 1 18:43:51 2020 (r361699) @@ -2343,10 +2343,22 @@ kernel_vmount(int flags, ...) return (error); } +/* + * Convert the old export args format into new export args. + * + * The old export args struct does not have security flavors. Otherwise, the + * structs are identical. The default security flavor 'sys' is applied when + * the given args export the filesystem. + */ void vfs_oexport_conv(const struct oexport_args *oexp, struct export_args *exp) { bcopy(oexp, exp, sizeof(*oexp)); - exp->ex_numsecflavors = 0; + if (exp->ex_flags & MNT_EXPORTED) { + exp->ex_numsecflavors = 1; + exp->ex_secflavors[0] = AUTH_SYS; + } else { + exp->ex_numsecflavors = 0; + } } From owner-svn-src-head@freebsd.org Mon Jun 1 18:58:10 2020 Return-Path: Delivered-To: svn-src-head@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 AD0FF33EF10; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) (envelope-from tijl@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bPZV475Mz4SNC; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) (envelope-from tijl@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 88DCF100D5; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051IwAtH092333; Mon, 1 Jun 2020 18:58:10 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051Iw9ED092330; Mon, 1 Jun 2020 18:58:09 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202006011858.051Iw9ED092330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 1 Jun 2020 18:58:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361700 - in head: etc/mtree secure/lib/libcrypto secure/lib/libcrypto/engines X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: etc/mtree secure/lib/libcrypto secure/lib/libcrypto/engines X-SVN-Commit-Revision: 361700 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 18:58:10 -0000 Author: tijl Date: Mon Jun 1 18:58:09 2020 New Revision: 361700 URL: https://svnweb.freebsd.org/changeset/base/361700 Log: Install 32-bit libcrypto engines in /usr/lib32/engines instead of /usr/lib32 and let 32-bit libcrypto search that location instead of /usr/lib/engines. Reviewed by: jkim Modified: head/etc/mtree/BSD.lib32.dist head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/engines/Makefile.inc Modified: head/etc/mtree/BSD.lib32.dist ============================================================================== --- head/etc/mtree/BSD.lib32.dist Mon Jun 1 18:43:51 2020 (r361699) +++ head/etc/mtree/BSD.lib32.dist Mon Jun 1 18:58:09 2020 (r361700) @@ -8,6 +8,8 @@ lib32 dtrace .. + engines + .. geom .. i18n Modified: head/secure/lib/libcrypto/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/Makefile.inc Mon Jun 1 18:43:51 2020 (r361699) +++ head/secure/lib/libcrypto/Makefile.inc Mon Jun 1 18:58:09 2020 (r361700) @@ -75,7 +75,7 @@ CFLAGS+= -DPOLY1305_ASM .if defined(LIB) CFLAGS+= -DOPENSSLDIR="\"/etc/ssl\"" -CFLAGS+= -DENGINESDIR="\"/usr/lib/engines\"" +CFLAGS+= -DENGINESDIR="\"${LIBDIR}/engines\"" .endif CFLAGS+= -DNDEBUG Modified: head/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/engines/Makefile.inc Mon Jun 1 18:43:51 2020 (r361699) +++ head/secure/lib/libcrypto/engines/Makefile.inc Mon Jun 1 18:58:09 2020 (r361700) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /usr/lib/engines +SHLIBDIR= ${LIBDIR}/engines LCRYPTO_SRC= ${SRCTOP}/crypto/openssl From owner-svn-src-head@freebsd.org Mon Jun 1 19:26:16 2020 Return-Path: Delivered-To: svn-src-head@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 C696F33F7E4; Mon, 1 Jun 2020 19:26:16 +0000 (UTC) (envelope-from kp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bQBw4xSRz4WG8; Mon, 1 Jun 2020 19:26:16 +0000 (UTC) (envelope-from kp@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 A4E4E1080D; Mon, 1 Jun 2020 19:26:16 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051JQGZr011189; Mon, 1 Jun 2020 19:26:16 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051JQGLB011188; Mon, 1 Jun 2020 19:26:16 GMT (envelope-from kp@FreeBSD.org) Message-Id: <202006011926.051JQGLB011188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Mon, 1 Jun 2020 19:26:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361701 - head/tests/sys/net X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/tests/sys/net X-SVN-Commit-Revision: 361701 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 19:26:16 -0000 Author: kp Date: Mon Jun 1 19:26:16 2020 New Revision: 361701 URL: https://svnweb.freebsd.org/changeset/base/361701 Log: bridge tests: Avoid building a switching loop Enable STP before bringing the bridges up. This avoids a switching loop, which has a tendency to drown out progress in userspace processes, especially on single-core systems. Only check that we have indeed shut down one of the looped interfaces PR: 246448 Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D25084 Modified: head/tests/sys/net/if_bridge_test.sh Modified: head/tests/sys/net/if_bridge_test.sh ============================================================================== --- head/tests/sys/net/if_bridge_test.sh Mon Jun 1 18:58:09 2020 (r361700) +++ head/tests/sys/net/if_bridge_test.sh Mon Jun 1 19:26:16 2020 (r361701) @@ -72,7 +72,6 @@ stp_head() { atf_set descr 'Spanning tree test' atf_set require.user root - atf_set require.progs jq } stp_body() @@ -91,13 +90,11 @@ stp_body() vnet_mkjail a ${bridge_a} ${epair_one}a ${epair_two}a vnet_mkjail b ${bridge_b} ${epair_one}b ${epair_two}b - jexec a ifconfig ${bridge_a} up jexec a ifconfig ${epair_one}a up jexec a ifconfig ${epair_two}a up jexec a ifconfig ${bridge_a} addm ${epair_one}a jexec a ifconfig ${bridge_a} addm ${epair_two}a - jexec b ifconfig ${bridge_b} up jexec b ifconfig ${epair_one}b up jexec b ifconfig ${epair_two}b up jexec b ifconfig ${bridge_b} addm ${epair_one}b @@ -105,22 +102,14 @@ stp_body() jexec a ifconfig ${bridge_a} 192.0.2.1/24 - # Give the interfaces some time to come up and pass some traffic - sleep 5 - - # Confirm that there's looping traffic - nbr=$(jexec a netstat -I ${bridge_a} --libxo json \ - | jq ".statistics.interface[0].\"received-packets\"") - if [ ${nbr} -lt 100 ] - then - atf_fail "Expected bridging loop, but found very few packets." - fi - # Enable spanning tree jexec a ifconfig ${bridge_a} stp ${epair_one}a jexec a ifconfig ${bridge_a} stp ${epair_two}a jexec b ifconfig ${bridge_b} stp ${epair_one}b jexec b ifconfig ${bridge_b} stp ${epair_two}b + + jexec b ifconfig ${bridge_b} up + jexec a ifconfig ${bridge_a} up # Give STP time to do its thing sleep 5 From owner-svn-src-head@freebsd.org Mon Jun 1 19:34:22 2020 Return-Path: Delivered-To: svn-src-head@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 2676633FDA0; Mon, 1 Jun 2020 19:34:22 +0000 (UTC) (envelope-from jkim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bQNG0Gg4z4XSY; Mon, 1 Jun 2020 19:34:22 +0000 (UTC) (envelope-from jkim@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 047FB105C6; Mon, 1 Jun 2020 19:34:22 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051JYLgp017000; Mon, 1 Jun 2020 19:34:21 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051JYLO5016999; Mon, 1 Jun 2020 19:34:21 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202006011934.051JYLO5016999@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Mon, 1 Jun 2020 19:34:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361702 - head X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 361702 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 19:34:22 -0000 Author: jkim Date: Mon Jun 1 19:34:21 2020 New Revision: 361702 URL: https://svnweb.freebsd.org/changeset/base/361702 Log: Catch up with r361700. OpenSSL 32-bit compat engines are moved to /usr/lib32/engines. Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Jun 1 19:26:16 2020 (r361701) +++ head/ObsoleteFiles.inc Mon Jun 1 19:34:21 2020 (r361702) @@ -36,6 +36,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines +OLD_LIBS+=usr/lib32/capi.so +OLD_LIBS+=usr/lib32/padlock.so + # 20200528: libevent renamed libevent1 OLD_FILES+=usr/include/private/event/event.h OLD_DIRS+=usr/include/private/event From owner-svn-src-head@freebsd.org Mon Jun 1 19:40:59 2020 Return-Path: Delivered-To: svn-src-head@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 E6A2933FDF2; Mon, 1 Jun 2020 19:40:59 +0000 (UTC) (envelope-from bdragon@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bQWv5w0tz4Y38; Mon, 1 Jun 2020 19:40:59 +0000 (UTC) (envelope-from bdragon@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 C62DE108A7; Mon, 1 Jun 2020 19:40:59 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051Jexte020374; Mon, 1 Jun 2020 19:40:59 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051JexmN020358; Mon, 1 Jun 2020 19:40:59 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <202006011940.051JexmN020358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Mon, 1 Jun 2020 19:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361703 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 361703 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 19:41:00 -0000 Author: bdragon Date: Mon Jun 1 19:40:59 2020 New Revision: 361703 URL: https://svnweb.freebsd.org/changeset/base/361703 Log: [PowerPC] Fix build-id note on powerpc64 kernel Due to the ordering of the powerpc64 linker script, we were discarding all notes before emitting .note.gnu.build-id. This had the effect of generating an empty build id section and breaking the kern.build_id sysctl added in r348611. powerpc and powerpcspe are uneffected. PR: 246430 MFC after: 3 days Sponsored by: Tag1 Consulting, Inc. Modified: head/sys/conf/ldscript.powerpc64 Modified: head/sys/conf/ldscript.powerpc64 ============================================================================== --- head/sys/conf/ldscript.powerpc64 Mon Jun 1 19:34:21 2020 (r361702) +++ head/sys/conf/ldscript.powerpc64 Mon Jun 1 19:40:59 2020 (r361703) @@ -37,9 +37,6 @@ SECTIONS /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */ /DISCARD/ : { *(.interp) } - /* Also delete notes */ - /DISCARD/ : { *(.note.*) } - .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) } @@ -51,6 +48,10 @@ SECTIONS *(.note.gnu.build-id) PROVIDE (__build_id_end = .); } + + /* Do not emit any additional notes. */ + /DISCARD/ : { *(.note.*) } + .rela.text : { *(.rela.text) *(.rela.gnu.linkonce.t*) } .rela.data : From owner-svn-src-head@freebsd.org Mon Jun 1 20:03:13 2020 Return-Path: Delivered-To: svn-src-head@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 5A1FC2F09AC; Mon, 1 Jun 2020 20:03:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bR1X5DFVz4btH; Mon, 1 Jun 2020 20:03:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id fqeKjH2MTYYpxfqeMj6c6h; Mon, 01 Jun 2020 14:03:10 -0600 X-Authority-Analysis: v=2.3 cv=OubUNx3t c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=nTHF0DUjJn0A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=4PEESc2Rp9k6QwJ_zCIA:9 a=0bXxn9q0MV6snEgNplNhOjQmxlI=:19 a=CjuIK1q_8ugA:10 a=OJAZQCPpPQ8A:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 162723CF; Mon, 1 Jun 2020 13:03:07 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 051K36gY039246; Mon, 1 Jun 2020 13:03:06 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 051K36sR039220; Mon, 1 Jun 2020 13:03:06 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202006012003.051K36sR039220@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ryan Moeller cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361699 - head/sys/kern In-reply-to: <202006011843.051IhpMM085854@repo.freebsd.org> References: <202006011843.051IhpMM085854@repo.freebsd.org> Comments: In-reply-to Ryan Moeller message dated "Mon, 01 Jun 2020 18:43:51 -0000." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 01 Jun 2020 13:03:06 -0700 X-CMAE-Envelope: MS4wfGx1V+gSS0Hu8SqpREi17TuDtsnmPK9vjM703yb7gmVvjoP+8Exz71s4aUlTYvqyLKGfEb7RIpNA0Qe5LWOWzfIHn6mh6Vh9+gNzTssJy5egePMhggXa PrrLWu8Q55j3cxhiz4ea+QG07ijIbqU6d7ncb2xSXATA4l8wkTF3WePp5cTi+puPrQEET8BIVbKnYzFvXUzHdaAYEYQYit9+3pElYRrff4wrCarq5+ANZA1X 8MVlk2hEOwx09LkMeQ5GHorAwjIVvgZiLuD/DSS0QIm7zMyJgwwhgnF5slQhDzT6 X-Rspamd-Queue-Id: 49bR1X5DFVz4btH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 20:03:13 -0000 In message <202006011843.051IhpMM085854@repo.freebsd.org>, Ryan Moeller writes: > Author: freqlabs > Date: Mon Jun 1 18:43:51 2020 > New Revision: 361699 > URL: https://svnweb.freebsd.org/changeset/base/361699 > > Log: > Assign default security flavor when converting old export args > > vfs_export requires security flavors be explicitly listed when > exporting as of r360900. > > Use the default AUTH_SYS flavor when converting old export args to > ensure compatibility with the legacy mount syscall. > > Reported by: rmacklem > Reviewed by: rmacklem > Approved by: mav (mentor) > MFC after: 3 days > Sponsored by: iXsystems, Inc. > Differential Revision: https://reviews.freebsd.org/D25045 > > Modified: > head/sys/kern/vfs_mount.c > > Modified: head/sys/kern/vfs_mount.c > ============================================================================= > = > --- head/sys/kern/vfs_mount.c Mon Jun 1 16:14:29 2020 (r361698) > +++ head/sys/kern/vfs_mount.c Mon Jun 1 18:43:51 2020 (r361699) > @@ -2343,10 +2343,22 @@ kernel_vmount(int flags, ...) > return (error); > } > > +/* > + * Convert the old export args format into new export args. > + * > + * The old export args struct does not have security flavors. Otherwise, th > e > + * structs are identical. The default security flavor 'sys' is applied when > + * the given args export the filesystem. > + */ > void > vfs_oexport_conv(const struct oexport_args *oexp, struct export_args *exp) > { > > bcopy(oexp, exp, sizeof(*oexp)); > - exp->ex_numsecflavors = 0; > + if (exp->ex_flags & MNT_EXPORTED) { > + exp->ex_numsecflavors = 1; > + exp->ex_secflavors[0] = AUTH_SYS; #include will be needed for this. This of course opens a new can of worms with regard to namespace pollution. > + } else { > + exp->ex_numsecflavors = 0; > + } > } > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Mon Jun 1 20:05:52 2020 Return-Path: Delivered-To: svn-src-head@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 DD96B2F0C34; Mon, 1 Jun 2020 20:05:52 +0000 (UTC) (envelope-from eric@vangyzen.net) Received: from smtp.vangyzen.net (hotblack.vangyzen.net [IPv6:2607:fc50:1000:7400:216:3eff:fe72:314f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49bR4c0P2Hz4cH6; Mon, 1 Jun 2020 20:05:51 +0000 (UTC) (envelope-from eric@vangyzen.net) Received: from disco.vangyzen.net (unknown [70.97.188.230]) by smtp.vangyzen.net (Postfix) with ESMTPSA id 6816B56487; Mon, 1 Jun 2020 15:05:50 -0500 (CDT) Subject: Re: svn commit: r361699 - head/sys/kern To: Cy Schubert , Ryan Moeller Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006011843.051IhpMM085854@repo.freebsd.org> <202006012003.051K36sR039220@slippy.cwsent.com> From: Eric van Gyzen Message-ID: <6597389d-85a9-4661-77d2-bd81632ee197@vangyzen.net> Date: Mon, 1 Jun 2020 15:05:43 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <202006012003.051K36sR039220@slippy.cwsent.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bR4c0P2Hz4cH6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of eric@vangyzen.net designates 2607:fc50:1000:7400:216:3eff:fe72:314f as permitted sender) smtp.mailfrom=eric@vangyzen.net X-Spamd-Result: default: False [-2.59 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:c]; NEURAL_HAM_LONG(-0.99)[-0.991]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[vangyzen.net]; NEURAL_HAM_MEDIUM(-1.00)[-0.995]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.31)[-0.306]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:36236, ipnet:2607:fc50:1000::/36, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 20:05:52 -0000 >> void >> vfs_oexport_conv(const struct oexport_args *oexp, struct export_args *exp) >> { >> >> bcopy(oexp, exp, sizeof(*oexp)); >> - exp->ex_numsecflavors = 0; >> + if (exp->ex_flags & MNT_EXPORTED) { >> + exp->ex_numsecflavors = 1; >> + exp->ex_secflavors[0] = AUTH_SYS; > > #include will be needed for this. > > This of course opens a new can of worms with regard to namespace pollution. rpc/types.h and rpc/auth.h are sufficient, but that doesn't make the can much smaller. Eric From owner-svn-src-head@freebsd.org Mon Jun 1 20:32:06 2020 Return-Path: Delivered-To: svn-src-head@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 3F2E52F191D; Mon, 1 Jun 2020 20:32:06 +0000 (UTC) (envelope-from melifaro@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bRft1Bn7z3RVn; Mon, 1 Jun 2020 20:32:06 +0000 (UTC) (envelope-from melifaro@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 19CE2114AE; Mon, 1 Jun 2020 20:32:06 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051KW6j3053389; Mon, 1 Jun 2020 20:32:06 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051KW3xX053371; Mon, 1 Jun 2020 20:32:03 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202006012032.051KW3xX053371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Jun 2020 20:32:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361704 - in head/sys: net net/route netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: in head/sys: net net/route netinet netinet6 X-SVN-Commit-Revision: 361704 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 20:32:06 -0000 Author: melifaro Date: Mon Jun 1 20:32:02 2020 New Revision: 361704 URL: https://svnweb.freebsd.org/changeset/base/361704 Log: * Add rib__route() functions to manipulate the routing table. The main driver for the change is the need to improve notification mechanism. Currently callers guess the operation data based on the rtentry structure returned in case of successful operation result. There are two problems with this appoach. First is that it doesn't provide enough information for the upcoming multipath changes, where rtentry refers to a new nexthop group, and there is no way of guessing which paths were added during the change. Second is that some rtentry fields can change during notification and protecting from it by requiring customers to unlock rtentry is not desired. Additionally, as the consumers such as rtsock do know which operation they request in advance, making explicit add/change/del versions of the functions makes sense, especially given the functions don't share a lot of code. With that in mind, introduce rib_cmd_info notification structure and rib__route() functions, with mandatory rib_cmd_info pointer. It will be used in upcoming generalized notifications. * Move definitions of the new functions and some other functions/structures used for the routing table manipulation to a separate header file, net/route/route_ctl.h. net/route.h is a frequently used file included in ~140 places in kernel, and 90% of the users don't need these definitions. Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D25067 Added: head/sys/net/route/route_ctl.h (contents, props changed) Modified: head/sys/net/if_llatbl.c head/sys/net/route.c head/sys/net/route.h head/sys/net/route/nhop_ctl.c head/sys/net/route/route_ctl.c head/sys/net/route/route_ddb.c head/sys/net/route/route_helpers.c head/sys/net/route/route_temporal.c head/sys/net/route/route_var.h head/sys/netinet/in_rmx.c head/sys/netinet/ip_icmp.c head/sys/netinet6/icmp6.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/nd6_rtr.c Modified: head/sys/net/if_llatbl.c ============================================================================== --- head/sys/net/if_llatbl.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/if_llatbl.c Mon Jun 1 20:32:02 2020 (r361704) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route.c Mon Jun 1 20:32:02 2020 (r361704) @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -346,6 +347,9 @@ rt_table_init(int offset, int family, u_int fibnum) nhops_init_rib(rh); + /* Init subscription system */ + CK_STAILQ_INIT(&rh->rnh_subscribers); + /* Finally, set base callbacks */ rh->rnh_addaddr = rn_addroute; rh->rnh_deladdr = rn_delete; @@ -1148,6 +1152,7 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru { const struct sockaddr *dst; struct rib_head *rnh; + struct rib_cmd_info rc; int error; KASSERT((fibnum < rt_numfibs), ("rtrequest1_fib: bad fibnum")); @@ -1180,10 +1185,11 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru if (info->rti_flags & RTF_HOST) info->rti_info[RTAX_NETMASK] = NULL; + bzero(&rc, sizeof(struct rib_cmd_info)); error = 0; switch (req) { case RTM_DELETE: - error = del_route(rnh, info, ret_nrt); + error = del_route(rnh, info, &rc); break; case RTM_RESOLVE: /* @@ -1192,14 +1198,17 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru */ break; case RTM_ADD: - error = add_route(rnh, info, ret_nrt); + error = add_route(rnh, info, &rc); break; case RTM_CHANGE: - error = change_route(rnh, info, ret_nrt); + error = change_route(rnh, info, &rc); break; default: error = EOPNOTSUPP; } + + if (ret_nrt != NULL) + *ret_nrt = rc.rc_rt; return (error); } Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route.h Mon Jun 1 20:32:02 2020 (r361704) @@ -399,12 +399,6 @@ void rtfree(struct rtentry *); void rtfree_func(struct rtentry *); void rt_updatemtu(struct ifnet *); -typedef int rt_walktree_f_t(struct rtentry *, void *); -typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); -void rib_walk_del(u_int fibnum, int family, rt_filter_f_t *filter_f, - void *arg, bool report); -void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); -void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void *arg); void rt_flushifroutes_af(struct ifnet *, int); void rt_flushifroutes(struct ifnet *ifp); @@ -423,12 +417,8 @@ int rtrequest1_fib(int, struct rt_addrinfo *, struct int rib_lookup_info(uint32_t, const struct sockaddr *, uint32_t, uint32_t, struct rt_addrinfo *); void rib_free_info(struct rt_addrinfo *info); -int rib_add_redirect(u_int fibnum, struct sockaddr *dst, - struct sockaddr *gateway, struct sockaddr *author, struct ifnet *ifp, - int flags, int expire_sec); /* New API */ -void rib_walk(int af, u_int fibnum, rt_walktree_f_t *wa_f, void *arg); struct nhop_object *rib_lookup(uint32_t fibnum, const struct sockaddr *dst, uint32_t flags, uint32_t flowid); #endif Modified: head/sys/net/route/nhop_ctl.c ============================================================================== --- head/sys/net/route/nhop_ctl.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route/nhop_ctl.c Mon Jun 1 20:32:02 2020 (r361704) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/net/route/route_ctl.c ============================================================================== --- head/sys/net/route/route_ctl.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route/route_ctl.c Mon Jun 1 20:32:02 2020 (r361704) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -67,11 +68,61 @@ __FBSDID("$FreeBSD$"); * All functions assumes they are called in net epoch. */ +static void rib_notify(struct rib_head *rnh, enum rib_subscription_type type, + struct rib_cmd_info *rc); + static void rt_notifydelete(struct rtentry *rt, struct rt_addrinfo *info); +static struct rib_head * +get_rnh(uint32_t fibnum, const struct rt_addrinfo *info) +{ + struct rib_head *rnh; + struct sockaddr *dst; + + KASSERT((fibnum < rt_numfibs), ("rib_add_route: bad fibnum")); + + dst = info->rti_info[RTAX_DST]; + rnh = rt_tables_get_rnh(fibnum, dst->sa_family); + + return (rnh); +} + +/* + * Adds route defined by @info into the kernel table specified by @fibnum and + * sa_family in @info->rti_info[RTAX_DST]. + * + * Returns 0 on success and fills in operation metadata into @rc. + */ int +rib_add_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + + rnh = get_rnh(fibnum, info); + if (rnh == NULL) + return (EAFNOSUPPORT); + + /* + * Check consistency between RTF_HOST flag and netmask + * existence. + */ + if (info->rti_flags & RTF_HOST) + info->rti_info[RTAX_NETMASK] = NULL; + else if (info->rti_info[RTAX_NETMASK] == NULL) + return (EINVAL); + + bzero(rc, sizeof(struct rib_cmd_info)); + rc->rc_cmd = RTM_ADD; + + return (add_route(rnh, info, rc)); +} + +int add_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { struct sockaddr *dst, *ndst, *gateway, *netmask; struct rtentry *rt, *rt_old; @@ -146,6 +197,7 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rt->rt_weight = 1; rt_setmetrics(info, rt); + rt_old = NULL; RIB_WLOCK(rnh); RT_LOCK(rt); @@ -163,12 +215,20 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rn = rnh->rnh_addaddr(ndst, netmask, &rnh->head, rt->rt_nodes); - if (rn != NULL && rt->rt_expire > 0) - tmproutes_update(rnh, rt); + if (rn != NULL) { + /* Most common usecase */ + if (rt->rt_expire > 0) + tmproutes_update(rnh, rt); - rt_old = NULL; - if (rn == NULL && (info->rti_flags & RTF_PINNED) != 0) { + /* Finalize notification */ + rnh->rnh_gen++; + rc->rc_rt = RNTORT(rn); + rc->rc_nh_new = nh; + + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + } else if ((info->rti_flags & RTF_PINNED) != 0) { + /* * Force removal and re-try addition * TODO: better multipath&pinned support @@ -180,9 +240,26 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rt_old = rt_unlinkrte(rnh, info, &error); info->rti_flags |= RTF_PINNED; info->rti_info[RTAX_DST] = info_dst; - if (rt_old != NULL) + if (rt_old != NULL) { rn = rnh->rnh_addaddr(ndst, netmask, &rnh->head, rt->rt_nodes); + + /* Finalize notification */ + rnh->rnh_gen++; + + if (rn != NULL) { + rc->rc_cmd = RTM_CHANGE; + rc->rc_rt = RNTORT(rn); + rc->rc_nh_old = rt_old->rt_nhop; + rc->rc_nh_new = nh; + } else { + rc->rc_cmd = RTM_DELETE; + rc->rc_rt = RNTORT(rn); + rc->rc_nh_old = rt_old->rt_nhop; + rc->rc_nh_new = nh; + } + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + } } RIB_WUNLOCK(rnh); @@ -208,12 +285,6 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in if (ifa->ifa_rtrequest) ifa->ifa_rtrequest(RTM_ADD, rt, rt->rt_nhop, info); - /* - * actually return a resultant rtentry - */ - if (ret_nrt) - *ret_nrt = rt; - rnh->rnh_gen++; /* Routing table updated */ RT_UNLOCK(rt); return (0); @@ -221,6 +292,29 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in /* + * Removes route defined by @info from the kernel table specified by @fibnum and + * sa_family in @info->rti_info[RTAX_DST]. + * + * Returns 0 on success and fills in operation metadata into @rc. + */ +int +rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, struct rib_cmd_info *rc) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + + rnh = get_rnh(fibnum, info); + if (rnh == NULL) + return (EAFNOSUPPORT); + + bzero(rc, sizeof(struct rib_cmd_info)); + rc->rc_cmd = RTM_DELETE; + + return (del_route(rnh, info, rc)); +} + +/* * Conditionally unlinks rtentry matching data inside @info from @rnh. * Returns unlinked, locked and referenced @rtentry on success, * Returns NULL and sets @perror to: @@ -295,7 +389,7 @@ rt_unlinkrte(struct rib_head *rnh, struct rt_addrinfo int del_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { struct sockaddr *dst, *netmask; struct sockaddr_storage mdst; @@ -314,6 +408,13 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in RIB_WLOCK(rnh); rt = rt_unlinkrte(rnh, info, &error); + if (rt != NULL) { + /* Finalize notification */ + rnh->rnh_gen++; + rc->rc_rt = rt; + rc->rc_nh_old = rt->rt_nhop; + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + } RIB_WUNLOCK(rnh); if (error != 0) return (error); @@ -324,17 +425,32 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in * If the caller wants it, then it can have it, * the entry will be deleted after the end of the current epoch. */ - if (ret_nrt) - *ret_nrt = rt; - rtfree(rt); return (0); } +int +rib_change_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + + rnh = get_rnh(fibnum, info); + if (rnh == NULL) + return (EAFNOSUPPORT); + + bzero(rc, sizeof(struct rib_cmd_info)); + rc->rc_cmd = RTM_CHANGE; + + return (change_route(rnh, info, rc)); +} + static int change_route_one(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { RIB_RLOCK_TRACKER; struct rtentry *rt = NULL; @@ -434,14 +550,18 @@ change_route_one(struct rib_head *rnh, struct rt_addri if ((nh_orig->nh_ifa != nh->nh_ifa) && nh_orig->nh_ifa->ifa_rtrequest) nh_orig->nh_ifa->ifa_rtrequest(RTM_DELETE, rt, nh_orig, info); - if (ret_nrt != NULL) - *ret_nrt = rt; + /* Finalize notification */ + rc->rc_rt = rt; + rc->rc_nh_old = nh_orig; + rc->rc_nh_new = rt->rt_nhop; RT_UNLOCK(rt); /* Update generation id to reflect rtable change */ rnh->rnh_gen++; + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + RIB_WUNLOCK(rnh); nhop_free(nh_orig); @@ -451,7 +571,7 @@ change_route_one(struct rib_head *rnh, struct rt_addri int change_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { int error; @@ -468,7 +588,7 @@ change_route(struct rib_head *rnh, struct rt_addrinfo * multiple times before failing. */ for (int i = 0; i < RIB_MAX_RETRIES; i++) { - error = change_route_one(rnh, info, ret_nrt); + error = change_route_one(rnh, info, rc); if (error != EAGAIN) break; } @@ -581,4 +701,62 @@ rib_walk_del(u_int fibnum, int family, rt_filter_f_t * } } +static void +rib_notify(struct rib_head *rnh, enum rib_subscription_type type, + struct rib_cmd_info *rc) +{ + struct rib_subscription *rs; + + CK_STAILQ_FOREACH(rs, &rnh->rnh_subscribers, next) { + if (rs->type == type) + rs->func(rnh, rc, rs->arg); + } +} + +struct rib_subscription * +rib_subscribe(uint32_t fibnum, int family, rib_subscription_cb_t *f, void *arg, + enum rib_subscription_type type, int waitok) +{ + struct rib_head *rnh; + struct rib_subscription *rs; + int flags = M_ZERO | (waitok ? M_WAITOK : 0); + + NET_EPOCH_ASSERT(); + KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); + rnh = rt_tables_get_rnh(fibnum, family); + + rs = malloc(sizeof(struct rib_subscription), M_RTABLE, flags); + if (rs == NULL) + return (NULL); + + rs->func = f; + rs->arg = arg; + rs->type = type; + + RIB_WLOCK(rnh); + CK_STAILQ_INSERT_TAIL(&rnh->rnh_subscribers, rs, next); + RIB_WUNLOCK(rnh); + + return (rs); +} + +int +rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription *rs) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); + rnh = rt_tables_get_rnh(fibnum, family); + + if (rnh == NULL) + return (ENOENT); + + RIB_WLOCK(rnh); + CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, next); + RIB_WUNLOCK(rnh); + + free(rs, M_RTABLE); + return (0); +} Added: head/sys/net/route/route_ctl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net/route/route_ctl.h Mon Jun 1 20:32:02 2020 (r361704) @@ -0,0 +1,90 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Alexander V. Chernikov + * + * 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$ + */ + +/* + * This header file contains public functions and structures used for + * routing table manipulations. + */ + +#ifndef _NET_ROUTE_ROUTE_CTL_H_ +#define _NET_ROUTE_ROUTE_CTL_H_ + +struct rib_cmd_info { + uint8_t rc_cmd; /* RTM_ADD|RTM_DEL|RTM_CHANGE */ + uint8_t spare[3]; + uint32_t rc_nh_weight; /* new nhop weight */ + struct rtentry *rc_rt; /* Target entry */ + struct nhop_object *rc_nh_old; /* Target nhop OR mpath */ + struct nhop_object *rc_nh_new; /* Target nhop OR mpath */ +}; + + +int rib_add_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc); +int rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc); +int rib_change_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc); + +int rib_add_redirect(u_int fibnum, struct sockaddr *dst, + struct sockaddr *gateway, struct sockaddr *author, struct ifnet *ifp, + int flags, int expire_sec); + +typedef int rt_walktree_f_t(struct rtentry *, void *); +void rib_walk(int af, u_int fibnum, rt_walktree_f_t *wa_f, void *arg); +void rib_walk_del(u_int fibnum, int family, rt_filter_f_t *filter_f, + void *arg, bool report); + +typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); +void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); +void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void *arg); + +enum rib_subscription_type { + RIB_NOTIFY_IMMEDIATE, + RIB_NOTIFY_DELAYED +}; + +typedef void rib_subscription_cb_t(struct rib_head *rnh, struct rib_cmd_info *rc, + void *arg); + +struct rib_subscription { + CK_STAILQ_ENTRY(rib_subscription) next; + rib_subscription_cb_t *func; + void *arg; + enum rib_subscription_type type; +}; + +struct rib_subscription *rib_subscribe(uint32_t fibnum, int family, + rib_subscription_cb_t *f, void *arg, enum rib_subscription_type type, + int waitok); +int rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription *rs); + + +#endif + Modified: head/sys/net/route/route_ddb.c ============================================================================== --- head/sys/net/route/route_ddb.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route/route_ddb.c Mon Jun 1 20:32:02 2020 (r361704) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include /* Modified: head/sys/net/route/route_helpers.c ============================================================================== --- head/sys/net/route/route_helpers.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route/route_helpers.c Mon Jun 1 20:32:02 2020 (r361704) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/net/route/route_temporal.c ============================================================================== --- head/sys/net/route/route_temporal.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route/route_temporal.c Mon Jun 1 20:32:02 2020 (r361704) @@ -38,11 +38,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include +#include #include #include Modified: head/sys/net/route/route_var.h ============================================================================== --- head/sys/net/route/route_var.h Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/net/route/route_var.h Mon Jun 1 20:32:02 2020 (r361704) @@ -35,6 +35,7 @@ #ifndef RNF_NORMAL #include #endif +#include #include #include /* struct sockaddr_in */ #include @@ -63,6 +64,7 @@ struct rib_head { struct callout expire_callout; /* Callout for expiring dynamic routes */ time_t next_expire; /* Next expire run ts */ struct nh_control *nh_control; /* nexthop subsystem data */ + CK_STAILQ_HEAD(, rib_subscription) rnh_subscribers;/* notification subscribers */ }; #define RIB_RLOCK_TRACKER struct rm_priotracker _rib_tracker @@ -110,12 +112,13 @@ void rt_setmetrics(const struct rt_addrinfo *info, str struct radix_node *rt_mpath_unlink(struct rib_head *rnh, struct rt_addrinfo *info, struct rtentry *rto, int *perror); #endif +struct rib_cmd_info; int add_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt); + struct rib_cmd_info *rc); int del_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt); + struct rib_cmd_info *rc); int change_route(struct rib_head *, struct rt_addrinfo *, - struct rtentry **); + struct rib_cmd_info *rc); VNET_PCPUSTAT_DECLARE(struct rtstat, rtstat); #define RTSTAT_ADD(name, val) \ Modified: head/sys/netinet/in_rmx.c ============================================================================== --- head/sys/netinet/in_rmx.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/netinet/in_rmx.c Mon Jun 1 20:32:02 2020 (r361704) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/netinet/ip_icmp.c ============================================================================== --- head/sys/netinet/ip_icmp.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/netinet/ip_icmp.c Mon Jun 1 20:32:02 2020 (r361704) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: head/sys/netinet6/icmp6.c ============================================================================== --- head/sys/netinet6/icmp6.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/netinet6/icmp6.c Mon Jun 1 20:32:02 2020 (r361704) @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: head/sys/netinet6/in6_rmx.c ============================================================================== --- head/sys/netinet6/in6_rmx.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/netinet6/in6_rmx.c Mon Jun 1 20:32:02 2020 (r361704) @@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/netinet6/nd6_rtr.c ============================================================================== --- head/sys/netinet6/nd6_rtr.c Mon Jun 1 19:40:59 2020 (r361703) +++ head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:32:02 2020 (r361704) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From owner-svn-src-head@freebsd.org Mon Jun 1 20:40:43 2020 Return-Path: Delivered-To: svn-src-head@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 31D142F1BBD; Mon, 1 Jun 2020 20:40:43 +0000 (UTC) (envelope-from melifaro@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bRrq0y66z3SJR; Mon, 1 Jun 2020 20:40:43 +0000 (UTC) (envelope-from melifaro@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 1BCF01159F; Mon, 1 Jun 2020 20:40:43 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051Keh6q055660; Mon, 1 Jun 2020 20:40:43 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051Kee9m055647; Mon, 1 Jun 2020 20:40:40 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202006012040.051Kee9m055647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Jun 2020 20:40:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361705 - in head/sys: net net/route netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: in head/sys: net net/route netinet netinet6 X-SVN-Commit-Revision: 361705 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 20:40:43 -0000 Author: melifaro Date: Mon Jun 1 20:40:40 2020 New Revision: 361705 URL: https://svnweb.freebsd.org/changeset/base/361705 Log: Revert r361704, it accidentally committed merged D25067 and D25070. Deleted: head/sys/net/route/route_ctl.h Modified: head/sys/net/if_llatbl.c head/sys/net/route.c head/sys/net/route.h head/sys/net/route/nhop_ctl.c head/sys/net/route/route_ctl.c head/sys/net/route/route_ddb.c head/sys/net/route/route_helpers.c head/sys/net/route/route_temporal.c head/sys/net/route/route_var.h head/sys/netinet/in_rmx.c head/sys/netinet/ip_icmp.c head/sys/netinet6/icmp6.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/nd6_rtr.c Modified: head/sys/net/if_llatbl.c ============================================================================== --- head/sys/net/if_llatbl.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/if_llatbl.c Mon Jun 1 20:40:40 2020 (r361705) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route.c Mon Jun 1 20:40:40 2020 (r361705) @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -347,9 +346,6 @@ rt_table_init(int offset, int family, u_int fibnum) nhops_init_rib(rh); - /* Init subscription system */ - CK_STAILQ_INIT(&rh->rnh_subscribers); - /* Finally, set base callbacks */ rh->rnh_addaddr = rn_addroute; rh->rnh_deladdr = rn_delete; @@ -1152,7 +1148,6 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru { const struct sockaddr *dst; struct rib_head *rnh; - struct rib_cmd_info rc; int error; KASSERT((fibnum < rt_numfibs), ("rtrequest1_fib: bad fibnum")); @@ -1185,11 +1180,10 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru if (info->rti_flags & RTF_HOST) info->rti_info[RTAX_NETMASK] = NULL; - bzero(&rc, sizeof(struct rib_cmd_info)); error = 0; switch (req) { case RTM_DELETE: - error = del_route(rnh, info, &rc); + error = del_route(rnh, info, ret_nrt); break; case RTM_RESOLVE: /* @@ -1198,17 +1192,14 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru */ break; case RTM_ADD: - error = add_route(rnh, info, &rc); + error = add_route(rnh, info, ret_nrt); break; case RTM_CHANGE: - error = change_route(rnh, info, &rc); + error = change_route(rnh, info, ret_nrt); break; default: error = EOPNOTSUPP; } - - if (ret_nrt != NULL) - *ret_nrt = rc.rc_rt; return (error); } Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route.h Mon Jun 1 20:40:40 2020 (r361705) @@ -399,6 +399,12 @@ void rtfree(struct rtentry *); void rtfree_func(struct rtentry *); void rt_updatemtu(struct ifnet *); +typedef int rt_walktree_f_t(struct rtentry *, void *); +typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); +void rib_walk_del(u_int fibnum, int family, rt_filter_f_t *filter_f, + void *arg, bool report); +void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); +void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void *arg); void rt_flushifroutes_af(struct ifnet *, int); void rt_flushifroutes(struct ifnet *ifp); @@ -417,8 +423,12 @@ int rtrequest1_fib(int, struct rt_addrinfo *, struct int rib_lookup_info(uint32_t, const struct sockaddr *, uint32_t, uint32_t, struct rt_addrinfo *); void rib_free_info(struct rt_addrinfo *info); +int rib_add_redirect(u_int fibnum, struct sockaddr *dst, + struct sockaddr *gateway, struct sockaddr *author, struct ifnet *ifp, + int flags, int expire_sec); /* New API */ +void rib_walk(int af, u_int fibnum, rt_walktree_f_t *wa_f, void *arg); struct nhop_object *rib_lookup(uint32_t fibnum, const struct sockaddr *dst, uint32_t flags, uint32_t flowid); #endif Modified: head/sys/net/route/nhop_ctl.c ============================================================================== --- head/sys/net/route/nhop_ctl.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route/nhop_ctl.c Mon Jun 1 20:40:40 2020 (r361705) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/net/route/route_ctl.c ============================================================================== --- head/sys/net/route/route_ctl.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route/route_ctl.c Mon Jun 1 20:40:40 2020 (r361705) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -68,61 +67,11 @@ __FBSDID("$FreeBSD$"); * All functions assumes they are called in net epoch. */ -static void rib_notify(struct rib_head *rnh, enum rib_subscription_type type, - struct rib_cmd_info *rc); - static void rt_notifydelete(struct rtentry *rt, struct rt_addrinfo *info); -static struct rib_head * -get_rnh(uint32_t fibnum, const struct rt_addrinfo *info) -{ - struct rib_head *rnh; - struct sockaddr *dst; - - KASSERT((fibnum < rt_numfibs), ("rib_add_route: bad fibnum")); - - dst = info->rti_info[RTAX_DST]; - rnh = rt_tables_get_rnh(fibnum, dst->sa_family); - - return (rnh); -} - -/* - * Adds route defined by @info into the kernel table specified by @fibnum and - * sa_family in @info->rti_info[RTAX_DST]. - * - * Returns 0 on success and fills in operation metadata into @rc. - */ int -rib_add_route(uint32_t fibnum, struct rt_addrinfo *info, - struct rib_cmd_info *rc) -{ - struct rib_head *rnh; - - NET_EPOCH_ASSERT(); - - rnh = get_rnh(fibnum, info); - if (rnh == NULL) - return (EAFNOSUPPORT); - - /* - * Check consistency between RTF_HOST flag and netmask - * existence. - */ - if (info->rti_flags & RTF_HOST) - info->rti_info[RTAX_NETMASK] = NULL; - else if (info->rti_info[RTAX_NETMASK] == NULL) - return (EINVAL); - - bzero(rc, sizeof(struct rib_cmd_info)); - rc->rc_cmd = RTM_ADD; - - return (add_route(rnh, info, rc)); -} - -int add_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rib_cmd_info *rc) + struct rtentry **ret_nrt) { struct sockaddr *dst, *ndst, *gateway, *netmask; struct rtentry *rt, *rt_old; @@ -197,7 +146,6 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rt->rt_weight = 1; rt_setmetrics(info, rt); - rt_old = NULL; RIB_WLOCK(rnh); RT_LOCK(rt); @@ -215,20 +163,12 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rn = rnh->rnh_addaddr(ndst, netmask, &rnh->head, rt->rt_nodes); - if (rn != NULL) { - /* Most common usecase */ - if (rt->rt_expire > 0) - tmproutes_update(rnh, rt); + if (rn != NULL && rt->rt_expire > 0) + tmproutes_update(rnh, rt); - /* Finalize notification */ - rnh->rnh_gen++; + rt_old = NULL; + if (rn == NULL && (info->rti_flags & RTF_PINNED) != 0) { - rc->rc_rt = RNTORT(rn); - rc->rc_nh_new = nh; - - rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); - } else if ((info->rti_flags & RTF_PINNED) != 0) { - /* * Force removal and re-try addition * TODO: better multipath&pinned support @@ -240,26 +180,9 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rt_old = rt_unlinkrte(rnh, info, &error); info->rti_flags |= RTF_PINNED; info->rti_info[RTAX_DST] = info_dst; - if (rt_old != NULL) { + if (rt_old != NULL) rn = rnh->rnh_addaddr(ndst, netmask, &rnh->head, rt->rt_nodes); - - /* Finalize notification */ - rnh->rnh_gen++; - - if (rn != NULL) { - rc->rc_cmd = RTM_CHANGE; - rc->rc_rt = RNTORT(rn); - rc->rc_nh_old = rt_old->rt_nhop; - rc->rc_nh_new = nh; - } else { - rc->rc_cmd = RTM_DELETE; - rc->rc_rt = RNTORT(rn); - rc->rc_nh_old = rt_old->rt_nhop; - rc->rc_nh_new = nh; - } - rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); - } } RIB_WUNLOCK(rnh); @@ -285,6 +208,12 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in if (ifa->ifa_rtrequest) ifa->ifa_rtrequest(RTM_ADD, rt, rt->rt_nhop, info); + /* + * actually return a resultant rtentry + */ + if (ret_nrt) + *ret_nrt = rt; + rnh->rnh_gen++; /* Routing table updated */ RT_UNLOCK(rt); return (0); @@ -292,29 +221,6 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in /* - * Removes route defined by @info from the kernel table specified by @fibnum and - * sa_family in @info->rti_info[RTAX_DST]. - * - * Returns 0 on success and fills in operation metadata into @rc. - */ -int -rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, struct rib_cmd_info *rc) -{ - struct rib_head *rnh; - - NET_EPOCH_ASSERT(); - - rnh = get_rnh(fibnum, info); - if (rnh == NULL) - return (EAFNOSUPPORT); - - bzero(rc, sizeof(struct rib_cmd_info)); - rc->rc_cmd = RTM_DELETE; - - return (del_route(rnh, info, rc)); -} - -/* * Conditionally unlinks rtentry matching data inside @info from @rnh. * Returns unlinked, locked and referenced @rtentry on success, * Returns NULL and sets @perror to: @@ -389,7 +295,7 @@ rt_unlinkrte(struct rib_head *rnh, struct rt_addrinfo int del_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rib_cmd_info *rc) + struct rtentry **ret_nrt) { struct sockaddr *dst, *netmask; struct sockaddr_storage mdst; @@ -408,13 +314,6 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in RIB_WLOCK(rnh); rt = rt_unlinkrte(rnh, info, &error); - if (rt != NULL) { - /* Finalize notification */ - rnh->rnh_gen++; - rc->rc_rt = rt; - rc->rc_nh_old = rt->rt_nhop; - rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); - } RIB_WUNLOCK(rnh); if (error != 0) return (error); @@ -425,32 +324,17 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in * If the caller wants it, then it can have it, * the entry will be deleted after the end of the current epoch. */ + if (ret_nrt) + *ret_nrt = rt; + rtfree(rt); return (0); } -int -rib_change_route(uint32_t fibnum, struct rt_addrinfo *info, - struct rib_cmd_info *rc) -{ - struct rib_head *rnh; - - NET_EPOCH_ASSERT(); - - rnh = get_rnh(fibnum, info); - if (rnh == NULL) - return (EAFNOSUPPORT); - - bzero(rc, sizeof(struct rib_cmd_info)); - rc->rc_cmd = RTM_CHANGE; - - return (change_route(rnh, info, rc)); -} - static int change_route_one(struct rib_head *rnh, struct rt_addrinfo *info, - struct rib_cmd_info *rc) + struct rtentry **ret_nrt) { RIB_RLOCK_TRACKER; struct rtentry *rt = NULL; @@ -550,18 +434,14 @@ change_route_one(struct rib_head *rnh, struct rt_addri if ((nh_orig->nh_ifa != nh->nh_ifa) && nh_orig->nh_ifa->ifa_rtrequest) nh_orig->nh_ifa->ifa_rtrequest(RTM_DELETE, rt, nh_orig, info); - /* Finalize notification */ - rc->rc_rt = rt; - rc->rc_nh_old = nh_orig; - rc->rc_nh_new = rt->rt_nhop; + if (ret_nrt != NULL) + *ret_nrt = rt; RT_UNLOCK(rt); /* Update generation id to reflect rtable change */ rnh->rnh_gen++; - rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); - RIB_WUNLOCK(rnh); nhop_free(nh_orig); @@ -571,7 +451,7 @@ change_route_one(struct rib_head *rnh, struct rt_addri int change_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rib_cmd_info *rc) + struct rtentry **ret_nrt) { int error; @@ -588,7 +468,7 @@ change_route(struct rib_head *rnh, struct rt_addrinfo * multiple times before failing. */ for (int i = 0; i < RIB_MAX_RETRIES; i++) { - error = change_route_one(rnh, info, rc); + error = change_route_one(rnh, info, ret_nrt); if (error != EAGAIN) break; } @@ -701,62 +581,4 @@ rib_walk_del(u_int fibnum, int family, rt_filter_f_t * } } -static void -rib_notify(struct rib_head *rnh, enum rib_subscription_type type, - struct rib_cmd_info *rc) -{ - struct rib_subscription *rs; - - CK_STAILQ_FOREACH(rs, &rnh->rnh_subscribers, next) { - if (rs->type == type) - rs->func(rnh, rc, rs->arg); - } -} - -struct rib_subscription * -rib_subscribe(uint32_t fibnum, int family, rib_subscription_cb_t *f, void *arg, - enum rib_subscription_type type, int waitok) -{ - struct rib_head *rnh; - struct rib_subscription *rs; - int flags = M_ZERO | (waitok ? M_WAITOK : 0); - - NET_EPOCH_ASSERT(); - KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); - rnh = rt_tables_get_rnh(fibnum, family); - - rs = malloc(sizeof(struct rib_subscription), M_RTABLE, flags); - if (rs == NULL) - return (NULL); - - rs->func = f; - rs->arg = arg; - rs->type = type; - - RIB_WLOCK(rnh); - CK_STAILQ_INSERT_TAIL(&rnh->rnh_subscribers, rs, next); - RIB_WUNLOCK(rnh); - - return (rs); -} - -int -rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription *rs) -{ - struct rib_head *rnh; - - NET_EPOCH_ASSERT(); - KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); - rnh = rt_tables_get_rnh(fibnum, family); - - if (rnh == NULL) - return (ENOENT); - - RIB_WLOCK(rnh); - CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, next); - RIB_WUNLOCK(rnh); - - free(rs, M_RTABLE); - return (0); -} Modified: head/sys/net/route/route_ddb.c ============================================================================== --- head/sys/net/route/route_ddb.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route/route_ddb.c Mon Jun 1 20:40:40 2020 (r361705) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include /* Modified: head/sys/net/route/route_helpers.c ============================================================================== --- head/sys/net/route/route_helpers.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route/route_helpers.c Mon Jun 1 20:40:40 2020 (r361705) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/net/route/route_temporal.c ============================================================================== --- head/sys/net/route/route_temporal.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route/route_temporal.c Mon Jun 1 20:40:40 2020 (r361705) @@ -38,13 +38,11 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include -#include #include #include Modified: head/sys/net/route/route_var.h ============================================================================== --- head/sys/net/route/route_var.h Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/net/route/route_var.h Mon Jun 1 20:40:40 2020 (r361705) @@ -35,7 +35,6 @@ #ifndef RNF_NORMAL #include #endif -#include #include #include /* struct sockaddr_in */ #include @@ -64,7 +63,6 @@ struct rib_head { struct callout expire_callout; /* Callout for expiring dynamic routes */ time_t next_expire; /* Next expire run ts */ struct nh_control *nh_control; /* nexthop subsystem data */ - CK_STAILQ_HEAD(, rib_subscription) rnh_subscribers;/* notification subscribers */ }; #define RIB_RLOCK_TRACKER struct rm_priotracker _rib_tracker @@ -112,13 +110,12 @@ void rt_setmetrics(const struct rt_addrinfo *info, str struct radix_node *rt_mpath_unlink(struct rib_head *rnh, struct rt_addrinfo *info, struct rtentry *rto, int *perror); #endif -struct rib_cmd_info; int add_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rib_cmd_info *rc); + struct rtentry **ret_nrt); int del_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rib_cmd_info *rc); + struct rtentry **ret_nrt); int change_route(struct rib_head *, struct rt_addrinfo *, - struct rib_cmd_info *rc); + struct rtentry **); VNET_PCPUSTAT_DECLARE(struct rtstat, rtstat); #define RTSTAT_ADD(name, val) \ Modified: head/sys/netinet/in_rmx.c ============================================================================== --- head/sys/netinet/in_rmx.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/netinet/in_rmx.c Mon Jun 1 20:40:40 2020 (r361705) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/netinet/ip_icmp.c ============================================================================== --- head/sys/netinet/ip_icmp.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/netinet/ip_icmp.c Mon Jun 1 20:40:40 2020 (r361705) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: head/sys/netinet6/icmp6.c ============================================================================== --- head/sys/netinet6/icmp6.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/netinet6/icmp6.c Mon Jun 1 20:40:40 2020 (r361705) @@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: head/sys/netinet6/in6_rmx.c ============================================================================== --- head/sys/netinet6/in6_rmx.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/netinet6/in6_rmx.c Mon Jun 1 20:40:40 2020 (r361705) @@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/netinet6/nd6_rtr.c ============================================================================== --- head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:32:02 2020 (r361704) +++ head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:40:40 2020 (r361705) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include From owner-svn-src-head@freebsd.org Mon Jun 1 20:49:46 2020 Return-Path: Delivered-To: svn-src-head@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 58BC22F1FD6; Mon, 1 Jun 2020 20:49:46 +0000 (UTC) (envelope-from melifaro@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bS3G24Hpz3Td4; Mon, 1 Jun 2020 20:49:46 +0000 (UTC) (envelope-from melifaro@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 3D9821176E; Mon, 1 Jun 2020 20:49:46 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051KnkCM060712; Mon, 1 Jun 2020 20:49:46 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051KnhxX060695; Mon, 1 Jun 2020 20:49:43 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202006012049.051KnhxX060695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Jun 2020 20:49:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361706 - in head/sys: net net/route netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: in head/sys: net net/route netinet netinet6 X-SVN-Commit-Revision: 361706 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 20:49:46 -0000 Author: melifaro Date: Mon Jun 1 20:49:42 2020 New Revision: 361706 URL: https://svnweb.freebsd.org/changeset/base/361706 Log: * Add rib__route() functions to manipulate the routing table. The main driver for the change is the need to improve notification mechanism. Currently callers guess the operation data based on the rtentry structure returned in case of successful operation result. There are two problems with this appoach. First is that it doesn't provide enough information for the upcoming multipath changes, where rtentry refers to a new nexthop group, and there is no way of guessing which paths were added during the change. Second is that some rtentry fields can change during notification and protecting from it by requiring customers to unlock rtentry is not desired. Additionally, as the consumers such as rtsock do know which operation they request in advance, making explicit add/change/del versions of the functions makes sense, especially given the functions don't share a lot of code. With that in mind, introduce rib_cmd_info notification structure and rib__route() functions, with mandatory rib_cmd_info pointer. It will be used in upcoming generalized notifications. * Move definitions of the new functions and some other functions/structures used for the routing table manipulation to a separate header file, net/route/route_ctl.h. net/route.h is a frequently used file included in ~140 places in kernel, and 90% of the users don't need these definitions. Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D25067 Modified: head/sys/net/if_llatbl.c head/sys/net/route.c head/sys/net/route.h head/sys/net/route/nhop_ctl.c head/sys/net/route/route_ctl.c head/sys/net/route/route_ddb.c head/sys/net/route/route_helpers.c head/sys/net/route/route_temporal.c head/sys/net/route/route_var.h head/sys/netinet/in_rmx.c head/sys/netinet/ip_icmp.c head/sys/netinet6/icmp6.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/nd6_rtr.c Modified: head/sys/net/if_llatbl.c ============================================================================== --- head/sys/net/if_llatbl.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/if_llatbl.c Mon Jun 1 20:49:42 2020 (r361706) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route.c Mon Jun 1 20:49:42 2020 (r361706) @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -346,6 +347,9 @@ rt_table_init(int offset, int family, u_int fibnum) nhops_init_rib(rh); + /* Init subscription system */ + CK_STAILQ_INIT(&rh->rnh_subscribers); + /* Finally, set base callbacks */ rh->rnh_addaddr = rn_addroute; rh->rnh_deladdr = rn_delete; @@ -1148,6 +1152,7 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru { const struct sockaddr *dst; struct rib_head *rnh; + struct rib_cmd_info rc; int error; KASSERT((fibnum < rt_numfibs), ("rtrequest1_fib: bad fibnum")); @@ -1180,10 +1185,11 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru if (info->rti_flags & RTF_HOST) info->rti_info[RTAX_NETMASK] = NULL; + bzero(&rc, sizeof(struct rib_cmd_info)); error = 0; switch (req) { case RTM_DELETE: - error = del_route(rnh, info, ret_nrt); + error = del_route(rnh, info, &rc); break; case RTM_RESOLVE: /* @@ -1192,14 +1198,17 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru */ break; case RTM_ADD: - error = add_route(rnh, info, ret_nrt); + error = add_route(rnh, info, &rc); break; case RTM_CHANGE: - error = change_route(rnh, info, ret_nrt); + error = change_route(rnh, info, &rc); break; default: error = EOPNOTSUPP; } + + if (ret_nrt != NULL) + *ret_nrt = rc.rc_rt; return (error); } Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route.h Mon Jun 1 20:49:42 2020 (r361706) @@ -399,12 +399,6 @@ void rtfree(struct rtentry *); void rtfree_func(struct rtentry *); void rt_updatemtu(struct ifnet *); -typedef int rt_walktree_f_t(struct rtentry *, void *); -typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); -void rib_walk_del(u_int fibnum, int family, rt_filter_f_t *filter_f, - void *arg, bool report); -void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); -void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void *arg); void rt_flushifroutes_af(struct ifnet *, int); void rt_flushifroutes(struct ifnet *ifp); @@ -423,12 +417,8 @@ int rtrequest1_fib(int, struct rt_addrinfo *, struct int rib_lookup_info(uint32_t, const struct sockaddr *, uint32_t, uint32_t, struct rt_addrinfo *); void rib_free_info(struct rt_addrinfo *info); -int rib_add_redirect(u_int fibnum, struct sockaddr *dst, - struct sockaddr *gateway, struct sockaddr *author, struct ifnet *ifp, - int flags, int expire_sec); /* New API */ -void rib_walk(int af, u_int fibnum, rt_walktree_f_t *wa_f, void *arg); struct nhop_object *rib_lookup(uint32_t fibnum, const struct sockaddr *dst, uint32_t flags, uint32_t flowid); #endif Modified: head/sys/net/route/nhop_ctl.c ============================================================================== --- head/sys/net/route/nhop_ctl.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route/nhop_ctl.c Mon Jun 1 20:49:42 2020 (r361706) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/net/route/route_ctl.c ============================================================================== --- head/sys/net/route/route_ctl.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route/route_ctl.c Mon Jun 1 20:49:42 2020 (r361706) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -67,11 +68,61 @@ __FBSDID("$FreeBSD$"); * All functions assumes they are called in net epoch. */ +static void rib_notify(struct rib_head *rnh, enum rib_subscription_type type, + struct rib_cmd_info *rc); + static void rt_notifydelete(struct rtentry *rt, struct rt_addrinfo *info); +static struct rib_head * +get_rnh(uint32_t fibnum, const struct rt_addrinfo *info) +{ + struct rib_head *rnh; + struct sockaddr *dst; + + KASSERT((fibnum < rt_numfibs), ("rib_add_route: bad fibnum")); + + dst = info->rti_info[RTAX_DST]; + rnh = rt_tables_get_rnh(fibnum, dst->sa_family); + + return (rnh); +} + +/* + * Adds route defined by @info into the kernel table specified by @fibnum and + * sa_family in @info->rti_info[RTAX_DST]. + * + * Returns 0 on success and fills in operation metadata into @rc. + */ int +rib_add_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + + rnh = get_rnh(fibnum, info); + if (rnh == NULL) + return (EAFNOSUPPORT); + + /* + * Check consistency between RTF_HOST flag and netmask + * existence. + */ + if (info->rti_flags & RTF_HOST) + info->rti_info[RTAX_NETMASK] = NULL; + else if (info->rti_info[RTAX_NETMASK] == NULL) + return (EINVAL); + + bzero(rc, sizeof(struct rib_cmd_info)); + rc->rc_cmd = RTM_ADD; + + return (add_route(rnh, info, rc)); +} + +int add_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { struct sockaddr *dst, *ndst, *gateway, *netmask; struct rtentry *rt, *rt_old; @@ -146,6 +197,7 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rt->rt_weight = 1; rt_setmetrics(info, rt); + rt_old = NULL; RIB_WLOCK(rnh); RT_LOCK(rt); @@ -163,12 +215,20 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rn = rnh->rnh_addaddr(ndst, netmask, &rnh->head, rt->rt_nodes); - if (rn != NULL && rt->rt_expire > 0) - tmproutes_update(rnh, rt); + if (rn != NULL) { + /* Most common usecase */ + if (rt->rt_expire > 0) + tmproutes_update(rnh, rt); - rt_old = NULL; - if (rn == NULL && (info->rti_flags & RTF_PINNED) != 0) { + /* Finalize notification */ + rnh->rnh_gen++; + rc->rc_rt = RNTORT(rn); + rc->rc_nh_new = nh; + + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + } else if ((info->rti_flags & RTF_PINNED) != 0) { + /* * Force removal and re-try addition * TODO: better multipath&pinned support @@ -180,9 +240,26 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in rt_old = rt_unlinkrte(rnh, info, &error); info->rti_flags |= RTF_PINNED; info->rti_info[RTAX_DST] = info_dst; - if (rt_old != NULL) + if (rt_old != NULL) { rn = rnh->rnh_addaddr(ndst, netmask, &rnh->head, rt->rt_nodes); + + /* Finalize notification */ + rnh->rnh_gen++; + + if (rn != NULL) { + rc->rc_cmd = RTM_CHANGE; + rc->rc_rt = RNTORT(rn); + rc->rc_nh_old = rt_old->rt_nhop; + rc->rc_nh_new = nh; + } else { + rc->rc_cmd = RTM_DELETE; + rc->rc_rt = RNTORT(rn); + rc->rc_nh_old = rt_old->rt_nhop; + rc->rc_nh_new = nh; + } + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + } } RIB_WUNLOCK(rnh); @@ -208,12 +285,6 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in if (ifa->ifa_rtrequest) ifa->ifa_rtrequest(RTM_ADD, rt, rt->rt_nhop, info); - /* - * actually return a resultant rtentry - */ - if (ret_nrt) - *ret_nrt = rt; - rnh->rnh_gen++; /* Routing table updated */ RT_UNLOCK(rt); return (0); @@ -221,6 +292,29 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in /* + * Removes route defined by @info from the kernel table specified by @fibnum and + * sa_family in @info->rti_info[RTAX_DST]. + * + * Returns 0 on success and fills in operation metadata into @rc. + */ +int +rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, struct rib_cmd_info *rc) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + + rnh = get_rnh(fibnum, info); + if (rnh == NULL) + return (EAFNOSUPPORT); + + bzero(rc, sizeof(struct rib_cmd_info)); + rc->rc_cmd = RTM_DELETE; + + return (del_route(rnh, info, rc)); +} + +/* * Conditionally unlinks rtentry matching data inside @info from @rnh. * Returns unlinked, locked and referenced @rtentry on success, * Returns NULL and sets @perror to: @@ -295,7 +389,7 @@ rt_unlinkrte(struct rib_head *rnh, struct rt_addrinfo int del_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { struct sockaddr *dst, *netmask; struct sockaddr_storage mdst; @@ -314,6 +408,13 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in RIB_WLOCK(rnh); rt = rt_unlinkrte(rnh, info, &error); + if (rt != NULL) { + /* Finalize notification */ + rnh->rnh_gen++; + rc->rc_rt = rt; + rc->rc_nh_old = rt->rt_nhop; + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + } RIB_WUNLOCK(rnh); if (error != 0) return (error); @@ -324,17 +425,32 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in * If the caller wants it, then it can have it, * the entry will be deleted after the end of the current epoch. */ - if (ret_nrt) - *ret_nrt = rt; - rtfree(rt); return (0); } +int +rib_change_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + + rnh = get_rnh(fibnum, info); + if (rnh == NULL) + return (EAFNOSUPPORT); + + bzero(rc, sizeof(struct rib_cmd_info)); + rc->rc_cmd = RTM_CHANGE; + + return (change_route(rnh, info, rc)); +} + static int change_route_one(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { RIB_RLOCK_TRACKER; struct rtentry *rt = NULL; @@ -434,14 +550,18 @@ change_route_one(struct rib_head *rnh, struct rt_addri if ((nh_orig->nh_ifa != nh->nh_ifa) && nh_orig->nh_ifa->ifa_rtrequest) nh_orig->nh_ifa->ifa_rtrequest(RTM_DELETE, rt, nh_orig, info); - if (ret_nrt != NULL) - *ret_nrt = rt; + /* Finalize notification */ + rc->rc_rt = rt; + rc->rc_nh_old = nh_orig; + rc->rc_nh_new = rt->rt_nhop; RT_UNLOCK(rt); /* Update generation id to reflect rtable change */ rnh->rnh_gen++; + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); + RIB_WUNLOCK(rnh); nhop_free(nh_orig); @@ -451,7 +571,7 @@ change_route_one(struct rib_head *rnh, struct rt_addri int change_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt) + struct rib_cmd_info *rc) { int error; @@ -468,7 +588,7 @@ change_route(struct rib_head *rnh, struct rt_addrinfo * multiple times before failing. */ for (int i = 0; i < RIB_MAX_RETRIES; i++) { - error = change_route_one(rnh, info, ret_nrt); + error = change_route_one(rnh, info, rc); if (error != EAGAIN) break; } @@ -581,4 +701,62 @@ rib_walk_del(u_int fibnum, int family, rt_filter_f_t * } } +static void +rib_notify(struct rib_head *rnh, enum rib_subscription_type type, + struct rib_cmd_info *rc) +{ + struct rib_subscription *rs; + + CK_STAILQ_FOREACH(rs, &rnh->rnh_subscribers, next) { + if (rs->type == type) + rs->func(rnh, rc, rs->arg); + } +} + +struct rib_subscription * +rib_subscribe(uint32_t fibnum, int family, rib_subscription_cb_t *f, void *arg, + enum rib_subscription_type type, int waitok) +{ + struct rib_head *rnh; + struct rib_subscription *rs; + int flags = M_ZERO | (waitok ? M_WAITOK : 0); + + NET_EPOCH_ASSERT(); + KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); + rnh = rt_tables_get_rnh(fibnum, family); + + rs = malloc(sizeof(struct rib_subscription), M_RTABLE, flags); + if (rs == NULL) + return (NULL); + + rs->func = f; + rs->arg = arg; + rs->type = type; + + RIB_WLOCK(rnh); + CK_STAILQ_INSERT_TAIL(&rnh->rnh_subscribers, rs, next); + RIB_WUNLOCK(rnh); + + return (rs); +} + +int +rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription *rs) +{ + struct rib_head *rnh; + + NET_EPOCH_ASSERT(); + KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); + rnh = rt_tables_get_rnh(fibnum, family); + + if (rnh == NULL) + return (ENOENT); + + RIB_WLOCK(rnh); + CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, next); + RIB_WUNLOCK(rnh); + + free(rs, M_RTABLE); + return (0); +} Modified: head/sys/net/route/route_ddb.c ============================================================================== --- head/sys/net/route/route_ddb.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route/route_ddb.c Mon Jun 1 20:49:42 2020 (r361706) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include /* Modified: head/sys/net/route/route_helpers.c ============================================================================== --- head/sys/net/route/route_helpers.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route/route_helpers.c Mon Jun 1 20:49:42 2020 (r361706) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/net/route/route_temporal.c ============================================================================== --- head/sys/net/route/route_temporal.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route/route_temporal.c Mon Jun 1 20:49:42 2020 (r361706) @@ -38,11 +38,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include +#include #include #include Modified: head/sys/net/route/route_var.h ============================================================================== --- head/sys/net/route/route_var.h Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/net/route/route_var.h Mon Jun 1 20:49:42 2020 (r361706) @@ -35,6 +35,7 @@ #ifndef RNF_NORMAL #include #endif +#include #include #include /* struct sockaddr_in */ #include @@ -63,6 +64,7 @@ struct rib_head { struct callout expire_callout; /* Callout for expiring dynamic routes */ time_t next_expire; /* Next expire run ts */ struct nh_control *nh_control; /* nexthop subsystem data */ + CK_STAILQ_HEAD(, rib_subscription) rnh_subscribers;/* notification subscribers */ }; #define RIB_RLOCK_TRACKER struct rm_priotracker _rib_tracker @@ -110,12 +112,13 @@ void rt_setmetrics(const struct rt_addrinfo *info, str struct radix_node *rt_mpath_unlink(struct rib_head *rnh, struct rt_addrinfo *info, struct rtentry *rto, int *perror); #endif +struct rib_cmd_info; int add_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt); + struct rib_cmd_info *rc); int del_route(struct rib_head *rnh, struct rt_addrinfo *info, - struct rtentry **ret_nrt); + struct rib_cmd_info *rc); int change_route(struct rib_head *, struct rt_addrinfo *, - struct rtentry **); + struct rib_cmd_info *rc); VNET_PCPUSTAT_DECLARE(struct rtstat, rtstat); #define RTSTAT_ADD(name, val) \ Modified: head/sys/netinet/in_rmx.c ============================================================================== --- head/sys/netinet/in_rmx.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/netinet/in_rmx.c Mon Jun 1 20:49:42 2020 (r361706) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/netinet/ip_icmp.c ============================================================================== --- head/sys/netinet/ip_icmp.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/netinet/ip_icmp.c Mon Jun 1 20:49:42 2020 (r361706) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: head/sys/netinet6/icmp6.c ============================================================================== --- head/sys/netinet6/icmp6.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/netinet6/icmp6.c Mon Jun 1 20:49:42 2020 (r361706) @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: head/sys/netinet6/in6_rmx.c ============================================================================== --- head/sys/netinet6/in6_rmx.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/netinet6/in6_rmx.c Mon Jun 1 20:49:42 2020 (r361706) @@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/netinet6/nd6_rtr.c ============================================================================== --- head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:40:40 2020 (r361705) +++ head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:49:42 2020 (r361706) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From owner-svn-src-head@freebsd.org Mon Jun 1 20:52:54 2020 Return-Path: Delivered-To: svn-src-head@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 0426F2F20EE; Mon, 1 Jun 2020 20:52:54 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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 49bS6s4v47z3V9Y; Mon, 1 Jun 2020 20:52:53 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id D064F3C0199; Mon, 1 Jun 2020 20:52:46 +0000 (UTC) Date: Mon, 1 Jun 2020 20:52:46 +0000 From: Brooks Davis To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r361683 - head/usr.sbin/certctl Message-ID: <20200601205246.GG3755@spindle.one-eyed-alien.net> References: <202006010125.0511PJw3044666@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qp4W5+cUSnZs0RIF" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 49bS6s4v47z3V9Y X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 20:52:54 -0000 --qp4W5+cUSnZs0RIF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 31, 2020 at 08:37:41PM -0500, Kyle Evans wrote: > n Sun, May 31, 2020 at 8:25 PM Kyle Evans wrote: > > > > Author: kevans > > Date: Mon Jun 1 01:25:19 2020 > > New Revision: 361683 > > URL: https://svnweb.freebsd.org/changeset/base/361683 > > > > Log: > > certctl: fix test syntax > > > > test doesn't understand &&, but it does understand -a. > > > > MFC after: 1 week > > >=20 > Sorry, this was a pretty low-quality commit message; && is a shell > construct, so the previous version lead to a lot of spam as the [ > invocation was split and the ] terminator lost. I'm pretty sure this was a result of my failing to test sufficiently after a merge conflict when committing. Sorry about that. -- Brooks --qp4W5+cUSnZs0RIF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJe1WqeAAoJEKzQXbSebgfAdEYIAKIbo9QnQUPdMtUmBwrluiGC rbKUAm9kba1Z1YabhWBSIYTAyFn9glbhmQyN9FSuLiQNGhX+/vHEJYZOHyG/GTMq kVnd0xRJYYG6h89tQFTB0WKvyiJhBPNrf5cIXEahL1pSVPY5RBsqVBx7pUw/928n 47YyIvvAMI930nJOJuypK3MVHxjaR8a0DMg0UiPtiDmmP7X6xdz5pLrAtQLxk5ks T6zgnabiKiZFcTUqFSnLKPjcCb+tsfvlydtbsVlVhAHyNfKP756CBucGJkLVFvMY 9P49Oei3Z4dgSRPR4vxzJ7ok6vr9VAVSECrMcEPQHiEjaO45xHnH350gutuGPVw= =QZ36 -----END PGP SIGNATURE----- --qp4W5+cUSnZs0RIF-- From owner-svn-src-head@freebsd.org Mon Jun 1 21:28:43 2020 Return-Path: Delivered-To: svn-src-head@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 C42E92F2B4C; Mon, 1 Jun 2020 21:28:43 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bSwC2NRKz3YP8; Mon, 1 Jun 2020 21:28:42 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mbp.fritz.box (ip4d1600c4.dynamic.kabel-deutschland.de [77.22.0.196]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id A83567220B803; Mon, 1 Jun 2020 23:28:38 +0200 (CEST) From: Michael Tuexen Message-Id: <6FE2C649-2D81-4C9C-B821-D8226B6BB95C@fh-muenster.de> Content-Type: multipart/signed; boundary="Apple-Mail=_30A6D176-B5FA-4F13-A949-3CE33C73C3B8"; protocol="application/pkcs7-signature"; micalg=sha-256 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn commit: r361706 - in head/sys: net net/route netinet netinet6 Date: Mon, 1 Jun 2020 23:28:37 +0200 In-Reply-To: <202006012049.051KnhxX060695@repo.freebsd.org> Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org To: "Alexander V. Chernikov" References: <202006012049.051KnhxX060695@repo.freebsd.org> X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 49bSwC2NRKz3YP8 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 21:28:43 -0000 --Apple-Mail=_30A6D176-B5FA-4F13-A949-3CE33C73C3B8 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 1. Jun 2020, at 22:49, Alexander V. Chernikov = wrote: >=20 > Author: melifaro > Date: Mon Jun 1 20:49:42 2020 > New Revision: 361706 > URL: https://svnweb.freebsd.org/changeset/base/361706 >=20 > Log: > * Add rib__route() functions to manipulate the = routing table. >=20 > The main driver for the change is the need to improve notification = mechanism. > Currently callers guess the operation data based on the rtentry = structure > returned in case of successful operation result. There are two = problems with > this appoach. First is that it doesn't provide enough information = for the > upcoming multipath changes, where rtentry refers to a new nexthop = group, > and there is no way of guessing which paths were added during the = change. > Second is that some rtentry fields can change during notification = and > protecting from it by requiring customers to unlock rtentry is not = desired. >=20 > Additionally, as the consumers such as rtsock do know which operation = they > request in advance, making explicit add/change/del versions of the = functions > makes sense, especially given the functions don't share a lot of = code. >=20 > With that in mind, introduce rib_cmd_info notification structure and > rib__route() functions, with mandatory rib_cmd_info = pointer. > It will be used in upcoming generalized notifications. >=20 > * Move definitions of the new functions and some other = functions/structures > used for the routing table manipulation to a separate header file, > net/route/route_ctl.h. net/route.h is a frequently used file = included in > ~140 places in kernel, and 90% of the users don't need these = definitions. >=20 > Reviewed by: ae > Differential Revision: https://reviews.freebsd.org/D25067 >=20 > Modified: > head/sys/net/if_llatbl.c > head/sys/net/route.c > head/sys/net/route.h > head/sys/net/route/nhop_ctl.c > head/sys/net/route/route_ctl.c > head/sys/net/route/route_ddb.c > head/sys/net/route/route_helpers.c > head/sys/net/route/route_temporal.c > head/sys/net/route/route_var.h > head/sys/netinet/in_rmx.c > head/sys/netinet/ip_icmp.c > head/sys/netinet6/icmp6.c > head/sys/netinet6/in6_rmx.c > head/sys/netinet6/nd6_rtr.c >=20 > Modified: head/sys/net/if_llatbl.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_llatbl.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/if_llatbl.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include Where is this file coming from? Best regards Michael > #include > #include > #include >=20 > Modified: head/sys/net/route.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -61,6 +61,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -346,6 +347,9 @@ rt_table_init(int offset, int family, u_int = fibnum) >=20 > nhops_init_rib(rh); >=20 > + /* Init subscription system */ > + CK_STAILQ_INIT(&rh->rnh_subscribers); > + > /* Finally, set base callbacks */ > rh->rnh_addaddr =3D rn_addroute; > rh->rnh_deladdr =3D rn_delete; > @@ -1148,6 +1152,7 @@ rtrequest1_fib(int req, struct rt_addrinfo = *info, stru > { > const struct sockaddr *dst; > struct rib_head *rnh; > + struct rib_cmd_info rc; > int error; >=20 > KASSERT((fibnum < rt_numfibs), ("rtrequest1_fib: bad fibnum")); > @@ -1180,10 +1185,11 @@ rtrequest1_fib(int req, struct rt_addrinfo = *info, stru > if (info->rti_flags & RTF_HOST) > info->rti_info[RTAX_NETMASK] =3D NULL; >=20 > + bzero(&rc, sizeof(struct rib_cmd_info)); > error =3D 0; > switch (req) { > case RTM_DELETE: > - error =3D del_route(rnh, info, ret_nrt); > + error =3D del_route(rnh, info, &rc); > break; > case RTM_RESOLVE: > /* > @@ -1192,14 +1198,17 @@ rtrequest1_fib(int req, struct rt_addrinfo = *info, stru > */ > break; > case RTM_ADD: > - error =3D add_route(rnh, info, ret_nrt); > + error =3D add_route(rnh, info, &rc); > break; > case RTM_CHANGE: > - error =3D change_route(rnh, info, ret_nrt); > + error =3D change_route(rnh, info, &rc); > break; > default: > error =3D EOPNOTSUPP; > } > + > + if (ret_nrt !=3D NULL) > + *ret_nrt =3D rc.rc_rt; >=20 > return (error); > } >=20 > Modified: head/sys/net/route.h > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route.h Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route.h Mon Jun 1 20:49:42 2020 = (r361706) > @@ -399,12 +399,6 @@ void rtfree(struct rtentry *); > void rtfree_func(struct rtentry *); > void rt_updatemtu(struct ifnet *); >=20 > -typedef int rt_walktree_f_t(struct rtentry *, void *); > -typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); > -void rib_walk_del(u_int fibnum, int family, rt_filter_f_t *filter_f, > - void *arg, bool report); > -void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, = void *); > -void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void = *arg); > void rt_flushifroutes_af(struct ifnet *, int); > void rt_flushifroutes(struct ifnet *ifp); >=20 > @@ -423,12 +417,8 @@ int rtrequest1_fib(int, struct rt_addrinfo = *, struct=20 > int rib_lookup_info(uint32_t, const struct sockaddr *, uint32_t, = uint32_t, > struct rt_addrinfo *); > void rib_free_info(struct rt_addrinfo *info); > -int rib_add_redirect(u_int fibnum, struct sockaddr *dst, > - struct sockaddr *gateway, struct sockaddr *author, struct = ifnet *ifp, > - int flags, int expire_sec); >=20 > /* New API */ > -void rib_walk(int af, u_int fibnum, rt_walktree_f_t *wa_f, void = *arg); > struct nhop_object *rib_lookup(uint32_t fibnum, const struct sockaddr = *dst, > uint32_t flags, uint32_t flowid); > #endif >=20 > Modified: head/sys/net/route/nhop_ctl.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route/nhop_ctl.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route/nhop_ctl.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include >=20 > Modified: head/sys/net/route/route_ctl.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route/route_ctl.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route/route_ctl.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -67,11 +68,61 @@ __FBSDID("$FreeBSD$"); > * All functions assumes they are called in net epoch. > */ >=20 > +static void rib_notify(struct rib_head *rnh, enum = rib_subscription_type type, > + struct rib_cmd_info *rc); > + > static void rt_notifydelete(struct rtentry *rt, struct rt_addrinfo = *info); >=20 > +static struct rib_head * > +get_rnh(uint32_t fibnum, const struct rt_addrinfo *info) > +{ > + struct rib_head *rnh; > + struct sockaddr *dst; > + > + KASSERT((fibnum < rt_numfibs), ("rib_add_route: bad fibnum")); > + > + dst =3D info->rti_info[RTAX_DST]; > + rnh =3D rt_tables_get_rnh(fibnum, dst->sa_family); > + > + return (rnh); > +} > + > +/* > + * Adds route defined by @info into the kernel table specified by = @fibnum and > + * sa_family in @info->rti_info[RTAX_DST]. > + * > + * Returns 0 on success and fills in operation metadata into @rc. > + */ > int > +rib_add_route(uint32_t fibnum, struct rt_addrinfo *info, > + struct rib_cmd_info *rc) > +{ > + struct rib_head *rnh; > + > + NET_EPOCH_ASSERT(); > + > + rnh =3D get_rnh(fibnum, info); > + if (rnh =3D=3D NULL) > + return (EAFNOSUPPORT); > + > + /* > + * Check consistency between RTF_HOST flag and netmask > + * existence. > + */ > + if (info->rti_flags & RTF_HOST) > + info->rti_info[RTAX_NETMASK] =3D NULL; > + else if (info->rti_info[RTAX_NETMASK] =3D=3D NULL) > + return (EINVAL); > + > + bzero(rc, sizeof(struct rib_cmd_info)); > + rc->rc_cmd =3D RTM_ADD; > + > + return (add_route(rnh, info, rc)); > +} > + > +int > add_route(struct rib_head *rnh, struct rt_addrinfo *info, > - struct rtentry **ret_nrt) > + struct rib_cmd_info *rc) > { > struct sockaddr *dst, *ndst, *gateway, *netmask; > struct rtentry *rt, *rt_old; > @@ -146,6 +197,7 @@ add_route(struct rib_head *rnh, struct rt_addrinfo = *in > rt->rt_weight =3D 1; >=20 > rt_setmetrics(info, rt); > + rt_old =3D NULL; >=20 > RIB_WLOCK(rnh); > RT_LOCK(rt); > @@ -163,12 +215,20 @@ add_route(struct rib_head *rnh, struct = rt_addrinfo *in >=20 > rn =3D rnh->rnh_addaddr(ndst, netmask, &rnh->head, = rt->rt_nodes); >=20 > - if (rn !=3D NULL && rt->rt_expire > 0) > - tmproutes_update(rnh, rt); > + if (rn !=3D NULL) { > + /* Most common usecase */ > + if (rt->rt_expire > 0) > + tmproutes_update(rnh, rt); >=20 > - rt_old =3D NULL; > - if (rn =3D=3D NULL && (info->rti_flags & RTF_PINNED) !=3D 0) { > + /* Finalize notification */ > + rnh->rnh_gen++; >=20 > + rc->rc_rt =3D RNTORT(rn); > + rc->rc_nh_new =3D nh; > + > + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); > + } else if ((info->rti_flags & RTF_PINNED) !=3D 0) { > + > /* > * Force removal and re-try addition > * TODO: better multipath&pinned support > @@ -180,9 +240,26 @@ add_route(struct rib_head *rnh, struct = rt_addrinfo *in > rt_old =3D rt_unlinkrte(rnh, info, &error); > info->rti_flags |=3D RTF_PINNED; > info->rti_info[RTAX_DST] =3D info_dst; > - if (rt_old !=3D NULL) > + if (rt_old !=3D NULL) { > rn =3D rnh->rnh_addaddr(ndst, netmask, = &rnh->head, > rt->rt_nodes); > + > + /* Finalize notification */ > + rnh->rnh_gen++; > + > + if (rn !=3D NULL) { > + rc->rc_cmd =3D RTM_CHANGE; > + rc->rc_rt =3D RNTORT(rn); > + rc->rc_nh_old =3D rt_old->rt_nhop; > + rc->rc_nh_new =3D nh; > + } else { > + rc->rc_cmd =3D RTM_DELETE; > + rc->rc_rt =3D RNTORT(rn); > + rc->rc_nh_old =3D rt_old->rt_nhop; > + rc->rc_nh_new =3D nh; > + } > + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); > + } > } > RIB_WUNLOCK(rnh); >=20 > @@ -208,12 +285,6 @@ add_route(struct rib_head *rnh, struct = rt_addrinfo *in > if (ifa->ifa_rtrequest) > ifa->ifa_rtrequest(RTM_ADD, rt, rt->rt_nhop, info); >=20 > - /* > - * actually return a resultant rtentry > - */ > - if (ret_nrt) > - *ret_nrt =3D rt; > - rnh->rnh_gen++; /* Routing table updated */ > RT_UNLOCK(rt); >=20 > return (0); > @@ -221,6 +292,29 @@ add_route(struct rib_head *rnh, struct = rt_addrinfo *in >=20 >=20 > /* > + * Removes route defined by @info from the kernel table specified by = @fibnum and > + * sa_family in @info->rti_info[RTAX_DST]. > + * > + * Returns 0 on success and fills in operation metadata into @rc. > + */ > +int > +rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, struct = rib_cmd_info *rc) > +{ > + struct rib_head *rnh; > + > + NET_EPOCH_ASSERT(); > + > + rnh =3D get_rnh(fibnum, info); > + if (rnh =3D=3D NULL) > + return (EAFNOSUPPORT); > + > + bzero(rc, sizeof(struct rib_cmd_info)); > + rc->rc_cmd =3D RTM_DELETE; > + > + return (del_route(rnh, info, rc)); > +} > + > +/* > * Conditionally unlinks rtentry matching data inside @info from @rnh. > * Returns unlinked, locked and referenced @rtentry on success, > * Returns NULL and sets @perror to: > @@ -295,7 +389,7 @@ rt_unlinkrte(struct rib_head *rnh, struct = rt_addrinfo=20 >=20 > int > del_route(struct rib_head *rnh, struct rt_addrinfo *info, > - struct rtentry **ret_nrt) > + struct rib_cmd_info *rc) > { > struct sockaddr *dst, *netmask; > struct sockaddr_storage mdst; > @@ -314,6 +408,13 @@ del_route(struct rib_head *rnh, struct = rt_addrinfo *in >=20 > RIB_WLOCK(rnh); > rt =3D rt_unlinkrte(rnh, info, &error); > + if (rt !=3D NULL) { > + /* Finalize notification */ > + rnh->rnh_gen++; > + rc->rc_rt =3D rt; > + rc->rc_nh_old =3D rt->rt_nhop; > + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); > + } > RIB_WUNLOCK(rnh); > if (error !=3D 0) > return (error); > @@ -324,17 +425,32 @@ del_route(struct rib_head *rnh, struct = rt_addrinfo *in > * If the caller wants it, then it can have it, > * the entry will be deleted after the end of the current epoch. > */ > - if (ret_nrt) > - *ret_nrt =3D rt; > - > rtfree(rt); >=20 > return (0); > } >=20 > +int > +rib_change_route(uint32_t fibnum, struct rt_addrinfo *info, > + struct rib_cmd_info *rc) > +{ > + struct rib_head *rnh; > + > + NET_EPOCH_ASSERT(); > + > + rnh =3D get_rnh(fibnum, info); > + if (rnh =3D=3D NULL) > + return (EAFNOSUPPORT); > + > + bzero(rc, sizeof(struct rib_cmd_info)); > + rc->rc_cmd =3D RTM_CHANGE; > + > + return (change_route(rnh, info, rc)); > +} > + > static int > change_route_one(struct rib_head *rnh, struct rt_addrinfo *info, > - struct rtentry **ret_nrt) > + struct rib_cmd_info *rc) > { > RIB_RLOCK_TRACKER; > struct rtentry *rt =3D NULL; > @@ -434,14 +550,18 @@ change_route_one(struct rib_head *rnh, struct = rt_addri > if ((nh_orig->nh_ifa !=3D nh->nh_ifa) && = nh_orig->nh_ifa->ifa_rtrequest) > nh_orig->nh_ifa->ifa_rtrequest(RTM_DELETE, rt, nh_orig, = info); >=20 > - if (ret_nrt !=3D NULL) > - *ret_nrt =3D rt; > + /* Finalize notification */ > + rc->rc_rt =3D rt; > + rc->rc_nh_old =3D nh_orig; > + rc->rc_nh_new =3D rt->rt_nhop; >=20 > RT_UNLOCK(rt); >=20 > /* Update generation id to reflect rtable change */ > rnh->rnh_gen++; >=20 > + rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); > + > RIB_WUNLOCK(rnh); >=20 > nhop_free(nh_orig); > @@ -451,7 +571,7 @@ change_route_one(struct rib_head *rnh, struct = rt_addri >=20 > int > change_route(struct rib_head *rnh, struct rt_addrinfo *info, > - struct rtentry **ret_nrt) > + struct rib_cmd_info *rc) > { > int error; >=20 > @@ -468,7 +588,7 @@ change_route(struct rib_head *rnh, struct = rt_addrinfo=20 > * multiple times before failing. > */ > for (int i =3D 0; i < RIB_MAX_RETRIES; i++) { > - error =3D change_route_one(rnh, info, ret_nrt); > + error =3D change_route_one(rnh, info, rc); > if (error !=3D EAGAIN) > break; > } > @@ -581,4 +701,62 @@ rib_walk_del(u_int fibnum, int family, = rt_filter_f_t * > } > } >=20 > +static void > +rib_notify(struct rib_head *rnh, enum rib_subscription_type type, > + struct rib_cmd_info *rc) > +{ > + struct rib_subscription *rs; > + > + CK_STAILQ_FOREACH(rs, &rnh->rnh_subscribers, next) { > + if (rs->type =3D=3D type) > + rs->func(rnh, rc, rs->arg); > + } > +} > + > +struct rib_subscription * > +rib_subscribe(uint32_t fibnum, int family, rib_subscription_cb_t *f, = void *arg, > + enum rib_subscription_type type, int waitok) > +{ > + struct rib_head *rnh; > + struct rib_subscription *rs; > + int flags =3D M_ZERO | (waitok ? M_WAITOK : 0); > + > + NET_EPOCH_ASSERT(); > + KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); > + rnh =3D rt_tables_get_rnh(fibnum, family); > + > + rs =3D malloc(sizeof(struct rib_subscription), M_RTABLE, flags); > + if (rs =3D=3D NULL) > + return (NULL); > + > + rs->func =3D f; > + rs->arg =3D arg; > + rs->type =3D type; > + > + RIB_WLOCK(rnh); > + CK_STAILQ_INSERT_TAIL(&rnh->rnh_subscribers, rs, next); > + RIB_WUNLOCK(rnh); > + > + return (rs); > +} > + > +int > +rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription = *rs) > +{ > + struct rib_head *rnh; > + > + NET_EPOCH_ASSERT(); > + KASSERT((fibnum < rt_numfibs), ("%s: bad fibnum", __func__)); > + rnh =3D rt_tables_get_rnh(fibnum, family); > + > + if (rnh =3D=3D NULL) > + return (ENOENT); > + > + RIB_WLOCK(rnh); > + CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, = next); > + RIB_WUNLOCK(rnh); > + > + free(rs, M_RTABLE); > + return (0); > +} >=20 >=20 > Modified: head/sys/net/route/route_ddb.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route/route_ddb.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route/route_ddb.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include >=20 > /* >=20 > Modified: head/sys/net/route/route_helpers.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route/route_helpers.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route/route_helpers.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include >=20 > Modified: head/sys/net/route/route_temporal.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route/route_temporal.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route/route_temporal.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -38,11 +38,13 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include >=20 > #include > #include > +#include > #include > #include >=20 >=20 > Modified: head/sys/net/route/route_var.h > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route/route_var.h Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/net/route/route_var.h Mon Jun 1 20:49:42 2020 = (r361706) > @@ -35,6 +35,7 @@ > #ifndef RNF_NORMAL > #include > #endif > +#include > #include > #include /* struct sockaddr_in */ > #include > @@ -63,6 +64,7 @@ struct rib_head { > struct callout expire_callout; /* Callout for expiring = dynamic routes */ > time_t next_expire; /* Next expire run ts */ > struct nh_control *nh_control; /* nexthop subsystem = data */ > + CK_STAILQ_HEAD(, rib_subscription) rnh_subscribers;/* = notification subscribers */ > }; >=20 > #define RIB_RLOCK_TRACKER struct rm_priotracker = _rib_tracker > @@ -110,12 +112,13 @@ void rt_setmetrics(const struct rt_addrinfo = *info, str > struct radix_node *rt_mpath_unlink(struct rib_head *rnh, > struct rt_addrinfo *info, struct rtentry *rto, int *perror); > #endif > +struct rib_cmd_info; > int add_route(struct rib_head *rnh, struct rt_addrinfo *info, > - struct rtentry **ret_nrt); > + struct rib_cmd_info *rc); > int del_route(struct rib_head *rnh, struct rt_addrinfo *info, > - struct rtentry **ret_nrt); > + struct rib_cmd_info *rc); > int change_route(struct rib_head *, struct rt_addrinfo *, > - struct rtentry **); > + struct rib_cmd_info *rc); >=20 > VNET_PCPUSTAT_DECLARE(struct rtstat, rtstat); > #define RTSTAT_ADD(name, val) \ >=20 > Modified: head/sys/netinet/in_rmx.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet/in_rmx.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/netinet/in_rmx.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include >=20 > Modified: head/sys/netinet/ip_icmp.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet/ip_icmp.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/netinet/ip_icmp.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include >=20 >=20 > Modified: head/sys/netinet6/icmp6.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet6/icmp6.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/netinet6/icmp6.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include >=20 >=20 > Modified: head/sys/netinet6/in6_rmx.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet6/in6_rmx.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/netinet6/in6_rmx.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include >=20 > Modified: head/sys/netinet6/nd6_rtr.c > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:40:40 2020 = (r361705) > +++ head/sys/netinet6/nd6_rtr.c Mon Jun 1 20:49:42 2020 = (r361706) > @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include --Apple-Mail=_30A6D176-B5FA-4F13-A949-3CE33C73C3B8 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEKow ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIF4DCCBMigAwIBAgIMIRX9tDE2QqO3mVLXMA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5MDYwNDE0MjkxMFoXDTIy MDYwMzE0MjkxMFowfDELMAkGA1UEBhMCREUxIDAeBgNVBAoMF0ZhY2hob2Noc2NodWxlIE11ZW5z dGVyMTIwMAYDVQQLDClGYWNoYmVyZWljaCBFbGVrdHJvdGVjaG5payB1bmQgSW5mb3JtYXRpazEX MBUGA1UEAwwOTWljaGFlbCBUdWV4ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM r8qQcPxLFCxzPtXvRyM9KeQaxyMA8gwUNc7IIiATs6mRQFe5ib/mvwT9nc0bAa+94go6HJDiD3FJ NkTo4u8aBsIcTt5pJtdBQLm88PLakbe3+fp/00//n7xxbTh7mAtFVCf25LxDCKkrdGk/+jglRq/R VdwhZZ3VpYCrx8YfI/hIzdRL3+4I4z/mnQ8K0X8d2MVVPG+9nBEngdnYGez5f/8wIVOgEYYBc21k yvMnVXLu2Ing+LwBd0gDG9Vasv87MNHCOZfJTNBlLhI2UDei/uNg9Zd4ynlMpPWZ7v0oiDWvmv8E OuD4oric8heyD0OYK2FL4qcVC4dn4pnyulfHAgMBAAGjggJOMIICSjA+BgNVHSAENzA1MA8GDSsG AQQBga0hgiwBAQQwEAYOKwYBBAGBrSGCLAEBBAQwEAYOKwYBBAGBrSGCLAIBBAQwCQYDVR0TBAIw ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQW BBTxiodBVL/lA4p5iNesIsJRhhgd6zAfBgNVHSMEGDAWgBRrOpiL+fJTidrgrbIyHgkf6Ko7dDAg BgNVHREEGTAXgRV0dWV4ZW5AZmgtbXVlbnN0ZXIuZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0 cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2FjcmwuY3JsMD+g PaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNy bC5jcmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu LmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv ZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6 Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw DQYJKoZIhvcNAQELBQADggEBABs3VlmIZ1VF3HkaQdjInZYmamRabbdgJ7cz6m6o/agKL7+Vhwx7 1BaaYs2gMa5Nu/GJ3YfdqIsUlYtKdl58Yhp/89E6xBfJkItS+rE8RFdf2XgklGlx7GmsvdA3tId5 b6K6r9a5wpVN0epxY6K8wwpzEib6fJLcHylybQXZ7JSOaLRLp6WU3QPoyTT7FpvAe/0b2MSCbPX4 fc53PCn2aGgXuRFVQeCn1SP1BF3QW1ppkFhcF6G+0JcUxYFAXE6r/71WZBvUHqoG/th2hAwQnS+Y KhUYh4SZQH3/ursXXJYXQ5vyIhkN1FZlmtWA8+ofdCnoqSTbiSX2Aa/kKbTapwgxggOdMIIDmQIB ATCBnjCBjTELMAkGA1UEBhMCREUxRTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5l cyBEZXV0c2NoZW4gRm9yc2NodW5nc25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMG A1UEAwwcREZOLVZlcmVpbiBHbG9iYWwgSXNzdWluZyBDQQIMIRX9tDE2QqO3mVLXMA0GCWCGSAFl AwQCAQUAoIIBzzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMDA2 MDEyMTI4MzdaMC8GCSqGSIb3DQEJBDEiBCBt/7DmNUKJSYh37BAjjsbqUU9T+bIsUAAKgixeA62n 7zCBrwYJKwYBBAGCNxAEMYGhMIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1 ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYD VQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBAgwhFf20 MTZCo7eZUtcwgbEGCyqGSIb3DQEJEAILMYGhoIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8 VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUu IFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5n IENBAgwhFf20MTZCo7eZUtcwDQYJKoZIhvcNAQEBBQAEggEAkNIWT8GHSJfXRHow5elvf6cFE7v5 VAsB5bH5Zpd0FG+el2t1DBCOFwKNBHVc2/GiFnNTB55k9wf4L5lnUMtCHA1oZlCI7KSaoKG+4oMN /m0UooEeSXqXIDzxOsNAuxQNCuEYobHENxPoDzQw7NVHOc9rVjbZBVM1xYMFgExTVqWwW32Z1M1l LlngTRlW1wUB4Ambiqi4srrcmiUloVyg0wOuY3bK7Tw8E9ZOHgMh9muqZMc1LGyRqMs7y/LcOvd/ 9FoSFekLNDtoTpc/nENS5TsB37MIcMNpQFLEm2UVhafIdt8S+9Vbm6FkaOeuyrqnxD8XHfrqbsYk Y+KQxYEA3QAAAAAAAA== --Apple-Mail=_30A6D176-B5FA-4F13-A949-3CE33C73C3B8-- From owner-svn-src-head@freebsd.org Mon Jun 1 21:43:35 2020 Return-Path: Delivered-To: svn-src-head@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 F2E452F372A; Mon, 1 Jun 2020 21:43:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bTFL6CfHz3bYx; Mon, 1 Jun 2020 21:43:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id fsDSju30yng7KfsDTjafiu; Mon, 01 Jun 2020 15:43:33 -0600 X-Authority-Analysis: v=2.3 cv=ecemg4MH c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=nTHF0DUjJn0A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=J-IugnFFISbjiFo_lpUA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id A6B27434; Mon, 1 Jun 2020 14:43:28 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 051LhSOS073955; Mon, 1 Jun 2020 14:43:28 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 051LhS8D073952; Mon, 1 Jun 2020 14:43:28 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202006012143.051LhS8D073952@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Michael Tuexen cc: "Alexander V. Chernikov" , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361706 - in head/sys: net net/route netinet netinet6 In-reply-to: <6FE2C649-2D81-4C9C-B821-D8226B6BB95C@fh-muenster.de> References: <202006012049.051KnhxX060695@repo.freebsd.org> <6FE2C649-2D81-4C9C-B821-D8226B6BB95C@fh-muenster.de> Comments: In-reply-to Michael Tuexen message dated "Mon, 01 Jun 2020 23:28:37 +0200." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 01 Jun 2020 14:43:28 -0700 X-CMAE-Envelope: MS4wfMQ72Uyu7AfAtHSClUAryTUlyjy17yZg4YDNjDaG+VMPukaE6DgOOohQwcMPV+PWh33VzYNVk5yguAc4co/s5eSslq8kjBrQZ3UDQgHlxBDMCtRLRSi/ 3LEnsJG9bBzdRrsocQ6DS6oZFN2HpM6nJWMa4n+HUHueB4NAdFuz/BZkWBrbRvMgW6qKbrNTahygFIC+5PDBrB02A8vGe7faNglJa62VkMj6Su7c/1BWwvjm KLXsgROq4d5CmL/yx7t7ivxnh7hak/0D9oFae+FxAcbEg9Y8FAuftMRGS+MdSG0J4uF1Q1toG8WoQLJAtw5kLcUc01jpU3d8vta1elBaVlM= X-Rspamd-Queue-Id: 49bTFL6CfHz3bYx X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.13) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-0.11 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; NEURAL_HAM_LONG(-0.28)[-0.278]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.125.17:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.42)[-0.423]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; NEURAL_HAM_MEDIUM(-0.71)[-0.713]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.13:from] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 21:43:36 -0000 In message <6FE2C649-2D81-4C9C-B821-D8226B6BB95C@fh-muenster.de>, Michael Tuexe n writes: > > --Apple-Mail=_30A6D176-B5FA-4F13-A949-3CE33C73C3B8 > Content-Transfer-Encoding: quoted-printable > Content-Type: text/plain; > charset=us-ascii > > > On 1. Jun 2020, at 22:49, Alexander V. Chernikov = > wrote: > >=20 > > Author: melifaro > > Date: Mon Jun 1 20:49:42 2020 > > New Revision: 361706 > > URL: https://svnweb.freebsd.org/changeset/base/361706 > >=20 > > Log: > > * Add rib__route() functions to manipulate the = > routing table. > >=20 > > The main driver for the change is the need to improve notification = > mechanism. > > Currently callers guess the operation data based on the rtentry = > structure > > returned in case of successful operation result. There are two = > problems with > > this appoach. First is that it doesn't provide enough information = > for the > > upcoming multipath changes, where rtentry refers to a new nexthop = > group, > > and there is no way of guessing which paths were added during the = > change. > > Second is that some rtentry fields can change during notification = > and > > protecting from it by requiring customers to unlock rtentry is not = > desired. > >=20 > > Additionally, as the consumers such as rtsock do know which operation = > they > > request in advance, making explicit add/change/del versions of the = > functions > > makes sense, especially given the functions don't share a lot of = > code. > >=20 > > With that in mind, introduce rib_cmd_info notification structure and > > rib__route() functions, with mandatory rib_cmd_info = > pointer. > > It will be used in upcoming generalized notifications. > >=20 > > * Move definitions of the new functions and some other = > functions/structures > > used for the routing table manipulation to a separate header file, > > net/route/route_ctl.h. net/route.h is a frequently used file = > included in > > ~140 places in kernel, and 90% of the users don't need these = > definitions. > >=20 > > Reviewed by: ae > > Differential Revision: https://reviews.freebsd.org/D25067 > >=20 > > Modified: > > head/sys/net/if_llatbl.c > > head/sys/net/route.c > > head/sys/net/route.h > > head/sys/net/route/nhop_ctl.c > > head/sys/net/route/route_ctl.c > > head/sys/net/route/route_ddb.c > > head/sys/net/route/route_helpers.c > > head/sys/net/route/route_temporal.c > > head/sys/net/route/route_var.h > > head/sys/netinet/in_rmx.c > > head/sys/netinet/ip_icmp.c > > head/sys/netinet6/icmp6.c > > head/sys/netinet6/in6_rmx.c > > head/sys/netinet6/nd6_rtr.c > >=20 > > Modified: head/sys/net/if_llatbl.c > > = > =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=3D=3D=3D=3D=3D= > =3D=3D=3D > > --- head/sys/net/if_llatbl.c Mon Jun 1 20:40:40 2020 = > (r361705) > > +++ head/sys/net/if_llatbl.c Mon Jun 1 20:49:42 2020 = > (r361706) > > @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); > > #include > > #include > > #include > > +#include > Where is this file coming from? That was in r361704 and reverted in r361705, but should have been in this commit too. > > Best regards > Michael -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Mon Jun 1 21:51:21 2020 Return-Path: Delivered-To: svn-src-head@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 148742F4007; Mon, 1 Jun 2020 21:51:21 +0000 (UTC) (envelope-from melifaro@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bTQJ6tfWz3cpH; Mon, 1 Jun 2020 21:51:20 +0000 (UTC) (envelope-from melifaro@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 E7AE412219; Mon, 1 Jun 2020 21:51:20 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051LpKhJ098884; Mon, 1 Jun 2020 21:51:20 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051LpKNm098883; Mon, 1 Jun 2020 21:51:20 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202006012151.051LpKNm098883@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Jun 2020 21:51:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361707 - head/sys/net/route X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: head/sys/net/route X-SVN-Commit-Revision: 361707 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 21:51:21 -0000 Author: melifaro Date: Mon Jun 1 21:51:20 2020 New Revision: 361707 URL: https://svnweb.freebsd.org/changeset/base/361707 Log: Finish r361706: add sys/net/route/route_ctl.h, missed in previous commit. Added: head/sys/net/route/route_ctl.h (contents, props changed) Added: head/sys/net/route/route_ctl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net/route/route_ctl.h Mon Jun 1 21:51:20 2020 (r361707) @@ -0,0 +1,68 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Alexander V. Chernikov + * + * 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$ + */ + +/* + * This header file contains public functions and structures used for + * routing table manipulations. + */ + +#ifndef _NET_ROUTE_ROUTE_CTL_H_ +#define _NET_ROUTE_ROUTE_CTL_H_ + +struct rib_cmd_info { + uint8_t rc_cmd; /* RTM_ADD|RTM_DEL|RTM_CHANGE */ + uint8_t spare[3]; + uint32_t rc_nh_weight; /* new nhop weight */ + struct rtentry *rc_rt; /* Target entry */ + struct nhop_object *rc_nh_old; /* Target nhop OR mpath */ + struct nhop_object *rc_nh_new; /* Target nhop OR mpath */ +}; + + +int rib_add_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc); +int rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc); +int rib_change_route(uint32_t fibnum, struct rt_addrinfo *info, + struct rib_cmd_info *rc); + +int rib_add_redirect(u_int fibnum, struct sockaddr *dst, + struct sockaddr *gateway, struct sockaddr *author, struct ifnet *ifp, + int flags, int expire_sec); + +typedef int rt_walktree_f_t(struct rtentry *, void *); +void rib_walk(int af, u_int fibnum, rt_walktree_f_t *wa_f, void *arg); +void rib_walk_del(u_int fibnum, int family, rt_filter_f_t *filter_f, + void *arg, bool report); + +typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); +void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); +void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void *arg); +#endif + From owner-svn-src-head@freebsd.org Mon Jun 1 21:52:25 2020 Return-Path: Delivered-To: svn-src-head@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 B0ADC2F401B; Mon, 1 Jun 2020 21:52:25 +0000 (UTC) (envelope-from melifaro@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bTRY4FsTz3clK; Mon, 1 Jun 2020 21:52:25 +0000 (UTC) (envelope-from melifaro@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 8CFC512481; Mon, 1 Jun 2020 21:52:25 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051LqPc9003890; Mon, 1 Jun 2020 21:52:25 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051LqPmv003889; Mon, 1 Jun 2020 21:52:25 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202006012152.051LqPmv003889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Jun 2020 21:52:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361708 - head/sys/net/route X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: head/sys/net/route X-SVN-Commit-Revision: 361708 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 21:52:25 -0000 Author: melifaro Date: Mon Jun 1 21:52:24 2020 New Revision: 361708 URL: https://svnweb.freebsd.org/changeset/base/361708 Log: Add rib subscription API. Currently there is no easy way of subscribing for the routing table changes. The only existing way is to set ifa_rtrequest callback in the each protocol ifaddr, which is not convenient or extandable. This change provides generic notification subscription mechanism, that will replace current ifa_rtrequest one and allow other applications such as accelerated routing lookup modules subscribe for the changes. In particular, this change provides 2 hooks: 1) synchronous one (RIB_NOTIFY_IMMEDIATE), called under RIB_WLOCK, which ensures exact ordering of the changes and 2) async one, (RIB_NOTIFY_DELAYED) that is called after the change w/o holding locks. The latter one does not provide any notification ordering guarantee. Differential Revision: https://reviews.freebsd.org/D25070 Modified: head/sys/net/route/route_ctl.c head/sys/net/route/route_ctl.h Modified: head/sys/net/route/route_ctl.c ============================================================================== --- head/sys/net/route/route_ctl.c Mon Jun 1 21:51:20 2020 (r361707) +++ head/sys/net/route/route_ctl.c Mon Jun 1 21:52:24 2020 (r361708) @@ -68,10 +68,19 @@ __FBSDID("$FreeBSD$"); * All functions assumes they are called in net epoch. */ +struct rib_subscription { + CK_STAILQ_ENTRY(rib_subscription) next; + rib_subscription_cb_t *func; + void *arg; + enum rib_subscription_type type; + struct epoch_context epoch_ctx; +}; + static void rib_notify(struct rib_head *rnh, enum rib_subscription_type type, struct rib_cmd_info *rc); static void rt_notifydelete(struct rtentry *rt, struct rt_addrinfo *info); +static void destroy_subscription_epoch(epoch_context_t ctx); static struct rib_head * get_rnh(uint32_t fibnum, const struct rt_addrinfo *info) @@ -263,6 +272,9 @@ add_route(struct rib_head *rnh, struct rt_addrinfo *in } RIB_WUNLOCK(rnh); + if ((rn != NULL) || (rt_old != NULL)) + rib_notify(rnh, RIB_NOTIFY_DELAYED, rc); + if (rt_old != NULL) { rt_notifydelete(rt_old, info); rtfree(rt_old); @@ -419,6 +431,7 @@ del_route(struct rib_head *rnh, struct rt_addrinfo *in if (error != 0) return (error); + rib_notify(rnh, RIB_NOTIFY_DELAYED, rc); rt_notifydelete(rt, info); /* @@ -559,11 +572,12 @@ change_route_one(struct rib_head *rnh, struct rt_addri /* Update generation id to reflect rtable change */ rnh->rnh_gen++; - rib_notify(rnh, RIB_NOTIFY_IMMEDIATE, rc); RIB_WUNLOCK(rnh); + rib_notify(rnh, RIB_NOTIFY_DELAYED, rc); + nhop_free(nh_orig); return (0); @@ -614,6 +628,7 @@ struct rt_delinfo struct rt_addrinfo info; struct rib_head *rnh; struct rtentry *head; + struct rib_cmd_info rc; }; /* @@ -643,7 +658,13 @@ rt_checkdelroute(struct radix_node *rn, void *arg) return (0); } - /* Entry was unlinked. Add to the list and return */ + /* Entry was unlinked. Notify subscribers */ + di->rnh->rnh_gen++; + di->rc.rc_rt = rt; + di->rc.rc_nh_old = rt->rt_nhop; + rib_notify(di->rnh, RIB_NOTIFY_IMMEDIATE, &di->rc); + + /* Add to the list and return */ rt->rt_chain = di->head; di->head = rt; @@ -665,6 +686,7 @@ rib_walk_del(u_int fibnum, int family, rt_filter_f_t * struct rib_head *rnh; struct rt_delinfo di; struct rtentry *rt; + struct epoch_tracker et; rnh = rt_tables_get_rnh(fibnum, family); if (rnh == NULL) @@ -674,20 +696,24 @@ rib_walk_del(u_int fibnum, int family, rt_filter_f_t * di.info.rti_filter = filter_f; di.info.rti_filterdata = arg; di.rnh = rnh; + di.rc.rc_cmd = RTM_DELETE; + NET_EPOCH_ENTER(et); + RIB_WLOCK(rnh); rnh->rnh_walktree(&rnh->head, rt_checkdelroute, &di); RIB_WUNLOCK(rnh); - if (di.head == NULL) - return; - /* We might have something to reclaim. */ while (di.head != NULL) { rt = di.head; di.head = rt->rt_chain; rt->rt_chain = NULL; + di.rc.rc_rt = rt; + di.rc.rc_nh_old = rt->rt_nhop; + rib_notify(rnh, RIB_NOTIFY_DELAYED, &di.rc); + /* TODO std rt -> rt_addrinfo export */ di.info.rti_info[RTAX_DST] = rt_key(rt); di.info.rti_info[RTAX_NETMASK] = rt_mask(rt); @@ -699,6 +725,8 @@ rib_walk_del(u_int fibnum, int family, rt_filter_f_t * fibnum); rtfree(rt); } + + NET_EPOCH_EXIT(et); } static void @@ -713,6 +741,13 @@ rib_notify(struct rib_head *rnh, enum rib_subscription } } +/* + * Subscribe for the changes in the routing table specified by @fibnum and + * @family. + * Needs to be run in network epoch. + * + * Returns pointer to the subscription structure on success. + */ struct rib_subscription * rib_subscribe(uint32_t fibnum, int family, rib_subscription_cb_t *f, void *arg, enum rib_subscription_type type, int waitok) @@ -740,6 +775,13 @@ rib_subscribe(uint32_t fibnum, int family, rib_subscri return (rs); } +/* + * Remove rtable subscription @rs from the table specified by @fibnum + * and @family. + * Needs to be run in network epoch. + * + * Returns 0 on success. + */ int rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription *rs) { @@ -756,7 +798,21 @@ rib_unsibscribe(uint32_t fibnum, int family, struct ri CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, next); RIB_WUNLOCK(rnh); - free(rs, M_RTABLE); + epoch_call(net_epoch_preempt, destroy_subscription_epoch, + &rs->epoch_ctx); + return (0); } +/* + * Epoch callback indicating subscription is safe to destroy + */ +static void +destroy_subscription_epoch(epoch_context_t ctx) +{ + struct rib_subscription *rs; + + rs = __containerof(ctx, struct rib_subscription, epoch_ctx); + + free(rs, M_RTABLE); +} Modified: head/sys/net/route/route_ctl.h ============================================================================== --- head/sys/net/route/route_ctl.h Mon Jun 1 21:51:20 2020 (r361707) +++ head/sys/net/route/route_ctl.h Mon Jun 1 21:52:24 2020 (r361708) @@ -64,5 +64,20 @@ void rib_walk_del(u_int fibnum, int family, rt_filter_ typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); void rt_foreach_fib_walk_del(int af, rt_filter_f_t *filter_f, void *arg); + +enum rib_subscription_type { + RIB_NOTIFY_IMMEDIATE, + RIB_NOTIFY_DELAYED +}; + +struct rib_subscription; +typedef void rib_subscription_cb_t(struct rib_head *rnh, struct rib_cmd_info *rc, + void *arg); + +struct rib_subscription *rib_subscribe(uint32_t fibnum, int family, + rib_subscription_cb_t *f, void *arg, enum rib_subscription_type type, + int waitok); +int rib_unsibscribe(uint32_t fibnum, int family, struct rib_subscription *rs); + #endif From owner-svn-src-head@freebsd.org Mon Jun 1 22:00:50 2020 Return-Path: Delivered-To: svn-src-head@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 78E7A2F4310; Mon, 1 Jun 2020 22:00:50 +0000 (UTC) (envelope-from melifaro@ipfw.ru) Received: from forward501j.mail.yandex.net (forward501j.mail.yandex.net [IPv6:2a02:6b8:0:801:2::111]) (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 49bTdF0Pzlz3dZw; Mon, 1 Jun 2020 22:00:48 +0000 (UTC) (envelope-from melifaro@ipfw.ru) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward501j.mail.yandex.net (Yandex) with ESMTP id DEF963380195; Tue, 2 Jun 2020 01:00:44 +0300 (MSK) Received: from localhost (localhost [::1]) by mxback8j.mail.yandex.net (mxback/Yandex) with ESMTP id Juq3NTd822-0hneMMmE; Tue, 02 Jun 2020 01:00:44 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfw.ru; s=mail; t=1591048844; bh=VFcsldl8Iuz+FskuU9Kl/0JqmSlClodwNFmCWYy2b8s=; h=Message-Id:Cc:Subject:In-Reply-To:Date:References:To:From; b=J/YJ+kw2W39EYgBr31vnRnYeusSB++jW51Ai3Xu2oxlhV9j5DnH1pUmD613QfRFZP pobdCiqyPVEOneFUeuS5aj+Z0xxJU1BXECHmqgmUtD+MLjoi8tgJcvU5JKWUrnZcm5 DnX4rljjvEcUzL14KoNtDnXy8++/QEaUM6Kx2WEU= Received: by iva4-64850291ca1c.qloud-c.yandex.net with HTTP; Tue, 02 Jun 2020 01:00:42 +0300 From: Alexander V. Chernikov Envelope-From: melifaro@ipfw.ru To: Cy Schubert , Michael Tuexen Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" In-Reply-To: <202006012143.051LhS8D073952@slippy.cwsent.com> References: <202006012049.051KnhxX060695@repo.freebsd.org> <6FE2C649-2D81-4C9C-B821-D8226B6BB95C@fh-muenster.de> <202006012143.051LhS8D073952@slippy.cwsent.com> Subject: Re: svn commit: r361706 - in head/sys: net net/route netinet netinet6 MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Mon, 01 Jun 2020 23:00:42 +0100 Message-Id: <1493091591048645@mail.yandex.ru> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 X-Rspamd-Queue-Id: 49bTdF0Pzlz3dZw X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=ipfw.ru header.s=mail header.b=J/YJ+kw2; dmarc=none; spf=pass (mx1.freebsd.org: domain of melifaro@ipfw.ru designates 2a02:6b8:0:801:2::111 as permitted sender) smtp.mailfrom=melifaro@ipfw.ru X-Spamd-Result: default: False [-3.28 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[ipfw.ru:s=mail]; NEURAL_HAM_MEDIUM(-0.99)[-0.994]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a02:6b8:0::/52]; NEURAL_HAM_LONG(-0.95)[-0.954]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[ipfw.ru:+]; NEURAL_HAM_SHORT(-1.03)[-1.035]; FORGED_SENDER(0.30)[melifaro@freebsd.org,melifaro@ipfw.ru]; RCVD_IN_DNSWL_LOW(-0.10)[2a02:6b8:0:801:2::111:from]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13238, ipnet:2a02:6b8::/32, country:RU]; FROM_NEQ_ENVFROM(0.00)[melifaro@freebsd.org,melifaro@ipfw.ru] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 22:00:50 -0000 01.06.2020, 22:43, "Cy Schubert" : > In message <6FE2C649-2D81-4C9C-B821-D8226B6BB95C@fh-muenster.de>, Michael > Tuexe > n writes: >>  --Apple-Mail=_30A6D176-B5FA-4F13-A949-3CE33C73C3B8 >>  Content-Transfer-Encoding: quoted-printable >>  Content-Type: text/plain; >>          charset=us-ascii >> >>  > On 1. Jun 2020, at 22:49, Alexander V. Chernikov = >>   wrote: >>  >=20 >>  > Author: melifaro >>  > Date: Mon Jun 1 20:49:42 2020 >>  > New Revision: 361706 >>  > URL: https://svnweb.freebsd.org/changeset/base/361706 >>  >=20 >>  > Log: >>  > * Add rib__route() functions to manipulate the = >>  routing table. >>  >=20 >>  > The main driver for the change is the need to improve notification = >>  mechanism. >>  > Currently callers guess the operation data based on the rtentry = >>  structure >>  > returned in case of successful operation result. There are two = >>  problems with >>  > this appoach. First is that it doesn't provide enough information = >>  for the >>  > upcoming multipath changes, where rtentry refers to a new nexthop = >>  group, >>  > and there is no way of guessing which paths were added during the = >>  change. >>  > Second is that some rtentry fields can change during notification = >>  and >>  > protecting from it by requiring customers to unlock rtentry is not = >>  desired. >>  >=20 >>  > Additionally, as the consumers such as rtsock do know which operation = >>  they >>  > request in advance, making explicit add/change/del versions of the = >>  functions >>  > makes sense, especially given the functions don't share a lot of = >>  code. >>  >=20 >>  > With that in mind, introduce rib_cmd_info notification structure and >>  > rib__route() functions, with mandatory rib_cmd_info = >>  pointer. >>  > It will be used in upcoming generalized notifications. >>  >=20 >>  > * Move definitions of the new functions and some other = >>  functions/structures >>  > used for the routing table manipulation to a separate header file, >>  > net/route/route_ctl.h. net/route.h is a frequently used file = >>  included in >>  > ~140 places in kernel, and 90% of the users don't need these = >>  definitions. >>  >=20 >>  > Reviewed by: ae >>  > Differential Revision: https://reviews.freebsd.org/D25067 >>  >=20 >>  > Modified: >>  > head/sys/net/if_llatbl.c >>  > head/sys/net/route.c >>  > head/sys/net/route.h >>  > head/sys/net/route/nhop_ctl.c >>  > head/sys/net/route/route_ctl.c >>  > head/sys/net/route/route_ddb.c >>  > head/sys/net/route/route_helpers.c >>  > head/sys/net/route/route_temporal.c >>  > head/sys/net/route/route_var.h >>  > head/sys/netinet/in_rmx.c >>  > head/sys/netinet/ip_icmp.c >>  > head/sys/netinet6/icmp6.c >>  > head/sys/netinet6/in6_rmx.c >>  > head/sys/netinet6/nd6_rtr.c >>  >=20 >>  > Modified: head/sys/net/if_llatbl.c >>  > = >>  =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=3D=3D=3D=3D=3D= >>  =3D=3D=3D >>  > --- head/sys/net/if_llatbl.c Mon Jun 1 20:40:40 2020 = >>  (r361705) >>  > +++ head/sys/net/if_llatbl.c Mon Jun 1 20:49:42 2020 = >>  (r361706) >>  > @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); >>  > #include >>  > #include >>  > #include >>  > +#include >>  Where is this file coming from? > > That was in r361704 and reverted in r361705, but should have been in this > commit too. Thanks for the notification and sorry for the breakage. Didn't realise it was not added and was testin another change. Commited back in r361707. > >>  Best regards >>  Michael > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > >         The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Mon Jun 1 23:26:37 2020 Return-Path: Delivered-To: svn-src-head@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 D75072F5F6A; Mon, 1 Jun 2020 23:26:37 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bWXF5Pzbz45Kg; Mon, 1 Jun 2020 23:26:37 +0000 (UTC) (envelope-from kevans@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 B53FE1367D; Mon, 1 Jun 2020 23:26:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051NQbnf059796; Mon, 1 Jun 2020 23:26:37 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051NQbeF059795; Mon, 1 Jun 2020 23:26:37 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006012326.051NQbeF059795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 1 Jun 2020 23:26:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361709 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 361709 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 23:26:37 -0000 Author: kevans Date: Mon Jun 1 23:26:37 2020 New Revision: 361709 URL: https://svnweb.freebsd.org/changeset/base/361709 Log: lualoader: improve drawer error handling At least one user has landed in a scenario where logo files appear to be misnamed, and we failed to find them. Our fallback for missing logodefs is orb/orbbw, based on the color status. In a scenario where we can't locate the logos, though, this is not ideal. Add in one more layer of fallback to properly just don't draw any logo if the fan has been jam packed with foreign material. PR: 246046 MFC after: 3 days Modified: head/stand/lua/drawer.lua Modified: head/stand/lua/drawer.lua ============================================================================== --- head/stand/lua/drawer.lua Mon Jun 1 21:52:24 2020 (r361708) +++ head/stand/lua/drawer.lua Mon Jun 1 23:26:37 2020 (r361709) @@ -258,6 +258,11 @@ local function drawlogo() else logodef = getLogodef(drawer.default_bw_logodef) end + + -- Something has gone terribly wrong. + if logodef == nil then + logodef = getLogodef(drawer.default_fallback_logodef) + end end if logodef ~= nil and logodef.graphic == none then @@ -355,6 +360,9 @@ shift = default_shift drawer.default_brand = 'fbsd' drawer.default_color_logodef = 'orb' drawer.default_bw_logodef = 'orbbw' +-- For when things go terribly wrong; this def should be present here in the +-- drawer module in case it's a filesystem issue. +drawer.default_fallback_logodef = 'none' function drawer.addBrand(name, def) branddefs[name] = def From owner-svn-src-head@freebsd.org Mon Jun 1 23:44:04 2020 Return-Path: Delivered-To: svn-src-head@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 6D3152F679F; Mon, 1 Jun 2020 23:44:04 +0000 (UTC) (envelope-from sjg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bWwN2LDhz47MS; Mon, 1 Jun 2020 23:44:04 +0000 (UTC) (envelope-from sjg@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 4B87413A9A; Mon, 1 Jun 2020 23:44:04 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051Ni43N071789; Mon, 1 Jun 2020 23:44:04 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051Ni4ix071788; Mon, 1 Jun 2020 23:44:04 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <202006012344.051Ni4ix071788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 1 Jun 2020 23:44:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361710 - head/stand/uboot/lib X-SVN-Group: head X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: head/stand/uboot/lib X-SVN-Commit-Revision: 361710 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 23:44:04 -0000 Author: sjg Date: Mon Jun 1 23:44:03 2020 New Revision: 361710 URL: https://svnweb.freebsd.org/changeset/base/361710 Log: stand/uboot: fix setting of gateip.s_addr Missplaced paren. Reviewed by: imp MFC after: 1 week Modified: head/stand/uboot/lib/net.c Modified: head/stand/uboot/lib/net.c ============================================================================== --- head/stand/uboot/lib/net.c Mon Jun 1 23:26:37 2020 (r361709) +++ head/stand/uboot/lib/net.c Mon Jun 1 23:44:03 2020 (r361710) @@ -187,7 +187,7 @@ get_env_net_params() rootip.s_addr = 0; return; } - if ((gateip.s_addr = inet_addr(envstr) == INADDR_NONE)) { + if ((gateip.s_addr = inet_addr(envstr)) == INADDR_NONE) { printf("Could not parse gatewayip '%s'\n", envstr); rootip.s_addr = 0; return; From owner-svn-src-head@freebsd.org Tue Jun 2 00:03:26 2020 Return-Path: Delivered-To: svn-src-head@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 D0F532F7108; Tue, 2 Jun 2020 00:03:26 +0000 (UTC) (envelope-from rmacklem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bXLk5DQsz49PB; Tue, 2 Jun 2020 00:03:26 +0000 (UTC) (envelope-from rmacklem@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 AC38813AD2; Tue, 2 Jun 2020 00:03:26 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05203QOv083891; Tue, 2 Jun 2020 00:03:26 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05203Qgx083890; Tue, 2 Jun 2020 00:03:26 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202006020003.05203Qgx083890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 2 Jun 2020 00:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361711 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 361711 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:03:26 -0000 Author: rmacklem Date: Tue Jun 2 00:03:26 2020 New Revision: 361711 URL: https://svnweb.freebsd.org/changeset/base/361711 Log: Fix build issue introduced by r361699. Reported by: cy (and others) Modified: head/sys/kern/vfs_mount.c Modified: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Mon Jun 1 23:44:03 2020 (r361710) +++ head/sys/kern/vfs_mount.c Tue Jun 2 00:03:26 2020 (r361711) @@ -70,6 +70,9 @@ __FBSDID("$FreeBSD$"); #include +#include +#include + #include #include From owner-svn-src-head@freebsd.org Tue Jun 2 00:05:58 2020 Return-Path: Delivered-To: svn-src-head@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 40F512F752D; Tue, 2 Jun 2020 00:05:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bXPc3KKtz49dg; Tue, 2 Jun 2020 00:05:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f195.google.com with SMTP id v11so11209746ilh.1; Mon, 01 Jun 2020 17:05:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=uexDmZZLqjG0jaw9M88CBWz/dyUPpZvLsyyZXkddUUk=; b=kL05idZ0l/fBu45zu1vZt85YRB9LEKY9UC5e4bBFUYFBJpIoUOHSKb+CB4oa7Vv6/Y Mry1zFuz2Q8216qzMtWb5XXJggHPc4DqF4BcC1lauhgnb1gL7JIz36Jrz6YSbJlN3/5r eft9kPux6QW0eTIEnV3zyy4Ip9/gmiix2fGsAzB2gFSFQ3AZoBlLHz+eWLqbg3DTw/DX DS9mASfPXqig0Gif57eQkp2japP/7Dr07138uUGIk7B6j94ODtfCZsXIpfkCd16Dt4RF dFOu4nWanUfmRE/6LsUQnJDFy7M7WZ0xmRrIqzjVy1j9yIbrNdLm8ZjYBPLtI8cSlfz2 L+6Q== X-Gm-Message-State: AOAM531Lcn3VLtckyjwNWzXHJmH4g3n9zxNzwcSBLdD+2X9y6rNuzNfy 3wQBQVGjN8odRknOya5hJ+wUp77itZHYw62PZPuhwg== X-Google-Smtp-Source: ABdhPJy8QHutpc42TSbiIJ1r3UjEZXYdV7aG6CnCIOJD0SJK165kOKt9M9dCYfTNyVBTforki3Z73X2PsD/cxj/M4+U= X-Received: by 2002:a92:c952:: with SMTP id i18mr24412520ilq.100.1591056352551; Mon, 01 Jun 2020 17:05:52 -0700 (PDT) MIME-Version: 1.0 References: <202005301612.04UGC1Fw082039@repo.freebsd.org> In-Reply-To: <202005301612.04UGC1Fw082039@repo.freebsd.org> From: Ed Maste Date: Mon, 1 Jun 2020 20:05:40 -0400 Message-ID: Subject: Re: svn commit: r361648 - head/share/mk To: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49bXPc3KKtz49dg X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.195 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.84 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.77)[-0.772]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.81)[-0.810]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.25)[-0.254]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.195:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.195:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:05:58 -0000 On Sat, 30 May 2020 at 12:12, Ed Maste wrote: > > Author: emaste > Date: Sat May 30 16:12:00 2020 > New Revision: 361648 > URL: https://svnweb.freebsd.org/changeset/base/361648 > > Log: > Disable BINUTILS by default on amd64 I received a private query about this but will follow up here because the answer may be useful to others. The concern: GNU as is still needed for skein_block_asm.s, so is this not broken? Indeed, GNU as is still needed for exactly one case in the base system, assembling skein_block_asm.s on amd64. It is still enabled via BINUTILS_BOOTSTRAP there. Disabling BINUTILS (this commit) means that GNU as is no longer installed as /usr/bin/as by installworld, on any arch. We still need to address skein so that we can completely remove binutils for FreeBSD 13.0. We have a few possibilities for dealing with the assmebly implementation, but I currently plan to switch back to the C implementation for now and follow up with one of those approaches later. From owner-svn-src-head@freebsd.org Tue Jun 2 00:25:24 2020 Return-Path: Delivered-To: svn-src-head@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 C3E8B2F8808; Tue, 2 Jun 2020 00:25:24 +0000 (UTC) (envelope-from freqlabs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bXr44syVz4D9K; Tue, 2 Jun 2020 00:25:24 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from Ryans-MBP.attlocal.net (unknown [IPv6:2600:1700:358a:c660:394e:89fc:2f14:fbb4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: freqlabs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 7507114B7C; Tue, 2 Jun 2020 00:25:24 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Subject: Re: svn commit: r361711 - head/sys/kern To: Rick Macklem , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006020003.05203Qgx083890@repo.freebsd.org> From: Ryan Moeller Message-ID: <19f9cc61-12d1-b81e-b634-b95e11f0365e@FreeBSD.org> Date: Mon, 1 Jun 2020 20:25:23 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <202006020003.05203Qgx083890@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:25:24 -0000 On 6/1/20 8:03 PM, Rick Macklem wrote: > Author: rmacklem > Date: Tue Jun 2 00:03:26 2020 > New Revision: 361711 > URL: https://svnweb.freebsd.org/changeset/base/361711 > > Log: > Fix build issue introduced by r361699. Oops, that was easily avoidable. :/ Thanks for picking up the pieces. > > Reported by: cy (and others) > > Modified: > head/sys/kern/vfs_mount.c > > Modified: head/sys/kern/vfs_mount.c > ============================================================================== > --- head/sys/kern/vfs_mount.c Mon Jun 1 23:44:03 2020 (r361710) > +++ head/sys/kern/vfs_mount.c Tue Jun 2 00:03:26 2020 (r361711) > @@ -70,6 +70,9 @@ __FBSDID("$FreeBSD$"); > > #include > > +#include > +#include > + > #include > #include > From owner-svn-src-head@freebsd.org Tue Jun 2 00:27:25 2020 Return-Path: Delivered-To: svn-src-head@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 A536B2F856F; Tue, 2 Jun 2020 00:27:25 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bXtP3cYZz4DpF; Tue, 2 Jun 2020 00:27:25 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 7255014B7D; Tue, 2 Jun 2020 00:27:25 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f176.google.com with SMTP id c185so10967959qke.7; Mon, 01 Jun 2020 17:27:25 -0700 (PDT) X-Gm-Message-State: AOAM531x3vtuZi0hTdDzU/v2+IPL0qLO7sOKTN5EHu2LrMDRGBhphnUg 7p56skk8hQo/WFCWOuC+yWuJCX5ETvaghHlH6R8= X-Google-Smtp-Source: ABdhPJw426wCkU9dk+NBSfJKkRjLXAOfu9S7ozmAadiQCjMEOueXmGPxNcL1VIoDCYSQ+o/nvsd8tKJQPHhkl95Kmnk= X-Received: by 2002:a37:a3ce:: with SMTP id m197mr22641816qke.493.1591057642337; Mon, 01 Jun 2020 17:27:22 -0700 (PDT) MIME-Version: 1.0 References: <202003271825.02RIPOmR010857@repo.freebsd.org> In-Reply-To: <202003271825.02RIPOmR010857@repo.freebsd.org> From: Kyle Evans Date: Mon, 1 Jun 2020 19:27:11 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r359374 - in head: . share/man/man4 share/man/man7 share/man/man9 sys/crypto/aesni sys/crypto/armv8 sys/crypto/blake2 sys/crypto/ccp sys/crypto/via sys/dev/cesa sys/dev/cxgbe sys/dev/cx... To: John Baldwin Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:27:25 -0000 On Fri, Mar 27, 2020 at 1:31 PM John Baldwin wrote: > > Author: jhb > Date: Fri Mar 27 18:25:23 2020 > New Revision: 359374 > URL: https://svnweb.freebsd.org/changeset/base/359374 > > Log: > Refactor driver and consumer interfaces for OCF (in-kernel crypto). > > [... snip ...] Hi John, ^/sys/modules/crypto needs opt_compat.h added to SRCS after this commit. :-) Thanks, Kyle Evans From owner-svn-src-head@freebsd.org Tue Jun 2 00:32:37 2020 Return-Path: Delivered-To: svn-src-head@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 8D26D2F88F4; Tue, 2 Jun 2020 00:32:37 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bY0P3HvPz4Fbg; Tue, 2 Jun 2020 00:32:37 +0000 (UTC) (envelope-from kevans@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 6C067141F4; Tue, 2 Jun 2020 00:32:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0520Wbic002518; Tue, 2 Jun 2020 00:32:37 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0520Wbke002516; Tue, 2 Jun 2020 00:32:37 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006020032.0520Wbke002516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 2 Jun 2020 00:32:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361712 - in head/sys/modules: . tcp X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/sys/modules: . tcp X-SVN-Commit-Revision: 361712 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:32:37 -0000 Author: kevans Date: Tue Jun 2 00:32:36 2020 New Revision: 361712 URL: https://svnweb.freebsd.org/changeset/base/361712 Log: modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, not both. Refrain from building if IPSEC is set, as the resulting module won't be able to load anyways if it's built into the kernel. KERN_OPTS is safe here; for tied modules, it will reflect the kernel configuration. For untied modules, it will defer to whatever is set in ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter situation has some risk to it for uncommon scenarios, but such is the life of untied kernel modules. Reported by: jenkins (a lot), O. Hartmann (once) Generally discussed with: imp, jhb Modified: head/sys/modules/Makefile head/sys/modules/tcp/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Tue Jun 2 00:03:26 2020 (r361711) +++ head/sys/modules/Makefile Tue Jun 2 00:32:36 2020 (r361712) @@ -427,7 +427,7 @@ _if_enc= if_enc _if_gif= if_gif _if_gre= if_gre _ipfw_pmod= ipfw_pmod -.if ${KERN_OPTS:MIPSEC_SUPPORT} +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} _ipsec= ipsec .endif .endif Modified: head/sys/modules/tcp/Makefile ============================================================================== --- head/sys/modules/tcp/Makefile Tue Jun 2 00:03:26 2020 (r361711) +++ head/sys/modules/tcp/Makefile Tue Jun 2 00:32:36 2020 (r361712) @@ -16,7 +16,7 @@ _tcp_rack= rack .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) -.if ${KERN_OPTS:MIPSEC_SUPPORT} +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} _tcpmd5= tcpmd5 .endif .endif From owner-svn-src-head@freebsd.org Tue Jun 2 00:46:16 2020 Return-Path: Delivered-To: svn-src-head@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 21F8D2F8AB0; Tue, 2 Jun 2020 00:46:16 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bYJ809BDz4GYk; Tue, 2 Jun 2020 00:46:16 +0000 (UTC) (envelope-from emaste@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 F0D4114238; Tue, 2 Jun 2020 00:46:15 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0520kFRd009068; Tue, 2 Jun 2020 00:46:15 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0520kFBJ009067; Tue, 2 Jun 2020 00:46:15 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006020046.0520kFBJ009067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 2 Jun 2020 00:46:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361713 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 361713 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:46:16 -0000 Author: emaste Date: Tue Jun 2 00:46:15 2020 New Revision: 361713 URL: https://svnweb.freebsd.org/changeset/base/361713 Log: bsd.prog.mk: split MK_PIE test for clarity And a comment explaining why PIE flags are disabled for static binaries. Modified: head/share/mk/bsd.prog.mk Modified: head/share/mk/bsd.prog.mk ============================================================================== --- head/share/mk/bsd.prog.mk Tue Jun 2 00:32:36 2020 (r361712) +++ head/share/mk/bsd.prog.mk Tue Jun 2 00:46:15 2020 (r361713) @@ -39,10 +39,13 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${MK_PIE} != "no" && (!defined(NO_SHARED) || ${NO_SHARED:tl} == "no") +.if ${MK_PIE} != "no" +# Static PIE is not yet supported/tested. +.if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" CFLAGS+= -fPIE CXXFLAGS+= -fPIE LDFLAGS+= -pie +.endif .endif .if ${MK_RETPOLINE} != "no" .if ${COMPILER_FEATURES:Mretpoline} && ${LINKER_FEATURES:Mretpoline} From owner-svn-src-head@freebsd.org Tue Jun 2 00:53:40 2020 Return-Path: Delivered-To: svn-src-head@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 6F0302F8AFF; Tue, 2 Jun 2020 00:53:40 +0000 (UTC) (envelope-from wulf@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bYSh2R8Kz4HPp; Tue, 2 Jun 2020 00:53:40 +0000 (UTC) (envelope-from wulf@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 4EC5D14257; Tue, 2 Jun 2020 00:53:40 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0520redb015298; Tue, 2 Jun 2020 00:53:40 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0520reiM015297; Tue, 2 Jun 2020 00:53:40 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <202006020053.0520reiM015297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Tue, 2 Jun 2020 00:53:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361715 - head/sys/dev/atkbdc X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/atkbdc X-SVN-Commit-Revision: 361715 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 00:53:40 -0000 Author: wulf Date: Tue Jun 2 00:53:39 2020 New Revision: 361715 URL: https://svnweb.freebsd.org/changeset/base/361715 Log: [psm] Do not disable trackpoint when hw.psm.elantech.touchpad_off is enabled PR: 246117 Reported by: Alexander Sieg MFC after: 1 week Modified: head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Tue Jun 2 00:49:13 2020 (r361714) +++ head/sys/dev/atkbdc/psm.c Tue Jun 2 00:53:39 2020 (r361715) @@ -4441,7 +4441,7 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, m *x = *y = *z = 0; ms->button = ms->obutton; - if (sc->syninfo.touchpad_off) + if (sc->syninfo.touchpad_off && pkt != ELANTECH_PKT_TRACKPOINT) return (0); /* Common legend From owner-svn-src-head@freebsd.org Tue Jun 2 01:04:50 2020 Return-Path: Delivered-To: svn-src-head@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 8BFB42F8E7E; Tue, 2 Jun 2020 01:04:50 +0000 (UTC) (envelope-from wulf@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bYjZ14x1z4K1L; Tue, 2 Jun 2020 01:04:50 +0000 (UTC) (envelope-from wulf@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 064A01482E; Tue, 2 Jun 2020 01:04:50 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05214n8w021741; Tue, 2 Jun 2020 01:04:49 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05214nfQ021740; Tue, 2 Jun 2020 01:04:49 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <202006020104.05214nfQ021740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Tue, 2 Jun 2020 01:04:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361718 - in head: share/man/man4 sys/dev/atkbdc X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: in head: share/man/man4 sys/dev/atkbdc X-SVN-Commit-Revision: 361718 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 01:04:50 -0000 Author: wulf Date: Tue Jun 2 01:04:49 2020 New Revision: 361718 URL: https://svnweb.freebsd.org/changeset/base/361718 Log: [psm] Workaround active PS/2 multiplexor hang which happens on some laptops after returning to legacy multiplexing mode at initialization stage. PR: 242542 Reported by: Felix Palmen MFC after: 1 week Modified: head/share/man/man4/psm.4 head/sys/dev/atkbdc/psm.c Modified: head/share/man/man4/psm.4 ============================================================================== --- head/share/man/man4/psm.4 Tue Jun 2 00:57:48 2020 (r361717) +++ head/share/man/man4/psm.4 Tue Jun 2 01:04:49 2020 (r361718) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 26, 2016 +.Dd June 2, 2020 .Dt PSM 4 .Os .Sh NAME @@ -361,6 +361,15 @@ the sysctl with the same name and by restarting .Xr moused 8 using .Pa /etc/rc.d/moused . +.Pp +Active multiplexing support can be disabled by setting +.Va hw.psm.mux_disabled +to +.Em 1 +at boot-time. +This will prevent +.Nm +from enabling active multiplexing mode needed for some Synaptics touchpads. .Sh IOCTLS There are a few .Xr ioctl 2 Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Tue Jun 2 00:57:48 2020 (r361717) +++ head/sys/dev/atkbdc/psm.c Tue Jun 2 01:04:49 2020 (r361718) @@ -517,6 +517,7 @@ static int verbose = PSM_DEBUG; static int synaptics_support = 1; static int trackpoint_support = 1; static int elantech_support = 1; +static int mux_disabled = 0; /* for backward compatibility */ #define OLD_MOUSE_GETHWINFO _IOR('M', 1, old_mousehw_t) @@ -2989,6 +2990,9 @@ SYSCTL_INT(_hw_psm, OID_AUTO, trackpoint_support, CTLF SYSCTL_INT(_hw_psm, OID_AUTO, elantech_support, CTLFLAG_RDTUN, &elantech_support, 0, "Enable support for Elantech touchpads"); +SYSCTL_INT(_hw_psm, OID_AUTO, mux_disabled, CTLFLAG_RDTUN, + &mux_disabled, 0, "Disable active multiplexing"); + static void psmintr(void *arg) { @@ -6293,6 +6297,9 @@ enable_synaptics_mux(struct psm_softc *sc, enum probea int active_ports_count = 0; int active_ports_mask = 0; + if (mux_disabled != 0) + return (FALSE); + version = enable_aux_mux(kbdc); if (version == -1) return (FALSE); @@ -6329,6 +6336,21 @@ enable_synaptics_mux(struct psm_softc *sc, enum probea /* IRQ handler does not support active multiplexing mode */ disable_aux_mux(kbdc); + + /* Is MUX still alive after switching back to legacy mode? */ + if (!enable_aux_dev(kbdc) || !disable_aux_dev(kbdc)) { + /* + * On some laptops e.g. Lenovo X121e dead AUX MUX can be + * brought back to life with resetting of keyboard. + */ + reset_kbd(kbdc); + if (!enable_aux_dev(kbdc) || !disable_aux_dev(kbdc)) { + printf("psm%d: AUX MUX hang detected!\n", sc->unit); + printf("Consider adding hw.psm.mux_disabled=1 to " + "loader tunables\n"); + } + } + empty_both_buffers(kbdc, 10); /* remove stray data if any */ return (probe); } From owner-svn-src-head@freebsd.org Tue Jun 2 01:09:17 2020 Return-Path: Delivered-To: svn-src-head@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 DC1892F9887; Tue, 2 Jun 2020 01:09:17 +0000 (UTC) (envelope-from rpokala@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bYpj5Tg3z4KPT; Tue, 2 Jun 2020 01:09:17 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from [192.168.1.10] (c-98-207-126-143.hsd1.ca.comcast.net [98.207.126.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id DB7E31552E; Tue, 2 Jun 2020 01:09:16 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.37.20051002 Date: Mon, 01 Jun 2020 18:09:12 -0700 Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... From: Ravi Pokala To: , Ian Lepore CC: Dimitry Andric , , , Message-ID: Thread-Topic: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... References: <304bb13cb6e80791f8924a573355a3643d614184.camel@freebsd.org> <202006011640.051GeOaf013240@gndrsh.dnsmgr.net> In-Reply-To: <202006011640.051GeOaf013240@gndrsh.dnsmgr.net> Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 01:09:17 -0000 -----Original Message----- From: on behalf of "Rodney W. Grimes" Reply-To: Date: 2020-06-01, Monday at 09:40 To: Ian Lepore Cc: Dimitry Andric , , , Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... > On Sun, 2020-05-31 at 22:04 +0000, Dimitry Andric wrote: > > Author: dim > > Date: Sun May 31 22:04:51 2020 > > New Revision: 361677 > > URL: https://svnweb.freebsd.org/changeset/base/361677 > > > > Log: > > Change Makefiles under usr.bin/svn to make them easier to > > incrementally > > update. No functional change intended. > > > > MFC after: 2 weeks > > > > I wish we could get style.Makefile(9) updated to mandate this 1-per- > line style when listing sources, dirs, etc, when the number of items is > greater than N, where N is something like 3-6 filenames. Otherwise the > requirement to sort the names alphabetically pretty much mandates that > many lines of the file will change just to insert one or two new files, > and that makes it all but impossible to figure out from a diff what > actually changed. I like this idea, though rather than 3-6 filenames I propose it to be anything longer than 3 lines, which is kinda about when the pain point should start. See the immediate SUBDIR below, it is 11 items on 2ish/3 lines, and any change would worst case be a 3 line diff. This probably covers a large portion of the tree. FWIW, I'm partial to the 'FOO+=bar' syntax, rather than continuation lines. It's too easy to forget to add the continuation when appending or inserting. I particularly do not like massive amounts of vertical white space which this would create, but lacking an automated tool this is probably a reasonable compromise. If we did it everywhere it would mean lots of scrolling when working on rather simple makefiles. I generally feel the opposite -- I do a destressing amount of work on an 80x24 serial console :-/ -- but I agree that "> 3 lines" is a reasonable compromise. -Ravi (rpokala@) > -- Ian > > > > [...] > > -SUBDIR= lib .WAIT \ > > - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ > > - svnsync svnversion svnmucc svnrdump > > +SUBDIR= lib \ > > + .WAIT \ > > + svn \ > > + svnadmin \ > > + svnbench \ > > + svndumpfilter \ > > + svnfsfs \ > > + svnlook \ > > + svnserve \ > > + svnsync \ > > + svnversion \ > > + svnmucc \ > > + svnrdump > > SUBDIR_PARALLEL= > > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Jun 2 01:21:49 2020 Return-Path: Delivered-To: svn-src-head@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 1CAFC2FA063; Tue, 2 Jun 2020 01:21:49 +0000 (UTC) (envelope-from jah@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bZ5900CDz4Lpd; Tue, 2 Jun 2020 01:21:49 +0000 (UTC) (envelope-from jah@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 EE41014BFD; Tue, 2 Jun 2020 01:21:48 +0000 (UTC) (envelope-from jah@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0521LmCd032924; Tue, 2 Jun 2020 01:21:48 GMT (envelope-from jah@FreeBSD.org) Received: (from jah@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0521LmUU032921; Tue, 2 Jun 2020 01:21:48 GMT (envelope-from jah@FreeBSD.org) Message-Id: <202006020121.0521LmUU032921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jah set sender to jah@FreeBSD.org using -f From: "Jason A. Harmening" Date: Tue, 2 Jun 2020 01:21:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361719 - in head/sys: dev/vt kern X-SVN-Group: head X-SVN-Commit-Author: jah X-SVN-Commit-Paths: in head/sys: dev/vt kern X-SVN-Commit-Revision: 361719 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 01:21:49 -0000 Author: jah Date: Tue Jun 2 01:21:48 2020 New Revision: 361719 URL: https://svnweb.freebsd.org/changeset/base/361719 Log: vt(4): reset scrollback and cursor position after clearing history buffer r361601 implemented basic support for cleaing the console history buffer. But after clearing the history buffer, it's not especially useful to be able to scroll back through that buffer, or for the cursor position to remain at (very likely) the bottom of the screen. PR: 224436 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D25079 Modified: head/sys/dev/vt/vt_buf.c head/sys/dev/vt/vt_core.c head/sys/kern/subr_terminal.c Modified: head/sys/dev/vt/vt_buf.c ============================================================================== --- head/sys/dev/vt/vt_buf.c Tue Jun 2 01:04:49 2020 (r361718) +++ head/sys/dev/vt/vt_buf.c Tue Jun 2 01:21:48 2020 (r361719) @@ -433,17 +433,22 @@ vtbuf_do_clearhistory(struct vt_buf *vb) vtbuf_do_fill(vb, &rect, VTBUF_SPACE_CHAR(ch)); } -void -vtbuf_init_early(struct vt_buf *vb) +static void +vtbuf_reset_scrollback(struct vt_buf *vb) { - vb->vb_flags |= VBF_CURSOR; vb->vb_roffset = 0; vb->vb_curroffset = 0; vb->vb_mark_start.tp_row = 0; vb->vb_mark_start.tp_col = 0; vb->vb_mark_end.tp_row = 0; vb->vb_mark_end.tp_col = 0; +} +void +vtbuf_init_early(struct vt_buf *vb) +{ + vb->vb_flags |= VBF_CURSOR; + vtbuf_reset_scrollback(vb); vtbuf_init_rows(vb); vtbuf_do_clearhistory(vb); vtbuf_make_undirty(vb); @@ -477,6 +482,8 @@ vtbuf_clearhistory(struct vt_buf *vb) { VTBUF_LOCK(vb); vtbuf_do_clearhistory(vb); + vtbuf_reset_scrollback(vb); + vb->vb_flags &= ~VBF_HISTORY_FULL; VTBUF_UNLOCK(vb); } Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Tue Jun 2 01:04:49 2020 (r361718) +++ head/sys/dev/vt/vt_core.c Tue Jun 2 01:21:48 2020 (r361719) @@ -2332,6 +2332,16 @@ skip_thunk: return (0); case CONS_CLRHIST: vtbuf_clearhistory(&vd->vd_curwindow->vw_buf); + /* + * Invalidate the entire visible window; it is not guaranteed + * that this operation will be immediately followed by a scroll + * event, so it would otherwise be possible for prior artifacts + * to remain visible. + */ + VT_LOCK(vd); + vd->vd_flags |= VDF_INVALID; + VT_UNLOCK(vd); + vt_resume_flush_timer(vd->vd_curwindow, 0); return (0); case CONS_GET: /* XXX */ Modified: head/sys/kern/subr_terminal.c ============================================================================== --- head/sys/kern/subr_terminal.c Tue Jun 2 01:04:49 2020 (r361718) +++ head/sys/kern/subr_terminal.c Tue Jun 2 01:21:48 2020 (r361719) @@ -480,6 +480,16 @@ termtty_ioctl(struct tty *tp, u_long cmd, caddr_t data tty_unlock(tp); error = tm->tm_class->tc_ioctl(tm, cmd, data, td); tty_lock(tp); + if ((error == 0) && (cmd == CONS_CLRHIST)) { + /* + * Scrollback history has been successfully cleared, + * so reset the cursor position to the top left of the screen. + */ + teken_pos_t p; + p.tp_row = 0; + p.tp_col = 0; + teken_set_cursor(&tm->tm_emulator, &p); + } return (error); } From owner-svn-src-head@freebsd.org Tue Jun 2 02:38:55 2020 Return-Path: Delivered-To: svn-src-head@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 8B2ED2FE0A8; Tue, 2 Jun 2020 02:38:55 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bbp739cDz4VZh; Tue, 2 Jun 2020 02:38:55 +0000 (UTC) (envelope-from kevans@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 6846815C02; Tue, 2 Jun 2020 02:38:55 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0522ctJQ076781; Tue, 2 Jun 2020 02:38:55 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0522cswW076778; Tue, 2 Jun 2020 02:38:54 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006020238.0522cswW076778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 2 Jun 2020 02:38:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361720 - in head: etc etc/mail usr.sbin/mailwrapper X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: etc etc/mail usr.sbin/mailwrapper X-SVN-Commit-Revision: 361720 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 02:38:55 -0000 Author: kevans Date: Tue Jun 2 02:38:54 2020 New Revision: 361720 URL: https://svnweb.freebsd.org/changeset/base/361720 Log: pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf that conflict, and hilarity ensues. There's currently three different places that we might install mailer.conf: - ^/etc/Makefile (package=runtime, contingent on MK_MAIL != no) - ^/libexec/dma/dmagent/Makefile (package=dma, contingent on MK_SENDMAIL != no) - ^/usr.sbin/mailwrapper/Makefile (package=utilities, contingent on not-installed) The mailwrapper installation will effectively never happen because the ^/etc one will first. This patch simplifies the whole situation; remove the ^/etc/Makefile version and install it primarily in mailwrapper if MK_MAILWRAPPER != "no". The scenarios covered in mailwrapper are: - sendmail(8) is installed, dma(8) may or may not be installed - neither sendmail(8) nor dma(8) is installed In the first scenario, sendmail(8) is dominant so we can go ahead and install the version in ^/etc/mail. In the unlisted scenario, sendmail(8) is not installed but dma(8) is, we'll let ^/libexec/dma/dmagent do the installation. In the second listed scenario, we still want to install an example mailer.conf so just install the base sendmail(8) version. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D24924 Modified: head/etc/Makefile head/etc/mail/mailer.conf head/usr.sbin/mailwrapper/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Jun 2 01:21:48 2020 (r361719) +++ head/etc/Makefile Tue Jun 2 02:38:54 2020 (r361720) @@ -17,11 +17,10 @@ SUBDIR+=sendmail # NB: keep these sorted by MK_* knobs -.if ${MK_SENDMAIL} == "no" -ETCMAIL=mailer.conf aliases -.else -ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \ - mailertable.sample aliases +ETCMAIL=aliases +.if ${MK_SENDMAIL} != "no" +ETCMAIL+=Makefile README access.sample virtusertable.sample \ + mailertable.sample .endif # Special top level files for FreeBSD Modified: head/etc/mail/mailer.conf ============================================================================== --- head/etc/mail/mailer.conf Tue Jun 2 01:21:48 2020 (r361719) +++ head/etc/mail/mailer.conf Tue Jun 2 02:38:54 2020 (r361720) @@ -2,6 +2,9 @@ # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # +# If dma(8) is installed, an example mailer.conf that uses dma(8) instead can +# can be found in /usr/share/examples/dma. +# sendmail /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail Modified: head/usr.sbin/mailwrapper/Makefile ============================================================================== --- head/usr.sbin/mailwrapper/Makefile Tue Jun 2 01:21:48 2020 (r361719) +++ head/usr.sbin/mailwrapper/Makefile Tue Jun 2 02:38:54 2020 (r361720) @@ -26,7 +26,11 @@ SYMLINKS+= ..${BINDIR}/mailwrapper /bin/rmail .endif .if ${MK_MAILWRAPPER} != "no" -.if !exists(${DESTDIR}/etc/mail/mailer.conf) +# We install here if either sendmail(8) is enabled, or dma(8) isn't. In the +# latter scenario, we take care of the possibility that neither sendmail(8) nor +# dma(8) are installed and simply provide a default that can be changed for an +# alternative in ports. +.if ${MK_SENDMAIL} != "no" || ${MK_DMAGENT} == "no" FILES= ${SRCTOP}/etc/mail/mailer.conf FILESDIR= /etc/mail FILESMODE= 644 From owner-svn-src-head@freebsd.org Tue Jun 2 02:47:49 2020 Return-Path: Delivered-To: svn-src-head@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 862EA2FE818; Tue, 2 Jun 2020 02:47:49 +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 49bc0N4KxKz4Wp0; Tue, 2 Jun 2020 02:47:48 +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 0522lkr4015033; Mon, 1 Jun 2020 19:47:46 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 0522lkCD015032; Mon, 1 Jun 2020 19:47:46 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006020247.0522lkCD015032@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... In-Reply-To: To: Ravi Pokala Date: Mon, 1 Jun 2020 19:47:46 -0700 (PDT) CC: rgrimes@freebsd.org, Ian Lepore , Dimitry Andric , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49bc0N4KxKz4Wp0 X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [2.89 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.15)[0.154]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.86)[0.863]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_LONG(0.98)[0.975]; RCPT_COUNT_SEVEN(0.00)[7]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 02:47:49 -0000 > -----Original Message----- > From: on behalf of "Rodney W. Grimes" > Reply-To: > Date: 2020-06-01, Monday at 09:40 > To: Ian Lepore > Cc: Dimitry Andric , , , > Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... > > > On Sun, 2020-05-31 at 22:04 +0000, Dimitry Andric wrote: > > > Author: dim > > > Date: Sun May 31 22:04:51 2020 > > > New Revision: 361677 > > > URL: https://svnweb.freebsd.org/changeset/base/361677 > > > > > > Log: > > > Change Makefiles under usr.bin/svn to make them easier to > > > incrementally > > > update. No functional change intended. > > > > > > MFC after: 2 weeks > > > > > > > I wish we could get style.Makefile(9) updated to mandate this 1-per- > > line style when listing sources, dirs, etc, when the number of items is > > greater than N, where N is something like 3-6 filenames. Otherwise the > > requirement to sort the names alphabetically pretty much mandates that > > many lines of the file will change just to insert one or two new files, > > and that makes it all but impossible to figure out from a diff what > > actually changed. > > I like this idea, though rather than 3-6 filenames I propose > it to be anything longer than 3 lines, which is kinda about when > the pain point should start. See the immediate SUBDIR below, it > is 11 items on 2ish/3 lines, and any change would worst case be a > 3 line diff. This probably covers a large portion of the tree. > > FWIW, I'm partial to the 'FOO+=bar' syntax, rather than continuation lines. It's too easy to forget to add the continuation when appending or inserting. That is indeed a better technique. > > I particularly do not like massive amounts of vertical white > space which this would create, but lacking an automated tool > this is probably a reasonable compromise. > > If we did it everywhere it would mean lots of scrolling when > working on rather simple makefiles. > > I generally feel the opposite -- I do a destressing amount of work on an 80x24 serial console :-/ -- but I agree that "> 3 lines" is a reasonable compromise. I think we have had a communications breakdown? To me it sounds as we both agree that needlessly making Makefiles vertically long is not wanted, but acceptable when folding these very long lists onto wide lines creates a different problem. > -Ravi (rpokala@) > > > -- Ian > > > > > > > [...] > > > -SUBDIR= lib .WAIT \ > > > - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ > > > - svnsync svnversion svnmucc svnrdump > > > +SUBDIR= lib \ > > > + .WAIT \ > > > + svn \ > > > + svnadmin \ > > > + svnbench \ > > > + svndumpfilter \ > > > + svnfsfs \ > > > + svnlook \ > > > + svnserve \ > > > + svnsync \ > > > + svnversion \ > > > + svnmucc \ > > > + svnrdump > > > SUBDIR_PARALLEL= > > > > > > > > > -- > Rod Grimes rgrimes@freebsd.org > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Jun 2 03:41:22 2020 Return-Path: Delivered-To: svn-src-head@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 B689732867A; Tue, 2 Jun 2020 03:41:22 +0000 (UTC) (envelope-from rpokala@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bdBB4RlZz4dqh; Tue, 2 Jun 2020 03:41:22 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from [192.168.1.10] (c-98-207-126-143.hsd1.ca.comcast.net [98.207.126.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id C7D47167BF; Tue, 2 Jun 2020 03:41:21 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.37.20051002 Date: Mon, 01 Jun 2020 20:41:18 -0700 Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... From: Ravi Pokala To: CC: Ian Lepore , Dimitry Andric , , , Message-ID: Thread-Topic: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... References: <202006020247.0522lkCD015032@gndrsh.dnsmgr.net> In-Reply-To: <202006020247.0522lkCD015032@gndrsh.dnsmgr.net> Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 03:41:22 -0000 > > I generally feel the opposite -- I do a destressing amount of work on a= n 80x24 serial console :-/ -- but I agree that "> 3 lines" is a reasonable c= ompromise. >=20 > I think we have had a communications breakdown? To me it sounds as we bo= th agree that needlessly making Makefiles vertically long is not wanted, but= acceptable when folding these very long lists onto wide lines creates a dif= ferent problem. That's exactly what I said: 'but I agree that "> 3 lines" is a reasonable c= ompromise.' :-) -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: "Rodney W. Grimes" Reply-To: Date: 2020-06-01, Monday at 19:47 To: Ravi Pokala Cc: , Ian Lepore , Dimitry Andric , , , Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr li= b/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff= lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... > -----Original Message----- > From: on behalf of "Rodney W. Grim= es" > Reply-To: > Date: 2020-06-01, Monday at 09:40 > To: Ian Lepore > Cc: Dimitry Andric , , <= svn-src-all@freebsd.org>, > Subject: Re: svn commit: r361677 - in head/usr.bin/svn: . lib lib/lib= apr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsv= n_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs... >=20 > > On Sun, 2020-05-31 at 22:04 +0000, Dimitry Andric wrote: > > > Author: dim > > > Date: Sun May 31 22:04:51 2020 > > > New Revision: 361677 > > > URL: https://svnweb.freebsd.org/changeset/base/361677 > > >=20 > > > Log: > > > Change Makefiles under usr.bin/svn to make them easier to > > > incrementally > > > update. No functional change intended. > > > =20 > > > MFC after: 2 weeks > > >=20 > >=20 > > I wish we could get style.Makefile(9) updated to mandate this 1= -per- > > line style when listing sources, dirs, etc, when the number of = items is > > greater than N, where N is something like 3-6 filenames. Other= wise the > > requirement to sort the names alphabetically pretty much mandat= es that > > many lines of the file will change just to insert one or two ne= w files, > > and that makes it all but impossible to figure out from a diff = what > > actually changed. >=20 > I like this idea, though rather than 3-6 filenames I propose > it to be anything longer than 3 lines, which is kinda about when > the pain point should start. See the immediate SUBDIR below, it > is 11 items on 2ish/3 lines, and any change would worst case be a > 3 line diff. This probably covers a large portion of the tree. >=20 > FWIW, I'm partial to the 'FOO+=3Dbar' syntax, rather than continuation = lines. It's too easy to forget to add the continuation when appending or ins= erting. That is indeed a better technique. >=20 > I particularly do not like massive amounts of vertical white > space which this would create, but lacking an automated tool > this is probably a reasonable compromise. > =20 > If we did it everywhere it would mean lots of scrolling when > working on rather simple makefiles. >=20 > I generally feel the opposite -- I do a destressing amount of work on= an 80x24 serial console :-/ -- but I agree that "> 3 lines" is a reasonable= compromise. I think we have had a communications breakdown? To me it sounds as we both agree that needlessly making Makefiles vertically long is not wanted, but acceptable when folding these very long lists onto wide lines creates a different problem. > -Ravi (rpokala@) >=20 > > -- Ian > >=20 > > >=20 > > [...]=20 > > > -SUBDIR=3D lib .WAIT \ > > > - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserv= e \ > > > - svnsync svnversion svnmucc svnrdump > > > +SUBDIR=3D lib \ > > > + .WAIT \ > > > + svn \ > > > + svnadmin \ > > > + svnbench \ > > > + svndumpfilter \ > > > + svnfsfs \ > > > + svnlook \ > > > + svnserve \ > > > + svnsync \ > > > + svnversion \ > > > + svnmucc \ > > > + svnrdump > > > SUBDIR_PARALLEL=3D > > > =20 > >=20 > >=20 >=20 > --=20 > Rod Grimes rgrime= s@freebsd.org >=20 >=20 >=20 --=20 Rod Grimes rgrimes@free= bsd.org From owner-svn-src-head@freebsd.org Tue Jun 2 03:44:22 2020 Return-Path: Delivered-To: svn-src-head@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 D0CD4328941; Tue, 2 Jun 2020 03:44:22 +0000 (UTC) (envelope-from cy@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bdFf3pVLz4f6b; Tue, 2 Jun 2020 03:44:22 +0000 (UTC) (envelope-from cy@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 7D8C316545; Tue, 2 Jun 2020 03:44:22 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0523iMtQ020401; Tue, 2 Jun 2020 03:44:22 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0523iMeu020400; Tue, 2 Jun 2020 03:44:22 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202006020344.0523iMeu020400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 2 Jun 2020 03:44:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361721 - head/contrib/ipfilter/man X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/contrib/ipfilter/man X-SVN-Commit-Revision: 361721 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 03:44:22 -0000 Author: cy Date: Tue Jun 2 03:44:22 2020 New Revision: 361721 URL: https://svnweb.freebsd.org/changeset/base/361721 Log: Per-rule hit counts (-h) can be used with either -i (input) or -o (output) filter rule lists. MFC after: 3 days Modified: head/contrib/ipfilter/man/ipfstat.8 Modified: head/contrib/ipfilter/man/ipfstat.8 ============================================================================== --- head/contrib/ipfilter/man/ipfstat.8 Tue Jun 2 02:38:54 2020 (r361720) +++ head/contrib/ipfilter/man/ipfstat.8 Tue Jun 2 03:44:22 2020 (r361721) @@ -69,8 +69,7 @@ the kernel) if any is present. Show groups currently configured (both active and inactive). .TP .B \-h -Show per-rule the number of times each one scores a "hit". For use in -combination with \fB\-i\fP. +Show per-rule the number of times each one scores a "hit". .TP .B \-i Display the filter list used for the input side of the kernel IP processing. From owner-svn-src-head@freebsd.org Tue Jun 2 09:45:44 2020 Return-Path: Delivered-To: svn-src-head@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 9109E32F8CC; Tue, 2 Jun 2020 09:45:44 +0000 (UTC) (envelope-from hselasky@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bnGc3LTVz4MZm; Tue, 2 Jun 2020 09:45:44 +0000 (UTC) (envelope-from hselasky@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 6DF841A864; Tue, 2 Jun 2020 09:45:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0529jist041822; Tue, 2 Jun 2020 09:45:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0529jiWs041821; Tue, 2 Jun 2020 09:45:44 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202006020945.0529jiWs041821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 2 Jun 2020 09:45:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361722 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 361722 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 09:45:44 -0000 Author: hselasky Date: Tue Jun 2 09:45:43 2020 New Revision: 361722 URL: https://svnweb.freebsd.org/changeset/base/361722 Log: Implement BUILD_BUG_ON_ZERO() in the LinuxKPI. Tested using gcc and clang. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 03:44:22 2020 (r361721) +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 09:45:43 2020 (r361722) @@ -94,6 +94,9 @@ #define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) #define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); } +extern const volatile int lkpi_build_bug_on_zero; +#define BUILD_BUG_ON_ZERO(x) ((x) ? lkpi_build_bug_on_zero : 0) + #define BUG() panic("BUG at %s:%d", __FILE__, __LINE__) #define BUG_ON(cond) do { \ if (cond) { \ From owner-svn-src-head@freebsd.org Tue Jun 2 10:19:46 2020 Return-Path: Delivered-To: svn-src-head@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 09C2033082F; Tue, 2 Jun 2020 10:19:46 +0000 (UTC) (envelope-from hselasky@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bp1s6YLjz4Qbh; Tue, 2 Jun 2020 10:19:45 +0000 (UTC) (envelope-from hselasky@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 DC5011AEF5; Tue, 2 Jun 2020 10:19:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052AJjM8060019; Tue, 2 Jun 2020 10:19:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052AJjxk060018; Tue, 2 Jun 2020 10:19:45 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202006021019.052AJjxk060018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 2 Jun 2020 10:19:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 361723 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 10:19:46 -0000 Author: hselasky Date: Tue Jun 2 10:19:45 2020 New Revision: 361723 URL: https://svnweb.freebsd.org/changeset/base/361723 Log: Implement struct_size() function macro in the LinuxKPI. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 09:45:43 2020 (r361722) +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 10:19:45 2020 (r361723) @@ -555,4 +555,10 @@ linux_ratelimited(linux_ratelimit_t *rl) return (ppsratecheck(&rl->lasttime, &rl->counter, 1)); } +#define struct_size(ptr, field, num) ({ \ + const size_t __size = offsetof(__typeof(*(ptr)), field); \ + const size_t __max = (SIZE_MAX - __size) / sizeof((ptr)->field[0]); \ + ((num) > __max) ? SIZE_MAX : (__size + sizeof((ptr)->field[0]) * (num)); \ +}) + #endif /* _LINUX_KERNEL_H_ */ From owner-svn-src-head@freebsd.org Tue Jun 2 10:35:31 2020 Return-Path: Delivered-To: svn-src-head@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 4EAE0330FE4; Tue, 2 Jun 2020 10:35:31 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bpN21J8fz4S9k; Tue, 2 Jun 2020 10:35:29 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1591094128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ic+t1sws3DG9eYrjYvFUFRbETuy/WoOY9I1lV521NgU=; b=WH2q1DhNGnOWvZewvSvTfpa0qn/X2Z7NCRHdSRndP5Ya/4NdHePdiW3wyk4dVZkV4JVClz UXNLl8V+/B2TWvrseK/PGsd6AtbVpnaLJz8N4vvAJt2Tkg6bWO+sr3ucjzMr8ndcRyZlVs rdbQaKypuBNKmDTR82DvbYn4UkIgPCs= Received: from skull.home.blih.net (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id dc3b548b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 2 Jun 2020 10:35:28 +0000 (UTC) Date: Tue, 2 Jun 2020 12:35:28 +0200 From: Emmanuel Vadot To: Hans Petter Selasky Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361722 - head/sys/compat/linuxkpi/common/include/linux Message-Id: <20200602123528.44c55539be28f1b48740ca76@bidouilliste.com> In-Reply-To: <202006020945.0529jiWs041821@repo.freebsd.org> References: <202006020945.0529jiWs041821@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bpN21J8fz4S9k X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=WH2q1DhN; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-2.56 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.04)[-1.036]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.02)[-1.017]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-0.01)[-0.008]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 10:35:31 -0000 Hello Hans, On Tue, 2 Jun 2020 09:45:44 +0000 (UTC) Hans Petter Selasky wrote: > Author: hselasky > Date: Tue Jun 2 09:45:43 2020 > New Revision: 361722 > URL: https://svnweb.freebsd.org/changeset/base/361722 > > Log: > Implement BUILD_BUG_ON_ZERO() in the LinuxKPI. > Tested using gcc and clang. > > MFC after: 1 week > Sponsored by: Mellanox Technologies > > Modified: > head/sys/compat/linuxkpi/common/include/linux/kernel.h > > Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h > ============================================================================== > --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 03:44:22 2020 (r361721) > +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 09:45:43 2020 (r361722) > @@ -94,6 +94,9 @@ > #define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) > #define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); } > > +extern const volatile int lkpi_build_bug_on_zero; > +#define BUILD_BUG_ON_ZERO(x) ((x) ? lkpi_build_bug_on_zero : 0) > + > #define BUG() panic("BUG at %s:%d", __FILE__, __LINE__) > #define BUG_ON(cond) do { \ > if (cond) { \ That doesn't work for drm-kmod. One example of error : --- intel_display.o --- /usr/home/manu/Work/freebsd/drm-kmod/drivers/gpu/drm/i915/intel_display.c:14804:38: error: implicit declaration of function '__is_constexpr' is invalid in C99 [-Werror,-Wimplicit-function-declaration] val = (val & ~PANEL_UNLOCK_MASK) | PANEL_UNLOCK_REGS; ^ /usr/home/manu/Work/freebsd/drm-kmod/drivers/gpu/drm/i915/i915_reg.h:4770:29: note: expanded from macro 'PANEL_UNLOCK_REGS' #define PANEL_UNLOCK_REGS REG_FIELD_PREP(PANEL_UNLOCK_MASK, 0xabcd) ^ /usr/home/manu/Work/freebsd/drm-kmod/drivers/gpu/drm/i915/i915_reg.h:164:28: note: expanded from macro 'REG_FIELD_PREP' BUILD_BUG_ON_ZERO(!__is_constexpr(__mask)) + \ ^ /usr/home/manu/Work/freebsd/drm-kmod/drivers/gpu/drm/i915/intel_display.c:14804:38: error: '__builtin_choose_expr' requires a constant expression val = (val & ~PANEL_UNLOCK_MASK) | PANEL_UNLOCK_REGS; ^~~~~~~~~~~~~~~~~ /usr/home/manu/Work/freebsd/drm-kmod/drivers/gpu/drm/i915/i915_reg.h:4770:29: note: expanded from macro 'PANEL_UNLOCK_REGS' #define PANEL_UNLOCK_REGS REG_FIELD_PREP(PANEL_UNLOCK_MASK, 0xabcd) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/home/manu/Work/freebsd/drm-kmod/drivers/gpu/drm/i915/i915_reg.h:167:49: note: expanded from macro 'REG_FIELD_PREP' BUILD_BUG_ON_ZERO(__builtin_choose_expr(__is_constexpr(__val), (~((__mask) >> __bf_shf(__mask)) & (__val)), 0)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/manu/Work/freebsd/freebsd-svn/base/head/sys//compat/linuxkpi/common/include/linux/kernel.h:98:32: note: expanded from macro 'BUILD_BUG_ON_ZERO' #define BUILD_BUG_ON_ZERO(x) ((x) ? lkpi_build_bug_on_zero : 0) ^ 11 errors generated. *** [intel_display.o] Error code 1 Step to reproduce: git clone https://github.com/freebsd/drm-kmod.git edit drivers/gpu/drm/i915/i915_drv.h to remove the dummy BUILD_BUG_ON_ZERO macro. make -C i915 -- Emmanuel Vadot From owner-svn-src-head@freebsd.org Tue Jun 2 10:36:15 2020 Return-Path: Delivered-To: svn-src-head@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 8EB6B331263; Tue, 2 Jun 2020 10:36:15 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bpNt1bQ8z4SZC; Tue, 2 Jun 2020 10:36:13 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1591094173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yUyWLLzld8LLjnU7d8P1zA+/6RgewZDNjY8haejVw94=; b=NcOhXDkBVeWLTun4VewgRx/+syVuHCdT8fhoGq7byganOPQcbE0KmOgLyY0Ktj5j5wp2gf HVzlO9DP2h37LLChufm8IcIKsdTdYMtRAOPgZWykCOyg03/Urg15HfM+r/RdEiFRyQX8es EDWKKdBCqxxBt/HKh8RDyk7NbwXuql8= Received: from skull.home.blih.net (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 2d99d9b4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 2 Jun 2020 10:36:13 +0000 (UTC) Date: Tue, 2 Jun 2020 12:36:12 +0200 From: Emmanuel Vadot To: Hans Petter Selasky Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux Message-Id: <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> In-Reply-To: <202006021019.052AJjxk060018@repo.freebsd.org> References: <202006021019.052AJjxk060018@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bpNt1bQ8z4SZC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=NcOhXDkB; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-2.95 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+mx:c]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.04)[-1.036]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.02)[-1.018]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-0.39)[-0.394]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 10:36:15 -0000 Hello Hans, On Tue, 2 Jun 2020 10:19:45 +0000 (UTC) Hans Petter Selasky wrote: > Author: hselasky > Date: Tue Jun 2 10:19:45 2020 > New Revision: 361723 > URL: https://svnweb.freebsd.org/changeset/base/361723 > > Log: > Implement struct_size() function macro in the LinuxKPI. > > MFC after: 1 week > Sponsored by: Mellanox Technologies > > Modified: > head/sys/compat/linuxkpi/common/include/linux/kernel.h > > Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h > ============================================================================== > --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 09:45:43 2020 (r361722) > +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 10:19:45 2020 (r361723) > @@ -555,4 +555,10 @@ linux_ratelimited(linux_ratelimit_t *rl) > return (ppsratecheck(&rl->lasttime, &rl->counter, 1)); > } > > +#define struct_size(ptr, field, num) ({ \ > + const size_t __size = offsetof(__typeof(*(ptr)), field); \ > + const size_t __max = (SIZE_MAX - __size) / sizeof((ptr)->field[0]); \ > + ((num) > __max) ? SIZE_MAX : (__size + sizeof((ptr)->field[0]) * (num)); \ > +}) > + > #endif /* _LINUX_KERNEL_H_ */ Can you bump FreeBSD_version so I can fix https://github.com/freebsd/drm-kmod/ and update the graphics/drm-devel-kmod port please ? -- Emmanuel Vadot From owner-svn-src-head@freebsd.org Tue Jun 2 11:32:10 2020 Return-Path: Delivered-To: svn-src-head@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 E06FE332AC0; Tue, 2 Jun 2020 11:32:10 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bqdP74BKz4YxX; Tue, 2 Jun 2020 11:32:09 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 080FD8D4A157; Tue, 2 Jun 2020 11:32:01 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 728C9E70810; Tue, 2 Jun 2020 11:32:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id MImnB1x8AKPJ; Tue, 2 Jun 2020 11:32:00 +0000 (UTC) Received: from [169.254.19.139] (unknown [IPv6:fde9:577b:c1a9:4902:ac27:826c:db4:4bfa]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 9CA1AE7080F; Tue, 2 Jun 2020 11:31:59 +0000 (UTC) From: "Bjoern A. Zeeb" To: "Emmanuel Vadot" Cc: "Hans Petter Selasky" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux Date: Tue, 02 Jun 2020 11:31:58 +0000 X-Mailer: MailMate (2.0BETAr6146) Message-ID: In-Reply-To: <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49bqdP74BKz4YxX X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of bzeeb-lists@lists.zabbadoz.net designates 195.201.62.131 as permitted sender) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net X-Spamd-Result: default: False [-2.67 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; NEURAL_HAM_MEDIUM(-1.02)[-1.020]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:195.201.62.131]; NEURAL_HAM_LONG(-1.03)[-1.026]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[zabbadoz.net]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.33)[-0.326]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:24940, ipnet:195.201.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 11:32:10 -0000 On 2 Jun 2020, at 10:36, Emmanuel Vadot wrote: > Hello Hans, > > On Tue, 2 Jun 2020 10:19:45 +0000 (UTC) > Hans Petter Selasky wrote: > >> Author: hselasky >> Date: Tue Jun 2 10:19:45 2020 >> New Revision: 361723 >> URL: https://svnweb.freebsd.org/changeset/base/361723 >> >> Log: >> Implement struct_size() function macro in the LinuxKPI. >> >> MFC after: 1 week >> Sponsored by: Mellanox Technologies >> >> Modified: >> head/sys/compat/linuxkpi/common/include/linux/kernel.h >> >> Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h >> =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=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 = >> 09:45:43 2020 (r361722) >> +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 = >> 10:19:45 2020 (r361723) >> @@ -555,4 +555,10 @@ linux_ratelimited(linux_ratelimit_t *rl) >> return (ppsratecheck(&rl->lasttime, &rl->counter, 1)); >> } >> >> +#define struct_size(ptr, field, num) ({ \ >> + const size_t __size =3D offsetof(__typeof(*(ptr)), field); \ >> + const size_t __max =3D (SIZE_MAX - __size) / sizeof((ptr)->field[0])= ; = >> \ >> + ((num) > __max) ? SIZE_MAX : (__size + sizeof((ptr)->field[0]) * = >> (num)); \ >> +}) >> + >> #endif /* _LINUX_KERNEL_H_ */ > > Can you bump FreeBSD_version so I can fix > https://github.com/freebsd/drm-kmod/ and update the > graphics/drm-devel-kmod port please ? I almost wonder if we want a =E2=80=9Clinuxkkpi version=E2=80=9D to check= instead. If there=E2=80=99s a lot more =E2=80=9Cwork=E2=80=9D on the linuxkpi we m= ight not want to = bump __FreeBSD_version for every change which can conflict/affect = external code? /bz From owner-svn-src-head@freebsd.org Tue Jun 2 11:38:25 2020 Return-Path: Delivered-To: svn-src-head@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 472CE333100; Tue, 2 Jun 2020 11:38:25 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bqmb3ZZQz4ZkF; Tue, 2 Jun 2020 11:38:22 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1591097900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PE0SyJ1VvT6OyaJgrFR54B937j6vW2L39RueGrhjmYA=; b=M86ePsvyEBUbGjJskzTfyhS0SR5s5P8D0wloP8gUJdpI4VGOnOU5Tuk1JNgq/dufQzY+nt Axc/qqRvXtwQVIbaXGdQ37tNLa16H+kPLxmZLBuqxj1fgtMORoDnGkbDrR4O4FzZpCbC3q zIMDRJultbDHX37kKi45UBPeLfJlWp0= Received: from skull.home.blih.net (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 21d75498 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 2 Jun 2020 11:38:20 +0000 (UTC) Date: Tue, 2 Jun 2020 13:38:19 +0200 From: Emmanuel Vadot To: "Bjoern A. Zeeb" Cc: "Hans Petter Selasky" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux Message-Id: <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> In-Reply-To: References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49bqmb3ZZQz4ZkF X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=M86ePsvy; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.04 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.04)[-1.039]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-0.46)[-0.463]; NEURAL_HAM_MEDIUM(-1.03)[-1.034]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 11:38:25 -0000 On Tue, 02 Jun 2020 11:31:58 +0000 "Bjoern A. Zeeb" wrote: > On 2 Jun 2020, at 10:36, Emmanuel Vadot wrote: >=20 > > Hello Hans, > > > > On Tue, 2 Jun 2020 10:19:45 +0000 (UTC) > > Hans Petter Selasky wrote: > > > >> Author: hselasky > >> Date: Tue Jun 2 10:19:45 2020 > >> New Revision: 361723 > >> URL: https://svnweb.freebsd.org/changeset/base/361723 > >> > >> Log: > >> Implement struct_size() function macro in the LinuxKPI. > >> > >> MFC after: 1 week > >> Sponsored by: Mellanox Technologies > >> > >> Modified: > >> head/sys/compat/linuxkpi/common/include/linux/kernel.h > >> > >> Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h > >> =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=3D=3D=3D= =3D=3D=3D=3D=3D > >> --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2= =20 > >> 09:45:43 2020 (r361722) > >> +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2= =20 > >> 10:19:45 2020 (r361723) > >> @@ -555,4 +555,10 @@ linux_ratelimited(linux_ratelimit_t *rl) > >> return (ppsratecheck(&rl->lasttime, &rl->counter, 1)); > >> } > >> > >> +#define struct_size(ptr, field, num) ({ \ > >> + const size_t __size =3D offsetof(__typeof(*(ptr)), field); \ > >> + const size_t __max =3D (SIZE_MAX - __size) / sizeof((ptr)->field[0])= ;=20 > >> \ > >> + ((num) > __max) ? SIZE_MAX : (__size + sizeof((ptr)->field[0]) *=20 > >> (num)); \ > >> +}) > >> + > >> #endif /* _LINUX_KERNEL_H_ */ > > > > Can you bump FreeBSD_version so I can fix > > https://github.com/freebsd/drm-kmod/ and update the > > graphics/drm-devel-kmod port please ? >=20 > I almost wonder if we want a ?linuxkkpi version? to check instead. > If there?s a lot more ?work? on the linuxkpi we might not want to=20 > bump __FreeBSD_version for every change which can conflict/affect=20 > external code? >=20 > /bz >=20 There is a LINUXKPI_VERSION but that's for Linux version compliance. It's not easy to add a linuxkpi_version like freebsd_version because you cannot check it in the port makefile. But that might help when mfc'ing linuxkpi stuff. FreeBSD_version is cheap enough to bump. --=20 Emmanuel Vadot From owner-svn-src-head@freebsd.org Tue Jun 2 12:02:16 2020 Return-Path: Delivered-To: svn-src-head@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 C27F933468A; Tue, 2 Jun 2020 12:02:16 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49brJ76Wx3z4dXL; Tue, 2 Jun 2020 12:02:15 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [62.141.129.235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 82916260A9D; Tue, 2 Jun 2020 14:02:08 +0200 (CEST) Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux To: Emmanuel Vadot , "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> From: Hans Petter Selasky Message-ID: <55a487f9-e934-6fab-1477-3140fab6fe4f@selasky.org> Date: Tue, 2 Jun 2020 14:01:52 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49brJ76Wx3z4dXL X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 2a01:4f8:c17:6c4b::2 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-1.81 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net]; NEURAL_HAM_LONG(-0.99)[-0.988]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; NEURAL_HAM_MEDIUM(-0.90)[-0.896]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.37)[0.371]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 12:02:16 -0000 Hi, I'll compile test DRM and add the missing is const expression macro and bump the FreeBSD version. Sorry for the breakage. --HPS From owner-svn-src-head@freebsd.org Tue Jun 2 12:23:04 2020 Return-Path: Delivered-To: svn-src-head@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 DB7D033568B; Tue, 2 Jun 2020 12:23:04 +0000 (UTC) (envelope-from hselasky@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49brm85ZdPz3S27; Tue, 2 Jun 2020 12:23:04 +0000 (UTC) (envelope-from hselasky@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 BAE4D1CC2F; Tue, 2 Jun 2020 12:23:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052CN4vY039949; Tue, 2 Jun 2020 12:23:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052CN4xK039948; Tue, 2 Jun 2020 12:23:04 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202006021223.052CN4xK039948@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 2 Jun 2020 12:23:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361724 - in head/sys: compat/linuxkpi/common/include/linux sys X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/sys: compat/linuxkpi/common/include/linux sys X-SVN-Commit-Revision: 361724 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 12:23:04 -0000 Author: hselasky Date: Tue Jun 2 12:23:04 2020 New Revision: 361724 URL: https://svnweb.freebsd.org/changeset/base/361724 Log: Implement __is_constexpr() function macro in the LinuxKPI. Bump the FreeBSD version. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h head/sys/sys/param.h Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 10:19:45 2020 (r361723) +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Jun 2 12:23:04 2020 (r361724) @@ -561,4 +561,7 @@ linux_ratelimited(linux_ratelimit_t *rl) ((num) > __max) ? SIZE_MAX : (__size + sizeof((ptr)->field[0]) * (num)); \ }) +#define __is_constexpr(x) \ + __builtin_constant_p(x) + #endif /* _LINUX_KERNEL_H_ */ Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Tue Jun 2 10:19:45 2020 (r361723) +++ head/sys/sys/param.h Tue Jun 2 12:23:04 2020 (r361724) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300096 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300097 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-head@freebsd.org Tue Jun 2 12:23:52 2020 Return-Path: Delivered-To: svn-src-head@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 78D85335424; Tue, 2 Jun 2020 12:23:52 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49brn32t9Jz3S3D; Tue, 2 Jun 2020 12:23:51 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [62.141.129.235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 45807260267; Tue, 2 Jun 2020 14:23:43 +0200 (CEST) Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux From: Hans Petter Selasky To: Emmanuel Vadot , "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> <55a487f9-e934-6fab-1477-3140fab6fe4f@selasky.org> Message-ID: <7370e668-53e2-03e0-96e1-26f2fa398953@selasky.org> Date: Tue, 2 Jun 2020 14:23:27 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <55a487f9-e934-6fab-1477-3140fab6fe4f@selasky.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49brn32t9Jz3S3D X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 88.99.82.50 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-1.82 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net:c]; NEURAL_HAM_LONG(-0.99)[-0.989]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; NEURAL_HAM_MEDIUM(-0.88)[-0.876]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.34)[0.344]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 12:23:52 -0000 On 2020-06-02 14:01, Hans Petter Selasky wrote: > Hi, > > I'll compile test DRM and add the missing is const expression macro and > bump the FreeBSD version. > > Sorry for the breakage. > > --HPS Bjoern, Small things like this are usually fine. It is important to not have too many local patches, as in this case with drm-devel-kmod ... Heads up Manu: extensible array support xarray.h will soon be ready for upstreaming! Here you go: https://svnweb.freebsd.org/changeset/base/361724 --HPS From owner-svn-src-head@freebsd.org Tue Jun 2 12:34:01 2020 Return-Path: Delivered-To: svn-src-head@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 5DE48335C8D; Tue, 2 Jun 2020 12:34:01 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bs0l4kfDz3TDT; Tue, 2 Jun 2020 12:33:59 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1591101237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7tufLnFjcaOuyn5kOUguaDSBcYp8USj8ZcKebw+XJAo=; b=heY4LGtQwSnocMhR4yG1Nm5v7as00BVZIZoo2BcflIG1xktYxvGqJKsilBIuXvXXsb5rw+ OePClEqd8xOZ/Dm5L2PA/QqFlw8rFRwcraYus41sl4Ztozp/GquYMK+11w1AtRISeOnq/d //oWmG756MncgusLeHJQeT2zDKYckz4= Received: from skull.home.blih.net (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 09a414d4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 2 Jun 2020 12:33:57 +0000 (UTC) Date: Tue, 2 Jun 2020 14:33:57 +0200 From: Emmanuel Vadot To: Hans Petter Selasky Cc: "Bjoern A. Zeeb" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux Message-Id: <20200602143357.da21661056b912a950f3b701@bidouilliste.com> In-Reply-To: <7370e668-53e2-03e0-96e1-26f2fa398953@selasky.org> References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> <55a487f9-e934-6fab-1477-3140fab6fe4f@selasky.org> <7370e668-53e2-03e0-96e1-26f2fa398953@selasky.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bs0l4kfDz3TDT X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=heY4LGtQ; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-2.43 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(0.14)[0.138]; NEURAL_HAM_LONG(-1.04)[-1.038]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_MEDIUM(-1.03)[-1.033]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 12:34:01 -0000 On Tue, 2 Jun 2020 14:23:27 +0200 Hans Petter Selasky wrote: > On 2020-06-02 14:01, Hans Petter Selasky wrote: > > Hi, > > > > I'll compile test DRM and add the missing is const expression macro and > > bump the FreeBSD version. > > > > Sorry for the breakage. > > > > --HPS > > Bjoern, > > Small things like this are usually fine. > > It is important to not have too many local patches, as in this case with > drm-devel-kmod ... > > Heads up Manu: extensible array support xarray.h will soon be ready for > upstreaming! Oh ! Good, that's something that I wanted to do at one point. Could you opened a review so I can prepare patches for drm-kmod before it lands ? > Here you go: > https://svnweb.freebsd.org/changeset/base/361724 Thanks ! > --HPS -- Emmanuel Vadot From owner-svn-src-head@freebsd.org Tue Jun 2 12:48:45 2020 Return-Path: Delivered-To: svn-src-head@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 A5F013362D9; Tue, 2 Jun 2020 12:48:45 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49bsKm6T4Cz3Vk2; Tue, 2 Jun 2020 12:48:44 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [62.141.129.235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id D8E89260267; Tue, 2 Jun 2020 14:48:42 +0200 (CEST) Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux To: Emmanuel Vadot Cc: "Bjoern A. Zeeb" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> <55a487f9-e934-6fab-1477-3140fab6fe4f@selasky.org> <7370e668-53e2-03e0-96e1-26f2fa398953@selasky.org> <20200602143357.da21661056b912a950f3b701@bidouilliste.com> From: Hans Petter Selasky Message-ID: Date: Tue, 2 Jun 2020 14:48:26 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200602143357.da21661056b912a950f3b701@bidouilliste.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bsKm6T4Cz3Vk2 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 88.99.82.50 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-1.56 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net:c]; NEURAL_HAM_LONG(-0.99)[-0.987]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; NEURAL_HAM_MEDIUM(-0.90)[-0.897]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.63)[0.628]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 12:48:45 -0000 On 2020-06-02 14:33, Emmanuel Vadot wrote: > On Tue, 2 Jun 2020 14:23:27 +0200 > Hans Petter Selasky wrote: > >> On 2020-06-02 14:01, Hans Petter Selasky wrote: >>> Hi, >>> >>> I'll compile test DRM and add the missing is const expression macro and >>> bump the FreeBSD version. >>> >>> Sorry for the breakage. >>> >>> --HPS >> >> Bjoern, >> >> Small things like this are usually fine. >> >> It is important to not have too many local patches, as in this case with >> drm-devel-kmod ... >> >> Heads up Manu: extensible array support xarray.h will soon be ready for >> upstreaming! > > Oh ! Good, that's something that I wanted to do at one point. > Could you opened a review so I can prepare patches for drm-kmod before > it lands ? > >> Here you go: >> https://svnweb.freebsd.org/changeset/base/361724 > Hi, If you can test/review this before Friday, would be great: https://reviews.freebsd.org/D25101 --HPS From owner-svn-src-head@freebsd.org Tue Jun 2 12:51:18 2020 Return-Path: Delivered-To: svn-src-head@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 C03ED3362F3; Tue, 2 Jun 2020 12:51:18 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bsNj2HHnz3Vqs; Tue, 2 Jun 2020 12:51:17 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1591102275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X1Vhf1D2hIGieTKaqQzS9B4W4xeZUeNVG+qhzlVKBJI=; b=XUtKn3HrYI6VmewMkCboqhsXjptq/ekOizXPKnrxOhdOJzr3NPShBy+WMshChwmJjIVdZd rsEG8GRRkQ557zsdi2LPiRTZb/c57OvuW1q0RRq2XUT2+4Vm7LKNIiOhpnsDdzzG0YzGrT Mgsj7XK0XsIWvB7krI9ccpsO6aowhgQ= Received: from skull.home.blih.net (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id cf2703a6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 2 Jun 2020 12:51:15 +0000 (UTC) Date: Tue, 2 Jun 2020 14:51:15 +0200 From: Emmanuel Vadot To: Hans Petter Selasky Cc: "Bjoern A. Zeeb" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361723 - head/sys/compat/linuxkpi/common/include/linux Message-Id: <20200602145115.bf183ea722688a414efa196d@bidouilliste.com> In-Reply-To: References: <202006021019.052AJjxk060018@repo.freebsd.org> <20200602123612.fc6dbafe55c2c981cb0ec9a1@bidouilliste.com> <20200602133819.ca4e9e508ba3334b77d24ee4@bidouilliste.com> <55a487f9-e934-6fab-1477-3140fab6fe4f@selasky.org> <7370e668-53e2-03e0-96e1-26f2fa398953@selasky.org> <20200602143357.da21661056b912a950f3b701@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49bsNj2HHnz3Vqs X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=XUtKn3Hr; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-2.43 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(0.14)[0.140]; NEURAL_HAM_LONG(-1.04)[-1.038]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_MEDIUM(-1.03)[-1.034]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 12:51:18 -0000 On Tue, 2 Jun 2020 14:48:26 +0200 Hans Petter Selasky wrote: > On 2020-06-02 14:33, Emmanuel Vadot wrote: > > On Tue, 2 Jun 2020 14:23:27 +0200 > > Hans Petter Selasky wrote: > > > >> On 2020-06-02 14:01, Hans Petter Selasky wrote: > >>> Hi, > >>> > >>> I'll compile test DRM and add the missing is const expression macro and > >>> bump the FreeBSD version. > >>> > >>> Sorry for the breakage. > >>> > >>> --HPS > >> > >> Bjoern, > >> > >> Small things like this are usually fine. > >> > >> It is important to not have too many local patches, as in this case with > >> drm-devel-kmod ... > >> > >> Heads up Manu: extensible array support xarray.h will soon be ready for > >> upstreaming! > > > > Oh ! Good, that's something that I wanted to do at one point. > > Could you opened a review so I can prepare patches for drm-kmod before > > it lands ? > > > >> Here you go: > >> https://svnweb.freebsd.org/changeset/base/361724 > > > > Hi, > > If you can test/review this before Friday, would be great: > > https://reviews.freebsd.org/D25101 > --HPS Will do, thanks. -- Emmanuel Vadot From owner-svn-src-head@freebsd.org Tue Jun 2 14:19:33 2020 Return-Path: Delivered-To: svn-src-head@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 804612F0812; Tue, 2 Jun 2020 14:19:33 +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 49bvLX69Nrz3y11; Tue, 2 Jun 2020 14:19:32 +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 052EJOYD017292; Tue, 2 Jun 2020 07:19:24 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 052EJOpl017291; Tue, 2 Jun 2020 07:19:24 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006021419.052EJOpl017291@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361721 - head/contrib/ipfilter/man In-Reply-To: <202006020344.0523iMeu020400@repo.freebsd.org> To: Cy Schubert Date: Tue, 2 Jun 2020 07:19:24 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49bvLX69Nrz3y11 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 14:19:33 -0000 > Author: cy > Date: Tue Jun 2 03:44:22 2020 > New Revision: 361721 > URL: https://svnweb.freebsd.org/changeset/base/361721 > > Log: > Per-rule hit counts (-h) can be used with either -i (input) or -o (output) > filter rule lists. This change does not make that explicitly apparent, as it simply removes that -h -i is valid, but that means -h [-i|-o] is implicit. > > MFC after: 3 days > > Modified: > head/contrib/ipfilter/man/ipfstat.8 > > Modified: head/contrib/ipfilter/man/ipfstat.8 > ============================================================================== > --- head/contrib/ipfilter/man/ipfstat.8 Tue Jun 2 02:38:54 2020 (r361720) > +++ head/contrib/ipfilter/man/ipfstat.8 Tue Jun 2 03:44:22 2020 (r361721) > @@ -69,8 +69,7 @@ the kernel) if any is present. > Show groups currently configured (both active and inactive). > .TP > .B \-h > -Show per-rule the number of times each one scores a "hit". For use in > -combination with \fB\-i\fP. > +Show per-rule the number of times each one scores a "hit". + For use in combination with \fB-i\fP or \fB-o\P. Also which does -h list by default if neither -i or -o is given? Is that even valid? > .TP > .B \-i > Display the filter list used for the input side of the kernel IP processing. > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Jun 2 14:28:22 2020 Return-Path: Delivered-To: svn-src-head@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 7DE6F2F09F8; Tue, 2 Jun 2020 14:28:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bvXj1ws5z40Pw; Tue, 2 Jun 2020 14:28:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id g7tpjcEdW62brg7tqjrCJE; Tue, 02 Jun 2020 08:28:19 -0600 X-Authority-Analysis: v=2.3 cv=LKf9vKe9 c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=nTHF0DUjJn0A:10 a=iKhvJSA4AAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=P1n5EExJesSCcB2wNToA:9 a=CjuIK1q_8ugA:10 a=odh9cflL3HIXMm4fY7Wr:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 8B057C96; Tue, 2 Jun 2020 07:28:16 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 052ESGdL068018; Tue, 2 Jun 2020 07:28:16 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 052ESGVZ068015; Tue, 2 Jun 2020 07:28:16 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202006021428.052ESGVZ068015@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: rgrimes@freebsd.org cc: Cy Schubert , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361721 - head/contrib/ipfilter/man In-reply-to: <202006021419.052EJOpl017291@gndrsh.dnsmgr.net> References: <202006021419.052EJOpl017291@gndrsh.dnsmgr.net> Comments: In-reply-to "Rodney W. Grimes" message dated "Tue, 02 Jun 2020 07:19:24 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 02 Jun 2020 07:28:16 -0700 X-CMAE-Envelope: MS4wfKrcWlykVN0rlCa65YOSlzwmUYAvcOZm4kqy+lXSCawbnydJy3uy2i4/PYmk1sJzpVdWki7LmaErxFrW3rzgoIyarDbtbbR8p/r7zMRyneiBgRQbai3B yzSVWSmtgikChOwrZicL3tMgKvtyeK7/7v84U/da7gHp+tBzNSwzaNi/zo6ZXTmxMbBQVIDEDXai/Dg0udF8dcIrYUEDlCgRvHjN2PfzIJ5HR14t1n1DdMD8 L9zqcorz7bfQY8D4IYZJTjsGOPakxGYSwqZNu2VXg9qnMs1hA8dLqh3caUlyw8hGKjbRiFT0cea2QbAWcaf8gA== X-Rspamd-Queue-Id: 49bvXj1ws5z40Pw X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.9) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [1.52 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.9:from]; HAS_XAW(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_SHORT(-0.49)[-0.490]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.125.17:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.9:from]; ARC_NA(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.17)[0.174]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; NEURAL_SPAM_LONG(0.54)[0.535]; R_SPF_NA(0.00)[no SPF record] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 14:28:22 -0000 In message <202006021419.052EJOpl017291@gndrsh.dnsmgr.net>, "Rodney W. Grimes" writes: > > Author: cy > > Date: Tue Jun 2 03:44:22 2020 > > New Revision: 361721 > > URL: https://svnweb.freebsd.org/changeset/base/361721 > > > > Log: > > Per-rule hit counts (-h) can be used with either -i (input) or -o (output > ) > > filter rule lists. > > This change does not make that explicitly apparent, as it simply > removes that -h -i is valid, but that means -h [-i|-o] is implicit. The man page and corresponding verification options needs some work. For instance -n also doesn't mean anything without either -i and/or -o. ipfstat needs the same love that's been shown to ippool. Noted and on my todo list. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Tue Jun 2 14:29:58 2020 Return-Path: Delivered-To: svn-src-head@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 8CA3D2F09FE; Tue, 2 Jun 2020 14:29:58 +0000 (UTC) (envelope-from weh@microsoft.com) Received: from APC01-HK2-obe.outbound.protection.outlook.com (mail-eopbgr1300093.outbound.protection.outlook.com [40.107.130.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bvZY3Fm8z40JM; Tue, 2 Jun 2020 14:29:57 +0000 (UTC) (envelope-from weh@microsoft.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nhU6rwsiaRmjA9Ga3kZcCbvWuMDIVIlzrGIrF5/0kXpdXe6ILFIMCWPyVCmIuam5LRHcfYYGBshz6yXamEM/l+AiMUG1RuHPS7LqJurUqYNo6debBncHo3ATZfkl/ybZnmyf0bvpriyGsmvK0N0os8CkfTR4pRaynMl1fn+dPIB44diDTDkXPxnU0CffmnZXBUghpppBF0XaNQ6RX7FuBF8s0AmrMQtnlc3zpyu50HjaaDAJeraOj3Qb7s9ijXG70Wz7nkPQZ/71qQFW7gsce1LQKfNoKD+yjSsraWhnWaMcigwgVESnZFILR5LEjEqJhBYflDctqDksHzEi/nheKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EWeeSROMaldHBGgERstYLGhp5CbHfHFppWLThjyp254=; b=mRk+xcsFElK4NJzpJJFbAQeSx5e0CThMql4uzFXIpM64fNCQCvPPMJ796iO2IESuWnc65kg9daxvJJrJ1E26dyXwyiKknOj+CW6bETLgWJ74eTE0B8r26nVRKI5Cq3no9OJyng/IUdqLwyNSIiNEppMAl2LzA4YNQ7fbB0NIHSAWQdxxNQZAqbJjrO0p+E7l98+tR8FzpZjLE2wSEFrBV0GqCnHvJH26+kw8P5HpcJKgIp6tP4+5JgWoGAhR9DGikXuGMc59wXH2cs1mqHP50Y79CiASFQ5NF9MOI0lrH0P68dnr5oDWAgutDMuvEFiTXz65LuzZ9YztbIGjDwJUuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none Received: from SG2P153MB0377.APCP153.PROD.OUTLOOK.COM (2603:1096:0:1::15) by SG2P153MB0215.APCP153.PROD.OUTLOOK.COM (2603:1096:4:8c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.4; Tue, 2 Jun 2020 14:29:53 +0000 Received: from SG2P153MB0377.APCP153.PROD.OUTLOOK.COM ([fe80::798e:2eb8:f18e:7a0]) by SG2P153MB0377.APCP153.PROD.OUTLOOK.COM ([fe80::798e:2eb8:f18e:7a0%7]) with mapi id 15.20.3088.000; Tue, 2 Jun 2020 14:29:53 +0000 From: Wei Hu To: Kyle Evans , Wei Hu CC: src-committers , svn-src-all , svn-src-head Subject: RE: svn commit: r361360 - head/sys/dev/hyperv/hvsock Thread-Topic: svn commit: r361360 - head/sys/dev/hyperv/hvsock Thread-Index: AQHWMBnLKwcBUA4tF02+0B+8EuJ7cKi0QXoAgAtPJgCABeGxkA== Date: Tue, 2 Jun 2020 14:29:53 +0000 Message-ID: References: <202005220917.04M9H7oE028708@repo.freebsd.org> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2020-06-02T14:29:51Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=34614ba9-7017-4e08-a5a2-0c09c6856a50; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0 x-originating-ip: [2404:f801:9000:18:6fed::496b] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b50dbc65-bac0-48bf-fdb4-08d807016a98 x-ms-traffictypediagnostic: SG2P153MB0215: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-forefront-prvs: 0422860ED4 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6APJmLYWqAH8Yx3Xq5UMicEkBSyN8jW3zAsspMaDOnl7ZwxNu/Ia5XdF6OAheN7o+epAPjTR3zRQYpkkQaRact7L0Cj2URCdctrA+UGY/hljA2Bz8h1VlmwlGNJfPY5pRDkhCoYbYnMjD8nn17JBNTe9MyFdcV6LtFXkNtuEo53O50jOk4ZYz5tRJv5WjoNjcSHh+KJr/kqKRuv7Avn/lBdNkMZaURMylrbxeBtuf9cHLQwPUKansKIrNyUvGwr/cbypoaPEkqUbUMX5HSPYAilnUF4J6/uuifDxeuOLmr2gxdCdtdGQhWSPxq0z6tPWe4FN4gBXWQJhY4q6a4JZaAjDhdMunWokkPH2JIdxe7H6ZbBOAXMiRax5mxGoWXXmJlfzlcJBDxyyLzpaTcdiRKD5YfVIXtRKaPvL6HxfcpsRuIRA2ZzZLAPQFeSC8rKZ x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SG2P153MB0377.APCP153.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(39860400002)(346002)(136003)(396003)(376002)(8676002)(71200400001)(8936002)(33656002)(53546011)(6506007)(186003)(83080400001)(86362001)(4326008)(82950400001)(82960400001)(478600001)(66476007)(66446008)(64756008)(66556008)(966005)(52536014)(66946007)(5660300002)(7696005)(10290500003)(76116006)(8990500004)(83380400001)(110136005)(316002)(54906003)(55016002)(2906002)(450100002)(9686003)(21314003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: +wWiyBXAtmKmh8LYPvz29uakqnjm0Hytf3Cx96FNfds/IahXiQSH44ijqrmCmVFbXtOBdxHASD/ZdVqvDjYZQwfsCZbHRdHTiNTwRWzG2Zzrj97II5UCLHmKIz+r2Mjgapkz7rq8m17eLCgpiavCopVCGa2EwCQwt19TF3PIHsK/J6ePelnhuuaoGM2ltp1Hmw7MrKCR8dTHQ/wfZQm8aobAfwj+GbWRLIQxspn/PlheJf6SWZw+6cqDJhBPouHSVX9QFhdACGVgplkOrRsknNv5p3HXqk7+bOAh789W2zZY6GA76QN1ccchyEniucoCvw3OVpIEg7XEPJT0kP8boBglGNBYhnqcu3e+w2axDduWYcatQ36eiHpoSHsPrVUqd/TyZA3m62VHpn6eFFV4u5m/wOlybVweLvQQV8dcGX93FI/PhsvNtJWeTOhgu6HB1xFJSsLe3AxnNtOu2VB8Yjx2mb2gfLasFjJImK+nWYv9aUBFVgGR3JWwa8kH7xiRd8V0EKevezjX78R9M4MR+A== x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b50dbc65-bac0-48bf-fdb4-08d807016a98 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jun 2020 14:29:53.3655 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7sCGHKGV4qKWl5SKWsNmLqAe/MSkVyShyC9dAaY/ZOueNlo8oh5F/LFdpEhHNtxk6FpXp5FJAUp9pQ+Ygi35Pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2P153MB0215 X-Rspamd-Queue-Id: 49bvZY3Fm8z40JM X-Spamd-Bar: --------- X-Spamd-Result: default: False [-9.12 / 15.00]; NEURAL_HAM_MEDIUM(-0.95)[-0.953]; R_DKIM_ALLOW(-0.20)[microsoft.com:s=selector2]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[microsoft.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.004]; MIME_BASE64_TEXT_BOGUS(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[microsoft.com:+]; MIME_BASE64_TEXT(0.10)[]; DMARC_POLICY_ALLOW(-0.50)[microsoft.com,reject]; WHITELIST_SPF_DKIM(-3.00)[microsoft.com:d:+,microsoft.com:s:+]; RCVD_IN_DNSWL_LOW(-0.10)[40.107.130.93:from]; NEURAL_HAM_SHORT(-1.16)[-1.160]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:8075, ipnet:40.64.0.0/10, country:US]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.130.93:from] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 14:29:58 -0000 PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBLeWxlIEV2YW5zIDxrZXZhbnNA ZnJlZWJzZC5vcmc+DQo+IFNlbnQ6IFNhdHVyZGF5LCBNYXkgMzAsIDIwMjAgNDozNCBBTQ0KPiBU bzogV2VpIEh1IDx3aHVAZnJlZWJzZC5vcmc+DQo+IENjOiBzcmMtY29tbWl0dGVycyA8c3JjLWNv bW1pdHRlcnNAZnJlZWJzZC5vcmc+OyBzdm4tc3JjLWFsbCA8c3ZuLXNyYy0NCj4gYWxsQGZyZWVi c2Qub3JnPjsgc3ZuLXNyYy1oZWFkIDxzdm4tc3JjLWhlYWRAZnJlZWJzZC5vcmc+DQo+IFN1Ympl Y3Q6IFJlOiBzdm4gY29tbWl0OiByMzYxMzYwIC0gaGVhZC9zeXMvZGV2L2h5cGVydi9odnNvY2sN Cj4gDQo+IE9uIEZyaSwgTWF5IDIyLCAyMDIwIGF0IDEwOjUxIEFNIEt5bGUgRXZhbnMgPGtldmFu c0BmcmVlYnNkLm9yZz4gd3JvdGU6DQo+ID4NCj4gPiBPbiBGcmksIE1heSAyMiwgMjAyMCBhdCA0 OjE3IEFNIFdlaSBIdSA8d2h1QGZyZWVic2Qub3JnPiB3cm90ZToNCj4gPiA+DQo+ID4gPiBBdXRo b3I6IHdodQ0KPiA+ID4gRGF0ZTogRnJpIE1heSAyMiAwOToxNzowNyAyMDIwDQo+ID4gPiBOZXcg UmV2aXNpb246IDM2MTM2MA0KPiA+ID4gVVJMOg0KPiA+ID4gaHR0cHM6Ly9uYW0wNi5zYWZlbGlu a3MucHJvdGVjdGlvbi5vdXRsb29rLmNvbS8/dXJsPWh0dHBzJTNBJTJGJTJGc3YNCj4gPiA+DQo+ IG53ZWIuZnJlZWJzZC5vcmclMkZjaGFuZ2VzZXQlMkZiYXNlJTJGMzYxMzYwJmFtcDtkYXRhPTAy JTdDMDElN0MNCj4gd2VoJQ0KPiA+ID4NCj4gNDBtaWNyb3NvZnQuY29tJTdDYzk3ZDJkZGRkMjNi NDQwYThmMTcwOGQ4MDQwZjk1NjMlN0M3MmY5ODhiZjg2ZjENCj4gNDFhDQo+ID4gPg0KPiBmOTFh YjJkN2NkMDExZGI0NyU3QzElN0MwJTdDNjM3MjYzODEyMjYyNjg2MjY0JmFtcDtzZGF0YT14UEo5 NQ0KPiBuVnNXUFYNCj4gPiA+IGY4cXhseFN5TXBsSlh1YUZjYnA1YmQ5RmlHZ3ZIaGFvJTNEJmFt cDtyZXNlcnZlZD0wDQo+ID4gPg0KPiA+ID4gTG9nOg0KPiA+ID4gICBTb2NrZXQgQUZfSFlQRVJW IHNob3VsZCByZXR1cm4gZmFpbHVyZSB3aGVuIGl0IGlzIG5vdCBydW5uaW5nIG9uDQo+ID4gPiBI eXBlclYNCj4gPiA+DQo+ID4gPiBbLi4uIHNuaXAgLi4uXQ0KPiA+ID4gQEAgLTM1NCw2ICszNTQs OSBAQCBodnNfdHJhbnNfYXR0YWNoKHN0cnVjdCBzb2NrZXQgKnNvLCBpbnQgcHJvdG8sDQo+ID4g PiBzdHJ1Y3QgIHsNCj4gPiA+ICAgICAgICAgc3RydWN0IGh2c19wY2IgKnBjYiA9IHNvMmh2c3Bj Yihzbyk7DQo+ID4gPg0KPiA+ID4gKyAgICAgICBpZiAodm1fZ3Vlc3QgIT0gVk1fR1VFU1RfSFYp DQo+ID4gPiArICAgICAgICAgICAgICAgcmV0dXJuIChFU09DS1ROT1NVUFBPUlQpOw0KPiA+ID4g Kw0KPiA+ID4gICAgICAgICBIVlNPQ0tfREJHKEhWU09DS19EQkdfVkVSQk9TRSwNCj4gPiA+ICAg ICAgICAgICAgICIlczogSHlwZXJWIFNvY2tldCBodnNfdHJhbnNfYXR0YWNoIGNhbGxlZFxuIiwN Cj4gPiA+IF9fZnVuY19fKTsNCj4gPiA+DQo+ID4NCj4gPiBUaGlzIG9uZSBtYXkgYmUgT0ssIGJ1 dCBub25lIG9mIHRoZXNlIG90aGVyIG1ldGhvZHMgc2hvdWxkIGJlIGFibGUgdG8NCj4gPiBiZSBp bnZva2VkIGlmIHRoZSBhdHRhY2ggZmFpbGVkLiBTZWUgdGhpcyBjb21tZW50IGF0IGFyb3VuZA0K PiA+IF4vc3lzL2tlcm4vdWlwY19zb2NrZXQuYyM1MDoNCj4gPg0KPiA+IDUwICogcHJ1X2RldGFj aCgpIGRpc2Fzc29jaWF0ZXMgcHJvdG9jb2wgbGF5ZXIgc3RhdGUgZnJvbSBhbiBhdHRhY2hlZA0K PiA+IHNvY2tldCwNCj4gPiA1MSAqIGFuZCB3aWxsIGJlIGNhbGxlZCBleGFjdGx5IG9uY2UgZm9y IHNvY2tldHMgaW4gd2hpY2ggcHJ1X2F0dGFjaCgpDQo+ID4gaGFzDQo+ID4gNTIgKiBiZWVuIHN1 Y2Nlc3NmdWxseSBjYWxsZWQuICBJZiBwcnVfYXR0YWNoKCkgcmV0dXJuZWQgYW4gZXJyb3IsDQo+ ID4gNTMgKiBwcnVfZGV0YWNoKCkgd2lsbCBub3QgYmUgY2FsbGVkLiAgU29ja2V0IGxheWVyIHBy aXZhdGUuDQo+ID4NCj4gPiBUaGF0IHNhaWQsIEkgd29uZGVyIGlmIFZORVRfRE9NQUlOX1NFVCBw cm92aWRlcyB0aGUgY29ycmVjdCBzZW1hbnRpY3MNCj4gPiBoZXJlIGF0IGFsbC4gWW91IGNhbid0 IGZhaWwgZG9tYWluX2luaXQsIGJ1dCBJIGRvbid0IHRoaW5rIHRoZXJlJ3MgYW55DQo+ID4gdmFs dWUgaW4gdGhpcyBkb21haW4gYWN0dWFsbHkgZ2V0dGluZyByZWdpc3RlcmVkIG9uIG5vbi1IeXBl clYgZ3Vlc3RzLA0KPiA+IGEgZmFjdCB3aGljaCBwcmVzdW1hYmx5IHdvbid0IGNoYW5nZSBhdCBy dW50aW1lLg0KPiA+DQo+IA0KPiBJJ20gY29uc2lkZXJpbmcgdGhlIHBhdGNoIGJlbG93LCB3aGlj aCBpcyBhbG1vc3QgY2VydGFpbmx5IGdvaW5nIHRvIGJlIG1hbmdsZWQNCj4gYnkgbXkgbWFpbCBj bGllbnQsIGZvciBzb2x2aW5nIHRoaXMgc3R5bGUgb2YgcHJvYmxlbS4gSXQgZ2l2ZXMgdGhlIGRv bWFpbiBhIGNoYW5jZQ0KPiB0byBwcm9iZSB0aGUgc3lzdGVtIGFuZCBvcHQgb3V0LCBmb3IgY2Fz ZXMgbGlrZSBodnNvY2sgd2hlcmUgbGVhdmluZyB0aGUNCj4gZG9tYWluIGFyb3VuZCBhbmQgZnVs bHktaW5pdGlhbGl6ZWQgd2hlbiB0aGVyZSdzIG5vIHdheSBpdCBjYW4gd29yayBpcyBib3RoDQo+ IHdhc3RlZnVsIGFuZCBhIGJpdCBvZiBhbiBhY2NpZGVudCB3YWl0aW5nIHRvIGhhcHBlbiAtLSBJ TU8gaXQncyBtdWNoIGxlc3MgZXJyb3INCj4gcHJvbmUgYW5kIG1vcmUgY29tZm9ydGluZyBpZiB3 ZSBqdXN0IHJlamVjdCBpdCBlYXJseSBvbiwgc2luY2Ugd2UgY2FuLiBUaGUNCj4gdm1fZ3Vlc3Qg ZGV0ZWN0aW9uIGFuZCBoeXBlcnYncyBmYWxzZS1wb3NpdGl2ZSBhdmVyc2lvbiBzdHVmZiBpbiBo eXBlcnZfaW5pdA0KPiBzaG91bGQgcnVuIG11Y2ggZWFybGllciB0aGFuIHRoaXMuDQo+IA0KPiBk aWZmIC0tZ2l0IGEvc3lzL2Rldi9oeXBlcnYvaHZzb2NrL2h2X3NvY2suYw0KPiBiL3N5cy9kZXYv aHlwZXJ2L2h2c29jay9odl9zb2NrLmMgaW5kZXggZDIxMmMyZDhjMmQuLmQzYmMxYWIwZjJjIDEw MDY0NA0KPiAtLS0gYS9zeXMvZGV2L2h5cGVydi9odnNvY2svaHZfc29jay5jDQo+ICsrKyBiL3N5 cy9kZXYvaHlwZXJ2L2h2c29jay9odl9zb2NrLmMNCj4gQEAgLTc0LDYgKzc0LDggQEAgU1lTQ1RM X0lOVChfbmV0X2h2c29jaywgT0lEX0FVVE8sIGh2c19kYmdfbGV2ZWwsDQo+IENUTEZMQUdfUldU VU4sICZodnNfZGJnX2xldmVsLA0KPiANCj4gIE1BTExPQ19ERUZJTkUoTV9IVlNPQ0ssICJoeXBl cnZfc29ja2V0IiwgImh5cGVydiBzb2NrZXQgY29udHJvbA0KPiBzdHJ1Y3R1cmVzIik7DQo+IA0K PiArc3RhdGljIGludCBodnNfZG9tX3Byb2JlKHZvaWQpOw0KPiArDQo+ICAvKiBUaGUgTVRVIGlz IDE2S0IgcGVyIGhvc3Qgc2lkZSdzIGRlc2lnbiAqLw0KPiAgI2RlZmluZSBIVlNPQ0tfTVRVX1NJ WkUgICAgICAgICAgICAgICAgKDEwMjQgKiAxNikNCj4gICNkZWZpbmUgSFZTT0NLX1NFTkRfQlVG X1NaICAgICAoUEFHRV9TSVpFIC0gc2l6ZW9mKHN0cnVjdA0KPiB2bXBpcGVfcHJvdG9faGVhZGVy KSkNCj4gQEAgLTEyNCw2ICsxMjYsNyBAQCBzdGF0aWMgc3RydWN0IHByb3Rvc3cgICAgICAgICAg ICAgICBodl9zb2NrZXRfcHJvdG9zd1tdID0gew0KPiAgc3RhdGljIHN0cnVjdCBkb21haW4gICAg ICAgICAgIGh2X3NvY2tldF9kb21haW4gPSB7DQo+ICAgICAgICAgLmRvbV9mYW1pbHkgPSAgICAg ICAgICAgQUZfSFlQRVJWLA0KPiAgICAgICAgIC5kb21fbmFtZSA9ICAgICAgICAgICAgICJoeXBl cnYiLA0KPiArICAgICAgIC5kb21fcHJvYmUgPSAgICAgICAgICAgIGh2c19kb21fcHJvYmUsDQo+ ICAgICAgICAgLmRvbV9wcm90b3N3ID0gICAgICAgICAgaHZfc29ja2V0X3Byb3Rvc3csDQo+ICAg ICAgICAgLmRvbV9wcm90b3N3TlBST1RPU1cgPQ0KPiAmaHZfc29ja2V0X3Byb3Rvc3dbbml0ZW1z KGh2X3NvY2tldF9wcm90b3N3KV0NCj4gIH07DQo+IEBAIC0zMjIsNiArMzI1LDE2IEBAIGh2c190 cmFuc191bmxvY2sodm9pZCkNCj4gICAgICAgICBzeF94dW5sb2NrKCZodnNfdHJhbnNfc29ja3Nf c3gpOyAgfQ0KPiANCj4gK3N0YXRpYyBpbnQNCj4gK2h2c19kb21fcHJvYmUodm9pZCkNCj4gK3sN Cj4gKw0KPiArICAgICAgIC8qIERvbid0IGV2ZW4gZ2l2ZSB1cyBhIGNoYW5jZSB0byBhdHRhY2gg b24gbm9uLUh5cGVyVi4gKi8NCj4gKyAgICAgICBpZiAodm1fZ3Vlc3QgIT0gVk1fR1VFU1RfSFYp DQo+ICsgICAgICAgICAgICAgICByZXR1cm4gKEVOWElPKTsNCj4gKyAgICAgICByZXR1cm4gKDAp Ow0KPiArfQ0KPiArDQo+ICB2b2lkDQo+ICBodnNfdHJhbnNfaW5pdCh2b2lkKQ0KPiAgew0KPiBA QCAtMzI5LDkgKzM0Miw2IEBAIGh2c190cmFuc19pbml0KHZvaWQpDQo+ICAgICAgICAgaWYgKCFJ U19ERUZBVUxUX1ZORVQoY3Vydm5ldCkpDQo+ICAgICAgICAgICAgICAgICByZXR1cm47DQo+IA0K PiAtICAgICAgIGlmICh2bV9ndWVzdCAhPSBWTV9HVUVTVF9IVikNCj4gLSAgICAgICAgICAgICAg IHJldHVybjsNCj4gLQ0KPiAgICAgICAgIEhWU09DS19EQkcoSFZTT0NLX0RCR19WRVJCT1NFLA0K PiAgICAgICAgICAgICAiJXM6IEh5cGVyViBTb2NrZXQgaHZzX3RyYW5zX2luaXQgY2FsbGVkXG4i LCBfX2Z1bmNfXyk7DQo+IA0KPiBAQCAtMzU0LDkgKzM2NCw2IEBAIGh2c190cmFuc19hdHRhY2go c3RydWN0IHNvY2tldCAqc28sIGludCBwcm90bywgc3RydWN0DQo+IHRocmVhZCAqdGQpICB7DQo+ ICAgICAgICAgc3RydWN0IGh2c19wY2IgKnBjYiA9IHNvMmh2c3BjYihzbyk7DQo+IA0KPiAtICAg ICAgIGlmICh2bV9ndWVzdCAhPSBWTV9HVUVTVF9IVikNCj4gLSAgICAgICAgICAgICAgIHJldHVy biAoRVNPQ0tUTk9TVVBQT1JUKTsNCj4gLQ0KPiAgICAgICAgIEhWU09DS19EQkcoSFZTT0NLX0RC R19WRVJCT1NFLA0KPiAgICAgICAgICAgICAiJXM6IEh5cGVyViBTb2NrZXQgaHZzX3RyYW5zX2F0 dGFjaCBjYWxsZWRcbiIsIF9fZnVuY19fKTsNCj4gDQo+IEBAIC0zODMsOSArMzkwLDYgQEAgaHZz X3RyYW5zX2RldGFjaChzdHJ1Y3Qgc29ja2V0ICpzbykgIHsNCj4gICAgICAgICBzdHJ1Y3QgaHZz X3BjYiAqcGNiOw0KPiANCj4gLSAgICAgICBpZiAodm1fZ3Vlc3QgIT0gVk1fR1VFU1RfSFYpDQo+ IC0gICAgICAgICAgICAgICByZXR1cm47DQo+IC0NCj4gICAgICAgICBIVlNPQ0tfREJHKEhWU09D S19EQkdfVkVSQk9TRSwNCj4gICAgICAgICAgICAgIiVzOiBIeXBlclYgU29ja2V0IGh2c190cmFu c19kZXRhY2ggY2FsbGVkXG4iLCBfX2Z1bmNfXyk7DQo+IA0KPiBAQCAtNTk1LDkgKzU5OSw2IEBA IGh2c190cmFuc19kaXNjb25uZWN0KHN0cnVjdCBzb2NrZXQgKnNvKSAgew0KPiAgICAgICAgIHN0 cnVjdCBodnNfcGNiICpwY2I7DQo+IA0KPiAtICAgICAgIGlmICh2bV9ndWVzdCAhPSBWTV9HVUVT VF9IVikNCj4gLSAgICAgICAgICAgICAgIHJldHVybiAoRVNPQ0tUTk9TVVBQT1JUKTsNCj4gLQ0K PiAgICAgICAgIEhWU09DS19EQkcoSFZTT0NLX0RCR19WRVJCT1NFLA0KPiAgICAgICAgICAgICAi JXM6IEh5cGVyViBTb2NrZXQgaHZzX3RyYW5zX2Rpc2Nvbm5lY3QgY2FsbGVkXG4iLCBfX2Z1bmNf Xyk7DQo+IA0KPiBAQCAtOTI1LDkgKzkyNiw2IEBAIGh2c190cmFuc19jbG9zZShzdHJ1Y3Qgc29j a2V0ICpzbykgIHsNCj4gICAgICAgICBzdHJ1Y3QgaHZzX3BjYiAqcGNiOw0KPiANCj4gLSAgICAg ICBpZiAodm1fZ3Vlc3QgIT0gVk1fR1VFU1RfSFYpDQo+IC0gICAgICAgICAgICAgICByZXR1cm47 DQo+IC0NCj4gICAgICAgICBIVlNPQ0tfREJHKEhWU09DS19EQkdfVkVSQk9TRSwNCj4gICAgICAg ICAgICAgIiVzOiBIeXBlclYgU29ja2V0IGh2c190cmFuc19jbG9zZSBjYWxsZWRcbiIsIF9fZnVu Y19fKTsNCj4gDQo+IEBAIC05NjksOSArOTY3LDYgQEAgaHZzX3RyYW5zX2Fib3J0KHN0cnVjdCBz b2NrZXQgKnNvKSAgew0KPiAgICAgICAgIHN0cnVjdCBodnNfcGNiICpwY2IgPSBzbzJodnNwY2Io c28pOw0KPiANCj4gLSAgICAgICBpZiAodm1fZ3Vlc3QgIT0gVk1fR1VFU1RfSFYpDQo+IC0gICAg ICAgICAgICAgICByZXR1cm47DQo+IC0NCj4gICAgICAgICBIVlNPQ0tfREJHKEhWU09DS19EQkdf VkVSQk9TRSwNCj4gICAgICAgICAgICAgIiVzOiBIeXBlclYgU29ja2V0IGh2c190cmFuc19hYm9y dCBjYWxsZWRcbiIsIF9fZnVuY19fKTsNCj4gDQo+IGRpZmYgLS1naXQgYS9zeXMva2Vybi91aXBj X2RvbWFpbi5jIGIvc3lzL2tlcm4vdWlwY19kb21haW4uYyBpbmRleA0KPiA2MGUzMGViMWFlMC4u NjMyMTc1NjZiYTkgMTAwNjQ0DQo+IC0tLSBhL3N5cy9rZXJuL3VpcGNfZG9tYWluLmMNCj4gKysr IGIvc3lzL2tlcm4vdWlwY19kb21haW4uYw0KPiBAQCAtMTcwLDkgKzE3MCwxMyBAQCBwcm90b3N3 X2luaXQoc3RydWN0IHByb3Rvc3cgKnByKSAgdm9pZA0KPiBkb21haW5faW5pdCh2b2lkICphcmcp ICB7DQo+IC0gICAgICAgc3RydWN0IGRvbWFpbiAqZHAgPSBhcmc7DQo+ICsgICAgICAgc3RydWN0 IGRvbWFpbl9zZXRfYXJncyAqZHNhID0gYXJnOw0KPiArICAgICAgIHN0cnVjdCBkb21haW4gKmRw Ow0KPiAgICAgICAgIHN0cnVjdCBwcm90b3N3ICpwcjsNCj4gDQo+ICsgICAgICAgaWYgKCFkc2Et PmRzYV9zdXBwb3J0ZWQpDQo+ICsgICAgICAgICAgICAgICByZXR1cm47DQo+ICsgICAgICAgZHAg PSBkc2EtPmRzYV9kcDsNCj4gICAgICAgICBpZiAoZHAtPmRvbV9pbml0KQ0KPiAgICAgICAgICAg ICAgICAgKCpkcC0+ZG9tX2luaXQpKCk7DQo+ICAgICAgICAgZm9yIChwciA9IGRwLT5kb21fcHJv dG9zdzsgcHIgPCBkcC0+ZG9tX3Byb3Rvc3dOUFJPVE9TVzsgcHIrKykgQEANCj4gLTE5OCw4ICsy MDIsMTIgQEAgdm5ldF9kb21haW5faW5pdCh2b2lkICphcmcpICB2b2lkDQo+IHZuZXRfZG9tYWlu X3VuaW5pdCh2b2lkICphcmcpICB7DQo+IC0gICAgICAgc3RydWN0IGRvbWFpbiAqZHAgPSBhcmc7 DQo+ICsgICAgICAgc3RydWN0IGRvbWFpbl9zZXRfYXJncyAqZHNhID0gYXJnOw0KPiArICAgICAg IHN0cnVjdCBkb21haW4gKmRwOw0KPiANCj4gKyAgICAgICBpZiAoIWRzYS0+ZHNhX3N1cHBvcnRl ZCkNCj4gKyAgICAgICAgICAgICAgIHJldHVybjsNCj4gKyAgICAgICBkcCA9IGRzYS0+ZHNhX2Rw Ow0KPiAgICAgICAgIGlmIChkcC0+ZG9tX2Rlc3Ryb3kpDQo+ICAgICAgICAgICAgICAgICAoKmRw LT5kb21fZGVzdHJveSkoKTsNCj4gIH0NCj4gQEAgLTIxMyw5ICsyMjEsMTQgQEAgdm5ldF9kb21h aW5fdW5pbml0KHZvaWQgKmFyZykgIHZvaWQNCj4gZG9tYWluX2FkZCh2b2lkICpkYXRhKSAgew0K PiArICAgICAgIHN0cnVjdCBkb21haW5fc2V0X2FyZ3MgKmRzYTsNCj4gICAgICAgICBzdHJ1Y3Qg ZG9tYWluICpkcDsNCj4gDQo+IC0gICAgICAgZHAgPSAoc3RydWN0IGRvbWFpbiAqKWRhdGE7DQo+ ICsgICAgICAgZHNhID0gZGF0YTsNCj4gKyAgICAgICBkcCA9IGRzYS0+ZHNhX2RwOw0KPiArICAg ICAgIGlmIChkcC0+ZG9tX3Byb2JlICE9IE5VTEwgJiYgKCpkcC0+ZG9tX3Byb2JlKSgpICE9IDAp DQo+ICsgICAgICAgICAgICAgICByZXR1cm47DQo+ICsgICAgICAgZHNhLT5kc2Ffc3VwcG9ydGVk ID0gMTsNCj4gICAgICAgICBtdHhfbG9jaygmZG9tX210eCk7DQo+ICAgICAgICAgZHAtPmRvbV9u ZXh0ID0gZG9tYWluczsNCj4gICAgICAgICBkb21haW5zID0gZHA7DQo+IGRpZmYgLS1naXQgYS9z eXMvc3lzL2RvbWFpbi5oIGIvc3lzL3N5cy9kb21haW4uaCBpbmRleA0KPiBlODNkZDBmNGFmYy4u MTEyMTFmMDcyYzIgMTAwNjQ0DQo+IC0tLSBhL3N5cy9zeXMvZG9tYWluLmgNCj4gKysrIGIvc3lz L3N5cy9kb21haW4uaA0KPiBAQCAtNDksNiArNDksNyBAQCBzdHJ1Y3QgICAgICAgIHNvY2tldDsN Cj4gIHN0cnVjdCBkb21haW4gew0KPiAgICAgICAgIGludCAgICAgZG9tX2ZhbWlseTsgICAgICAg ICAgICAgLyogQUZfeHh4ICovDQo+ICAgICAgICAgY2hhciAgICAqZG9tX25hbWU7DQo+ICsgICAg ICAgaW50ICAgICAoKmRvbV9wcm9iZSkodm9pZCk7ICAgICAvKiBjaGVjayBmb3Igc3VwcG9ydCAo b3B0aW9uYWwpICovDQo+ICAgICAgICAgdm9pZCAgICAoKmRvbV9pbml0KSAgICAgICAgICAgICAv KiBpbml0aWFsaXplIGRvbWFpbiBkYXRhIHN0cnVjdHVyZXMgKi8NCj4gICAgICAgICAgICAgICAg ICh2b2lkKTsNCj4gICAgICAgICB2b2lkICAgICgqZG9tX2Rlc3Ryb3kpICAgICAgICAgIC8qIGNs ZWFudXAgc3RydWN0dXJlcyAvIHN0YXRlICovDQo+IEBAIC03OSwyMCArODAsMzYgQEAgdm9pZCAg ICAgICAgICAgICAgICB2bmV0X2RvbWFpbl9pbml0KHZvaWQgKik7DQo+ICB2b2lkICAgICAgICAg ICB2bmV0X2RvbWFpbl91bmluaXQodm9pZCAqKTsNCj4gICNlbmRpZg0KPiANCj4gK3N0cnVjdCBk b21haW5fc2V0X2FyZ3Mgew0KPiArICAgICAgIHN0cnVjdCBkb21haW4gICAqZHNhX2RwOw0KPiAr ICAgICAgIGludCAgICAgICAgICAgICAgZHNhX3N1cHBvcnRlZDsNCj4gK307DQo+ICsNCj4gICNk ZWZpbmUgICAgICAgIERPTUFJTl9TRVQobmFtZSkNCj4gICAgICAgICAgXA0KPiArICAgICAgIHN0 YXRpYyBzdHJ1Y3QgZG9tYWluX3NldF9hcmdzIG5hbWUgIyMgZG9tYWluX3NldF9hcmdzID0geyAg ICAgICBcDQo+ICsgICAgICAgICAgICAgICAuZHNhX2RwID0gJiBuYW1lICMjIGRvbWFpbiwgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwNCj4gKyAgICAgICB9OyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXA0KPiAgICAgICAg IFNZU0lOSVQoZG9tYWluX2FkZF8gIyMgbmFtZSwgU0lfU1VCX1BST1RPX0RPTUFJTiwgICAgICAg ICAgICAgICBcDQo+IC0gICAgICAgICAgIFNJX09SREVSX0ZJUlNULCBkb21haW5fYWRkLCAmIG5h bWUgIyMgZG9tYWluKTsgICAgICAgICAgICAgIFwNCj4gKyAgICAgICAgICAgU0lfT1JERVJfRklS U1QsIGRvbWFpbl9hZGQsICZuYW1lICMjIGRvbWFpbl9zZXRfYXJncyk7ICAgICAgXA0KPiAgICAg ICAgIFNZU0lOSVQoZG9tYWluX2luaXRfICMjIG5hbWUsIFNJX1NVQl9QUk9UT19ET01BSU4sICAg ICAgICAgICAgICBcDQo+IC0gICAgICAgICAgIFNJX09SREVSX1NFQ09ORCwgZG9tYWluX2luaXQs ICYgbmFtZSAjIyBkb21haW4pOw0KPiArICAgICAgICAgICBTSV9PUkRFUl9TRUNPTkQsIGRvbWFp bl9pbml0LCAmbmFtZSAjIyBkb21haW5fc2V0X2FyZ3MpOw0KPiAgI2lmZGVmIFZJTUFHRQ0KPiAr LyoNCj4gKyAqIFRoZXJlJ3Mgbm8gc3VjaCB0aGluZyBhcyBwZXItdm5ldCBkb21haW5zLCBzbyBk b21haW5fc2V0X2FyZ3MgZG9uJ3QNCj4gK3JlYWxseQ0KPiArICogbmVlZCB0byBiZSB2aXJ0dWFs aXplZCBhdCB0aGUgbW9tZW50LiAgRnVydGhlciBjb25zaWRlcmF0aW9uIHdvdWxkDQo+ICtiZSBu ZWVkZWQNCj4gKyAqIGZvciBzdWNoIGEgY29uY2VwdCB0byB3b3JrIGF0IGFsbC4NCj4gKyAqLw0K PiAgI2RlZmluZSAgICAgICAgVk5FVF9ET01BSU5fU0VUKG5hbWUpDQo+ICAgICAgICAgIFwNCj4g KyAgICAgICBzdGF0aWMgc3RydWN0IGRvbWFpbl9zZXRfYXJncyBuYW1lICMjIGRvbWFpbl9zZXRf YXJncyA9IHsgICAgICAgXA0KPiArICAgICAgICAgICAgICAgLmRzYV9kcCA9ICYgbmFtZSAjIyBk b21haW4sICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcDQo+ICsgICAgICAgfTsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwN Cj4gICAgICAgICBTWVNJTklUKGRvbWFpbl9hZGRfICMjIG5hbWUsIFNJX1NVQl9QUk9UT19ET01B SU4sICAgICAgICAgICAgICAgXA0KPiAtICAgICAgICAgICBTSV9PUkRFUl9GSVJTVCwgZG9tYWlu X2FkZCwgJiBuYW1lICMjIGRvbWFpbik7ICAgICAgICAgICAgICBcDQo+ICsgICAgICAgICAgIFNJ X09SREVSX0ZJUlNULCBkb21haW5fYWRkLCAmbmFtZSAjIyBkb21haW5fc2V0X2FyZ3MpOyAgICAg IFwNCj4gICAgICAgICBWTkVUX1NZU0lOSVQodm5ldF9kb21haW5faW5pdF8gIyMgbmFtZSwgU0lf U1VCX1BST1RPX0RPTUFJTiwgICAgXA0KPiAtICAgICAgICAgICBTSV9PUkRFUl9TRUNPTkQsIHZu ZXRfZG9tYWluX2luaXQsICYgbmFtZSAjIyBkb21haW4pOyAgICAgICBcDQo+ICsgICAgICAgICAg IFNJX09SREVSX1NFQ09ORCwgdm5ldF9kb21haW5faW5pdCwgJm5hbWUgIyMNCj4gKyBkb21haW5f c2V0X2FyZ3MpOyBcDQo+ICAgICAgICAgVk5FVF9TWVNVTklOSVQodm5ldF9kb21haW5fdW5pbml0 XyAjIyBuYW1lLCAgICAgICAgICAgICAgICAgICAgIFwNCj4gICAgICAgICAgICAgU0lfU1VCX1BS T1RPX0RPTUFJTiwgU0lfT1JERVJfU0VDT05ELCB2bmV0X2RvbWFpbl91bmluaXQsICAgXA0KPiAt ICAgICAgICAgICAmIG5hbWUgIyMgZG9tYWluKQ0KPiArICAgICAgICAgICAmbmFtZSAjIyBkb21h aW5fc2V0X2FyZ3MpOw0KPiAgI2Vsc2UgLyogIVZJTUFHRSAqLw0KPiAgI2RlZmluZSAgICAgICAg Vk5FVF9ET01BSU5fU0VUKG5hbWUpICAgRE9NQUlOX1NFVChuYW1lKQ0KPiAgI2VuZGlmIC8qIFZJ TUFHRSAqLw0KDQpUaGFua3MgS3lsZS4gSXQgbWFrZXMgYSBsb3Qgb2Ygc2Vuc2UgaWYgaXQgY2Fu IGJlIHJlamVjdGVkIGFzIGVhcmx5IGFzIHBvc3NpYmxlIHdoZW4gaXQNCmlzIG5vdCBvbiBIeXBl clYuIEkgYW0gZmluZSB3aXRoIHRoZSBjaGFuZ2VzIGluIHRoZSBodnNvY2suIFRoZSBjaGFuZ2Vz IG1hZGUgaW4gDQp1aXBjX2RvbWFpbi5jIGFuZCBkb21haW4uaCBtYXkgbmVlZCBtb3JlIGV5ZXMg dG8gcmV2aWV3IGZyb20gVklNQUdFDQpwZXJzcGVjdGl2ZS4gDQoNClRoYW5rcywNCldlaQ0K From owner-svn-src-head@freebsd.org Tue Jun 2 14:34:01 2020 Return-Path: Delivered-To: svn-src-head@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 D94352F0B7F; Tue, 2 Jun 2020 14:34:01 +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 49bvgD2Vrxz418W; Tue, 2 Jun 2020 14:34:00 +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 052EXtW2017365; Tue, 2 Jun 2020 07:33:55 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 052EXtvm017364; Tue, 2 Jun 2020 07:33:55 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006021433.052EXtvm017364@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361721 - head/contrib/ipfilter/man In-Reply-To: <202006021428.052ESGVZ068015@slippy.cwsent.com> To: Cy Schubert Date: Tue, 2 Jun 2020 07:33:55 -0700 (PDT) CC: rgrimes@freebsd.org, Cy Schubert , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49bvgD2Vrxz418W X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [2.19 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.08)[-0.076]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.66)[0.660]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(0.71)[0.708]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 14:34:01 -0000 > In message <202006021419.052EJOpl017291@gndrsh.dnsmgr.net>, "Rodney W. > Grimes" > writes: > > > Author: cy > > > Date: Tue Jun 2 03:44:22 2020 > > > New Revision: 361721 > > > URL: https://svnweb.freebsd.org/changeset/base/361721 > > > > > > Log: > > > Per-rule hit counts (-h) can be used with either -i (input) or -o (output > > ) > > > filter rule lists. > > > > This change does not make that explicitly apparent, as it simply > > removes that -h -i is valid, but that means -h [-i|-o] is implicit. > > The man page and corresponding verification options needs some work. For > instance -n also doesn't mean anything without either -i and/or -o. ipfstat > needs the same love that's been shown to ippool. Noted and on my todo list. > Thank you. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Jun 2 15:05:24 2020 Return-Path: Delivered-To: svn-src-head@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 9C1E72F1E92; Tue, 2 Jun 2020 15:05:24 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bwMS3C2Kz44GJ; Tue, 2 Jun 2020 15:05:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8203:2990:b194:c7cf:2443:aa95]) (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 DD7461BD08; Tue, 2 Jun 2020 15:05:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r361633 - in head/sys: net netipsec To: Kyle Evans , "Hartmann, O." Cc: src-committers , svn-src-all , svn-src-head References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> <20200601081810.79c9fb1d@hermann.fritz.box> From: John Baldwin 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: <6b8d4731-15e0-4c0b-af5f-bbecdbead7e3@FreeBSD.org> Date: Tue, 2 Jun 2020 08:05:22 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:05:24 -0000 On 6/1/20 8:02 AM, Kyle Evans wrote: > On Mon, Jun 1, 2020 at 1:18 AM Hartmann, O. wrote: >> >> On Sun, 31 May 2020 11:43:18 +0200 >> "Hartmann, O." wrote: >> >>> On Fri, 29 May 2020 19:22:40 +0000 (UTC) >>> John Baldwin wrote: >>> >>>> Author: jhb >>>> Date: Fri May 29 19:22:40 2020 >>>> New Revision: 361633 >>>> URL: https://svnweb.freebsd.org/changeset/base/361633 >>>> >>>> Log: >>>> Consistently include opt_ipsec.h for consumers of >>>> . >>>> This fixes ipsec.ko to include all of IPSEC_DEBUG. >>>> >>> [... snip ...] >>> >>> [...] >>> --- all_subdir_ipsec --- >>> --- ipsec_mod.o --- >>> /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration >>> of function 'ipsec_support_enable' is invalid in C99 >>> [-Werror,-Wimplicit-function-declaration] >>> ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ >>> /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration >>> of function 'ipsec_support_disable' is invalid in C99 >>> [-Werror,-Wimplicit-function-declaration] >>> ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- >>> Building >>> /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/ipw_bss/ipw_bss.ko >>> --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: >>> note: did you mean 'ipsec_support_enable'? >>> /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' >>> declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); >>> ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 >>> >>> make[4]: stopped in /usr/src/sys/modules/ipsec >> >> FYI: IPSEC is statically built into the kernel via "options IPSEC" > > This is the same failure as we're seeing on LINT kernels, which also > have both. I've got a tentative diff at [0] that teaches the modules > to cope with the possibility, but I haven't thought too much on how > useful the result is. IIRC we're building the modules into the kernel > anyways in this scenario, so the result probably just won't load > because it's already loaded. > > [0] https://people.freebsd.org/~kevans.ipsec.diff I think we should just not build ipsec.ko and tcp_md5.ko if the kernel already includes the support instead. I started testing this yesterday but got side tracked. I will try to get this fixed today. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Jun 2 15:07:27 2020 Return-Path: Delivered-To: svn-src-head@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 5F35C2F1BD3; Tue, 2 Jun 2020 15:07:27 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bwPq1vwTz44L5; Tue, 2 Jun 2020 15:07:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8203:2990:b194:c7cf:2443:aa95]) (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 C480B1BC84; Tue, 2 Jun 2020 15:07:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r361712 - in head/sys/modules: . tcp To: Kyle Evans , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006020032.0520Wbke002516@repo.freebsd.org> From: John Baldwin 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: <1b2dbc65-197d-a62b-3ba7-2cf78819277c@FreeBSD.org> Date: Tue, 2 Jun 2020 08:07:25 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <202006020032.0520Wbke002516@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:07:27 -0000 On 6/1/20 5:32 PM, Kyle Evans wrote: > Author: kevans > Date: Tue Jun 2 00:32:36 2020 > New Revision: 361712 > URL: https://svnweb.freebsd.org/changeset/base/361712 > > Log: > modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC > > IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, > not both. Refrain from building if IPSEC is set, as the resulting module > won't be able to load anyways if it's built into the kernel. > > KERN_OPTS is safe here; for tied modules, it will reflect the kernel > configuration. For untied modules, it will defer to whatever is set in > ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter > situation has some risk to it for uncommon scenarios, but such is the life > of untied kernel modules. > > Reported by: jenkins (a lot), O. Hartmann (once) > Generally discussed with: imp, jhb > > Modified: > head/sys/modules/Makefile > head/sys/modules/tcp/Makefile > > Modified: head/sys/modules/Makefile > ============================================================================== > --- head/sys/modules/Makefile Tue Jun 2 00:03:26 2020 (r361711) > +++ head/sys/modules/Makefile Tue Jun 2 00:32:36 2020 (r361712) > @@ -427,7 +427,7 @@ _if_enc= if_enc > _if_gif= if_gif > _if_gre= if_gre > _ipfw_pmod= ipfw_pmod > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > _ipsec= ipsec > .endif > .endif > > Modified: head/sys/modules/tcp/Makefile > ============================================================================== > --- head/sys/modules/tcp/Makefile Tue Jun 2 00:03:26 2020 (r361711) > +++ head/sys/modules/tcp/Makefile Tue Jun 2 00:32:36 2020 (r361712) > @@ -16,7 +16,7 @@ _tcp_rack= rack > > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > defined(ALL_MODULES) > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} Thanks. Was finally getting back to this this morning. This one should be TCP_SIGNATURE, not IPSEC. (This would break for a kernel which doesn't have IPSEC but does have TCP_SIGNATURE.) -- John Baldwin From owner-svn-src-head@freebsd.org Tue Jun 2 15:07:37 2020 Return-Path: Delivered-To: svn-src-head@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 6E93B2F1BD8; Tue, 2 Jun 2020 15:07:37 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bwPz4ZV6z44Qj; Tue, 2 Jun 2020 15:07:35 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4EB921B78D; Tue, 2 Jun 2020 15:07:34 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f182.google.com with SMTP id f18so12865842qkh.1; Tue, 02 Jun 2020 08:07:34 -0700 (PDT) X-Gm-Message-State: AOAM533S4iAslzyl/sYvjqBV7P4HIlmlLYxIfAI2rYyEta8eJbnf94Nj As5DV5gRxYnHjzckfbPVD1p2yV4L9l/TFfTjwqk= X-Google-Smtp-Source: ABdhPJwftzdS/gD9MkorQpV+ZcmmebGJPOGEfZMV5t1upfF9amsTVlu/WLDQ9K5JD/33CRqie33KUka3VBZnZYOqN9Q= X-Received: by 2002:a37:4dcc:: with SMTP id a195mr25921891qkb.430.1591110453553; Tue, 02 Jun 2020 08:07:33 -0700 (PDT) MIME-Version: 1.0 References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> <20200601081810.79c9fb1d@hermann.fritz.box> <6b8d4731-15e0-4c0b-af5f-bbecdbead7e3@FreeBSD.org> In-Reply-To: <6b8d4731-15e0-4c0b-af5f-bbecdbead7e3@FreeBSD.org> From: Kyle Evans Date: Tue, 2 Jun 2020 10:07:20 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361633 - in head/sys: net netipsec To: John Baldwin Cc: "Hartmann, O." , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:07:37 -0000 On Tue, Jun 2, 2020 at 10:05 AM John Baldwin wrote: > > On 6/1/20 8:02 AM, Kyle Evans wrote: > > On Mon, Jun 1, 2020 at 1:18 AM Hartmann, O. wrote: > >> > >> On Sun, 31 May 2020 11:43:18 +0200 > >> "Hartmann, O." wrote: > >> > >>> On Fri, 29 May 2020 19:22:40 +0000 (UTC) > >>> John Baldwin wrote: > >>> > >>>> Author: jhb > >>>> Date: Fri May 29 19:22:40 2020 > >>>> New Revision: 361633 > >>>> URL: https://svnweb.freebsd.org/changeset/base/361633 > >>>> > >>>> Log: > >>>> Consistently include opt_ipsec.h for consumers of > >>>> . > >>>> This fixes ipsec.ko to include all of IPSEC_DEBUG. > >>>> > >>> [... snip ...] > >>> > >>> [...] > >>> --- all_subdir_ipsec --- > >>> --- ipsec_mod.o --- > >>> /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration > >>> of function 'ipsec_support_enable' is invalid in C99 > >>> [-Werror,-Wimplicit-function-declaration] > >>> ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ > >>> /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration > >>> of function 'ipsec_support_disable' is invalid in C99 > >>> [-Werror,-Wimplicit-function-declaration] > >>> ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- > >>> Building > >>> /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/ipw_bss/ipw_bss.ko > >>> --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: > >>> note: did you mean 'ipsec_support_enable'? > >>> /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' > >>> declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); > >>> ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 > >>> > >>> make[4]: stopped in /usr/src/sys/modules/ipsec > >> > >> FYI: IPSEC is statically built into the kernel via "options IPSEC" > > > > This is the same failure as we're seeing on LINT kernels, which also > > have both. I've got a tentative diff at [0] that teaches the modules > > to cope with the possibility, but I haven't thought too much on how > > useful the result is. IIRC we're building the modules into the kernel > > anyways in this scenario, so the result probably just won't load > > because it's already loaded. > > > > [0] https://people.freebsd.org/~kevans.ipsec.diff > > I think we should just not build ipsec.ko and tcp_md5.ko if the kernel already > includes the support instead. I started testing this yesterday but got side > tracked. I will try to get this fixed today. > Hi, Sorry, I forgot to follow up- I went ahead and tested+committed that as r361712 to end the Jenkins spam. Thanks, Kyle Evans From owner-svn-src-head@freebsd.org Tue Jun 2 15:08:41 2020 Return-Path: Delivered-To: svn-src-head@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 2E77B2F1E56; Tue, 2 Jun 2020 15:08:41 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bwRF0Shjz44cc; Tue, 2 Jun 2020 15:08:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 0B29F1BB06; Tue, 2 Jun 2020 15:08:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id b27so12812870qka.4; Tue, 02 Jun 2020 08:08:41 -0700 (PDT) X-Gm-Message-State: AOAM530uqdyt1yMjQ9MHrDMpnePE+rtQEluevaHWDhIzCi8SG2LNaUdy 5EiZpZ1jW9ARd8am3On4JlhzJKF0fHwFVPwgsJo= X-Google-Smtp-Source: ABdhPJwWEJ4VbaqVPcX15hnJ2+ZEW5CWH5Wu/xm/CuMwXf/JkPyZotQ+dd+8zJpZsBX0qcbBFGsMeaRJF79Gv1n8i+w= X-Received: by 2002:a37:a3ce:: with SMTP id m197mr25457881qke.493.1591110520590; Tue, 02 Jun 2020 08:08:40 -0700 (PDT) MIME-Version: 1.0 References: <202006020032.0520Wbke002516@repo.freebsd.org> <1b2dbc65-197d-a62b-3ba7-2cf78819277c@FreeBSD.org> In-Reply-To: <1b2dbc65-197d-a62b-3ba7-2cf78819277c@FreeBSD.org> From: Kyle Evans Date: Tue, 2 Jun 2020 10:08:27 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361712 - in head/sys/modules: . tcp To: John Baldwin Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:08:41 -0000 On Tue, Jun 2, 2020 at 10:07 AM John Baldwin wrote: > > On 6/1/20 5:32 PM, Kyle Evans wrote:> > Author: kevans > > Date: Tue Jun 2 00:32:36 2020 > > New Revision: 361712 > > URL: https://svnweb.freebsd.org/changeset/base/361712 > > > > Log: > > modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC > > > > IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, > > not both. Refrain from building if IPSEC is set, as the resulting module > > won't be able to load anyways if it's built into the kernel. > > > > KERN_OPTS is safe here; for tied modules, it will reflect the kernel > > configuration. For untied modules, it will defer to whatever is set in > > ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter > > situation has some risk to it for uncommon scenarios, but such is the life > > of untied kernel modules. > > > > Reported by: jenkins (a lot), O. Hartmann (once) > > Generally discussed with: imp, jhb > > > > Modified: > > head/sys/modules/Makefile > > head/sys/modules/tcp/Makefile > > > > Modified: head/sys/modules/Makefile > > ============================================================================== > > --- head/sys/modules/Makefile Tue Jun 2 00:03:26 2020 (r361711) > > +++ head/sys/modules/Makefile Tue Jun 2 00:32:36 2020 (r361712) > > @@ -427,7 +427,7 @@ _if_enc= if_enc > > _if_gif= if_gif > > _if_gre= if_gre > > _ipfw_pmod= ipfw_pmod > > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > > _ipsec= ipsec > > .endif > > .endif > > > > Modified: head/sys/modules/tcp/Makefile > > ============================================================================== > > --- head/sys/modules/tcp/Makefile Tue Jun 2 00:03:26 2020 (r361711) > > +++ head/sys/modules/tcp/Makefile Tue Jun 2 00:32:36 2020 (r361712) > > @@ -16,7 +16,7 @@ _tcp_rack= rack > > > > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > > defined(ALL_MODULES) > > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > > Thanks. > > Was finally getting back to this this morning. This one should be TCP_SIGNATURE, > not IPSEC. (This would break for a kernel which doesn't have IPSEC but does > have TCP_SIGNATURE.) > Whoops. =-( From owner-svn-src-head@freebsd.org Tue Jun 2 15:14:10 2020 Return-Path: Delivered-To: svn-src-head@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 C583D2F2126; Tue, 2 Jun 2020 15:14:10 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bwYZ4pxdz45XQ; Tue, 2 Jun 2020 15:14:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8203:2990:b194:c7cf:2443:aa95]) (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 362961BA92; Tue, 2 Jun 2020 15:14:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r361712 - in head/sys/modules: . tcp To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-head References: <202006020032.0520Wbke002516@repo.freebsd.org> <1b2dbc65-197d-a62b-3ba7-2cf78819277c@FreeBSD.org> From: John Baldwin 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: Date: Tue, 2 Jun 2020 08:14:09 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:14:10 -0000 On 6/2/20 8:08 AM, Kyle Evans wrote: > On Tue, Jun 2, 2020 at 10:07 AM John Baldwin wrote: >> >> On 6/1/20 5:32 PM, Kyle Evans wrote:> > Author: kevans >>> Date: Tue Jun 2 00:32:36 2020 >>> New Revision: 361712 >>> URL: https://svnweb.freebsd.org/changeset/base/361712 >>> >>> Log: >>> modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC >>> >>> IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, >>> not both. Refrain from building if IPSEC is set, as the resulting module >>> won't be able to load anyways if it's built into the kernel. >>> >>> KERN_OPTS is safe here; for tied modules, it will reflect the kernel >>> configuration. For untied modules, it will defer to whatever is set in >>> ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter >>> situation has some risk to it for uncommon scenarios, but such is the life >>> of untied kernel modules. >>> >>> Reported by: jenkins (a lot), O. Hartmann (once) >>> Generally discussed with: imp, jhb >>> >>> Modified: >>> head/sys/modules/Makefile >>> head/sys/modules/tcp/Makefile >>> >>> Modified: head/sys/modules/Makefile >>> ============================================================================== >>> --- head/sys/modules/Makefile Tue Jun 2 00:03:26 2020 (r361711) >>> +++ head/sys/modules/Makefile Tue Jun 2 00:32:36 2020 (r361712) >>> @@ -427,7 +427,7 @@ _if_enc= if_enc >>> _if_gif= if_gif >>> _if_gre= if_gre >>> _ipfw_pmod= ipfw_pmod >>> -.if ${KERN_OPTS:MIPSEC_SUPPORT} >>> +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} >>> _ipsec= ipsec >>> .endif >>> .endif >>> >>> Modified: head/sys/modules/tcp/Makefile >>> ============================================================================== >>> --- head/sys/modules/tcp/Makefile Tue Jun 2 00:03:26 2020 (r361711) >>> +++ head/sys/modules/tcp/Makefile Tue Jun 2 00:32:36 2020 (r361712) >>> @@ -16,7 +16,7 @@ _tcp_rack= rack >>> >>> .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ >>> defined(ALL_MODULES) >>> -.if ${KERN_OPTS:MIPSEC_SUPPORT} >>> +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} >> >> Thanks. >> >> Was finally getting back to this this morning. This one should be TCP_SIGNATURE, >> not IPSEC. (This would break for a kernel which doesn't have IPSEC but does >> have TCP_SIGNATURE.) >> > > Whoops. =-( No worries. I just finished a LINT build with that change. I'll make sure a full tinderbox passes ok though. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Jun 2 16:20:59 2020 Return-Path: Delivered-To: svn-src-head@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 1476D2F37F3; Tue, 2 Jun 2020 16:20:59 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49by2f6tyLz4CSd; Tue, 2 Jun 2020 16:20:58 +0000 (UTC) (envelope-from kib@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 E7C021F3EE; Tue, 2 Jun 2020 16:20:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052GKw7h084647; Tue, 2 Jun 2020 16:20:58 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052GKwEF084646; Tue, 2 Jun 2020 16:20:58 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006021620.052GKwEF084646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 2 Jun 2020 16:20:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361725 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 361725 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 16:20:59 -0000 Author: kib Date: Tue Jun 2 16:20:58 2020 New Revision: 361725 URL: https://svnweb.freebsd.org/changeset/base/361725 Log: Do not allow to load ET_DYN object with DF_1_PIE flag set. Linkers are supposed to mark PIE binaries with DF_1_PIE, such binary cannot be correctly and usefully loaded neither by dlopen(3) nor as a dependency of other object. For instance, we cannot do anything useful with COPY relocations, among other things. Glibc already added similar restriction. Requested and reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D25086 Modified: head/libexec/rtld-elf/rtld.c head/libexec/rtld-elf/rtld.h Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Tue Jun 2 12:23:04 2020 (r361724) +++ head/libexec/rtld-elf/rtld.c Tue Jun 2 16:20:58 2020 (r361725) @@ -1370,6 +1370,8 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_D obj->z_interpose = true; if (dynp->d_un.d_val & DF_1_NODEFLIB) obj->z_nodeflib = true; + if (dynp->d_un.d_val & DF_1_PIE) + obj->z_pie = true; break; default: @@ -2580,6 +2582,10 @@ do_load_object(int fd, const char *name, char *path, s obj->path = path; if (!digest_dynamic(obj, 0)) goto errp; + if (obj->z_pie) { + _rtld_error("Cannot load PIE binary %s as dso", obj->path); + goto errp; + } dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path, obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount); if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN | RTLD_LO_TRACE)) == Modified: head/libexec/rtld-elf/rtld.h ============================================================================== --- head/libexec/rtld-elf/rtld.h Tue Jun 2 12:23:04 2020 (r361724) +++ head/libexec/rtld-elf/rtld.h Tue Jun 2 16:20:58 2020 (r361725) @@ -257,6 +257,7 @@ typedef struct Struct_Obj_Entry { bool z_interpose : 1; /* Interpose all objects but main */ bool z_nodeflib : 1; /* Don't search default library path */ bool z_global : 1; /* Make the object global */ + bool z_pie : 1; /* Object proclaimed itself PIE executable */ bool static_tls : 1; /* Needs static TLS allocation */ bool static_tls_copied : 1; /* Needs static TLS copying */ bool ref_nodel : 1; /* Refcount increased to prevent dlclose */ From owner-svn-src-head@freebsd.org Tue Jun 2 16:40:58 2020 Return-Path: Delivered-To: svn-src-head@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 AE4332F3DE1; Tue, 2 Jun 2020 16:40:58 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49byTk4Bmnz4FRR; Tue, 2 Jun 2020 16:40:58 +0000 (UTC) (envelope-from adrian@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 8B62E1FD27; Tue, 2 Jun 2020 16:40:58 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052GewDm097392; Tue, 2 Jun 2020 16:40:58 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052GewZa097391; Tue, 2 Jun 2020 16:40:58 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006021640.052GewZa097391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 2 Jun 2020 16:40:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361726 - head/sys/dev/usb/wlan X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/usb/wlan X-SVN-Commit-Revision: 361726 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 16:40:58 -0000 Author: adrian Date: Tue Jun 2 16:40:58 2020 New Revision: 361726 URL: https://svnweb.freebsd.org/changeset/base/361726 Log: [run] Add 11NA flags for 5G NICs that support HT. Now that I'm a proud owner of an ASUS USB-N66, I can test 2G/5G and 3-stream configurations. For now, just flip on 5G HT rates. I've tested this in both 5G HT20 and 5G 11a modes. It's still one stream for now until we verify that the number of streams reported (ie the MIMO below) is actually the number of 11n streams, NOT the number of antennas. (They don't have to match! You can have more antennas than MIMO streams!) Tested: * run0: MAC/BBP RT3593 (rev 0x0402), RF RT3053 (MIMO 3T3R) Modified: head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Tue Jun 2 16:20:58 2020 (r361725) +++ head/sys/dev/usb/wlan/if_run.c Tue Jun 2 16:40:58 2020 (r361726) @@ -4943,6 +4943,8 @@ run_getradiocaps(struct ieee80211com *ic, sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 || sc->rf_rev == RT5592_RF_5592) { setbit(bands, IEEE80211_MODE_11A); + if (sc->rf_rev != RT3070_RF_2020) + setbit(bands, IEEE80211_MODE_11NA); /* Note: for now, only support HT20 channels */ ieee80211_add_channel_list_5ghz(chans, maxchans, nchans, run_chan_5ghz, nitems(run_chan_5ghz), bands, 0); From owner-svn-src-head@freebsd.org Tue Jun 2 17:18:17 2020 Return-Path: Delivered-To: svn-src-head@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 790902F4B28; Tue, 2 Jun 2020 17:18:17 +0000 (UTC) (envelope-from dougm@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bzJn2fFFz4K3t; Tue, 2 Jun 2020 17:18:17 +0000 (UTC) (envelope-from dougm@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 56241203A2; Tue, 2 Jun 2020 17:18:17 +0000 (UTC) (envelope-from dougm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052HIH9u021843; Tue, 2 Jun 2020 17:18:17 GMT (envelope-from dougm@FreeBSD.org) Received: (from dougm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052HIHRs021842; Tue, 2 Jun 2020 17:18:17 GMT (envelope-from dougm@FreeBSD.org) Message-Id: <202006021718.052HIHRs021842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dougm set sender to dougm@FreeBSD.org using -f From: Doug Moore Date: Tue, 2 Jun 2020 17:18:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361727 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: dougm X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 361727 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 17:18:17 -0000 Author: dougm Date: Tue Jun 2 17:18:16 2020 New Revision: 361727 URL: https://svnweb.freebsd.org/changeset/base/361727 Log: Remove from RB_REMOVE_COLOR some null checks where the pointer checked is provably never null. Restructure the surrounding code just enough to make the non-nullness obvious. Reviewed by: markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D25089 Modified: head/sys/sys/tree.h Modified: head/sys/sys/tree.h ============================================================================== --- head/sys/sys/tree.h Tue Jun 2 16:40:58 2020 (r361726) +++ head/sys/sys/tree.h Tue Jun 2 17:18:16 2020 (r361727) @@ -493,26 +493,23 @@ name##_RB_REMOVE_COLOR(struct name *head, struct type RB_ROTATE_LEFT(head, parent, tmp, field);\ tmp = RB_RIGHT(parent, field); \ } \ - if (!RB_ISRED(RB_LEFT(tmp, field), field) && \ - !RB_ISRED(RB_RIGHT(tmp, field), field)) { \ + if (RB_ISRED(RB_LEFT(tmp, field), field)) { \ + struct type *oleft; \ + oleft = RB_LEFT(tmp, field); \ + RB_COLOR(oleft, field) = RB_BLACK; \ RB_COLOR(tmp, field) = RB_RED; \ + RB_ROTATE_RIGHT(head, tmp, oleft, field); \ + tmp = RB_RIGHT(parent, field); \ + } else if (!RB_ISRED(RB_RIGHT(tmp, field), field)) { \ + RB_COLOR(tmp, field) = RB_RED; \ elm = parent; \ parent = RB_PARENT(elm, field); \ continue; \ } \ - if (!RB_ISRED(RB_RIGHT(tmp, field), field)) { \ - struct type *oleft; \ - if ((oleft = RB_LEFT(tmp, field)) \ - != NULL) \ - RB_COLOR(oleft, field) = RB_BLACK; \ - RB_COLOR(tmp, field) = RB_RED; \ - RB_ROTATE_RIGHT(head, tmp, oleft, field); \ - tmp = RB_RIGHT(parent, field); \ - } \ + if (RB_ISRED(RB_RIGHT(tmp, field), field)) \ + RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK; \ RB_COLOR(tmp, field) = RB_COLOR(parent, field); \ RB_COLOR(parent, field) = RB_BLACK; \ - if (RB_RIGHT(tmp, field)) \ - RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK; \ RB_ROTATE_LEFT(head, parent, tmp, field); \ elm = RB_ROOT(head); \ break; \ @@ -523,26 +520,23 @@ name##_RB_REMOVE_COLOR(struct name *head, struct type RB_ROTATE_RIGHT(head, parent, tmp, field);\ tmp = RB_LEFT(parent, field); \ } \ - if (!RB_ISRED(RB_LEFT(tmp, field), field) && \ - !RB_ISRED(RB_RIGHT(tmp, field), field)) { \ + if (RB_ISRED(RB_RIGHT(tmp, field), field)) { \ + struct type *oright; \ + oright = RB_RIGHT(tmp, field); \ + RB_COLOR(oright, field) = RB_BLACK; \ RB_COLOR(tmp, field) = RB_RED; \ + RB_ROTATE_LEFT(head, tmp, oright, field); \ + tmp = RB_LEFT(parent, field); \ + } else if (!RB_ISRED(RB_LEFT(tmp, field), field)) { \ + RB_COLOR(tmp, field) = RB_RED; \ elm = parent; \ parent = RB_PARENT(elm, field); \ continue; \ } \ - if (!RB_ISRED(RB_LEFT(tmp, field), field)) { \ - struct type *oright; \ - if ((oright = RB_RIGHT(tmp, field)) \ - != NULL) \ - RB_COLOR(oright, field) = RB_BLACK; \ - RB_COLOR(tmp, field) = RB_RED; \ - RB_ROTATE_LEFT(head, tmp, oright, field); \ - tmp = RB_LEFT(parent, field); \ - } \ + if (RB_ISRED(RB_LEFT(tmp, field), field)) \ + RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK; \ RB_COLOR(tmp, field) = RB_COLOR(parent, field); \ RB_COLOR(parent, field) = RB_BLACK; \ - if (RB_LEFT(tmp, field)) \ - RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK; \ RB_ROTATE_RIGHT(head, parent, tmp, field); \ elm = RB_ROOT(head); \ break; \ From owner-svn-src-head@freebsd.org Tue Jun 2 17:33:10 2020 Return-Path: Delivered-To: svn-src-head@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 B22ED2F5353; Tue, 2 Jun 2020 17:33:10 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bzdy4HCdz4MCc; Tue, 2 Jun 2020 17:33:10 +0000 (UTC) (envelope-from kib@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 8DB2B20847; Tue, 2 Jun 2020 17:33:10 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052HXAYd033564; Tue, 2 Jun 2020 17:33:10 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052HXAUI033563; Tue, 2 Jun 2020 17:33:10 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006021733.052HXAUI033563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 2 Jun 2020 17:33:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361728 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 361728 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 17:33:10 -0000 Author: kib Date: Tue Jun 2 17:33:10 2020 New Revision: 361728 URL: https://svnweb.freebsd.org/changeset/base/361728 Log: Uppercase 'dso' to indicate that it is abbreviation. Suggested by: arichardson Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Tue Jun 2 17:18:16 2020 (r361727) +++ head/libexec/rtld-elf/rtld.c Tue Jun 2 17:33:10 2020 (r361728) @@ -2583,7 +2583,7 @@ do_load_object(int fd, const char *name, char *path, s if (!digest_dynamic(obj, 0)) goto errp; if (obj->z_pie) { - _rtld_error("Cannot load PIE binary %s as dso", obj->path); + _rtld_error("Cannot load PIE binary %s as DSO", obj->path); goto errp; } dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path, From owner-svn-src-head@freebsd.org Tue Jun 2 22:36:17 2020 Return-Path: Delivered-To: svn-src-head@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 935602FCB51; Tue, 2 Jun 2020 22:36:17 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49c6Mj3R5Wz40h1; Tue, 2 Jun 2020 22:36:17 +0000 (UTC) (envelope-from adrian@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 710C12410C; Tue, 2 Jun 2020 22:36:17 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052MaH8m024511; Tue, 2 Jun 2020 22:36:17 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052MaHU8024510; Tue, 2 Jun 2020 22:36:17 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006022236.052MaHU8024510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 2 Jun 2020 22:36:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361737 - head/sys/dev/usb/wlan X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/usb/wlan X-SVN-Commit-Revision: 361737 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 22:36:17 -0000 Author: adrian Date: Tue Jun 2 22:36:17 2020 New Revision: 361737 URL: https://svnweb.freebsd.org/changeset/base/361737 Log: [run] Set the number of HT chains. * Set the tx/rx chains based on the existing MIMO eeprom reads * Add 3-chain rates Tested: * MAC/BBP RT5390 (rev 0x0502), RF RT5370 (MIMO 1T1R), 2g/5g STA * MAC/BBP RT3593 (rev 0x0402), RF RT3053 (MIMO 3T3R), 2g/5g STA Modified: head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Tue Jun 2 20:42:45 2020 (r361736) +++ head/sys/dev/usb/wlan/if_run.c Tue Jun 2 22:36:17 2020 (r361737) @@ -537,6 +537,7 @@ static const struct rt2860_rate { { 0x85, 5, IEEE80211_T_HT, 4, 60, 60 }, { 0x86, 6, IEEE80211_T_HT, 4, 60, 60 }, { 0x87, 7, IEEE80211_T_HT, 4, 60, 60 }, + /* MCS - 2 streams */ { 0x88, 8, IEEE80211_T_HT, 4, 60, 60 }, { 0x89, 9, IEEE80211_T_HT, 4, 60, 60 }, @@ -546,6 +547,16 @@ static const struct rt2860_rate { { 0x8d, 13, IEEE80211_T_HT, 4, 60, 60 }, { 0x8e, 14, IEEE80211_T_HT, 4, 60, 60 }, { 0x8f, 15, IEEE80211_T_HT, 4, 60, 60 }, + + /* MCS - 3 streams */ + { 0x90, 16, IEEE80211_T_HT, 4, 60, 60 }, + { 0x91, 17, IEEE80211_T_HT, 4, 60, 60 }, + { 0x92, 18, IEEE80211_T_HT, 4, 60, 60 }, + { 0x93, 19, IEEE80211_T_HT, 4, 60, 60 }, + { 0x94, 20, IEEE80211_T_HT, 4, 60, 60 }, + { 0x95, 21, IEEE80211_T_HT, 4, 60, 60 }, + { 0x96, 22, IEEE80211_T_HT, 4, 60, 60 }, + { 0x97, 23, IEEE80211_T_HT, 4, 60, 60 }, }; /* These are indexes into the above rt2860_rates[] array */ @@ -553,7 +564,7 @@ static const struct rt2860_rate { #define RT2860_RIDX_CCK11 3 #define RT2860_RIDX_OFDM6 4 #define RT2860_RIDX_MCS0 12 -#define RT2860_RIDX_MAX 28 +#define RT2860_RIDX_MAX 36 static const struct { uint16_t reg; @@ -859,12 +870,8 @@ run_attach(device_t self) IEEE80211_HTCAP_MAXAMSDU_3839 | IEEE80211_HTCAP_SMPS_OFF; - /* - * For now, just do 1 stream. Later on we'll figure out - * how many tx/rx streams a particular NIC supports. - */ - ic->ic_rxstream = 1; - ic->ic_txstream = 1; + ic->ic_rxstream = sc->nrxchains; + ic->ic_txstream = sc->ntxchains; } ic->ic_cryptocaps = From owner-svn-src-head@freebsd.org Tue Jun 2 22:37:54 2020 Return-Path: Delivered-To: svn-src-head@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 210DA2FC9EA; Tue, 2 Jun 2020 22:37:54 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49c6PY6NQhz40sw; Tue, 2 Jun 2020 22:37:53 +0000 (UTC) (envelope-from adrian@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 D5D4C2418C; Tue, 2 Jun 2020 22:37:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052MbrMF024682; Tue, 2 Jun 2020 22:37:53 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052Mbrth024680; Tue, 2 Jun 2020 22:37:53 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006022237.052Mbrth024680@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 2 Jun 2020 22:37:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361738 - head/sys/dev/usb/wlan X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/usb/wlan X-SVN-Commit-Revision: 361738 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 22:37:54 -0000 Author: adrian Date: Tue Jun 2 22:37:53 2020 New Revision: 361738 URL: https://svnweb.freebsd.org/changeset/base/361738 Log: [run] note that PHY_HT is for mixed mode. Submitted by: Ashish Gupta Differential Revision: https://reviews.freebsd.org/D25108 Modified: head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_runreg.h Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Tue Jun 2 22:36:17 2020 (r361737) +++ head/sys/dev/usb/wlan/if_run.c Tue Jun 2 22:37:53 2020 (r361738) @@ -3397,7 +3397,7 @@ run_set_tx_desc(struct run_softc *sc, struct run_tx_da mcs |= RT2860_PHY_OFDM; } else if (rt2860_rates[ridx].phy == IEEE80211_T_HT) { /* XXX TODO: [adrian] set short preamble for MCS? */ - mcs |= RT2860_PHY_HT; /* Mixed, not greenfield */ + mcs |= RT2860_PHY_HT_MIX; /* Mixed, not greenfield */ } txwi->phy = htole16(mcs); Modified: head/sys/dev/usb/wlan/if_runreg.h ============================================================================== --- head/sys/dev/usb/wlan/if_runreg.h Tue Jun 2 22:36:17 2020 (r361737) +++ head/sys/dev/usb/wlan/if_runreg.h Tue Jun 2 22:37:53 2020 (r361738) @@ -781,7 +781,7 @@ struct rt2860_txwi { #define RT2860_PHY_MODE 0xc000 #define RT2860_PHY_CCK (0 << 14) #define RT2860_PHY_OFDM (1 << 14) -#define RT2860_PHY_HT (2 << 14) +#define RT2860_PHY_HT_MIX (2 << 14) #define RT2860_PHY_HT_GF (3 << 14) #define RT2860_PHY_SGI (1 << 8) #define RT2860_PHY_BW40 (1 << 7) From owner-svn-src-head@freebsd.org Tue Jun 2 22:55:52 2020 Return-Path: Delivered-To: svn-src-head@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 3ABDE2FD06B; Tue, 2 Jun 2020 22:55:52 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49c6pJ0jkTz42wL; Tue, 2 Jun 2020 22:55:52 +0000 (UTC) (envelope-from emaste@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 0F3E424526; Tue, 2 Jun 2020 22:55:52 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052MtpXC036629; Tue, 2 Jun 2020 22:55:51 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052MtplW036627; Tue, 2 Jun 2020 22:55:51 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006022255.052MtplW036627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 2 Jun 2020 22:55:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361739 - in head/contrib/llvm-project/llvm: include/llvm/BinaryFormat tools/llvm-readobj X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/contrib/llvm-project/llvm: include/llvm/BinaryFormat tools/llvm-readobj X-SVN-Commit-Revision: 361739 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 22:55:52 -0000 Author: emaste Date: Tue Jun 2 22:55:51 2020 New Revision: 361739 URL: https://svnweb.freebsd.org/changeset/base/361739 Log: llvm: Add DF_1_PIE Discussed with: dim Obtained from: LLVM d9943e7f0ce8 MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/contrib/llvm-project/llvm/include/llvm/BinaryFormat/ELF.h head/contrib/llvm-project/llvm/tools/llvm-readobj/ELFDumper.cpp Modified: head/contrib/llvm-project/llvm/include/llvm/BinaryFormat/ELF.h ============================================================================== --- head/contrib/llvm-project/llvm/include/llvm/BinaryFormat/ELF.h Tue Jun 2 22:37:53 2020 (r361738) +++ head/contrib/llvm-project/llvm/include/llvm/BinaryFormat/ELF.h Tue Jun 2 22:55:51 2020 (r361739) @@ -1290,7 +1290,8 @@ enum { DF_1_NORELOC = 0x00400000, DF_1_SYMINTPOSE = 0x00800000, // Object has individual interposers. DF_1_GLOBAUDIT = 0x01000000, // Global auditing required. - DF_1_SINGLETON = 0x02000000 // Singleton symbols are used. + DF_1_SINGLETON = 0x02000000, // Singleton symbols are used. + DF_1_PIE = 0x08000000, // Object is a position-independent executable. }; // DT_MIPS_FLAGS values. Modified: head/contrib/llvm-project/llvm/tools/llvm-readobj/ELFDumper.cpp ============================================================================== --- head/contrib/llvm-project/llvm/tools/llvm-readobj/ELFDumper.cpp Tue Jun 2 22:37:53 2020 (r361738) +++ head/contrib/llvm-project/llvm/tools/llvm-readobj/ELFDumper.cpp Tue Jun 2 22:55:51 2020 (r361739) @@ -2213,7 +2213,8 @@ static const EnumEntry ElfDynamicDTFlags1[] LLVM_READOBJ_DT_FLAG_ENT(DF_1, NORELOC), LLVM_READOBJ_DT_FLAG_ENT(DF_1, SYMINTPOSE), LLVM_READOBJ_DT_FLAG_ENT(DF_1, GLOBAUDIT), - LLVM_READOBJ_DT_FLAG_ENT(DF_1, SINGLETON) + LLVM_READOBJ_DT_FLAG_ENT(DF_1, SINGLETON), + LLVM_READOBJ_DT_FLAG_ENT(DF_1, PIE), }; static const EnumEntry ElfDynamicDTMipsFlags[] = { From owner-svn-src-head@freebsd.org Tue Jun 2 22:57:14 2020 Return-Path: Delivered-To: svn-src-head@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 07E9D2FD42B; Tue, 2 Jun 2020 22:57:14 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49c6qs6LQbz439r; Tue, 2 Jun 2020 22:57:13 +0000 (UTC) (envelope-from emaste@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 D4EA623ED8; Tue, 2 Jun 2020 22:57:13 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052MvDob036734; Tue, 2 Jun 2020 22:57:13 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052MvDaH036733; Tue, 2 Jun 2020 22:57:13 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006022257.052MvDaH036733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 2 Jun 2020 22:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361740 - head/contrib/llvm-project/lld/ELF X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/llvm-project/lld/ELF X-SVN-Commit-Revision: 361740 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 22:57:14 -0000 Author: emaste Date: Tue Jun 2 22:57:13 2020 New Revision: 361740 URL: https://svnweb.freebsd.org/changeset/base/361740 Log: lld: Set DF_1_PIE for -pie DF_1_PIE originated from Solaris[1]. GNU ld[2] sets the flag on non-Solaris platforms. It can help distinguish PIE from ET_DYN. eu-classify from elfutils uses this to recognize PIE[3]. glibc uses this flag to reject dlopen'ing a PIE[4] [1] https://docs.oracle.com/cd/E36784_01/html/E36857/chapter6-42444.html [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=5fe2850dd96483f176858fd75c098313d5b20bc2 [3] https://sourceware.org/git/?p=elfutils.git;a=commit;h=3f489b5c7c78df6d52f8982f79c36e9a220e8951 [4] https://sourceware.org/bugzilla/show_bug.cgi?id=24323 Discussed with: dim Obtained from: LLVM ee9a251caf1d MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/contrib/llvm-project/lld/ELF/SyntheticSections.cpp Modified: head/contrib/llvm-project/lld/ELF/SyntheticSections.cpp ============================================================================== --- head/contrib/llvm-project/lld/ELF/SyntheticSections.cpp Tue Jun 2 22:55:51 2020 (r361739) +++ head/contrib/llvm-project/lld/ELF/SyntheticSections.cpp Tue Jun 2 22:57:13 2020 (r361740) @@ -1315,6 +1315,8 @@ template void DynamicSection::final dtFlags1 |= DF_1_NODELETE; if (config->zNodlopen) dtFlags1 |= DF_1_NOOPEN; + if (config->pie) + dtFlags1 |= DF_1_PIE; if (config->zNow) { dtFlags |= DF_BIND_NOW; dtFlags1 |= DF_1_NOW; From owner-svn-src-head@freebsd.org Wed Jun 3 00:16:37 2020 Return-Path: Delivered-To: svn-src-head@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 875DD2FEA58; Wed, 3 Jun 2020 00:16:37 +0000 (UTC) (envelope-from jah@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49c8bT34Hfz4BB8; Wed, 3 Jun 2020 00:16:37 +0000 (UTC) (envelope-from jah@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 64C7925130; Wed, 3 Jun 2020 00:16:37 +0000 (UTC) (envelope-from jah@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0530GbCU085703; Wed, 3 Jun 2020 00:16:37 GMT (envelope-from jah@FreeBSD.org) Received: (from jah@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0530GbcT085701; Wed, 3 Jun 2020 00:16:37 GMT (envelope-from jah@FreeBSD.org) Message-Id: <202006030016.0530GbcT085701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jah set sender to jah@FreeBSD.org using -f From: "Jason A. Harmening" Date: Wed, 3 Jun 2020 00:16:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361741 - head/sys/x86/x86 X-SVN-Group: head X-SVN-Commit-Author: jah X-SVN-Commit-Paths: head/sys/x86/x86 X-SVN-Commit-Revision: 361741 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 00:16:37 -0000 Author: jah Date: Wed Jun 3 00:16:36 2020 New Revision: 361741 URL: https://svnweb.freebsd.org/changeset/base/361741 Log: Remove unnecessary WITNESS check in x86 bus_dma When I did some bus_dma cleanup in r320528, I brought forward some sketchy WITNESS checks from the prior x86 busdma wrappers, instead of recognizing them as technical debt and just dropping them. Two of these were removed in r346351 and r346851, but one remains in bounce_bus_dmamem_alloc(). This check could be constrained to only apply in the BUS_DMA_NOWAIT case, but it's cleaner to simply remove it and rely on the checks already present in the sleepable allocation paths used by this function. While here, remove another unnecessary witness check in bus_dma_tag_create (the tag is always allocated with M_NOWAIT), and fix a couple of typos. Reported by: cem Reviewed by: kib, cem MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D25107 Modified: head/sys/x86/x86/busdma_bounce.c head/sys/x86/x86/busdma_machdep.c Modified: head/sys/x86/x86/busdma_bounce.c ============================================================================== --- head/sys/x86/x86/busdma_bounce.c Tue Jun 2 22:57:13 2020 (r361740) +++ head/sys/x86/x86/busdma_bounce.c Wed Jun 3 00:16:36 2020 (r361741) @@ -407,8 +407,6 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vad vm_memattr_t attr; int mflags; - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s", __func__); - if (flags & BUS_DMA_NOWAIT) mflags = M_NOWAIT; else @@ -492,7 +490,7 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vad } /* - * Free a piece of memory and it's allociated dmamap, that was allocated + * Free a piece of memory and its associated dmamap, that was allocated * via bus_dmamem_alloc. Make the same choice for free/contigfree. */ static void Modified: head/sys/x86/x86/busdma_machdep.c ============================================================================== --- head/sys/x86/x86/busdma_machdep.c Tue Jun 2 22:57:13 2020 (r361740) +++ head/sys/x86/x86/busdma_machdep.c Wed Jun 3 00:16:36 2020 (r361741) @@ -223,8 +223,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t al struct bus_dma_tag_common *tc; int error; - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s", __func__); - if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, From owner-svn-src-head@freebsd.org Wed Jun 3 05:09:34 2020 Return-Path: Delivered-To: svn-src-head@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 15D2D32C9D1; Wed, 3 Jun 2020 05:09:34 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cH5T6s3tz4j5x; Wed, 3 Jun 2020 05:09:33 +0000 (UTC) (envelope-from vmaffione@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 E213E8A41; Wed, 3 Jun 2020 05:09:33 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05359XFj064631; Wed, 3 Jun 2020 05:09:33 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05359XHK064630; Wed, 3 Jun 2020 05:09:33 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006030509.05359XHK064630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 05:09:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361744 - head/sys/dev/virtio/network X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/virtio/network X-SVN-Commit-Revision: 361744 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 05:09:34 -0000 Author: vmaffione Date: Wed Jun 3 05:09:33 2020 New Revision: 361744 URL: https://svnweb.freebsd.org/changeset/base/361744 Log: netmap: vtnet: honor NM_IRQ_RESCHED The netmap_rx_irq() function may return NM_IRQ_RESCHED to inform the driver that more work is pending, and that netmap expects netmap_rx_irq() to be called again as soon as possible. This change implements this behaviour in the vtnet driver. MFC after: 1 week Modified: head/sys/dev/virtio/network/if_vtnet.c Modified: head/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- head/sys/dev/virtio/network/if_vtnet.c Wed Jun 3 05:00:40 2020 (r361743) +++ head/sys/dev/virtio/network/if_vtnet.c Wed Jun 3 05:09:33 2020 (r361744) @@ -1916,6 +1916,9 @@ vtnet_rx_vq_intr(void *xrxq) struct vtnet_rxq *rxq; struct ifnet *ifp; int tries, more; +#ifdef DEV_NETMAP + int nmirq; +#endif /* DEV_NETMAP */ rxq = xrxq; sc = rxq->vtnrx_sc; @@ -1934,8 +1937,13 @@ vtnet_rx_vq_intr(void *xrxq) } #ifdef DEV_NETMAP - if (netmap_rx_irq(ifp, rxq->vtnrx_id, &more) != NM_IRQ_PASS) + nmirq = netmap_rx_irq(ifp, rxq->vtnrx_id, &more); + if (nmirq != NM_IRQ_PASS) { + if (nmirq == NM_IRQ_RESCHED) { + taskqueue_enqueue(rxq->vtnrx_tq, &rxq->vtnrx_intrtask); + } return; + } #endif /* DEV_NETMAP */ VTNET_RXQ_LOCK(rxq); @@ -1971,10 +1979,23 @@ vtnet_rxq_tq_intr(void *xrxq, int pending) struct vtnet_rxq *rxq; struct ifnet *ifp; int more; +#ifdef DEV_NETMAP + int nmirq; +#endif /* DEV_NETMAP */ rxq = xrxq; sc = rxq->vtnrx_sc; ifp = sc->vtnet_ifp; + +#ifdef DEV_NETMAP + nmirq = netmap_rx_irq(ifp, rxq->vtnrx_id, &more); + if (nmirq != NM_IRQ_PASS) { + if (nmirq == NM_IRQ_RESCHED) { + taskqueue_enqueue(rxq->vtnrx_tq, &rxq->vtnrx_intrtask); + } + return; + } +#endif /* DEV_NETMAP */ VTNET_RXQ_LOCK(rxq); From owner-svn-src-head@freebsd.org Wed Jun 3 05:27:30 2020 Return-Path: Delivered-To: svn-src-head@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 76BF732D30A; Wed, 3 Jun 2020 05:27:30 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cHVB2TWDz4l31; Wed, 3 Jun 2020 05:27:30 +0000 (UTC) (envelope-from vmaffione@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 37EF3867C; Wed, 3 Jun 2020 05:27:30 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0535RU6k076626; Wed, 3 Jun 2020 05:27:30 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0535RUrc076625; Wed, 3 Jun 2020 05:27:30 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006030527.0535RUrc076625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 05:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361745 - head/sys/dev/virtio/network X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/virtio/network X-SVN-Commit-Revision: 361745 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 05:27:30 -0000 Author: vmaffione Date: Wed Jun 3 05:27:29 2020 New Revision: 361745 URL: https://svnweb.freebsd.org/changeset/base/361745 Log: netmap: vtnet: call netmap_rx_irq() under VQ lock The netmap_rx_irq() function normally wakes up user-space threads waiting for more packets. In this case, it is not necessary to call it under the driver queue lock. However, if the interface is attached to a VALE switch, netmap_rx_irq() ends up calling rxsync on the interface (see netmap_bwrap_intr_notify()). Although concurrent rxsyncs are serialized through the kring lock (see nm_kr_tryget()), the lock acquire operation is not blocking. As a result, it may happen that netmap_rx_irq() is called on an RX ring while another instance is running, causing the second call to fail, and received packets stall in the receive VQ. We fix this issue by calling netmap_irx_irq() under the VQ lock. MFC after: 1 week Modified: head/sys/dev/virtio/network/if_vtnet.c Modified: head/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- head/sys/dev/virtio/network/if_vtnet.c Wed Jun 3 05:09:33 2020 (r361744) +++ head/sys/dev/virtio/network/if_vtnet.c Wed Jun 3 05:27:29 2020 (r361745) @@ -1936,9 +1936,20 @@ vtnet_rx_vq_intr(void *xrxq) return; } + VTNET_RXQ_LOCK(rxq); + #ifdef DEV_NETMAP + /* + * We call netmap_rx_irq() under lock to prevent concurrent calls. + * This is not necessary to serialize the access to the RX vq, but + * rather to avoid races that may happen if this interface is + * attached to a VALE switch, which would cause received packets + * to stall in the RX queue (nm_kr_tryget() could find the kring + * busy when called from netmap_bwrap_intr_notify()). + */ nmirq = netmap_rx_irq(ifp, rxq->vtnrx_id, &more); if (nmirq != NM_IRQ_PASS) { + VTNET_RXQ_UNLOCK(rxq); if (nmirq == NM_IRQ_RESCHED) { taskqueue_enqueue(rxq->vtnrx_tq, &rxq->vtnrx_intrtask); } @@ -1946,8 +1957,6 @@ vtnet_rx_vq_intr(void *xrxq) } #endif /* DEV_NETMAP */ - VTNET_RXQ_LOCK(rxq); - again: if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { VTNET_RXQ_UNLOCK(rxq); @@ -1987,17 +1996,18 @@ vtnet_rxq_tq_intr(void *xrxq, int pending) sc = rxq->vtnrx_sc; ifp = sc->vtnet_ifp; + VTNET_RXQ_LOCK(rxq); + #ifdef DEV_NETMAP nmirq = netmap_rx_irq(ifp, rxq->vtnrx_id, &more); if (nmirq != NM_IRQ_PASS) { + VTNET_RXQ_UNLOCK(rxq); if (nmirq == NM_IRQ_RESCHED) { taskqueue_enqueue(rxq->vtnrx_tq, &rxq->vtnrx_intrtask); } return; } #endif /* DEV_NETMAP */ - - VTNET_RXQ_LOCK(rxq); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { VTNET_RXQ_UNLOCK(rxq); From owner-svn-src-head@freebsd.org Wed Jun 3 05:48:42 2020 Return-Path: Delivered-To: svn-src-head@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 EEE4032DD47; Wed, 3 Jun 2020 05:48:42 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cHyf65x3z4n7x; Wed, 3 Jun 2020 05:48:42 +0000 (UTC) (envelope-from vmaffione@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 CCB6090CA; Wed, 3 Jun 2020 05:48:42 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0535mgsN089329; Wed, 3 Jun 2020 05:48:42 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0535mgXa089328; Wed, 3 Jun 2020 05:48:42 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006030548.0535mgXa089328@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 05:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361746 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361746 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 05:48:43 -0000 Author: vmaffione Date: Wed Jun 3 05:48:42 2020 New Revision: 361746 URL: https://svnweb.freebsd.org/changeset/base/361746 Log: netmap: vtnet: remove leftover memory barriers MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 05:27:29 2020 (r361745) +++ head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 05:48:42 2020 (r361746) @@ -129,7 +129,6 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int fl /* * First part: process new packets to send. */ - rmb(); nm_i = kring->nr_hwcur; if (nm_i != head) { /* we have new packets to send */ @@ -302,7 +301,6 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl struct vtnet_rxq *rxq = &sc->vtnet_rxqs[ring_nr]; struct virtqueue *vq = rxq->vtnrx_vq; - rmb(); /* * First part: import newly received packets. * Only accept our own buffers (matching the token). We should only get From owner-svn-src-head@freebsd.org Wed Jun 3 05:49:20 2020 Return-Path: Delivered-To: svn-src-head@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 96F3E32DDBD; Wed, 3 Jun 2020 05:49:20 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cHzN3Qszz4nDj; Wed, 3 Jun 2020 05:49:20 +0000 (UTC) (envelope-from vmaffione@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 70E40912D; Wed, 3 Jun 2020 05:49:20 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0535nKPf089409; Wed, 3 Jun 2020 05:49:20 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0535nK2T089408; Wed, 3 Jun 2020 05:49:20 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006030549.0535nK2T089408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 05:49:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361747 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361747 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 05:49:20 -0000 Author: vmaffione Date: Wed Jun 3 05:49:19 2020 New Revision: 361747 URL: https://svnweb.freebsd.org/changeset/base/361747 Log: netmap: vale: fix disabled logs MFC after: 1 week Modified: head/sys/dev/netmap/netmap_vale.c Modified: head/sys/dev/netmap/netmap_vale.c ============================================================================== --- head/sys/dev/netmap/netmap_vale.c Wed Jun 3 05:48:42 2020 (r361746) +++ head/sys/dev/netmap/netmap_vale.c Wed Jun 3 05:49:19 2020 (r361747) @@ -1034,7 +1034,7 @@ nm_vale_flush(struct nm_bdg_fwd *ft, u_int n, struct n } nm_prdis(5, "pass 2 dst %d is %x %s", - i, d_i, is_vp ? "virtual" : "nic/host"); + i, d_i, nm_is_bwrap(&dst_na->up) ? "nic/host" : "virtual"); dst_nr = d_i & (NM_BDG_MAXRINGS-1); nrings = dst_na->up.num_rx_rings; if (dst_nr >= nrings) @@ -1114,7 +1114,7 @@ retry: nm_prdis("send [%d] %d(%d) bytes at %s:%d", i, (int)copy_len, (int)dst_len, - NM_IFPNAME(dst_ifp), j); + dst_na->up.name, j); /* round to a multiple of 64 */ copy_len = (copy_len + 63) & ~63; From owner-svn-src-head@freebsd.org Wed Jun 3 09:38:52 2020 Return-Path: Delivered-To: svn-src-head@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 E3752331F3B; Wed, 3 Jun 2020 09:38:52 +0000 (UTC) (envelope-from freqlabs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cP4D5jmJz3gRP; Wed, 3 Jun 2020 09:38:52 +0000 (UTC) (envelope-from freqlabs@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 BF884B97B; Wed, 3 Jun 2020 09:38:52 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0539cqjq030622; Wed, 3 Jun 2020 09:38:52 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0539cqFL030619; Wed, 3 Jun 2020 09:38:52 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202006030938.0539cqFL030619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 3 Jun 2020 09:38:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361748 - in head/sys: fs/tmpfs sys X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: in head/sys: fs/tmpfs sys X-SVN-Commit-Revision: 361748 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 09:38:53 -0000 Author: freqlabs Date: Wed Jun 3 09:38:51 2020 New Revision: 361748 URL: https://svnweb.freebsd.org/changeset/base/361748 Log: tmpfs: Preserve alignment of struct fid fields On 64-bit platforms, the two short fields in `struct tmpfs_fid` are padded to the 64-bit alignment of the long field. This pushes the offsets of the subsequent fields by 4 bytes and makes `struct tmpfs_fid` bigger than `struct fid`. `tmpfs_vptofh()` casts a `struct fid *` to `struct tmpfs_fid *`, causing 4 bytes of adjacent memory to be overwritten when the struct fields are set. Through several layers of indirection and embedded structs, the adjacent memory for one particular call to `tmpfs_vptofh()` happens to be the stack canary for `nfsrvd_compound()`. Half of the canary ends up being clobbered, going unnoticed until eventually the stack check fails when `nfsrvd_compound()` returns and a panic is triggered. Instead of duplicating fields of `struct fid` in `struct tmpfs_fid`, narrow the struct to cover only the unique fields for tmpfs and assert at compile time that the struct fits in the allotted space. This way we don't have to replicate the offsets of `struct fid` fields, we just use them directly. Reviewed by: kib, mav, rmacklem Approved by: mav (mentor) MFC after: 1 week Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D25077 Modified: head/sys/fs/tmpfs/tmpfs.h head/sys/fs/tmpfs/tmpfs_vfsops.c head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/sys/mount.h Modified: head/sys/fs/tmpfs/tmpfs.h ============================================================================== --- head/sys/fs/tmpfs/tmpfs.h Wed Jun 3 05:49:19 2020 (r361747) +++ head/sys/fs/tmpfs/tmpfs.h Wed Jun 3 09:38:51 2020 (r361748) @@ -37,6 +37,7 @@ #ifndef _FS_TMPFS_TMPFS_H_ #define _FS_TMPFS_TMPFS_H_ +#include #include #include @@ -393,12 +394,12 @@ struct tmpfs_mount { * This structure maps a file identifier to a tmpfs node. Used by the * NFS code. */ -struct tmpfs_fid { - uint16_t tf_len; - uint16_t tf_pad; - ino_t tf_id; - unsigned long tf_gen; +struct tmpfs_fid_data { + ino_t tfd_id; + unsigned long tfd_gen; }; +_Static_assert(sizeof(struct tmpfs_fid_data) <= MAXFIDSZ, + "(struct tmpfs_fid_data) is larger than (struct fid).fid_data"); struct tmpfs_dir_cursor { struct tmpfs_dirent *tdc_current; Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vfsops.c Wed Jun 3 05:49:19 2020 (r361747) +++ head/sys/fs/tmpfs/tmpfs_vfsops.c Wed Jun 3 09:38:51 2020 (r361748) @@ -566,24 +566,29 @@ static int tmpfs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) { - struct tmpfs_fid *tfhp; + struct tmpfs_fid_data tfd; struct tmpfs_mount *tmp; struct tmpfs_node *node; int error; + if (fhp->fid_len != sizeof(tfd)) + return (EINVAL); + + /* + * Copy from fid_data onto the stack to avoid unaligned pointer use. + * See the comment in sys/mount.h on struct fid for details. + */ + memcpy(&tfd, fhp->fid_data, fhp->fid_len); + tmp = VFS_TO_TMPFS(mp); - tfhp = (struct tmpfs_fid *)fhp; - if (tfhp->tf_len != sizeof(struct tmpfs_fid)) + if (tfd.tfd_id >= tmp->tm_nodes_max) return (EINVAL); - if (tfhp->tf_id >= tmp->tm_nodes_max) - return (EINVAL); - TMPFS_LOCK(tmp); LIST_FOREACH(node, &tmp->tm_nodes_used, tn_entries) { - if (node->tn_id == tfhp->tf_id && - node->tn_gen == tfhp->tf_gen) { + if (node->tn_id == tfd.tfd_id && + node->tn_gen == tfd.tfd_gen) { tmpfs_ref_node(node); break; } Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Wed Jun 3 05:49:19 2020 (r361747) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Wed Jun 3 09:38:51 2020 (r361748) @@ -1435,16 +1435,28 @@ tmpfs_pathconf(struct vop_pathconf_args *v) static int tmpfs_vptofh(struct vop_vptofh_args *ap) +/* +vop_vptofh { + IN struct vnode *a_vp; + IN struct fid *a_fhp; +}; +*/ { - struct tmpfs_fid *tfhp; + struct tmpfs_fid_data tfd; struct tmpfs_node *node; + struct fid *fhp; - tfhp = (struct tmpfs_fid *)ap->a_fhp; node = VP_TO_TMPFS_NODE(ap->a_vp); + fhp = ap->a_fhp; + fhp->fid_len = sizeof(tfd); - tfhp->tf_len = sizeof(struct tmpfs_fid); - tfhp->tf_id = node->tn_id; - tfhp->tf_gen = node->tn_gen; + /* + * Copy into fid_data from the stack to avoid unaligned pointer use. + * See the comment in sys/mount.h on struct fid for details. + */ + tfd.tfd_id = node->tn_id; + tfd.tfd_gen = node->tn_gen; + memcpy(fhp->fid_data, &tfd, fhp->fid_len); return (0); } Modified: head/sys/sys/mount.h ============================================================================== --- head/sys/sys/mount.h Wed Jun 3 05:49:19 2020 (r361747) +++ head/sys/sys/mount.h Wed Jun 3 09:38:51 2020 (r361748) @@ -57,6 +57,9 @@ typedef struct fsid { int32_t val[2]; } fsid_t; /* fil /* * File identifier. * These are unique per filesystem on a single machine. + * + * Note that the offset of fid_data is 4 bytes, so care must be taken to avoid + * undefined behavior accessing unaligned fields within an embedded struct. */ #define MAXFIDSZ 16 From owner-svn-src-head@freebsd.org Wed Jun 3 13:02:33 2020 Return-Path: Delivered-To: svn-src-head@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 3A906336F00; Wed, 3 Jun 2020 13:02:33 +0000 (UTC) (envelope-from ae@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cTbF0P1dz4KTH; Wed, 3 Jun 2020 13:02:33 +0000 (UTC) (envelope-from ae@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 08BE7E7E6; Wed, 3 Jun 2020 13:02:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053D2Wmu062628; Wed, 3 Jun 2020 13:02:32 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053D2WDk062624; Wed, 3 Jun 2020 13:02:32 GMT (envelope-from ae@FreeBSD.org) Message-Id: <202006031302.053D2WDk062624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 3 Jun 2020 13:02:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361749 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: ae X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 361749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 13:02:33 -0000 Author: ae Date: Wed Jun 3 13:02:31 2020 New Revision: 361749 URL: https://svnweb.freebsd.org/changeset/base/361749 Log: Add if_reassing method to all tunneling interfaces. After r339550 tunneling interfaces have started handle appearing and disappearing of ingress IP address on the host system. When such interfaces are moving into VNET jail, they lose ability to properly handle ifaddr_event_ext event. And this leads to need to reconfigure tunnel to make it working again. Since moving an interface into VNET jail leads to removing of all IP addresses, it looks consistent, that tunnel configuration should also be cleared. This is what will do if_reassing method. Reported by: John W. O'Brien MFC after: 1 week Modified: head/sys/net/if_gif.c head/sys/net/if_gre.c head/sys/net/if_ipsec.c head/sys/net/if_me.c Modified: head/sys/net/if_gif.c ============================================================================== --- head/sys/net/if_gif.c Wed Jun 3 09:38:51 2020 (r361748) +++ head/sys/net/if_gif.c Wed Jun 3 13:02:31 2020 (r361749) @@ -104,6 +104,9 @@ void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struc void (*ng_gif_attach_p)(struct ifnet *ifp); void (*ng_gif_detach_p)(struct ifnet *ifp); +#ifdef VIMAGE +static void gif_reassign(struct ifnet *, struct vnet *, char *); +#endif static void gif_delete_tunnel(struct gif_softc *); static int gif_ioctl(struct ifnet *, u_long, caddr_t); static int gif_transmit(struct ifnet *, struct mbuf *); @@ -150,6 +153,9 @@ gif_clone_create(struct if_clone *ifc, int unit, caddr GIF2IFP(sc)->if_transmit = gif_transmit; GIF2IFP(sc)->if_qflush = gif_qflush; GIF2IFP(sc)->if_output = gif_output; +#ifdef VIMAGE + GIF2IFP(sc)->if_reassign = gif_reassign; +#endif GIF2IFP(sc)->if_capabilities |= IFCAP_LINKSTATE; GIF2IFP(sc)->if_capenable |= IFCAP_LINKSTATE; if_attach(GIF2IFP(sc)); @@ -159,6 +165,21 @@ gif_clone_create(struct if_clone *ifc, int unit, caddr return (0); } + +#ifdef VIMAGE +static void +gif_reassign(struct ifnet *ifp, struct vnet *new_vnet __unused, + char *unused __unused) +{ + struct gif_softc *sc; + + sx_xlock(&gif_ioctl_sx); + sc = ifp->if_softc; + if (sc != NULL) + gif_delete_tunnel(sc); + sx_xunlock(&gif_ioctl_sx); +} +#endif /* VIMAGE */ static void gif_clone_destroy(struct ifnet *ifp) Modified: head/sys/net/if_gre.c ============================================================================== --- head/sys/net/if_gre.c Wed Jun 3 09:38:51 2020 (r361748) +++ head/sys/net/if_gre.c Wed Jun 3 13:02:31 2020 (r361749) @@ -107,6 +107,9 @@ static void gre_clone_destroy(struct ifnet *); VNET_DEFINE_STATIC(struct if_clone *, gre_cloner); #define V_gre_cloner VNET(gre_cloner) +#ifdef VIMAGE +static void gre_reassign(struct ifnet *, struct vnet *, char *); +#endif static void gre_qflush(struct ifnet *); static int gre_transmit(struct ifnet *, struct mbuf *); static int gre_ioctl(struct ifnet *, u_long, caddr_t); @@ -183,12 +186,30 @@ gre_clone_create(struct if_clone *ifc, int unit, caddr GRE2IFP(sc)->if_ioctl = gre_ioctl; GRE2IFP(sc)->if_transmit = gre_transmit; GRE2IFP(sc)->if_qflush = gre_qflush; +#ifdef VIMAGE + GRE2IFP(sc)->if_reassign = gre_reassign; +#endif GRE2IFP(sc)->if_capabilities |= IFCAP_LINKSTATE; GRE2IFP(sc)->if_capenable |= IFCAP_LINKSTATE; if_attach(GRE2IFP(sc)); bpfattach(GRE2IFP(sc), DLT_NULL, sizeof(u_int32_t)); return (0); } + +#ifdef VIMAGE +static void +gre_reassign(struct ifnet *ifp, struct vnet *new_vnet __unused, + char *unused __unused) +{ + struct gre_softc *sc; + + sx_xlock(&gre_ioctl_sx); + sc = ifp->if_softc; + if (sc != NULL) + gre_delete_tunnel(sc); + sx_xunlock(&gre_ioctl_sx); +} +#endif /* VIMAGE */ static void gre_clone_destroy(struct ifnet *ifp) Modified: head/sys/net/if_ipsec.c ============================================================================== --- head/sys/net/if_ipsec.c Wed Jun 3 09:38:51 2020 (r361748) +++ head/sys/net/if_ipsec.c Wed Jun 3 13:02:31 2020 (r361749) @@ -170,6 +170,9 @@ static int ipsec_set_addresses(struct ifnet *, struct static int ipsec_set_reqid(struct ipsec_softc *, uint32_t); static void ipsec_set_running(struct ipsec_softc *); +#ifdef VIMAGE +static void ipsec_reassign(struct ifnet *, struct vnet *, char *); +#endif static void ipsec_srcaddr(void *, const struct sockaddr *, int); static int ipsec_ioctl(struct ifnet *, u_long, caddr_t); static int ipsec_transmit(struct ifnet *, struct mbuf *); @@ -201,11 +204,29 @@ ipsec_clone_create(struct if_clone *ifc, int unit, cad ifp->if_transmit = ipsec_transmit; ifp->if_qflush = ipsec_qflush; ifp->if_output = ipsec_output; +#ifdef VIMAGE + ifp->if_reassign = ipsec_reassign; +#endif if_attach(ifp); bpfattach(ifp, DLT_NULL, sizeof(uint32_t)); return (0); } + +#ifdef VIMAGE +static void +ipsec_reassign(struct ifnet *ifp, struct vnet *new_vnet __unused, + char *unused __unused) +{ + struct ipsec_softc *sc; + + sx_xlock(&ipsec_ioctl_sx); + sc = ifp->if_softc; + if (sc != NULL) + ipsec_delete_tunnel(sc); + sx_xunlock(&ipsec_ioctl_sx); +} +#endif /* VIMAGE */ static void ipsec_clone_destroy(struct ifnet *ifp) Modified: head/sys/net/if_me.c ============================================================================== --- head/sys/net/if_me.c Wed Jun 3 09:38:51 2020 (r361748) +++ head/sys/net/if_me.c Wed Jun 3 13:02:31 2020 (r361749) @@ -113,6 +113,9 @@ static void me_clone_destroy(struct ifnet *); VNET_DEFINE_STATIC(struct if_clone *, me_cloner); #define V_me_cloner VNET(me_cloner) +#ifdef VIMAGE +static void me_reassign(struct ifnet *, struct vnet *, char *); +#endif static void me_qflush(struct ifnet *); static int me_transmit(struct ifnet *, struct mbuf *); static int me_ioctl(struct ifnet *, u_long, caddr_t); @@ -200,12 +203,30 @@ me_clone_create(struct if_clone *ifc, int unit, caddr_ ME2IFP(sc)->if_ioctl = me_ioctl; ME2IFP(sc)->if_transmit = me_transmit; ME2IFP(sc)->if_qflush = me_qflush; +#ifdef VIMAGE + ME2IFP(sc)->if_reassign = me_reassign; +#endif ME2IFP(sc)->if_capabilities |= IFCAP_LINKSTATE; ME2IFP(sc)->if_capenable |= IFCAP_LINKSTATE; if_attach(ME2IFP(sc)); bpfattach(ME2IFP(sc), DLT_NULL, sizeof(u_int32_t)); return (0); } + +#ifdef VIMAGE +static void +me_reassign(struct ifnet *ifp, struct vnet *new_vnet __unused, + char *unused __unused) +{ + struct me_softc *sc; + + sx_xlock(&me_ioctl_sx); + sc = ifp->if_softc; + if (sc != NULL) + me_delete_tunnel(sc); + sx_xunlock(&me_ioctl_sx); +} +#endif /* VIMAGE */ static void me_clone_destroy(struct ifnet *ifp) From owner-svn-src-head@freebsd.org Wed Jun 3 13:51:54 2020 Return-Path: Delivered-To: svn-src-head@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 27565338090; Wed, 3 Jun 2020 13:51:54 +0000 (UTC) (envelope-from tuexen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cVhB091Sz4Qnc; Wed, 3 Jun 2020 13:51:54 +0000 (UTC) (envelope-from tuexen@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 00BB7F013; Wed, 3 Jun 2020 13:51:54 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053DprrZ091979; Wed, 3 Jun 2020 13:51:53 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053DprtT091978; Wed, 3 Jun 2020 13:51:53 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202006031351.053DprtT091978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 3 Jun 2020 13:51:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361750 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 361750 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 13:51:54 -0000 Author: tuexen Date: Wed Jun 3 13:51:53 2020 New Revision: 361750 URL: https://svnweb.freebsd.org/changeset/base/361750 Log: Restrict enabling TCP-FASTOPEN to end-points in CLOSED or LISTEN state Enabling TCP-FASTOPEN on an end-point which is in a state other than CLOSED or LISTEN, is a bug in the application. So it should not work. Also the TCP code does not (and needs not to) handle this. While there, also simplify the setting of the TF_FASTOPEN flag. This issue was found by running syzkaller. Reviewed by: rrs MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D25115 Modified: head/sys/netinet/tcp_usrreq.c Modified: head/sys/netinet/tcp_usrreq.c ============================================================================== --- head/sys/netinet/tcp_usrreq.c Wed Jun 3 13:02:31 2020 (r361749) +++ head/sys/netinet/tcp_usrreq.c Wed Jun 3 13:51:53 2020 (r361750) @@ -2239,6 +2239,11 @@ unlock_and_done: return (error); INP_WLOCK_RECHECK(inp); + if ((tp->t_state != TCPS_CLOSED) && + (tp->t_state != TCPS_LISTEN)) { + error = EINVAL; + goto unlock_and_done; + } if (tfo_optval.enable) { if (tp->t_state == TCPS_LISTEN) { if (!V_tcp_fastopen_server_enable) { @@ -2246,7 +2251,6 @@ unlock_and_done: goto unlock_and_done; } - tp->t_flags |= TF_FASTOPEN; if (tp->t_tfo_pending == NULL) tp->t_tfo_pending = tcp_fastopen_alloc_counter(); @@ -2265,8 +2269,8 @@ unlock_and_done: tp->t_tfo_client_cookie_len = TCP_FASTOPEN_PSK_LEN; } - tp->t_flags |= TF_FASTOPEN; } + tp->t_flags |= TF_FASTOPEN; } else tp->t_flags &= ~TF_FASTOPEN; goto unlock_and_done; From owner-svn-src-head@freebsd.org Wed Jun 3 14:07:32 2020 Return-Path: Delivered-To: svn-src-head@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 53C2A338489; Wed, 3 Jun 2020 14:07:32 +0000 (UTC) (envelope-from rrs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cW2D1dw0z4S1R; Wed, 3 Jun 2020 14:07:32 +0000 (UTC) (envelope-from rrs@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 33828F1CC; Wed, 3 Jun 2020 14:07:32 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053E7Wov099311; Wed, 3 Jun 2020 14:07:32 GMT (envelope-from rrs@FreeBSD.org) Received: (from rrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053E7Vp5099307; Wed, 3 Jun 2020 14:07:31 GMT (envelope-from rrs@FreeBSD.org) Message-Id: <202006031407.053E7Vp5099307@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rrs set sender to rrs@FreeBSD.org using -f From: Randall Stewart Date: Wed, 3 Jun 2020 14:07:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361751 - in head/sys/netinet: . tcp_stacks X-SVN-Group: head X-SVN-Commit-Author: rrs X-SVN-Commit-Paths: in head/sys/netinet: . tcp_stacks X-SVN-Commit-Revision: 361751 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 14:07:32 -0000 Author: rrs Date: Wed Jun 3 14:07:31 2020 New Revision: 361751 URL: https://svnweb.freebsd.org/changeset/base/361751 Log: This fixes a couple of skyzaller crashes. Most of them have to do with TFO. Even the default stack had one of the issues: 1) We need to make sure for rack that we don't advance snd_nxt beyond iss when we are not doing fast open. We otherwise can get a bunch of SYN's sent out incorrectly with the seq number advancing. 2) When we complete the 3-way handshake we should not ever append to reassembly if the tlen is 0, if TFO is enabled prior to this fix we could still call the reasemmbly. Note this effects all three stacks. 3) Rack like its cousin BBR should track if a SYN is on a send map entry. 4) Both bbr and rack need to only consider len incremented on a SYN if the starting seq is iss, otherwise we don't increment len which may mean we return without adding a sendmap entry. This work was done in collaberation with Michael Tuexen, thanks for all the testing! Sponsored by: Netflix Inc Differential Revision: https://reviews.freebsd.org/D25000 Modified: head/sys/netinet/tcp_input.c head/sys/netinet/tcp_stacks/bbr.c head/sys/netinet/tcp_stacks/rack.c head/sys/netinet/tcp_stacks/tcp_rack.h Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Wed Jun 3 13:51:53 2020 (r361750) +++ head/sys/netinet/tcp_input.c Wed Jun 3 14:07:31 2020 (r361751) @@ -2989,7 +2989,7 @@ dodata: /* XXX */ */ tfo_syn = ((tp->t_state == TCPS_SYN_RECEIVED) && IS_FASTOPEN(tp->t_flags)); - if ((tlen || (thflags & TH_FIN) || tfo_syn) && + if ((tlen || (thflags & TH_FIN) || (tfo_syn && tlen > 0)) && TCPS_HAVERCVDFIN(tp->t_state) == 0) { tcp_seq save_start = th->th_seq; tcp_seq save_rnxt = tp->rcv_nxt; Modified: head/sys/netinet/tcp_stacks/bbr.c ============================================================================== --- head/sys/netinet/tcp_stacks/bbr.c Wed Jun 3 13:51:53 2020 (r361750) +++ head/sys/netinet/tcp_stacks/bbr.c Wed Jun 3 14:07:31 2020 (r361751) @@ -6028,7 +6028,7 @@ bbr_log_output(struct tcp_bbr *bbr, struct tcpcb *tp, * or FIN if seq_out is adding more on and a FIN is present * (and we are not resending). */ - if (th_flags & TH_SYN) + if ((th_flags & TH_SYN) && (tp->iss == seq_out)) len++; if (th_flags & TH_FIN) len++; @@ -8369,7 +8369,7 @@ bbr_process_data(struct mbuf *m, struct tcphdr *th, st */ tfo_syn = ((tp->t_state == TCPS_SYN_RECEIVED) && IS_FASTOPEN(tp->t_flags)); - if ((tlen || (thflags & TH_FIN) || tfo_syn) && + if ((tlen || (thflags & TH_FIN) || (tfo_syn && tlen > 0)) && TCPS_HAVERCVDFIN(tp->t_state) == 0) { tcp_seq save_start = th->th_seq; tcp_seq save_rnxt = tp->rcv_nxt; Modified: head/sys/netinet/tcp_stacks/rack.c ============================================================================== --- head/sys/netinet/tcp_stacks/rack.c Wed Jun 3 13:51:53 2020 (r361750) +++ head/sys/netinet/tcp_stacks/rack.c Wed Jun 3 14:07:31 2020 (r361751) @@ -6237,7 +6237,7 @@ rack_log_output(struct tcpcb *tp, struct tcpopt *to, i * or FIN if seq_out is adding more on and a FIN is present * (and we are not resending). */ - if (th_flags & TH_SYN) + if ((th_flags & TH_SYN) && (seq_out == tp->iss)) len++; if (th_flags & TH_FIN) len++; @@ -6280,6 +6280,7 @@ again: rsm->usec_orig_send = us_cts; if (th_flags & TH_SYN) { /* The data space is one beyond snd_una */ + rsm->r_flags |= RACK_HAS_SIN; rsm->r_start = seq_out + 1; rsm->r_end = rsm->r_start + (len - 1); } else { @@ -8724,7 +8725,7 @@ rack_process_data(struct mbuf *m, struct tcphdr *th, s */ tfo_syn = ((tp->t_state == TCPS_SYN_RECEIVED) && IS_FASTOPEN(tp->t_flags)); - if ((tlen || (thflags & TH_FIN) || tfo_syn) && + if ((tlen || (thflags & TH_FIN) || (tfo_syn && tlen > 0)) && TCPS_HAVERCVDFIN(tp->t_state) == 0) { tcp_seq save_start = th->th_seq; tcp_seq save_rnxt = tp->rcv_nxt; @@ -12563,8 +12564,10 @@ again: len = 0; } /* Without fast-open there should never be data sent on a SYN */ - if ((flags & TH_SYN) && (!IS_FASTOPEN(tp->t_flags))) + if ((flags & TH_SYN) && (!IS_FASTOPEN(tp->t_flags))) { + tp->snd_nxt = tp->iss; len = 0; + } orig_len = len; if (len <= 0) { /* Modified: head/sys/netinet/tcp_stacks/tcp_rack.h ============================================================================== --- head/sys/netinet/tcp_stacks/tcp_rack.h Wed Jun 3 13:51:53 2020 (r361750) +++ head/sys/netinet/tcp_stacks/tcp_rack.h Wed Jun 3 14:07:31 2020 (r361751) @@ -39,6 +39,7 @@ #define RACK_RWND_COLLAPSED 0x0100/* The peer collapsed the rwnd on the segment */ #define RACK_APP_LIMITED 0x0200/* We went app limited after this send */ #define RACK_WAS_ACKED 0x0400/* a RTO undid the ack, but it already had a rtt calc done */ +#define RACK_HAS_SIN 0x0800/* SIN is on this guy */ #define RACK_NUM_OF_RETRANS 3 #define RACK_INITIAL_RTO 1000 /* 1 second in milli seconds */ From owner-svn-src-head@freebsd.org Wed Jun 3 14:16:41 2020 Return-Path: Delivered-To: svn-src-head@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 35940338733; Wed, 3 Jun 2020 14:16:41 +0000 (UTC) (envelope-from rrs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cWDn0ZlSz4Sxp; Wed, 3 Jun 2020 14:16:41 +0000 (UTC) (envelope-from rrs@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 0F306F264; Wed, 3 Jun 2020 14:16:41 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053EGe9Z005707; Wed, 3 Jun 2020 14:16:40 GMT (envelope-from rrs@FreeBSD.org) Received: (from rrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053EGem7005706; Wed, 3 Jun 2020 14:16:40 GMT (envelope-from rrs@FreeBSD.org) Message-Id: <202006031416.053EGem7005706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rrs set sender to rrs@FreeBSD.org using -f From: Randall Stewart Date: Wed, 3 Jun 2020 14:16:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361752 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: rrs X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 361752 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 14:16:41 -0000 Author: rrs Date: Wed Jun 3 14:16:40 2020 New Revision: 361752 URL: https://svnweb.freebsd.org/changeset/base/361752 Log: We should never allow either the broadcast or IN_ADDR_ANY to be connected to or sent to. This was fond when working with Michael Tuexen and Skyzaller. Skyzaller seems to want to use either of these two addresses to connect to at times. And it really is an error to do so, so lets not allow that behavior. Sponsored by: Netflix Inc. Differential Revision: https://reviews.freebsd.org/D24852 Modified: head/sys/netinet/tcp_usrreq.c Modified: head/sys/netinet/tcp_usrreq.c ============================================================================== --- head/sys/netinet/tcp_usrreq.c Wed Jun 3 14:07:31 2020 (r361751) +++ head/sys/netinet/tcp_usrreq.c Wed Jun 3 14:16:40 2020 (r361752) @@ -552,6 +552,10 @@ tcp_usr_connect(struct socket *so, struct sockaddr *na if (sinp->sin_family == AF_INET && IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) return (EAFNOSUPPORT); + if ((sinp->sin_family == AF_INET) && + ((ntohl(sinp->sin_addr.s_addr) == INADDR_BROADCAST) || + (sinp->sin_addr.s_addr == INADDR_ANY))) + return(EAFNOSUPPORT); if ((error = prison_remote_ip4(td->td_ucred, &sinp->sin_addr)) != 0) return (error); @@ -652,6 +656,11 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *n error = EAFNOSUPPORT; goto out; } + if ((ntohl(sin.sin_addr.s_addr) == INADDR_BROADCAST) || + (sin.sin_addr.s_addr == INADDR_ANY)) { + error = EAFNOSUPPORT; + goto out; + } if ((error = prison_remote_ip4(td->td_ucred, &sin.sin_addr)) != 0) goto out; @@ -1019,6 +1028,13 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf goto out; } if (IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) { + if (m) + m_freem(m); + error = EAFNOSUPPORT; + goto out; + } + if ((ntohl(sinp->sin_addr.s_addr) == INADDR_BROADCAST) || + (sinp->sin_addr.s_addr == INADDR_ANY)) { if (m) m_freem(m); error = EAFNOSUPPORT; From owner-svn-src-head@freebsd.org Wed Jun 3 14:35:29 2020 Return-Path: Delivered-To: svn-src-head@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 D17A9338E03; Wed, 3 Jun 2020 14:35:29 +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 49cWfT1jVnz4W9f; Wed, 3 Jun 2020 14:35:28 +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 053EZKEC021830; Wed, 3 Jun 2020 07:35:20 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 053EZKdm021829; Wed, 3 Jun 2020 07:35:20 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006031435.053EZKdm021829@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361752 - head/sys/netinet In-Reply-To: <202006031416.053EGem7005706@repo.freebsd.org> To: Randall Stewart Date: Wed, 3 Jun 2020 07:35:20 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49cWfT1jVnz4W9f X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 14:35:29 -0000 > Author: rrs > Date: Wed Jun 3 14:16:40 2020 > New Revision: 361752 > URL: https://svnweb.freebsd.org/changeset/base/361752 > > Log: > We should never allow either the broadcast or IN_ADDR_ANY to be > connected to or sent to. This was fond when working with Michael > Tuexen and Skyzaller. Skyzaller seems to want to use either of > these two addresses to connect to at times. And it really is > an error to do so, so lets not allow that behavior. It would be preferable if possible to use the macros from netinet/in.h. #define INADDR_ANY ((in_addr_t)0x00000000) #define in_nullhost(x) ((x).s_addr == INADDR_ANY) There is an in_broadcast, but thats a function doing a more complicated test checking for all possible local broadcast addresses, which may be what you really want to do here. I am also finding it odd that we need to do this at the TCP layer, there should already be stuff in place that prevents this from occuring at the IP layer. I guess this stuff is setup and ends up in a tcb, that later fails when it goes to xmit a packet? > > Sponsored by: Netflix Inc. > Differential Revision: https://reviews.freebsd.org/D24852 > > Modified: > head/sys/netinet/tcp_usrreq.c > > Modified: head/sys/netinet/tcp_usrreq.c > ============================================================================== > --- head/sys/netinet/tcp_usrreq.c Wed Jun 3 14:07:31 2020 (r361751) > +++ head/sys/netinet/tcp_usrreq.c Wed Jun 3 14:16:40 2020 (r361752) > @@ -552,6 +552,10 @@ tcp_usr_connect(struct socket *so, struct sockaddr *na > if (sinp->sin_family == AF_INET > && IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) > return (EAFNOSUPPORT); > + if ((sinp->sin_family == AF_INET) && > + ((ntohl(sinp->sin_addr.s_addr) == INADDR_BROADCAST) || > + (sinp->sin_addr.s_addr == INADDR_ANY))) > + return(EAFNOSUPPORT); > if ((error = prison_remote_ip4(td->td_ucred, &sinp->sin_addr)) != 0) > return (error); > > @@ -652,6 +656,11 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *n > error = EAFNOSUPPORT; > goto out; > } > + if ((ntohl(sin.sin_addr.s_addr) == INADDR_BROADCAST) || > + (sin.sin_addr.s_addr == INADDR_ANY)) { > + error = EAFNOSUPPORT; > + goto out; > + } > if ((error = prison_remote_ip4(td->td_ucred, > &sin.sin_addr)) != 0) > goto out; > @@ -1019,6 +1028,13 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf > goto out; > } > if (IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) { > + if (m) > + m_freem(m); > + error = EAFNOSUPPORT; > + goto out; > + } > + if ((ntohl(sinp->sin_addr.s_addr) == INADDR_BROADCAST) || > + (sinp->sin_addr.s_addr == INADDR_ANY)) { > if (m) > m_freem(m); > error = EAFNOSUPPORT; > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Wed Jun 3 16:38:17 2020 Return-Path: Delivered-To: svn-src-head@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 3469D33B2D0; Wed, 3 Jun 2020 16:38:17 +0000 (UTC) (envelope-from mhorne@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cZN90f83z3X9W; Wed, 3 Jun 2020 16:38:17 +0000 (UTC) (envelope-from mhorne@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 1130B11016; Wed, 3 Jun 2020 16:38:17 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053GcGwx091479; Wed, 3 Jun 2020 16:38:16 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053GcGoJ091478; Wed, 3 Jun 2020 16:38:16 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202006031638.053GcGoJ091478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Wed, 3 Jun 2020 16:38:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361754 - head/stand/efi/gptboot X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/stand/efi/gptboot X-SVN-Commit-Revision: 361754 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 16:38:17 -0000 Author: mhorne Date: Wed Jun 3 16:38:16 2020 New Revision: 361754 URL: https://svnweb.freebsd.org/changeset/base/361754 Log: gptboot.efi: align secbuf to 4K The u-boot EFI implementation of the ReadBlocks and WriteBlocks methods requires that the provided buffer meet the IO alignment requirements of the underlying disk. Unlike loader.efi, gptboot.efi doesn't check this requirement, and therefore fails to perform a successful read. Adjust secbuf's alignment to 4K in hopes that we will always meet this requirement. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D25111 Modified: head/stand/efi/gptboot/proto.c Modified: head/stand/efi/gptboot/proto.c ============================================================================== --- head/stand/efi/gptboot/proto.c Wed Jun 3 14:54:54 2020 (r361753) +++ head/stand/efi/gptboot/proto.c Wed Jun 3 16:38:16 2020 (r361754) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include "gpt.h" #include static const uuid_t freebsd_ufs_uuid = GPT_ENT_TYPE_FREEBSD_UFS; -static char secbuf[4096]; +static char secbuf[4096] __aligned(4096); static struct dsk dsk; static dev_info_t *devices = NULL; static dev_info_t *raw_device = NULL; From owner-svn-src-head@freebsd.org Wed Jun 3 16:57:30 2020 Return-Path: Delivered-To: svn-src-head@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 D178C33BA5A; Wed, 3 Jun 2020 16:57:30 +0000 (UTC) (envelope-from freqlabs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cZpL5GFTz3Zjb; Wed, 3 Jun 2020 16:57:30 +0000 (UTC) (envelope-from freqlabs@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 ABDA011503; Wed, 3 Jun 2020 16:57:30 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053GvUD6003758; Wed, 3 Jun 2020 16:57:30 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053GvUut003757; Wed, 3 Jun 2020 16:57:30 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202006031657.053GvUut003757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 3 Jun 2020 16:57:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361756 - head/sys/netinet6 X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: head/sys/netinet6 X-SVN-Commit-Revision: 361756 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 16:57:30 -0000 Author: freqlabs Date: Wed Jun 3 16:57:30 2020 New Revision: 361756 URL: https://svnweb.freebsd.org/changeset/base/361756 Log: scope6: Check for NULL afdata before dereferencing Narrows the race window with if_detach. Approved by: mav (mentor) MFC after: 3 days Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D25017 Modified: head/sys/netinet6/scope6.c Modified: head/sys/netinet6/scope6.c ============================================================================== --- head/sys/netinet6/scope6.c Wed Jun 3 16:51:30 2020 (r361755) +++ head/sys/netinet6/scope6.c Wed Jun 3 16:57:30 2020 (r361756) @@ -422,6 +422,10 @@ in6_setscope(struct in6_addr *in6, struct ifnet *ifp, struct epoch_tracker et; NET_EPOCH_ENTER(et); + if (ifp->if_afinfo[AF_INET6] == NULL) { + NET_EPOCH_EXIT(et); + return (ENETDOWN); + } sid = SID(ifp); zoneid = sid->s6id_list[scope]; NET_EPOCH_EXIT(et); From owner-svn-src-head@freebsd.org Wed Jun 3 17:26:01 2020 Return-Path: Delivered-To: svn-src-head@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 11DCD33C1DD; Wed, 3 Jun 2020 17:26:01 +0000 (UTC) (envelope-from freqlabs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cbRD6cSxz3dsf; Wed, 3 Jun 2020 17:26:00 +0000 (UTC) (envelope-from freqlabs@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 D984311572; Wed, 3 Jun 2020 17:26:00 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053HQ0xb023072; Wed, 3 Jun 2020 17:26:00 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053HQ042023071; Wed, 3 Jun 2020 17:26:00 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202006031726.053HQ042023071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 3 Jun 2020 17:26:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361757 - head/sys/netinet6 X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: head/sys/netinet6 X-SVN-Commit-Revision: 361757 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 17:26:01 -0000 Author: freqlabs Date: Wed Jun 3 17:26:00 2020 New Revision: 361757 URL: https://svnweb.freebsd.org/changeset/base/361757 Log: Fix typo in previous commit Applied the wrong patch Reported by: Michael Butler Approved by: mav (mentor) Sponsored by: iXsystems.com Modified: head/sys/netinet6/scope6.c Modified: head/sys/netinet6/scope6.c ============================================================================== --- head/sys/netinet6/scope6.c Wed Jun 3 16:57:30 2020 (r361756) +++ head/sys/netinet6/scope6.c Wed Jun 3 17:26:00 2020 (r361757) @@ -422,7 +422,7 @@ in6_setscope(struct in6_addr *in6, struct ifnet *ifp, struct epoch_tracker et; NET_EPOCH_ENTER(et); - if (ifp->if_afinfo[AF_INET6] == NULL) { + if (ifp->if_afdata[AF_INET6] == NULL) { NET_EPOCH_EXIT(et); return (ENETDOWN); } From owner-svn-src-head@freebsd.org Wed Jun 3 17:42:18 2020 Return-Path: Delivered-To: svn-src-head@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 B63FC33C7B4; Wed, 3 Jun 2020 17:42:18 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cbp24RRcz3wkb; Wed, 3 Jun 2020 17:42:18 +0000 (UTC) (envelope-from vmaffione@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 93AFB11E85; Wed, 3 Jun 2020 17:42:18 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053HgI5l035359; Wed, 3 Jun 2020 17:42:18 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053HgIus035358; Wed, 3 Jun 2020 17:42:18 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006031742.053HgIus035358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 17:42:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361758 - in head/sys/dev: netmap virtio/network X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: in head/sys/dev: netmap virtio/network X-SVN-Commit-Revision: 361758 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 17:42:18 -0000 Author: vmaffione Date: Wed Jun 3 17:42:17 2020 New Revision: 361758 URL: https://svnweb.freebsd.org/changeset/base/361758 Log: netmap: vtnet: add vtnrx_nm_refill index to receive queues The new index tracks the next netmap slot that is going to be enqueued into the virtqueue. The index is necessary to prevent the receive VQ and the netmap rx ring from going out of sync, considering that we never enqueue N slots, but at most N-1. This change fixes a bug that causes the VQ and the netmap ring to go out of sync after N-1 packets have been received. MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h head/sys/dev/virtio/network/if_vtnetvar.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 17:26:00 2020 (r361757) +++ head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 17:42:17 2020 (r361758) @@ -196,9 +196,11 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int fl } /* - * Publish (up to) num netmap receive buffers to the host, - * starting from the first one that the user made available - * (kring->nr_hwcur). + * Publish 'num 'netmap receive buffers to the host, starting + * from the next available one (rx->vtnrx_nm_refill). + * Return a positive error code on error, and 0 on success. + * If we could not publish all of the buffers that's an error, + * since the netmap ring and the virtqueue would go out of sync. */ static int vtnet_netmap_kring_refill(struct netmap_kring *kring, u_int num) @@ -208,7 +210,7 @@ vtnet_netmap_kring_refill(struct netmap_kring *kring, struct netmap_ring *ring = kring->ring; u_int ring_nr = kring->ring_id; u_int const lim = kring->nkr_num_slots - 1; - u_int nm_i = kring->nr_hwcur; + u_int nm_i; /* device-specific */ struct vtnet_softc *sc = ifp->if_softc; @@ -219,7 +221,8 @@ vtnet_netmap_kring_refill(struct netmap_kring *kring, struct sglist_seg ss[2]; struct sglist sg = { ss, 0, 0, 2 }; - for (; num > 0; nm_i = nm_next(nm_i, lim), num--) { + for (nm_i = rxq->vtnrx_nm_refill; num > 0; + nm_i = nm_next(nm_i, lim), num--) { struct netmap_slot *slot = &ring->slot[nm_i]; uint64_t paddr; void *addr = PNMB(na, slot, &paddr); @@ -227,7 +230,7 @@ vtnet_netmap_kring_refill(struct netmap_kring *kring, if (addr == NETMAP_BUF_BASE(na)) { /* bad buf */ if (netmap_ring_reinit(kring)) - return -1; + return EFAULT; } slot->flags &= ~NS_BUF_CHANGED; @@ -240,14 +243,14 @@ vtnet_netmap_kring_refill(struct netmap_kring *kring, err = virtqueue_enqueue(vq, /*cookie=*/rxq, &sg, /*readable=*/0, /*writeable=*/sg.sg_nseg); if (unlikely(err)) { - if (err != ENOSPC) - nm_prerr("virtqueue_enqueue(%s) failed: %d", - kring->name, err); + nm_prerr("virtqueue_enqueue(%s) failed: %d", + kring->name, err); break; } } + rxq->vtnrx_nm_refill = nm_i; - return nm_i; + return num == 0 ? 0 : ENOSPC; } /* @@ -274,11 +277,14 @@ vtnet_netmap_rxq_populate(struct vtnet_rxq *rxq) /* Expose all the RX netmap buffers we can. In case of no indirect * buffers, the number of netmap slots in the RX ring matches the * maximum number of 2-elements sglist that the RX virtqueue can - * accommodate (minus 1 to avoid netmap ring wraparound). */ + * accommodate. We need to start from kring->nr_hwcur, which is 0 + * on netmap register and may be different from 0 if a virtio + * re-init happens while the device is in use by netmap. */ + rxq->vtnrx_nm_refill = kring->nr_hwcur; error = vtnet_netmap_kring_refill(kring, na->num_rx_desc - 1); virtqueue_notify(rxq->vtnrx_vq); - return error < 0 ? ENXIO : 0; + return error; } /* Reconcile kernel and user view of the receive ring. */ @@ -350,15 +356,19 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl */ nm_i = kring->nr_hwcur; /* netmap ring index */ if (nm_i != head) { - int howmany = head - nm_i; - int nm_j; + int released; + int error; - if (howmany < 0) - howmany += kring->nkr_num_slots; - nm_j = vtnet_netmap_kring_refill(kring, howmany); - if (nm_j < 0) - return nm_j; - kring->nr_hwcur = nm_j; + released = head - nm_i; + if (released < 0) + released += kring->nkr_num_slots; + error = vtnet_netmap_kring_refill(kring, released); + if (error) { + nm_prerr("Failed to replenish RX VQ with %u sgs", + released); + return error; + } + kring->nr_hwcur = head; virtqueue_notify(vq); } Modified: head/sys/dev/virtio/network/if_vtnetvar.h ============================================================================== --- head/sys/dev/virtio/network/if_vtnetvar.h Wed Jun 3 17:26:00 2020 (r361757) +++ head/sys/dev/virtio/network/if_vtnetvar.h Wed Jun 3 17:42:17 2020 (r361758) @@ -80,6 +80,7 @@ struct vtnet_rxq { struct taskqueue *vtnrx_tq; struct task vtnrx_intrtask; #ifdef DEV_NETMAP + uint32_t vtnrx_nm_refill; struct virtio_net_hdr_mrg_rxbuf vtnrx_shrhdr; #endif /* DEV_NETMAP */ char vtnrx_name[16]; From owner-svn-src-head@freebsd.org Wed Jun 3 17:46:21 2020 Return-Path: Delivered-To: svn-src-head@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 AE54C33CB82; Wed, 3 Jun 2020 17:46:21 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cbtj4D2cz3yDN; Wed, 3 Jun 2020 17:46:21 +0000 (UTC) (envelope-from vmaffione@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 8C1ED11E8C; Wed, 3 Jun 2020 17:46:21 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053HkLVh035617; Wed, 3 Jun 2020 17:46:21 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053HkLBB035616; Wed, 3 Jun 2020 17:46:21 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006031746.053HkLBB035616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 17:46:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361759 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361759 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 17:46:21 -0000 Author: vmaffione Date: Wed Jun 3 17:46:21 2020 New Revision: 361759 URL: https://svnweb.freebsd.org/changeset/base/361759 Log: netmap: vtnet: fix race condition in rxsync This change prevents a race that happens when rxsync dequeues N-1 rx packets (with N being the size of the netmap rx ring). In this situation, the loop exits without re-enabling the rx interrupts, thus causing the VQ to stall. MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 17:42:17 2020 (r361758) +++ head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 17:46:21 2020 (r361759) @@ -310,8 +310,11 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl /* * First part: import newly received packets. * Only accept our own buffers (matching the token). We should only get - * matching buffers. We may need to stop early to avoid hwtail to overrun - * hwcur. + * matching buffers. The hwtail should never overrun hwcur, because + * we publish only N-1 receive buffers (and non N). + * In any case we must not leave this routine with the interrupts + * disabled, pending packets in the VQ and hwtail == (hwcur - 1), + * otherwise the pending packets could stall. */ if (netmap_no_pendintr || force_update) { uint32_t hwtail_lim = nm_prev(kring->nr_hwcur, lim); @@ -320,10 +323,17 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl vtnet_rxq_disable_intr(rxq); nm_i = kring->nr_hwtail; - while (nm_i != hwtail_lim) { + for (;;) { int len; token = virtqueue_dequeue(vq, &len); if (token == NULL) { + /* + * Enable the interrupts again and double-check + * for more work. We can go on until we win the + * race condition, since we are not replenishing + * in the meanwhile, and thus we will process at + * most N-1 slots. + */ if (interrupts && vtnet_rxq_enable_intr(rxq)) { vtnet_rxq_disable_intr(rxq); continue; @@ -333,6 +343,11 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl if (unlikely(token != (void *)rxq)) { nm_prerr("BUG: RX token mismatch"); } else { + if (nm_i == hwtail_lim) { + KASSERT(false, ("hwtail would " + "overrun hwcur")); + } + /* Skip the virtio-net header. */ len -= sc->vtnet_hdr_size; if (unlikely(len < 0)) { From owner-svn-src-head@freebsd.org Wed Jun 3 17:47:33 2020 Return-Path: Delivered-To: svn-src-head@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 423A033C7E7; Wed, 3 Jun 2020 17:47:33 +0000 (UTC) (envelope-from vmaffione@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cbw515vwz3y24; Wed, 3 Jun 2020 17:47:33 +0000 (UTC) (envelope-from vmaffione@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 211F811E8D; Wed, 3 Jun 2020 17:47:33 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053HlXxh035720; Wed, 3 Jun 2020 17:47:33 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053HlX4t035719; Wed, 3 Jun 2020 17:47:33 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006031747.053HlX4t035719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 3 Jun 2020 17:47:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361760 - head/sys/dev/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/sys/dev/netmap X-SVN-Commit-Revision: 361760 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 17:47:33 -0000 Author: vmaffione Date: Wed Jun 3 17:47:32 2020 New Revision: 361760 URL: https://svnweb.freebsd.org/changeset/base/361760 Log: netmap: vtnet: clean up rxsync disabled logs MFC after: 1 week Modified: head/sys/dev/netmap/if_vtnet_netmap.h Modified: head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 17:46:21 2020 (r361759) +++ head/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 3 17:47:32 2020 (r361760) @@ -363,8 +363,6 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl kring->nr_hwtail = nm_i; kring->nr_kflags &= ~NKR_PENDINTR; } - nm_prdis("[B] h %d c %d hwcur %d hwtail %d", ring->head, ring->cur, - kring->nr_hwcur, kring->nr_hwtail); /* * Second part: skip past packets that userspace has released. @@ -387,8 +385,8 @@ vtnet_netmap_rxsync(struct netmap_kring *kring, int fl virtqueue_notify(vq); } - nm_prdis("[C] h %d c %d t %d hwcur %d hwtail %d", ring->head, ring->cur, - ring->tail, kring->nr_hwcur, kring->nr_hwtail); + nm_prdis("h %d c %d t %d hwcur %d hwtail %d", kring->rhead, + kring->rcur, kring->rtail, kring->nr_hwcur, kring->nr_hwtail); return 0; } From owner-svn-src-head@freebsd.org Wed Jun 3 18:29:39 2020 Return-Path: Delivered-To: svn-src-head@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 1954633F9B7; Wed, 3 Jun 2020 18:29:39 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ccrc5d63z4KPq; Wed, 3 Jun 2020 18:29:36 +0000 (UTC) (envelope-from kevans@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 47D6E12345; Wed, 3 Jun 2020 18:29:33 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053ITW5D083524; Wed, 3 Jun 2020 18:29:32 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053ITWxH083523; Wed, 3 Jun 2020 18:29:32 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006031829.053ITWxH083523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 3 Jun 2020 18:29:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361763 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 361763 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 18:29:39 -0000 Author: kevans Date: Wed Jun 3 18:29:32 2020 New Revision: 361763 URL: https://svnweb.freebsd.org/changeset/base/361763 Log: lualoader: drop the filename and word "LUA" from errors The filename is nearly always wrong since it's /boot/lua/loader.lua, which is not useful for diagnostics. The actual errmsg will include a lua filename if this is relevant. Dropping "LUA" while we're here because that's almost universally irrelevant to whatever error follows, unless the error states that it's actually a lua problem. Both of these are minor nits that just detract from identifying the pertinent information. MFC after: 3 days Modified: head/stand/common/interp_lua.c Modified: head/stand/common/interp_lua.c ============================================================================== --- head/stand/common/interp_lua.c Wed Jun 3 18:09:32 2020 (r361762) +++ head/stand/common/interp_lua.c Wed Jun 3 18:29:32 2020 (r361763) @@ -126,7 +126,7 @@ interp_init(void) if (interp_include(filename) != 0) { const char *errstr = lua_tostring(luap, -1); errstr = errstr == NULL ? "unknown" : errstr; - printf("Startup error in %s:\nLUA ERROR: %s.\n", filename, errstr); + printf("ERROR: %s.\n", errstr); lua_pop(luap, 1); setenv("autoboot_delay", "NO", 1); } From owner-svn-src-head@freebsd.org Wed Jun 3 18:42:29 2020 Return-Path: Delivered-To: svn-src-head@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 30D7A2F00A4; Wed, 3 Jun 2020 18:42:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cd7T0RPxz4NsG; Wed, 3 Jun 2020 18:42:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A50D12A89; Wed, 3 Jun 2020 18:42:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053IgSBE098598; Wed, 3 Jun 2020 18:42:28 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053IgSsa098597; Wed, 3 Jun 2020 18:42:28 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006031842.053IgSsa098597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 18:42:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361764 - head/sys/modules/tcp X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/modules/tcp X-SVN-Commit-Revision: 361764 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 18:42:29 -0000 Author: jhb Date: Wed Jun 3 18:42:28 2020 New Revision: 361764 URL: https://svnweb.freebsd.org/changeset/base/361764 Log: Revise r361712 to disable tcpmd5.ko for 'options TCP_SIGNATURE' Modified: head/sys/modules/tcp/Makefile Modified: head/sys/modules/tcp/Makefile ============================================================================== --- head/sys/modules/tcp/Makefile Wed Jun 3 18:29:32 2020 (r361763) +++ head/sys/modules/tcp/Makefile Wed Jun 3 18:42:28 2020 (r361764) @@ -16,7 +16,7 @@ _tcp_rack= rack .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) -.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} _tcpmd5= tcpmd5 .endif .endif From owner-svn-src-head@freebsd.org Wed Jun 3 18:56:17 2020 Return-Path: Delivered-To: svn-src-head@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 922BD2F0668; Wed, 3 Jun 2020 18:56:17 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cdRP2R4Tz4R0s; Wed, 3 Jun 2020 18:56:17 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 47337280AC; Wed, 3 Jun 2020 18:56:17 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f52.google.com with SMTP id e2so1656176qvw.7; Wed, 03 Jun 2020 11:56:17 -0700 (PDT) X-Gm-Message-State: AOAM532E+sNuU1aj2ERhIFRTWVJ4EPiWavMZ6XFjR9ccgtAk4TJj4zd9 a62UdOes3ifqS5u+DKMqNbtMTEodiZ8h8pOcoAQ= X-Google-Smtp-Source: ABdhPJw24i4Bi631kQEbo8IjurbKHHsO8pxOFjgfP7YijBneu05SFFkYS05j+o8dZXyE5E4Mw3Qf6d9aa+VjheXDDd4= X-Received: by 2002:a0c:ba22:: with SMTP id w34mr1255650qvf.129.1591210576723; Wed, 03 Jun 2020 11:56:16 -0700 (PDT) MIME-Version: 1.0 References: <202006031842.053IgSsa098597@repo.freebsd.org> In-Reply-To: <202006031842.053IgSsa098597@repo.freebsd.org> From: Kyle Evans Date: Wed, 3 Jun 2020 13:56:03 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361764 - head/sys/modules/tcp To: John Baldwin Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 18:56:17 -0000 On Wed, Jun 3, 2020 at 1:42 PM John Baldwin wrote: > > Author: jhb > Date: Wed Jun 3 18:42:28 2020 > New Revision: 361764 > URL: https://svnweb.freebsd.org/changeset/base/361764 > > Log: > Revise r361712 to disable tcpmd5.ko for 'options TCP_SIGNATURE' > > Modified: > head/sys/modules/tcp/Makefile > > Modified: head/sys/modules/tcp/Makefile > ============================================================================== > --- head/sys/modules/tcp/Makefile Wed Jun 3 18:29:32 2020 (r361763) > +++ head/sys/modules/tcp/Makefile Wed Jun 3 18:42:28 2020 (r361764) > @@ -16,7 +16,7 @@ _tcp_rack= rack > > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > defined(ALL_MODULES) > -.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} > _tcpmd5= tcpmd5 > .endif > .endif Thanks! =-) From owner-svn-src-head@freebsd.org Wed Jun 3 18:59:32 2020 Return-Path: Delivered-To: svn-src-head@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 72A392F05C6; Wed, 3 Jun 2020 18:59:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cdW82Ln8z4RC8; Wed, 3 Jun 2020 18:59:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4765C12B9B; Wed, 3 Jun 2020 18:59:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053IxW6h006159; Wed, 3 Jun 2020 18:59:32 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053IxWPb006158; Wed, 3 Jun 2020 18:59:32 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006031859.053IxWPb006158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 18:59:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361767 - head/lib/libc/sys X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/sys X-SVN-Commit-Revision: 361767 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 18:59:32 -0000 Author: jhb Date: Wed Jun 3 18:59:31 2020 New Revision: 361767 URL: https://svnweb.freebsd.org/changeset/base/361767 Log: Document SO_NO_OFFLOADS and SO_NO_DDP. Reviewed by: bcr, np MFC after: 1 week Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D25043 Modified: head/lib/libc/sys/getsockopt.2 Modified: head/lib/libc/sys/getsockopt.2 ============================================================================== --- head/lib/libc/sys/getsockopt.2 Wed Jun 3 18:53:56 2020 (r361766) +++ head/lib/libc/sys/getsockopt.2 Wed Jun 3 18:59:31 2020 (r361767) @@ -28,7 +28,7 @@ .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd September 11, 2019 +.Dd June 03, 2020 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -191,6 +191,8 @@ The following options are recognized in .It Dv SO_USER_COOKIE Ta "set the 'so_user_cookie' value for the socket (uint32_t, set only)" .It Dv SO_TS_CLOCK Ta "set specific format of timestamp returned by SO_TIMESTAMP" .It Dv SO_MAX_PACING_RATE Ta "set the maximum transmit rate in bytes per second for the socket" +.It Dv SO_NO_OFFLOAD Ta "disables protocol offloads" +.It Dv SO_NO_DDP Ta "disables direct data placement offload" .El .Pp .Dv SO_DEBUG @@ -512,7 +514,6 @@ the error status. It may be used to check for asynchronous errors on connected datagram sockets or for other asynchronous errors. .Pp -Finally, .Dv SO_LABEL returns the MAC label of the socket. .Dv SO_PEERLABEL @@ -521,6 +522,7 @@ Note that your kernel must be compiled with MAC suppor See .Xr mac 3 for more information. +.Pp .Dv SO_LISTENQLIMIT returns the maximal number of queued connections, as set by .Xr listen 2 . @@ -532,6 +534,17 @@ returns the number of unaccepted incomplete connection .Dv SO_MAX_PACING_RATE instruct the socket and underlying network adapter layers to limit the transfer rate to the given unsigned 32-bit value in bytes per second. +.Pp +.Dv SO_NO_OFFLOAD +disables support for protocol offloads. +At present, this prevents TCP sockets from using TCP offload engines. +.Dv SO_NO_DDP +disables support for a specific TCP offload known as direct data +placement (DDP). +DDP is an offload supported by Chelsio network adapters that permits +reassembled TCP data streams to be received via zero-copy in +user-supplied buffers using +.Xr aio_read 2 . .Sh RETURN VALUES .Rv -std .Sh ERRORS From owner-svn-src-head@freebsd.org Wed Jun 3 20:25:03 2020 Return-Path: Delivered-To: svn-src-head@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 580EF2F286D; Wed, 3 Jun 2020 20:25:03 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cgPq24yVz4c0s; Wed, 3 Jun 2020 20:25:03 +0000 (UTC) (envelope-from adrian@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 3E72D1387B; Wed, 3 Jun 2020 20:25:03 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053KP3OA063106; Wed, 3 Jun 2020 20:25:03 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053KP23H063104; Wed, 3 Jun 2020 20:25:02 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006032025.053KP23H063104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 3 Jun 2020 20:25:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361768 - head/sys/dev/otus X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/otus X-SVN-Commit-Revision: 361768 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 20:25:03 -0000 Author: adrian Date: Wed Jun 3 20:25:02 2020 New Revision: 361768 URL: https://svnweb.freebsd.org/changeset/base/361768 Log: [otus] enable 802.11n for 2GHz and 5GHz. This flips on basic 11n for 2GHz/5GHz station operation. * It flips on HT20 and MCS rates; * It enables A-MPDU decap - the payload format is a bit different; * It does do some basic checks for HT40 but I haven't yet flipped on HT40 support; * It enables software A-MSDU transmit; I honestly don't want to make A-MPDU TX work and there are apparently issues with QoS and A-MPDU TX. So I totally am ignoring A-MPDU TX; * MCS rate transmit is fine. I haven't: * A-MPDU TX, as I said above; * made radiotap work fully; * HT40; * short-GI support; * lots of other stuff that honestly no-one is likely to use. But! Hey, this is another ye olde 11n USB NIC that now works pretty OK in 11n rates. A-MPDU receive seems fine enough given it's a draft-n device from before 2010. Tested: * Ye olde UB82 Test NIC (AR9170 + AR9104) - 2GHz/5GHz Modified: head/sys/dev/otus/if_otus.c head/sys/dev/otus/if_otusreg.h Modified: head/sys/dev/otus/if_otus.c ============================================================================== --- head/sys/dev/otus/if_otus.c Wed Jun 3 18:59:31 2020 (r361767) +++ head/sys/dev/otus/if_otus.c Wed Jun 3 20:25:02 2020 (r361768) @@ -91,6 +91,7 @@ SYSCTL_INT(_hw_usb_otus, OID_AUTO, debug, CTLFLAG_RWTU #define OTUS_DEBUG_REGIO 0x00000200 #define OTUS_DEBUG_IRQ 0x00000400 #define OTUS_DEBUG_TXCOMP 0x00000800 +#define OTUS_DEBUG_RX_BUFFER 0x00001000 #define OTUS_DEBUG_ANY 0xffffffff #define OTUS_DPRINTF(sc, dm, ...) \ @@ -131,7 +132,6 @@ static device_attach_t otus_attach; static device_detach_t otus_detach; static int otus_attachhook(struct otus_softc *); -void otus_get_chanlist(struct otus_softc *); static void otus_getradiocaps(struct ieee80211com *, int, int *, struct ieee80211_channel[]); int otus_load_firmware(struct otus_softc *, const char *, @@ -395,9 +395,8 @@ otus_vap_create(struct ieee80211com *ic, const char na uvp->newstate = vap->iv_newstate; vap->iv_newstate = otus_newstate; - /* XXX TODO: double-check */ - vap->iv_ampdu_density = IEEE80211_HTCAP_MPDUDENSITY_16; - vap->iv_ampdu_rxmax = IEEE80211_HTCAP_MAXRXAMPDU_32K; + vap->iv_ampdu_density = IEEE80211_HTCAP_MPDUDENSITY_8; + vap->iv_ampdu_rxmax = IEEE80211_HTCAP_MAXRXAMPDU_64K; ieee80211_ratectl_init(vap); @@ -699,6 +698,16 @@ otus_attachhook(struct otus_softc *sc) IEEE80211_ADDR_COPY(ic->ic_macaddr, sc->eeprom.baseEepHeader.macAddr); sc->sc_led_newstate = otus_led_newstate_type3; /* XXX */ + if (sc->txmask == 0x5) + ic->ic_txstream = 2; + else + ic->ic_txstream = 1; + + if (sc->rxmask == 0x5) + ic->ic_rxstream = 2; + else + ic->ic_rxstream = 1; + device_printf(sc->sc_dev, "MAC/BBP AR9170, RF AR%X, MIMO %dT%dR, address %s\n", (sc->capflags & AR5416_OPFLAGS_11A) ? @@ -721,33 +730,21 @@ otus_attachhook(struct otus_softc *sc) IEEE80211_C_WME | /* WME/QoS */ IEEE80211_C_SHSLOT | /* Short slot time supported. */ IEEE80211_C_FF | /* Atheros fast-frames supported. */ - IEEE80211_C_MONITOR | + IEEE80211_C_MONITOR | /* Enable monitor mode */ + IEEE80211_C_SWAMSDUTX | /* Do software A-MSDU TX */ IEEE80211_C_WPA; /* WPA/RSN. */ - /* XXX TODO: 11n */ - + ic->ic_htcaps = + IEEE80211_HTC_HT | #if 0 - if (sc->eeprom.baseEepHeader.opCapFlags & AR5416_OPFLAGS_11G) { - /* Set supported .11b and .11g rates. */ - ic->ic_sup_rates[IEEE80211_MODE_11B] = - ieee80211_std_rateset_11b; - ic->ic_sup_rates[IEEE80211_MODE_11G] = - ieee80211_std_rateset_11g; - } - if (sc->eeprom.baseEepHeader.opCapFlags & AR5416_OPFLAGS_11A) { - /* Set supported .11a rates. */ - ic->ic_sup_rates[IEEE80211_MODE_11A] = - ieee80211_std_rateset_11a; - } + IEEE80211_HTC_AMPDU | #endif + IEEE80211_HTC_AMSDU | + IEEE80211_HTCAP_MAXAMSDU_3839 | + IEEE80211_HTCAP_SMPS_OFF; -#if 0 - /* Build the list of supported channels. */ - otus_get_chanlist(sc); -#else otus_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans, ic->ic_channels); -#endif ieee80211_ifattach(ic); ic->ic_raw_xmit = otus_raw_xmit; @@ -780,38 +777,6 @@ otus_attachhook(struct otus_softc *sc) return (0); } -void -otus_get_chanlist(struct otus_softc *sc) -{ - struct ieee80211com *ic = &sc->sc_ic; - uint16_t domain; - uint8_t chan; - int i; - - /* XXX regulatory domain. */ - domain = le16toh(sc->eeprom.baseEepHeader.regDmn[0]); - OTUS_DPRINTF(sc, OTUS_DEBUG_RESET, "regdomain=0x%04x\n", domain); - - if (sc->eeprom.baseEepHeader.opCapFlags & AR5416_OPFLAGS_11G) { - for (i = 0; i < 14; i++) { - chan = ar_chans[i]; - ic->ic_channels[chan].ic_freq = - ieee80211_ieee2mhz(chan, IEEE80211_CHAN_2GHZ); - ic->ic_channels[chan].ic_flags = - IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | - IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; - } - } - if (sc->eeprom.baseEepHeader.opCapFlags & AR5416_OPFLAGS_11A) { - for (i = 14; i < nitems(ar_chans); i++) { - chan = ar_chans[i]; - ic->ic_channels[chan].ic_freq = - ieee80211_ieee2mhz(chan, IEEE80211_CHAN_5GHZ); - ic->ic_channels[chan].ic_flags = IEEE80211_CHAN_A; - } - } -} - static void otus_getradiocaps(struct ieee80211com *ic, int maxchans, int *nchans, struct ieee80211_channel chans[]) @@ -824,15 +789,13 @@ otus_getradiocaps(struct ieee80211com *ic, if (sc->eeprom.baseEepHeader.opCapFlags & AR5416_OPFLAGS_11G) { setbit(bands, IEEE80211_MODE_11B); setbit(bands, IEEE80211_MODE_11G); -#if 0 - if (sc->sc_ht) - setbit(bands, IEEE80211_MODE_11NG); -#endif + setbit(bands, IEEE80211_MODE_11NG); ieee80211_add_channel_list_2ghz(chans, maxchans, nchans, ar_chans, 14, bands, 0); } if (sc->eeprom.baseEepHeader.opCapFlags & AR5416_OPFLAGS_11A) { setbit(bands, IEEE80211_MODE_11A); + setbit(bands, IEEE80211_MODE_11NA); ieee80211_add_channel_list_5ghz(chans, maxchans, nchans, &ar_chans[14], nitems(ar_chans) - 14, bands, 0); } @@ -1588,6 +1551,12 @@ otus_cmd_rxeof(struct otus_softc *sc, uint8_t *buf, in } } +/* + * Handle a single MPDU. + * + * This may be a single MPDU, or it may be a sub-frame from an A-MPDU. + * In the latter case some of the header details need to be adjusted. + */ void otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, int len, struct mbufq *rxq) { @@ -1596,41 +1565,126 @@ otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, in #if 0 struct ieee80211_node *ni; #endif - struct ar_rx_tail *tail; + struct ar_rx_macstatus *mac_status = NULL; + struct ar_rx_phystatus *phy_status = NULL; struct ieee80211_frame *wh; struct mbuf *m; - uint8_t *plcp; // int s; - int mlen; - if (__predict_false(len < AR_PLCP_HDR_LEN)) { - OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, - "sub-xfer too short %d\n", len); - return; + + if (otus_debug & OTUS_DEBUG_RX_BUFFER) { + device_printf(sc->sc_dev, "%s: %*D\n", + __func__, len, buf, "-"); } - plcp = buf; - /* All bits in the PLCP header are set to 1 for non-MPDU. */ - if (memcmp(plcp, AR_PLCP_HDR_INTR, AR_PLCP_HDR_LEN) == 0) { - otus_cmd_rxeof(sc, plcp + AR_PLCP_HDR_LEN, + /* + * Before any data path stuff - check to see if this is a command + * response. + * + * All bits in the PLCP header are set to 1 for non-MPDU. + */ + if ((len >= AR_PLCP_HDR_LEN) && + memcmp(buf, AR_PLCP_HDR_INTR, AR_PLCP_HDR_LEN) == 0) { + otus_cmd_rxeof(sc, buf + AR_PLCP_HDR_LEN, len - AR_PLCP_HDR_LEN); return; } - /* Received MPDU. */ - if (__predict_false(len < AR_PLCP_HDR_LEN + sizeof (*tail))) { - OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "MPDU too short %d\n", len); + /* + * First step - get the status for the given frame. + * This will tell us whether it's a single MPDU or + * an A-MPDU subframe. + */ + if (len < sizeof(*mac_status)) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s: sub-xfer too short (no mac_status) (len %d)\n", + __func__, len); counter_u64_add(ic->ic_ierrors, 1); return; } - tail = (struct ar_rx_tail *)(plcp + len - sizeof (*tail)); + /* + * Remove the mac_status from the payload length. + * + * Note: cheating, don't reallocate the buffer! + */ + mac_status = (struct ar_rx_macstatus *)(buf + len - sizeof(*mac_status)); + len -= sizeof(*mac_status); - /* Discard error frames; don't discard BAD_RA (eg monitor mode); let net80211 do that */ - if (__predict_false((tail->error & ~AR_RX_ERROR_BAD_RA) != 0)) { - OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "error frame 0x%02x\n", tail->error); - if (tail->error & AR_RX_ERROR_FCS) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "%s: mac status=0x%x\n", + __func__, mac_status->status); + + /* + * Next - check the MAC status before doing anything else. + * Extract out the PLCP header for single and first frames; + * since there's a single RX path we can shove PLCP headers + * from both into sc->ar_last_rx_plcp[] so it can be reused. + */ + if (((mac_status->status & AR_RX_STATUS_MPDU_MASK) == AR_RX_STATUS_MPDU_SINGLE) || + ((mac_status->status & AR_RX_STATUS_MPDU_MASK) == AR_RX_STATUS_MPDU_FIRST)) { + /* + * Ok, we need to at least have a PLCP header at + * this point. + */ + if (len < AR_PLCP_HDR_LEN) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s sub-xfer too short (no mac+plcp) (len %d\n)", + __func__, len); + counter_u64_add(ic->ic_ierrors, 1); + return; + } + memcpy(sc->ar_last_rx_plcp, buf, AR_PLCP_HDR_LEN); + + /* + * At this point we can just consume the PLCP header. + * The beginning of the frame should thus be data. + */ + buf += AR_PLCP_HDR_LEN; + len -= AR_PLCP_HDR_LEN; + } + + /* + * Next - see if we have a PHY status. + * + * The PHY status is at the end of the final A-MPDU subframe + * or a single MPDU frame. + * + * We'll use this to tag frames with noise floor / RSSI + * if they have valid information. + */ + if (((mac_status->status & AR_RX_STATUS_MPDU_MASK) == AR_RX_STATUS_MPDU_SINGLE) || + ((mac_status->status & AR_RX_STATUS_MPDU_MASK) == AR_RX_STATUS_MPDU_LAST)) { + if (len < sizeof(*phy_status)) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s sub-xfer too short (no phy status) (len %d\n)", + __func__, len); + counter_u64_add(ic->ic_ierrors, 1); + return; + } + /* + * Take a pointer to the phy status and remove the length + * from the end of the buffer. + * + * Note: we're cheating here; don't reallocate the buffer! + */ + phy_status = (struct ar_rx_phystatus *) + (buf + len - sizeof(*phy_status)); + len -= sizeof(*phy_status); + } + + /* + * Middle frames just have a MAC status (stripped above.) + * No PHY status, and PLCP is from ar_last_rx_plcp. + */ + + /* + * Discard error frames; don't discard BAD_RA (eg monitor mode); + * let net80211 do that + */ + if (__predict_false((mac_status->error & ~AR_RX_ERROR_BAD_RA) != 0)) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "error frame 0x%02x\n", mac_status->error); + if (mac_status->error & AR_RX_ERROR_FCS) { OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "bad FCS\n"); - } else if (tail->error & AR_RX_ERROR_MMIC) { + } else if (mac_status->error & AR_RX_ERROR_MMIC) { /* Report Michael MIC failures to net80211. */ #if 0 ieee80211_notify_michael_failure(ni->ni_vap, wh, keyidx); @@ -1640,77 +1694,75 @@ otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, in counter_u64_add(ic->ic_ierrors, 1); return; } - /* Compute MPDU's length. */ - mlen = len - AR_PLCP_HDR_LEN - sizeof (*tail); - /* Make sure there's room for an 802.11 header + FCS. */ - if (__predict_false(mlen < IEEE80211_MIN_LEN)) { + + /* + * Make sure there's room for an 802.11 header + FCS. + * + * Note: a CTS/ACK is 14 bytes (FC, DUR, RA, FCS). + * Making it IEEE80211_MIN_LEN misses CTS/ACKs. + * + * This won't be tossed at this point; eventually once + * rx radiotap is implemented this will allow for + * CTS/ACK frames. Passing them up to net80211 will + * currently make it angry (too short packets.) + */ + if (len < 2 + 2 + IEEE80211_ADDR_LEN + IEEE80211_CRC_LEN) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s: too short for 802.11 (len %d)\n", + __func__, len); counter_u64_add(ic->ic_ierrors, 1); return; } - mlen -= IEEE80211_CRC_LEN; /* strip 802.11 FCS */ - wh = (struct ieee80211_frame *)(plcp + AR_PLCP_HDR_LEN); + len -= IEEE80211_CRC_LEN; /* strip 802.11 FCS */ + wh = (struct ieee80211_frame *) buf; /* - * TODO: I see > 2KiB buffers in this path; is it A-MSDU or something? + * The firmware does seem to spit out a bunch of frames + * with invalid frame control values here. Just toss them + * rather than letting net80211 get angry and log. */ - m = m_get2(mlen, M_NOWAIT, MT_DATA, M_PKTHDR); + if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != + IEEE80211_FC0_VERSION_0) { + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s: invalid 802.11 fc version (firmware bug?)\n", + __func__); + counter_u64_add(ic->ic_ierrors, 1); + return; + } + + m = m_get2(len, M_NOWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { - device_printf(sc->sc_dev, "%s: failed m_get2() (mlen=%d)\n", __func__, mlen); + device_printf(sc->sc_dev, "%s: failed m_get2() (len=%d)\n", + __func__, len); counter_u64_add(ic->ic_ierrors, 1); return; } /* Finalize mbuf. */ - memcpy(mtod(m, uint8_t *), wh, mlen); - m->m_pkthdr.len = m->m_len = mlen; + memcpy(mtod(m, uint8_t *), wh, len); + m->m_pkthdr.len = m->m_len = len; -#if 0 - if (__predict_false(sc->sc_drvbpf != NULL)) { - struct otus_rx_radiotap_header *tap = &sc->sc_rxtap; - struct mbuf mb; + /* XXX TODO: add setting rx radiotap fields here */ - tap->wr_flags = 0; - tap->wr_antsignal = tail->rssi; - tap->wr_rate = 2; /* In case it can't be found below. */ - switch (tail->status & AR_RX_STATUS_MT_MASK) { - case AR_RX_STATUS_MT_CCK: - switch (plcp[0]) { - case 10: tap->wr_rate = 2; break; - case 20: tap->wr_rate = 4; break; - case 55: tap->wr_rate = 11; break; - case 110: tap->wr_rate = 22; break; - } - if (tail->status & AR_RX_STATUS_SHPREAMBLE) - tap->wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE; - break; - case AR_RX_STATUS_MT_OFDM: - switch (plcp[0] & 0xf) { - case 0xb: tap->wr_rate = 12; break; - case 0xf: tap->wr_rate = 18; break; - case 0xa: tap->wr_rate = 24; break; - case 0xe: tap->wr_rate = 36; break; - case 0x9: tap->wr_rate = 48; break; - case 0xd: tap->wr_rate = 72; break; - case 0x8: tap->wr_rate = 96; break; - case 0xc: tap->wr_rate = 108; break; - } - break; - } - mb.m_data = (caddr_t)tap; - mb.m_next = m; - mb.m_nextpkt = NULL; - mb.m_type = 0; - mb.m_flags = 0; - bpf_mtap(sc->sc_drvbpf, &mb, BPF_DIRECTION_IN); + /* + * Ok, check the frame length and toss if it's too short + * for net80211. This will toss ACK/CTS. + */ + if (m->m_len < IEEE80211_MIN_LEN) { + /* XXX TODO: add radiotap receive here */ + m_free(m); m = NULL; + return; } -#endif - /* Add RSSI/NF to this mbuf */ + /* Add RSSI to this mbuf if we have a PHY header */ bzero(&rxs, sizeof(rxs)); - rxs.r_flags = IEEE80211_R_NF | IEEE80211_R_RSSI; + rxs.r_flags = IEEE80211_R_NF; rxs.c_nf = sc->sc_nf[0]; /* XXX chain 0 != combined rssi/nf */ - rxs.c_rssi = tail->rssi; + if (phy_status != NULL) { + rxs.r_flags |= IEEE80211_R_RSSI; + rxs.c_rssi = phy_status->rssi; + } /* XXX TODO: add MIMO RSSI/NF as well */ if (ieee80211_add_rx_params(m, &rxs) == 0) { counter_u64_add(ic->ic_ierrors, 1); @@ -1741,10 +1793,18 @@ otus_rxeof(struct usb_xfer *xfer, struct otus_data *da caddr_t buf = data->buf; struct ar_rx_head *head; uint16_t hlen; - int len; + int len, offset = 0; usbd_xfer_status(xfer, &len, NULL, NULL, NULL); + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s: transfer completed; len=%d\n", + __func__, len); + if (otus_debug & OTUS_DEBUG_RX_BUFFER) { + device_printf(sc->sc_dev, "%s: %*D\n", + __func__, len, buf, "-"); + } + while (len >= sizeof (*head)) { head = (struct ar_rx_head *)buf; if (__predict_false(head->tag != htole16(AR_RX_HEAD_TAG))) { @@ -1753,19 +1813,26 @@ otus_rxeof(struct usb_xfer *xfer, struct otus_data *da break; } hlen = le16toh(head->len); + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "%s: hlen=%d\n", + __func__, hlen); if (__predict_false(sizeof (*head) + hlen > len)) { OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "xfer too short %d/%d\n", len, hlen); break; } /* Process sub-xfer. */ - otus_sub_rxeof(sc, (uint8_t *)&head[1], hlen, rxq); + otus_sub_rxeof(sc, (uint8_t *) (((uint8_t *) buf) + 4), hlen, rxq); /* Next sub-xfer is aligned on a 32-bit boundary. */ hlen = (sizeof (*head) + hlen + 3) & ~3; + offset += hlen; + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, + "%s: rounded size is %d, next packet starts at %d\n", + __func__, hlen, offset); buf += hlen; len -= hlen; } + OTUS_DPRINTF(sc, OTUS_DEBUG_RXDONE, "%s: done!\n", __func__); } static void @@ -2094,6 +2161,11 @@ otus_rate_to_hw_rate(struct otus_softc *sc, uint8_t ra is_2ghz = !! (IEEE80211_IS_CHAN_2GHZ(sc->sc_ic.ic_curchan)); + /* MCS check */ + if (rate & 0x80) { + return rate; + } + switch (rate) { /* CCK */ case 2: @@ -2129,12 +2201,17 @@ otus_rate_to_hw_rate(struct otus_softc *sc, uint8_t ra return (0x0); /* 1MB CCK */ else return (0xb); /* 6MB OFDM */ - - /* XXX TODO: HT */ } } static int +otus_hw_rate_is_ht(struct otus_softc *sc, uint8_t hw_rate) +{ + + return !! (hw_rate & 0x80); +} + +static int otus_hw_rate_is_ofdm(struct otus_softc *sc, uint8_t hw_rate) { @@ -2262,7 +2339,10 @@ otus_tx(struct otus_softc *sc, struct ieee80211_node * if (!ismcast) { if (m->m_pkthdr.len + IEEE80211_CRC_LEN >= vap->iv_rtsthreshold) macctl |= AR_TX_MAC_RTS; - else if (ic->ic_flags & IEEE80211_F_USEPROT) { + else if (otus_hw_rate_is_ht(sc, rate)) { + if (ic->ic_htprotmode == IEEE80211_PROT_RTSCTS) + macctl |= AR_TX_MAC_RTS; + } else if (ic->ic_flags & IEEE80211_F_USEPROT) { if (ic->ic_protmode == IEEE80211_PROT_CTSONLY) macctl |= AR_TX_MAC_CTS; else if (ic->ic_protmode == IEEE80211_PROT_RTSCTS) @@ -2270,8 +2350,15 @@ otus_tx(struct otus_softc *sc, struct ieee80211_node * } } - phyctl |= AR_TX_PHY_MCS(rate); - if (otus_hw_rate_is_ofdm(sc, rate)) { + phyctl |= AR_TX_PHY_MCS(rate & 0x7f); /* Note: MCS rates are 0x80 and above */ + if (otus_hw_rate_is_ht(sc, rate)) { + phyctl |= AR_TX_PHY_MT_HT; + /* Always use all tx antennas for now, just to be safe */ + phyctl |= AR_TX_PHY_ANTMSK(sc->txmask); + + /* Heavy clip */ + phyctl |= (rate & 0x7) << AR_TX_PHY_TX_HEAVY_CLIP_SHIFT; + } else if (otus_hw_rate_is_ofdm(sc, rate)) { phyctl |= AR_TX_PHY_MT_OFDM; /* Always use all tx antennas for now, just to be safe */ phyctl |= AR_TX_PHY_ANTMSK(sc->txmask); @@ -2287,7 +2374,6 @@ otus_tx(struct otus_softc *sc, struct ieee80211_node * if (!(macctl & AR_TX_MAC_NOACK)) OTUS_NODE(ni)->tx_done++; - /* Fill Tx descriptor. */ head = (struct ar_tx_head *)data->buf; head->len = htole16(m->m_pkthdr.len + IEEE80211_CRC_LEN); @@ -2463,6 +2549,22 @@ otus_updateslot(struct otus_softc *sc) (void)otus_write_barrier(sc); } +/* + * Things to do based on 2GHz or 5GHz: + * + * + slottime + * + dyn_sifs_ack + * + rts_cts_rate + * + slot time + * + mac_rates + * + mac_tpc + * + * And in the transmit path + * + tpc: carl9170_tx_rate_tpc_chains + * + carl9170_tx_physet() + * + disable short premable tx + */ + int otus_init_mac(struct otus_softc *sc) { @@ -2641,10 +2743,17 @@ otus_program_phy(struct otus_softc *sc, struct ieee802 int error, i; /* Select PHY programming based on band and bandwidth. */ - if (IEEE80211_IS_CHAN_2GHZ(c)) - vals = ar5416_phy_vals_2ghz_20mhz; - else - vals = ar5416_phy_vals_5ghz_20mhz; + if (IEEE80211_IS_CHAN_2GHZ(c)) { + if (IEEE80211_IS_CHAN_HT40(c)) + vals = ar5416_phy_vals_2ghz_40mhz; + else + vals = ar5416_phy_vals_2ghz_20mhz; + } else { + if (IEEE80211_IS_CHAN_HT40(c)) + vals = ar5416_phy_vals_5ghz_40mhz; + else + vals = ar5416_phy_vals_5ghz_20mhz; + } for (i = 0; i < nitems(ar5416_phy_regs); i++) otus_write(sc, AR_PHY(ar5416_phy_regs[i]), vals[i]); sc->phy_vals = vals; Modified: head/sys/dev/otus/if_otusreg.h ============================================================================== --- head/sys/dev/otus/if_otusreg.h Wed Jun 3 18:59:31 2020 (r361767) +++ head/sys/dev/otus/if_otusreg.h Wed Jun 3 20:25:02 2020 (r361768) @@ -201,12 +201,17 @@ struct ar_tx_head { uint32_t phyctl; /* Modulation type. */ +#define AR_TX_PHY_MT_SHIFT 0 /* 0:1 - PHY mode */ #define AR_TX_PHY_MT_CCK 0 #define AR_TX_PHY_MT_OFDM 1 #define AR_TX_PHY_MT_HT 2 -#define AR_TX_PHY_GF (1 << 2) -#define AR_TX_PHY_BW_SHIFT 3 -#define AR_TX_PHY_TPC_SHIFT 9 +#define AR_TX_PHY_GF (1 << 2) /* 2 - greenfield */ +#define AR_TX_PHY_BW_SHIFT 3 /* 4:3 - bandwidth */ +#define AR_TX_PHY_BW_20MHZ 0 +#define AR_TX_PHY_BW_40MHZ 2 +#define AR_TX_PHY_BW_40MHZ_DUP 3 +#define AR_TX_PHY_TX_HEAVY_CLIP_SHIFT 6 /* 9:6 - heavy clip */ +#define AR_TX_PHY_TPC_SHIFT 9 /* 14:9 - TX power */ #define AR_TX_PHY_ANTMSK(msk) ((msk) << 15) #define AR_TX_PHY_MCS(mcs) ((mcs) << 18) #define AR_TX_PHY_SHGI (1U << 31) @@ -220,15 +225,11 @@ struct ar_rx_head { } __packed; /* Rx descriptor. */ -struct ar_rx_tail { - uint8_t rssi_ant[3]; - uint8_t rssi_ant_ext[3]; - uint8_t rssi; /* Combined RSSI. */ - uint8_t evm[2][6]; /* Error Vector Magnitude. */ - uint8_t phy_err; - uint8_t sa_idx; - uint8_t da_idx; - uint8_t error; + +struct ar_rx_macstatus { + uint8_t sa_idx; + uint8_t da_idx; + uint8_t error; #define AR_RX_ERROR_TIMEOUT (1 << 0) #define AR_RX_ERROR_OVERRUN (1 << 1) #define AR_RX_ERROR_DECRYPT (1 << 2) @@ -236,16 +237,28 @@ struct ar_rx_tail { #define AR_RX_ERROR_BAD_RA (1 << 4) #define AR_RX_ERROR_PLCP (1 << 5) #define AR_RX_ERROR_MMIC (1 << 6) - - uint8_t status; + uint8_t status; /* Modulation type (same as AR_TX_PHY_MT). */ #define AR_RX_STATUS_MT_MASK 0x3 #define AR_RX_STATUS_MT_CCK 0 #define AR_RX_STATUS_MT_OFDM 1 #define AR_RX_STATUS_MT_HT 2 #define AR_RX_STATUS_SHPREAMBLE (1 << 3) +#define AR_RX_STATUS_MPDU_MASK 0x30 +#define AR_RX_STATUS_MPDU_SINGLE 0x00 +#define AR_RX_STATUS_MPDU_LAST 0x10 +#define AR_RX_STATUS_MPDU_FIRST 0x20 +#define AR_RX_STATUS_MPDU_MIDDLE 0x30 } __packed; +struct ar_rx_phystatus { + uint8_t rssi_ant[3]; + uint8_t rssi_ant_ext[3]; + uint8_t rssi; /* Combined RSSI. */ + uint8_t evm[2][6]; /* Error Vector Magnitude. */ + uint8_t phy_err; +} __packed; + #define AR_PLCP_HDR_LEN 12 /* Magic PLCP header for firmware notifications through Rx bulk pipe. */ static uint8_t AR_PLCP_HDR_INTR[] = { @@ -468,7 +481,6 @@ static const uint32_t ar5416_phy_vals_5ghz_20mhz[] = { 0x5fd80682, 0x7fe00482, 0x7f3c7bba, 0xf3307ff0 }; -#ifdef notyet static const uint32_t ar5416_phy_vals_5ghz_40mhz[] = { 0x00000007, 0x000003c4, 0x00000000, 0xad848e19, 0x7d14e000, 0x9c0a9f6b, 0x00000090, 0x00000000, 0x02020200, 0x00000e0e, @@ -537,9 +549,7 @@ static const uint32_t ar5416_phy_vals_5ghz_40mhz[] = { 0x17601685, 0x1f801104, 0x37a00c03, 0x3fc40883, 0x57c00803, 0x5fd80682, 0x7fe00482, 0x7f3c7bba, 0xf3307ff0 }; -#endif -#ifdef notyet static const uint32_t ar5416_phy_vals_2ghz_40mhz[] = { 0x00000007, 0x000003c4, 0x00000000, 0xad848e19, 0x7d14e000, 0x9c0a9f6b, 0x00000090, 0x00000000, 0x02020200, 0x00000e0e, @@ -608,7 +618,6 @@ static const uint32_t ar5416_phy_vals_2ghz_40mhz[] = { 0x17601685, 0x1f801104, 0x37a00c03, 0x3fc40883, 0x57c00803, 0x5fd80682, 0x7fe00482, 0x7f3c7bba, 0xf3307ff0 }; -#endif static const uint32_t ar5416_phy_vals_2ghz_20mhz[] = { 0x00000007, 0x00000300, 0x00000000, 0xad848e19, 0x7d14e000, @@ -1053,6 +1062,9 @@ struct otus_softc { struct otus_tx_cmd sc_cmd[OTUS_CMD_LIST_COUNT]; struct usb_xfer *sc_xfer[OTUS_N_XFER]; + + /* Last seen PLCP header; for A-MPDU decap */ + uint8_t ar_last_rx_plcp[AR_PLCP_HDR_LEN]; STAILQ_HEAD(, otus_data) sc_rx_active; STAILQ_HEAD(, otus_data) sc_rx_inactive; From owner-svn-src-head@freebsd.org Wed Jun 3 20:42:53 2020 Return-Path: Delivered-To: svn-src-head@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 2C1852F2BB1; Wed, 3 Jun 2020 20:42:53 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cgpP0Kk5z4f5s; Wed, 3 Jun 2020 20:42:53 +0000 (UTC) (envelope-from emaste@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 069B713CF4; Wed, 3 Jun 2020 20:42:53 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053Kgqql075366; Wed, 3 Jun 2020 20:42:52 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053KgqQp075365; Wed, 3 Jun 2020 20:42:52 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006032042.053KgqQp075365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 3 Jun 2020 20:42:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361769 - head/lib/libc/sys X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/lib/libc/sys X-SVN-Commit-Revision: 361769 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 20:42:53 -0000 Author: emaste Date: Wed Jun 3 20:42:52 2020 New Revision: 361769 URL: https://svnweb.freebsd.org/changeset/base/361769 Log: mmap.2: correct prot argument terminology One of the error descriptions referred to permissions; in context the meaning was probably clear, but the prot values are properly called protections. MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/lib/libc/sys/mmap.2 Modified: head/lib/libc/sys/mmap.2 ============================================================================== --- head/lib/libc/sys/mmap.2 Wed Jun 3 20:25:02 2020 (r361768) +++ head/lib/libc/sys/mmap.2 Wed Jun 3 20:42:52 2020 (r361769) @@ -528,8 +528,8 @@ was specified and insufficient memory was available. .It Bq Er ENOTSUP The .Fa prot -argument contains permissions which are not a subset of the specified -maximum permissions. +argument contains protections which are not a subset of the specified +maximum protections. .El .Sh SEE ALSO .Xr madvise 2 , From owner-svn-src-head@freebsd.org Wed Jun 3 20:54:38 2020 Return-Path: Delivered-To: svn-src-head@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 7167C2F3544; Wed, 3 Jun 2020 20:54:38 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ch3y28XMz3RRn; Wed, 3 Jun 2020 20:54:38 +0000 (UTC) (envelope-from kib@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 4503114456; Wed, 3 Jun 2020 20:54:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053KscFi081543; Wed, 3 Jun 2020 20:54:38 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053KsbSs081539; Wed, 3 Jun 2020 20:54:37 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006032054.053KsbSs081539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 3 Jun 2020 20:54:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361770 - in head: include lib/libthr lib/libthr/thread share/man/man3 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head: include lib/libthr lib/libthr/thread share/man/man3 X-SVN-Commit-Revision: 361770 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 20:54:38 -0000 Author: kib Date: Wed Jun 3 20:54:36 2020 New Revision: 361770 URL: https://svnweb.freebsd.org/changeset/base/361770 Log: Add pthread_getname_np() and pthread_setname_np() aliases for pthread_get_name_np() and pthread_set_name_np(), to be compatible with Linux. PR: 238404 Proposed and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D25117 Modified: head/include/pthread_np.h head/lib/libthr/pthread.map head/lib/libthr/thread/thr_info.c head/share/man/man3/Makefile head/share/man/man3/pthread_set_name_np.3 Modified: head/include/pthread_np.h ============================================================================== --- head/include/pthread_np.h Wed Jun 3 20:42:52 2020 (r361769) +++ head/include/pthread_np.h Wed Jun 3 20:54:36 2020 (r361770) @@ -50,6 +50,7 @@ int pthread_attr_get_np(pthread_t, pthread_attr_t *); int pthread_attr_getaffinity_np(const pthread_attr_t *, size_t, cpuset_t *); int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const cpuset_t *); void pthread_get_name_np(pthread_t, char *, size_t); +void pthread_getname_np(pthread_t, char *, size_t); int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); int pthread_getthreadid_np(void); int pthread_main_np(void); @@ -65,6 +66,7 @@ void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); int pthread_peekjoin_np(pthread_t, void **); void pthread_set_name_np(pthread_t, const char *); +void pthread_setname_np(pthread_t, const char *); int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); int pthread_single_np(void); void pthread_suspend_all_np(void); Modified: head/lib/libthr/pthread.map ============================================================================== --- head/lib/libthr/pthread.map Wed Jun 3 20:42:52 2020 (r361769) +++ head/lib/libthr/pthread.map Wed Jun 3 20:54:36 2020 (r361770) @@ -328,5 +328,7 @@ FBSD_1.5 { }; FBSD_1.6 { + pthread_getname_np; pthread_peekjoin_np; + pthread_setname_np; }; Modified: head/lib/libthr/thread/thr_info.c ============================================================================== --- head/lib/libthr/thread/thr_info.c Wed Jun 3 20:42:52 2020 (r361769) +++ head/lib/libthr/thread/thr_info.c Wed Jun 3 20:54:36 2020 (r361770) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include "thr_private.h" __weak_reference(_pthread_set_name_np, pthread_set_name_np); +__weak_reference(_pthread_set_name_np, pthread_setname_np); static void thr_set_name_np(struct pthread *thread, const char *name) @@ -89,6 +90,7 @@ thr_get_name_np(struct pthread *thread, char *buf, siz } __weak_reference(_pthread_get_name_np, pthread_get_name_np); +__weak_reference(_pthread_get_name_np, pthread_getname_np); void _pthread_get_name_np(pthread_t thread, char *buf, size_t len) Modified: head/share/man/man3/Makefile ============================================================================== --- head/share/man/man3/Makefile Wed Jun 3 20:42:52 2020 (r361769) +++ head/share/man/man3/Makefile Wed Jun 3 20:54:36 2020 (r361770) @@ -493,7 +493,9 @@ PTHREAD_MLINKS+=pthread_rwlock_rdlock.3 pthread_rwlock PTHREAD_MLINKS+=pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ pthread_schedparam.3 pthread_setschedparam.3 -PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 +PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ + pthread_set_name_np.3 pthread_getname_np.3 \ + pthread_set_name_np.3 pthread_setname_np.3 PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 Modified: head/share/man/man3/pthread_set_name_np.3 ============================================================================== --- head/share/man/man3/pthread_set_name_np.3 Wed Jun 3 20:42:52 2020 (r361769) +++ head/share/man/man3/pthread_set_name_np.3 Wed Jun 3 20:54:36 2020 (r361770) @@ -24,12 +24,14 @@ .\" .\" $FreeBSD$ .\" -.Dd August 12, 2018 +.Dd June 3, 2020 .Dt PTHREAD_SET_NAME_NP 3 .Os .Sh NAME .Nm pthread_get_name_np , +.Nm pthread_getname_np , .Nm pthread_set_name_np +.Nm pthread_setname_np .Nd set and retrieve the thread name .Sh LIBRARY .Lb libpthread @@ -38,18 +40,26 @@ .Ft void .Fn pthread_get_name_np "pthread_t thread" "char *name" "size_t len" .Ft void +.Fn pthread_getname_np "pthread_t thread" "char *name" "size_t len" +.Ft void .Fn pthread_set_name_np "pthread_t thread" "const char *name" +.Ft void +.Fn pthread_setname_np "pthread_t thread" "const char *name" .Sh DESCRIPTION The .Fn pthread_set_name_np -function applies a copy of the given +and +.Fn pthread_setname_np +functions applies a copy of the given .Fa name to the given .Fa thread . .Pp The .Fn pthread_get_name_np -function retrieves the +and +.Fn pthread_getname_np +functions retrieves the .Fa name associated with .Fa thread . @@ -70,6 +80,11 @@ appear inside are silently ignored. and .Fn pthread_get_name_np are non-standard extensions. +.Fn pthread_setname_np +and +.Fn pthread_getname_np +are also non-standard, but are implemented by larger number of operating +systems so they are in fact more portable. .Sh AUTHORS This manual page was written by .An Alexey Zelkin Aq Mt phantom@FreeBSD.org From owner-svn-src-head@freebsd.org Wed Jun 3 21:19:58 2020 Return-Path: Delivered-To: svn-src-head@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 128562F35E4; Wed, 3 Jun 2020 21:19:58 +0000 (UTC) (envelope-from gonzo@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49chd96n18z3TlF; Wed, 3 Jun 2020 21:19:57 +0000 (UTC) (envelope-from gonzo@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 E3AD114736; Wed, 3 Jun 2020 21:19:57 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053LJv3P094184; Wed, 3 Jun 2020 21:19:57 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053LJvZ7094183; Wed, 3 Jun 2020 21:19:57 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <202006032119.053LJvZ7094183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Wed, 3 Jun 2020 21:19:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361771 - head/sys/modules/dtb/rockchip X-SVN-Group: head X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: head/sys/modules/dtb/rockchip X-SVN-Commit-Revision: 361771 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 21:19:58 -0000 Author: gonzo Date: Wed Jun 3 21:19:57 2020 New Revision: 361771 URL: https://svnweb.freebsd.org/changeset/base/361771 Log: Add dtb for Firefly RK3399 to the list of Rockchip dtbs Modified: head/sys/modules/dtb/rockchip/Makefile Modified: head/sys/modules/dtb/rockchip/Makefile ============================================================================== --- head/sys/modules/dtb/rockchip/Makefile Wed Jun 3 20:54:36 2020 (r361770) +++ head/sys/modules/dtb/rockchip/Makefile Wed Jun 3 21:19:57 2020 (r361771) @@ -5,6 +5,7 @@ DTS= \ rockchip/rk3399-khadas-edge.dts \ rockchip/rk3399-khadas-edge-v.dts \ rockchip/rk3328-rock64.dts \ + rockchip/rk3399-firefly.dts \ rockchip/rk3399-rockpro64.dts DTSO= rk3328-dwc3.dtso From owner-svn-src-head@freebsd.org Wed Jun 3 22:11:06 2020 Return-Path: Delivered-To: svn-src-head@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 AFB0C2F4851; Wed, 3 Jun 2020 22:11:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cjmB4DFBz3bD2; Wed, 3 Jun 2020 22:11:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8BB021504B; Wed, 3 Jun 2020 22:11:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MB6Jn027142; Wed, 3 Jun 2020 22:11:06 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MB6QM027140; Wed, 3 Jun 2020 22:11:06 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006032211.053MB6QM027140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 22:11:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361773 - in head/sys: dev/cxgbe/crypto opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys: dev/cxgbe/crypto opencrypto X-SVN-Commit-Revision: 361773 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:11:06 -0000 Author: jhb Date: Wed Jun 3 22:11:05 2020 New Revision: 361773 URL: https://svnweb.freebsd.org/changeset/base/361773 Log: Add explicit bzero's of sensitive data in software crypto consumers. Explicitly zero IVs, block buffers, and hashes/digests. Reviewed by: delphij Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25057 Modified: head/sys/dev/cxgbe/crypto/t4_crypto.c head/sys/opencrypto/cryptosoft.c Modified: head/sys/dev/cxgbe/crypto/t4_crypto.c ============================================================================== --- head/sys/dev/cxgbe/crypto/t4_crypto.c Wed Jun 3 21:22:14 2020 (r361772) +++ head/sys/dev/cxgbe/crypto/t4_crypto.c Wed Jun 3 22:11:05 2020 (r361773) @@ -1495,11 +1495,15 @@ ccr_gcm_soft(struct ccr_session *s, struct cryptop *cr } } else error = EBADMSG; + explicit_bzero(digest2, sizeof(digest2)); } out: zfree(kschedule, M_CCR); zfree(auth_ctx, M_CCR); + explicit_bzero(block, sizeof(block)); + explicit_bzero(iv, sizeof(iv)); + explicit_bzero(digest, sizeof(digest)); crp->crp_etype = error; crypto_done(crp); } @@ -1953,11 +1957,15 @@ ccr_ccm_soft(struct ccr_session *s, struct cryptop *cr } } else error = EBADMSG; + explicit_bzero(digest2, sizeof(digest2)); } out: zfree(kschedule, M_CCR); zfree(auth_ctx, M_CCR); + explicit_bzero(block, sizeof(block)); + explicit_bzero(iv, sizeof(iv)); + explicit_bzero(digest, sizeof(digest)); crp->crp_etype = error; crypto_done(crp); } Modified: head/sys/opencrypto/cryptosoft.c ============================================================================== --- head/sys/opencrypto/cryptosoft.c Wed Jun 3 21:22:14 2020 (r361772) +++ head/sys/opencrypto/cryptosoft.c Wed Jun 3 22:11:05 2020 (r361773) @@ -131,8 +131,6 @@ swcr_encdec(struct swcr_session *ses, struct cryptop * (crp->crp_flags & CRYPTO_F_IV_SEPARATE) == 0) return (EINVAL); - crypto_read_iv(crp, iv); - if (crp->crp_cipher_key != NULL) { csp = crypto_get_params(crp->crp_session); error = exf->setkey(sw->sw_kschedule, @@ -141,6 +139,8 @@ swcr_encdec(struct swcr_session *ses, struct cryptop * return (error); } + crypto_read_iv(crp, iv); + if (exf->reinit) { /* * xforms that provide a reinit method perform all IV @@ -277,6 +277,9 @@ swcr_encdec(struct swcr_session *ses, struct cryptop * crypto_cursor_copyback(&cc_out, resid, blk); } + explicit_bzero(blk, sizeof(blk)); + explicit_bzero(iv, sizeof(iv)); + explicit_bzero(iv2, sizeof(iv2)); return (0); } @@ -314,7 +317,6 @@ static int swcr_authcompute(struct swcr_session *ses, struct cryptop *crp) { u_char aalg[HASH_MAX_LEN]; - u_char uaalg[HASH_MAX_LEN]; const struct crypto_session_params *csp; struct swcr_auth *sw; struct auth_hash *axf; @@ -383,14 +385,18 @@ swcr_authcompute(struct swcr_session *ses, struct cryp } if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { + u_char uaalg[HASH_MAX_LEN]; + crypto_copydata(crp, crp->crp_digest_start, sw->sw_mlen, uaalg); if (timingsafe_bcmp(aalg, uaalg, sw->sw_mlen) != 0) - return (EBADMSG); + err = EBADMSG; + explicit_bzero(uaalg, sizeof(uaalg)); } else { /* Inject the authentication data */ crypto_copyback(crp, crp->crp_digest_start, sw->sw_mlen, aalg); } - return (0); + explicit_bzero(aalg, sizeof(aalg)); + return (err); } CTASSERT(INT_MAX <= (1ll<<39) - 256); /* GCM: plain text < 2^39-256 */ @@ -402,14 +408,13 @@ swcr_gmac(struct swcr_session *ses, struct cryptop *cr uint32_t blkbuf[howmany(EALG_MAX_BLOCK_LEN, sizeof(uint32_t))]; u_char *blk = (u_char *)blkbuf; u_char aalg[AALG_MAX_RESULT_LEN]; - u_char uaalg[AALG_MAX_RESULT_LEN]; u_char iv[EALG_MAX_BLOCK_LEN]; struct crypto_buffer_cursor cc; union authctx ctx; struct swcr_auth *swa; struct auth_hash *axf; uint32_t *blkp; - int blksz, ivlen, len, resid; + int blksz, error, ivlen, len, resid; swa = &ses->swcr_auth; axf = swa->sw_axf; @@ -440,16 +445,23 @@ swcr_gmac(struct swcr_session *ses, struct cryptop *cr /* Finalize MAC */ axf->Final(aalg, &ctx); + error = 0; if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { + u_char uaalg[AALG_MAX_RESULT_LEN]; + crypto_copydata(crp, crp->crp_digest_start, swa->sw_mlen, uaalg); if (timingsafe_bcmp(aalg, uaalg, swa->sw_mlen) != 0) - return (EBADMSG); + error = EBADMSG; + explicit_bzero(uaalg, sizeof(uaalg)); } else { /* Inject the authentication data */ crypto_copyback(crp, crp->crp_digest_start, swa->sw_mlen, aalg); } - return (0); + explicit_bzero(blkbuf, sizeof(blkbuf)); + explicit_bzero(aalg, sizeof(aalg)); + explicit_bzero(iv, sizeof(iv)); + return (error); } static int @@ -458,7 +470,6 @@ swcr_gcm(struct swcr_session *ses, struct cryptop *crp uint32_t blkbuf[howmany(EALG_MAX_BLOCK_LEN, sizeof(uint32_t))]; u_char *blk = (u_char *)blkbuf; u_char aalg[AALG_MAX_RESULT_LEN]; - u_char uaalg[AALG_MAX_RESULT_LEN]; u_char iv[EALG_MAX_BLOCK_LEN]; struct crypto_buffer_cursor cc_in, cc_out; union authctx ctx; @@ -467,7 +478,7 @@ swcr_gcm(struct swcr_session *ses, struct cryptop *crp struct auth_hash *axf; struct enc_xform *exf; uint32_t *blkp; - int blksz, ivlen, len, r, resid; + int blksz, error, ivlen, len, r, resid; swa = &ses->swcr_auth; axf = swa->sw_axf; @@ -536,13 +547,19 @@ swcr_gcm(struct swcr_session *ses, struct cryptop *crp axf->Final(aalg, &ctx); /* Validate tag */ + error = 0; if (!CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) { + u_char uaalg[AALG_MAX_RESULT_LEN]; + crypto_copydata(crp, crp->crp_digest_start, swa->sw_mlen, uaalg); r = timingsafe_bcmp(aalg, uaalg, swa->sw_mlen); - if (r != 0) - return (EBADMSG); + explicit_bzero(uaalg, sizeof(uaalg)); + if (r != 0) { + error = EBADMSG; + goto out; + } /* tag matches, decrypt data */ crypto_cursor_init(&cc_in, &crp->crp_buf); @@ -562,7 +579,12 @@ swcr_gcm(struct swcr_session *ses, struct cryptop *crp aalg); } - return (0); +out: + explicit_bzero(blkbuf, sizeof(blkbuf)); + explicit_bzero(aalg, sizeof(aalg)); + explicit_bzero(iv, sizeof(iv)); + + return (error); } static int @@ -571,13 +593,12 @@ swcr_ccm_cbc_mac(struct swcr_session *ses, struct cryp uint32_t blkbuf[howmany(EALG_MAX_BLOCK_LEN, sizeof(uint32_t))]; u_char *blk = (u_char *)blkbuf; u_char aalg[AALG_MAX_RESULT_LEN]; - u_char uaalg[AALG_MAX_RESULT_LEN]; u_char iv[EALG_MAX_BLOCK_LEN]; struct crypto_buffer_cursor cc; union authctx ctx; struct swcr_auth *swa; struct auth_hash *axf; - int blksz, ivlen, len, resid; + int blksz, error, ivlen, len, resid; swa = &ses->swcr_auth; axf = swa->sw_axf; @@ -609,16 +630,23 @@ swcr_ccm_cbc_mac(struct swcr_session *ses, struct cryp /* Finalize MAC */ axf->Final(aalg, &ctx); + error = 0; if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { + u_char uaalg[AALG_MAX_RESULT_LEN]; + crypto_copydata(crp, crp->crp_digest_start, swa->sw_mlen, uaalg); if (timingsafe_bcmp(aalg, uaalg, swa->sw_mlen) != 0) - return (EBADMSG); + error = EBADMSG; + explicit_bzero(uaalg, sizeof(uaalg)); } else { /* Inject the authentication data */ crypto_copyback(crp, crp->crp_digest_start, swa->sw_mlen, aalg); } - return (0); + explicit_bzero(blkbuf, sizeof(blkbuf)); + explicit_bzero(aalg, sizeof(aalg)); + explicit_bzero(iv, sizeof(iv)); + return (error); } static int @@ -627,7 +655,6 @@ swcr_ccm(struct swcr_session *ses, struct cryptop *crp uint32_t blkbuf[howmany(EALG_MAX_BLOCK_LEN, sizeof(uint32_t))]; u_char *blk = (u_char *)blkbuf; u_char aalg[AALG_MAX_RESULT_LEN]; - u_char uaalg[AALG_MAX_RESULT_LEN]; u_char iv[EALG_MAX_BLOCK_LEN]; struct crypto_buffer_cursor cc_in, cc_out; union authctx ctx; @@ -635,7 +662,7 @@ swcr_ccm(struct swcr_session *ses, struct cryptop *crp struct swcr_encdec *swe; struct auth_hash *axf; struct enc_xform *exf; - int blksz, ivlen, len, r, resid; + int blksz, error, ivlen, len, r, resid; swa = &ses->swcr_auth; axf = swa->sw_axf; @@ -712,13 +739,19 @@ swcr_ccm(struct swcr_session *ses, struct cryptop *crp axf->Final(aalg, &ctx); /* Validate tag */ + error = 0; if (!CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) { + u_char uaalg[AALG_MAX_RESULT_LEN]; + crypto_copydata(crp, crp->crp_digest_start, swa->sw_mlen, uaalg); r = timingsafe_bcmp(aalg, uaalg, swa->sw_mlen); - if (r != 0) - return (EBADMSG); + explicit_bzero(uaalg, sizeof(uaalg)); + if (r != 0) { + error = EBADMSG; + goto out; + } /* tag matches, decrypt data */ exf->reinit(swe->sw_kschedule, iv); @@ -739,7 +772,11 @@ swcr_ccm(struct swcr_session *ses, struct cryptop *crp aalg); } - return (0); +out: + explicit_bzero(blkbuf, sizeof(blkbuf)); + explicit_bzero(aalg, sizeof(aalg)); + explicit_bzero(iv, sizeof(iv)); + return (error); } /* From owner-svn-src-head@freebsd.org Wed Jun 3 22:15:11 2020 Return-Path: Delivered-To: svn-src-head@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 CC0702F4CFB; Wed, 3 Jun 2020 22:15:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cjrv520nz3byg; Wed, 3 Jun 2020 22:15:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7C79152B4; Wed, 3 Jun 2020 22:15:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MFBjg032044; Wed, 3 Jun 2020 22:15:11 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MFBib032043; Wed, 3 Jun 2020 22:15:11 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006032215.053MFBib032043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 22:15:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361774 - head/sys/crypto/aesni X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/crypto/aesni X-SVN-Commit-Revision: 361774 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:15:11 -0000 Author: jhb Date: Wed Jun 3 22:15:11 2020 New Revision: 361774 URL: https://svnweb.freebsd.org/changeset/base/361774 Log: Explicitly zero on-stack IVs, tags, and HMAC keys. Reviewed by: delphij Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25057 Modified: head/sys/crypto/aesni/aesni.c Modified: head/sys/crypto/aesni/aesni.c ============================================================================== --- head/sys/crypto/aesni/aesni.c Wed Jun 3 22:11:05 2020 (r361773) +++ head/sys/crypto/aesni/aesni.c Wed Jun 3 22:15:11 2020 (r361774) @@ -815,6 +815,8 @@ out: explicit_bzero(outbuf, crp->crp_payload_length); free(outbuf, M_AESNI); } + explicit_bzero(iv, sizeof(iv)); + explicit_bzero(tag, sizeof(tag)); return (error); } @@ -826,9 +828,7 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry struct SHA256Context sha2 __aligned(16); struct sha1_ctxt sha1 __aligned(16); } sctx; - uint8_t hmac_key[SHA1_BLOCK_LEN] __aligned(16); uint32_t res[SHA2_256_HASH_LEN / sizeof(uint32_t)]; - uint32_t res2[SHA2_256_HASH_LEN / sizeof(uint32_t)]; const uint8_t *key; int i, keylen; @@ -839,6 +839,8 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry keylen = csp->csp_auth_klen; if (ses->hmac) { + uint8_t hmac_key[SHA1_BLOCK_LEN] __aligned(16); + /* Inner hash: (K ^ IPAD) || data */ ses->hash_init(&sctx); for (i = 0; i < keylen; i++) @@ -869,6 +871,7 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry ses->hash_update(&sctx, hmac_key, sizeof(hmac_key)); ses->hash_update(&sctx, res, ses->hash_len); ses->hash_finalize(res, &sctx); + explicit_bzero(hmac_key, sizeof(hmac_key)); } else { ses->hash_init(&sctx); @@ -889,10 +892,14 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry } if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { + uint32_t res2[SHA2_256_HASH_LEN / sizeof(uint32_t)]; + crypto_copydata(crp, crp->crp_digest_start, ses->mlen, res2); if (timingsafe_bcmp(res, res2, ses->mlen) != 0) return (EBADMSG); + explicit_bzero(res2, sizeof(res2)); } else crypto_copyback(crp, crp->crp_digest_start, ses->mlen, res); + explicit_bzero(res, sizeof(res)); return (0); } From owner-svn-src-head@freebsd.org Wed Jun 3 22:18:16 2020 Return-Path: Delivered-To: svn-src-head@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 B4AA42F4E53; Wed, 3 Jun 2020 22:18:16 +0000 (UTC) (envelope-from gonzo@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cjwS4QJDz3cDq; Wed, 3 Jun 2020 22:18:16 +0000 (UTC) (envelope-from gonzo@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 930C1152B5; Wed, 3 Jun 2020 22:18:16 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MIGXN032355; Wed, 3 Jun 2020 22:18:16 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MIGPn032354; Wed, 3 Jun 2020 22:18:16 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <202006032218.053MIGPn032354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Wed, 3 Jun 2020 22:18:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi X-SVN-Group: head X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: in head/sys: dts/arm64/overlays modules/dtb/rpi X-SVN-Commit-Revision: 361775 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:18:16 -0000 Author: gonzo Date: Wed Jun 3 22:18:15 2020 New Revision: 361775 URL: https://svnweb.freebsd.org/changeset/base/361775 Log: Add spigen overlay for Raspberry Pi 4 Submitted by: gergely.czuczy@harmless.hu Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props changed) Modified: head/sys/modules/dtb/rpi/Makefile Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 22:18:15 2020 (r361775) @@ -0,0 +1,30 @@ +/* $FreeBSD$ */ + +/dts-v1/; +/plugin/; + +/ { + compatible = "brcm,bcm2711"; +}; + +&{/soc/spi@7e204000} { + status = "okay"; + spigen0: spigen0 { + compatible = "freebsd,spigen"; + reg = <0>; + spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */ + status = "okay"; + }; + spigen1: spigen1 { + compatible = "freebsd,spigen"; + reg = <1>; + spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */ + status = "okay"; + }; +}; + +&{/soc/gpio@7e200000/spi0_cs_pins} { + brcm,pins = <8 7>; + brcm,function = <4>; /* ALT0 */ +}; + Modified: head/sys/modules/dtb/rpi/Makefile ============================================================================== --- head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:15:11 2020 (r361774) +++ head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:18:15 2020 (r361775) @@ -6,7 +6,8 @@ DTSO= \ spigen-rpi2.dtso .elif ${MACHINE_ARCH} == "aarch64" DTSO= \ - spigen-rpi3.dtso + spigen-rpi3.dtso \ + spigen-rpi4.dtso .endif .include From owner-svn-src-head@freebsd.org Wed Jun 3 22:18:22 2020 Return-Path: Delivered-To: svn-src-head@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 8E5C62F4E55; Wed, 3 Jun 2020 22:18:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cjwZ2Q9Qz3c8X; Wed, 3 Jun 2020 22:18:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71B1B15492; Wed, 3 Jun 2020 22:18:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MIL8J032409; Wed, 3 Jun 2020 22:18:21 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MILPO032408; Wed, 3 Jun 2020 22:18:21 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006032218.053MILPO032408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 22:18:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361776 - head/sys/dev/cxgbe/crypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/cxgbe/crypto X-SVN-Commit-Revision: 361776 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:18:24 -0000 Author: jhb Date: Wed Jun 3 22:18:21 2020 New Revision: 361776 URL: https://svnweb.freebsd.org/changeset/base/361776 Log: Explicitly zero AES key schedules on the stack. Reviewed by: delphij MFC after: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25057 Modified: head/sys/dev/cxgbe/crypto/t4_keyctx.c Modified: head/sys/dev/cxgbe/crypto/t4_keyctx.c ============================================================================== --- head/sys/dev/cxgbe/crypto/t4_keyctx.c Wed Jun 3 22:18:15 2020 (r361775) +++ head/sys/dev/cxgbe/crypto/t4_keyctx.c Wed Jun 3 22:18:21 2020 (r361776) @@ -75,6 +75,7 @@ t4_init_gmac_hash(const char *key, int klen, char *gha rounds = rijndaelKeySetupEnc(keysched, key, klen * 8); rijndaelEncrypt(keysched, rounds, zeroes, ghash); + explicit_bzero(keysched, sizeof(keysched)); } /* Copy out the partial hash state from a software hash implementation. */ @@ -169,4 +170,5 @@ t4_aes_getdeckey(void *dec_key, const void *enc_key, u break; } MPASS(dkey == dec_key); + explicit_bzero(ek, sizeof(ek)); } From owner-svn-src-head@freebsd.org Wed Jun 3 22:19:53 2020 Return-Path: Delivered-To: svn-src-head@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 5A26F2F4FC3; Wed, 3 Jun 2020 22:19:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cjyK1bWbz3cZd; Wed, 3 Jun 2020 22:19:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3181715493; Wed, 3 Jun 2020 22:19:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MJqYU032590; Wed, 3 Jun 2020 22:19:52 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MJqYl032589; Wed, 3 Jun 2020 22:19:52 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006032219.053MJqYl032589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 22:19:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361777 - head/sys/dev/cxgbe/crypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/cxgbe/crypto X-SVN-Commit-Revision: 361777 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:19:53 -0000 Author: jhb Date: Wed Jun 3 22:19:52 2020 New Revision: 361777 URL: https://svnweb.freebsd.org/changeset/base/361777 Log: Explicitly zero IVs on the stack. Reviewed by: delphij Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25057 Modified: head/sys/dev/cxgbe/crypto/t4_crypto.c Modified: head/sys/dev/cxgbe/crypto/t4_crypto.c ============================================================================== --- head/sys/dev/cxgbe/crypto/t4_crypto.c Wed Jun 3 22:18:21 2020 (r361776) +++ head/sys/dev/cxgbe/crypto/t4_crypto.c Wed Jun 3 22:19:52 2020 (r361777) @@ -751,6 +751,7 @@ ccr_blkcipher(struct ccr_softc *sc, struct ccr_session /* XXX: TODO backpressure */ t4_wrq_tx(sc->adapter, wr); + explicit_bzero(iv, sizeof(iv)); return (0); } @@ -1069,6 +1070,7 @@ ccr_eta(struct ccr_softc *sc, struct ccr_session *s, s /* XXX: TODO backpressure */ t4_wrq_tx(sc->adapter, wr); + explicit_bzero(iv, sizeof(iv)); return (0); } @@ -1351,6 +1353,7 @@ ccr_gcm(struct ccr_softc *sc, struct ccr_session *s, s /* XXX: TODO backpressure */ t4_wrq_tx(sc->adapter, wr); + explicit_bzero(iv, sizeof(iv)); return (0); } @@ -1818,6 +1821,7 @@ ccr_ccm(struct ccr_softc *sc, struct ccr_session *s, s /* XXX: TODO backpressure */ t4_wrq_tx(sc->adapter, wr); + explicit_bzero(iv, sizeof(iv)); return (0); } From owner-svn-src-head@freebsd.org Wed Jun 3 22:30:44 2020 Return-Path: Delivered-To: svn-src-head@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 DE5252F51A8; Wed, 3 Jun 2020 22:30:44 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ckBr5Q1Zz3dl3; Wed, 3 Jun 2020 22:30:44 +0000 (UTC) (envelope-from adrian@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 B4040154C0; Wed, 3 Jun 2020 22:30:44 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MUia4040061; Wed, 3 Jun 2020 22:30:44 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MUiiN040059; Wed, 3 Jun 2020 22:30:44 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006032230.053MUiiN040059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 3 Jun 2020 22:30:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361778 - head/sys/dev/usb/wlan X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/usb/wlan X-SVN-Commit-Revision: 361778 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:30:44 -0000 Author: adrian Date: Wed Jun 3 22:30:44 2020 New Revision: 361778 URL: https://svnweb.freebsd.org/changeset/base/361778 Log: [run] Fix up tx/rx frame size. This specifically fixes that TX frames are large enough now to hold a 3900 odd byte AMSDU (the little ones); me flipping it on earlier messed up transmit! Tested: * if_run, STA mode, TX/RX TCP/UDP iperf. TCP is now back to normal and correctly does ~ 3200 byte AMSDU/fast frames (2x1600ish byte MSDUs). Modified: head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_runvar.h Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Wed Jun 3 22:19:52 2020 (r361777) +++ head/sys/dev/usb/wlan/if_run.c Wed Jun 3 22:30:44 2020 (r361778) @@ -3050,10 +3050,11 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_ tr_setup: if (sc->rx_m == NULL) { sc->rx_m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, - MJUMPAGESIZE /* xfer can be bigger than MCLBYTES */); + RUN_MAX_RXSZ); } if (sc->rx_m == NULL) { - RUN_DPRINTF(sc, RUN_DEBUG_RECV | RUN_DEBUG_RECV_DESC, + RUN_DPRINTF(sc, RUN_DEBUG_RECV | + RUN_DEBUG_RECV_DESC | RUN_DEBUG_USB, "could not allocate mbuf - idle with stall\n"); counter_u64_add(ic->ic_ierrors, 1); usbd_xfer_set_stall(xfer); Modified: head/sys/dev/usb/wlan/if_runvar.h ============================================================================== --- head/sys/dev/usb/wlan/if_runvar.h Wed Jun 3 22:19:52 2020 (r361777) +++ head/sys/dev/usb/wlan/if_runvar.h Wed Jun 3 22:30:44 2020 (r361778) @@ -23,14 +23,15 @@ #ifndef _IF_RUNVAR_H_ #define _IF_RUNVAR_H_ +/* Support up to 4KB frames - useful for A-MSDU/FF. */ #define RUN_MAX_RXSZ \ MIN(4096, MJUMPAGESIZE) -/* NB: "11" is the maximum number of padding bytes needed for Tx */ +/* Support up to 8KB frames - useful for A-MSDU/FF. */ #define RUN_MAX_TXSZ \ (sizeof (struct rt2870_txd) + \ sizeof (struct rt2860_txwi) + \ - MCLBYTES + 11) + 8192 + 11) #define RUN_TX_TIMEOUT 5000 /* ms */ From owner-svn-src-head@freebsd.org Wed Jun 3 23:21:45 2020 Return-Path: Delivered-To: svn-src-head@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 3B68C2F612B; Wed, 3 Jun 2020 23:21:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49clKj0p4yz41gd; Wed, 3 Jun 2020 23:21:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 167E815D65; Wed, 3 Jun 2020 23:21:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053NLiKR075564; Wed, 3 Jun 2020 23:21:44 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053NLiIm075563; Wed, 3 Jun 2020 23:21:44 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006032321.053NLiIm075563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 23:21:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361779 - head/sys/modules/crypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/modules/crypto X-SVN-Commit-Revision: 361779 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 23:21:45 -0000 Author: jhb Date: Wed Jun 3 23:21:44 2020 New Revision: 361779 URL: https://svnweb.freebsd.org/changeset/base/361779 Log: Add opt_compat.h needed by r359374. Reported by: kevans Modified: head/sys/modules/crypto/Makefile Modified: head/sys/modules/crypto/Makefile ============================================================================== --- head/sys/modules/crypto/Makefile Wed Jun 3 22:30:44 2020 (r361778) +++ head/sys/modules/crypto/Makefile Wed Jun 3 23:21:44 2020 (r361779) @@ -65,6 +65,7 @@ SRCS += utils.c CFLAGS.utils.c += -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT} SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h +SRCS += opt_compat.h SRCS += opt_ddb.h SRCS += cbc_mac.c SRCS += xform_cbc_mac.c From owner-svn-src-head@freebsd.org Thu Jun 4 00:28:00 2020 Return-Path: Delivered-To: svn-src-head@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 057662F8983; Thu, 4 Jun 2020 00:28:00 +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 49cmp72W0Pz48TK; Thu, 4 Jun 2020 00:27:58 +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 0540RuJQ023665; Wed, 3 Jun 2020 17:27:56 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 0540RuJK023664; Wed, 3 Jun 2020 17:27:56 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: <202006032218.053MIGPn032354@repo.freebsd.org> To: Oleksandr Tymoshenko Date: Wed, 3 Jun 2020 17:27:56 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49cmp72W0Pz48TK X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 00:28:00 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: gonzo > Date: Wed Jun 3 22:18:15 2020 > New Revision: 361775 > URL: https://svnweb.freebsd.org/changeset/base/361775 > > Log: > Add spigen overlay for Raspberry Pi 4 > > Submitted by: gergely.czuczy@harmless.hu > > Added: > head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props changed) > Modified: > head/sys/modules/dtb/rpi/Makefile > > Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 22:18:15 2020 (r361775) > @@ -0,0 +1,30 @@ > +/* $FreeBSD$ */ This file needs some form of copyright/license. > + > +/dts-v1/; > +/plugin/; > + > +/ { > + compatible = "brcm,bcm2711"; > +}; > + > +&{/soc/spi@7e204000} { > + status = "okay"; > + spigen0: spigen0 { > + compatible = "freebsd,spigen"; > + reg = <0>; > + spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */ > + status = "okay"; > + }; > + spigen1: spigen1 { > + compatible = "freebsd,spigen"; > + reg = <1>; > + spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */ > + status = "okay"; > + }; > +}; > + > +&{/soc/gpio@7e200000/spi0_cs_pins} { > + brcm,pins = <8 7>; > + brcm,function = <4>; /* ALT0 */ > +}; > + > > Modified: head/sys/modules/dtb/rpi/Makefile > ============================================================================== > --- head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:15:11 2020 (r361774) > +++ head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:18:15 2020 (r361775) > @@ -6,7 +6,8 @@ DTSO= \ > spigen-rpi2.dtso > .elif ${MACHINE_ARCH} == "aarch64" > DTSO= \ > - spigen-rpi3.dtso > + spigen-rpi3.dtso \ > + spigen-rpi4.dtso > .endif > > .include > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 00:28:21 2020 Return-Path: Delivered-To: svn-src-head@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 5A6062F8A07; Thu, 4 Jun 2020 00:28:21 +0000 (UTC) (envelope-from rmacklem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cmpY1mlJz48Rn; Thu, 4 Jun 2020 00:28:21 +0000 (UTC) (envelope-from rmacklem@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 3808C168C4; Thu, 4 Jun 2020 00:28:21 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0540SLDC015476; Thu, 4 Jun 2020 00:28:21 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0540SLdO015475; Thu, 4 Jun 2020 00:28:21 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202006040028.0540SLdO015475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 4 Jun 2020 00:28:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361780 - head/usr.sbin/mountd X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.sbin/mountd X-SVN-Commit-Revision: 361780 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 00:28:21 -0000 Author: rmacklem Date: Thu Jun 4 00:28:20 2020 New Revision: 361780 URL: https://svnweb.freebsd.org/changeset/base/361780 Log: Fix mountd to handle getgrouplist() not returning groups[0] == groups[1]. Prior to r174547, getgrouplist(3) always returned a groups list with element 0 and 1 set to the basegid argument, so long as ngroups was > 1. Post-r174547 this is not the case. r328304 disabled the deduplication that removed the duplicate, but the duplicate still does not occur unless the group for a user in the password database is also entered in the group database. This patch fixes mountd so that it handles the case where a user specified with the -maproot or -mapall exports option has a getgrouplist(3) groups list where groups[0] != groups[1]. Found while testing another mountd patch. MFC after: 2 weeks Modified: head/usr.sbin/mountd/mountd.c Modified: head/usr.sbin/mountd/mountd.c ============================================================================== --- head/usr.sbin/mountd/mountd.c Wed Jun 3 23:21:44 2020 (r361779) +++ head/usr.sbin/mountd/mountd.c Thu Jun 4 00:28:20 2020 (r361780) @@ -3434,10 +3434,16 @@ parsecred(char *namelist, struct xucred *cr) /* * Compress out duplicate. */ - cr->cr_ngroups = ngroups - 1; cr->cr_groups[0] = groups[0]; - for (cnt = 2; cnt < ngroups; cnt++) - cr->cr_groups[cnt - 1] = groups[cnt]; + if (ngroups > 1 && groups[0] == groups[1]) { + cr->cr_ngroups = ngroups - 1; + for (cnt = 2; cnt < ngroups; cnt++) + cr->cr_groups[cnt - 1] = groups[cnt]; + } else { + cr->cr_ngroups = ngroups; + for (cnt = 1; cnt < ngroups; cnt++) + cr->cr_groups[cnt] = groups[cnt]; + } return; } /* From owner-svn-src-head@freebsd.org Thu Jun 4 00:59:48 2020 Return-Path: Delivered-To: svn-src-head@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 59C032F8DC3; Thu, 4 Jun 2020 00:59:48 +0000 (UTC) (envelope-from gonzo@freebsd.org) Received: from id.bluezbox.com (id.bluezbox.com [45.55.20.155]) (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 49cnVr09zDz4CXg; Thu, 4 Jun 2020 00:59:47 +0000 (UTC) (envelope-from gonzo@freebsd.org) Received: from localhost ([127.0.0.1] helo=id.bluezbox.com) by id.bluezbox.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92 (FreeBSD)) (envelope-from ) id 1jgeEO-000NCR-AA; Wed, 03 Jun 2020 17:59:41 -0700 Received: (from gonzo@localhost) by id.bluezbox.com (8.15.2/8.15.2/Submit) id 0540xeGj089182; Wed, 3 Jun 2020 17:59:40 -0700 (PDT) (envelope-from gonzo@freebsd.org) X-Authentication-Warning: id.bluezbox.com: gonzo set sender to gonzo@freebsd.org using -f Date: Wed, 3 Jun 2020 17:59:40 -0700 From: Oleksandr Tymoshenko To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi Message-ID: <20200604005940.GA89166@bluezbox.com> References: <202006032218.053MIGPn032354@repo.freebsd.org> <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> X-Operating-System: FreeBSD/11.2-RELEASE-p10 (amd64) User-Agent: Mutt/1.12.1 (2019-06-15) X-Spam-Level: -- X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see The administrator of that system for details. Content preview: Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > [ Charset UTF-8 unsupported, converting... ] > > Author: gonzo > > Date: Wed Jun 3 22:18:15 2020 > > New Revision: 361775 > > URL: https://svnweb. [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Rspamd-Queue-Id: 49cnVr09zDz4CXg X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:14061, ipnet:45.55.0.0/19, country:US]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 00:59:48 -0000 Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > [ Charset UTF-8 unsupported, converting... ] > > Author: gonzo > > Date: Wed Jun 3 22:18:15 2020 > > New Revision: 361775 > > URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > Log: > > Add spigen overlay for Raspberry Pi 4 > > > > Submitted by: gergely.czuczy@harmless.hu > > > > Added: > > head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props changed) > > Modified: > > head/sys/modules/dtb/rpi/Makefile > > > > Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > ============================================================================== > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 22:18:15 2020 (r361775) > > @@ -0,0 +1,30 @@ > > +/* $FreeBSD$ */ > > This file needs some form of copyright/license. Whom should I put as a copyright folder, The FreeBSD Project or the person who submitted the patch? -- gonzo From owner-svn-src-head@freebsd.org Thu Jun 4 01:49:29 2020 Return-Path: Delivered-To: svn-src-head@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 B06752FCB2A; Thu, 4 Jun 2020 01:49:29 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cpc94LCZz4KbF; Thu, 4 Jun 2020 01:49:29 +0000 (UTC) (envelope-from emaste@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 903DE17CF3; Thu, 4 Jun 2020 01:49:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0541nT1c065220; Thu, 4 Jun 2020 01:49:29 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0541nT6O065219; Thu, 4 Jun 2020 01:49:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006040149.0541nT6O065219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 4 Jun 2020 01:49:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361781 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 361781 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 01:49:29 -0000 Author: emaste Date: Thu Jun 4 01:49:29 2020 New Revision: 361781 URL: https://svnweb.freebsd.org/changeset/base/361781 Log: Correct terminology in vm.imply_prot_max sysctl description As with r361769 (man page), PROT_* are properly called protections, not permissions. MFC after: 1 week MFC with: r361769 Sponsored by: The FreeBSD Foundation Modified: head/sys/vm/vm_mmap.c Modified: head/sys/vm/vm_mmap.c ============================================================================== --- head/sys/vm/vm_mmap.c Thu Jun 4 00:28:20 2020 (r361780) +++ head/sys/vm/vm_mmap.c Thu Jun 4 01:49:29 2020 (r361781) @@ -106,7 +106,7 @@ SYSCTL_INT(_vm, OID_AUTO, mincore_mapped, CTLFLAG_RWTU "mincore reports mappings, not residency"); static int imply_prot_max = 0; SYSCTL_INT(_vm, OID_AUTO, imply_prot_max, CTLFLAG_RWTUN, &imply_prot_max, 0, - "Imply maximum page permissions in mmap() when none are specified"); + "Imply maximum page protections in mmap() when none are specified"); #ifdef MAP_32BIT #define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) From owner-svn-src-head@freebsd.org Thu Jun 4 02:10:31 2020 Return-Path: Delivered-To: svn-src-head@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 D83852FCF7D; Thu, 4 Jun 2020 02:10:31 +0000 (UTC) (envelope-from pfg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cq4R5RJRz4Mbk; Thu, 4 Jun 2020 02:10:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.5] (unknown [181.52.72.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: pfg) by smtp.freebsd.org (Postfix) with ESMTPSA id 3608E2B6FE; Thu, 4 Jun 2020 02:10:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: Oleksandr Tymoshenko , rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006032218.053MIGPn032354@repo.freebsd.org> <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> <20200604005940.GA89166@bluezbox.com> From: Pedro Giffuni Organization: FreeBSD Message-ID: <1351bb12-b6e4-b751-4556-8c7751cdf3a5@FreeBSD.org> Date: Wed, 3 Jun 2020 21:10:30 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <20200604005940.GA89166@bluezbox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 02:10:31 -0000 On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: >> [ Charset UTF-8 unsupported, converting... ] >>> Author: gonzo >>> Date: Wed Jun 3 22:18:15 2020 >>> New Revision: 361775 >>> URL: https://svnweb.freebsd.org/changeset/base/361775 >>> >>> Log: >>> Add spigen overlay for Raspberry Pi 4 >>> >>> Submitted by: gergely.czuczy@harmless.hu >>> >>> Added: >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props changed) >>> Modified: >>> head/sys/modules/dtb/rpi/Makefile >>> >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso >>> ============================================================================== >>> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 22:18:15 2020 (r361775) >>> @@ -0,0 +1,30 @@ >>> +/* $FreeBSD$ */ >> This file needs some form of copyright/license. > Whom should I put as a copyright folder, The FreeBSD Project or the > person who submitted the patch? The person that submitted the patch. Note that the FreeBSD Project is not an entity and cannot hold copyrights (The Foundation can but unless they sponsored it, that usually involves paperwork). Pedro. From owner-svn-src-head@freebsd.org Thu Jun 4 02:30:24 2020 Return-Path: Delivered-To: svn-src-head@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 B0CC82FD474; Thu, 4 Jun 2020 02:30:24 +0000 (UTC) (envelope-from jkim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cqWN3zzVz4P7x; Thu, 4 Jun 2020 02:30:24 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from freefall.freebsd.org (static-71-168-218-4.cmdnnj.fios.verizon.net [71.168.218.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 736CF2B95D; Thu, 4 Jun 2020 02:30:24 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Subject: Re: svn commit: r361770 - in head: include lib/libthr lib/libthr/thread share/man/man3 To: Konstantin Belousov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006032054.053KsbSs081539@repo.freebsd.org> From: Jung-uk Kim Autocrypt: addr=jkim@FreeBSD.org; prefer-encrypt=mutual; keydata= mQENBFJBztUBCAChqNyGqmFuNo0U7MBzsD+q/G6Cv0l7LGVrOAsgh34M8wIWhD+tztDWMVfn AhxNDd0ceCj2bYOe67sTQxAScEcbt2FfvPOLp9MEXb9qohZj172Gwkk7dnhOhZZKhVGVZKM4 NcsuBDUzgf4f3Vdzj4wg6WlqplnTZo8lPE4hZWvZHoFIyunPTJWenybeV1xnxK7JkUdSvQR0 fA59RfTTECMwTrSEfYGUnxIDBraxJ7Ecs/0hGQ7sljIj8WBvlRDU5fU1xfF35aw56T8POQRq F4E6RVJW3YGuTpSwgtGZOTfygcLRhAiq3dFC3JNLaTVTpM8PjOinJyt9AU6RoITGOKwDABEB AAG0Hkp1bmctdWsgS2ltIDxqa2ltQEZyZWVCU0Qub3JnPokBPQQTAQoAJwUCUkHO1QIbAwUJ E0/POwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB8n5Ym/NvxRqyzB/wL7QtsIpeGfGIA ZPMtgXMucM3NWzomyQMln2j2efUkDKthzh9jBxgF53TjOr7imwIt0PT2k1bqctPrq5IRqnu9 mGroqaCLE3LG2/E3jEaao4k9PO6efwlioyivUo5NrqIQOQ4k3EAXw7d2y0Dk1VpTgdMrnUAB hj7lGlLqS4ydcrf24DdbCRGdEQwqd9DBeBgbWynxAJMgbZBhYVEyIHuQKkJ8qY0ibIPXXuF0 KYDeH0qUHtWV2K3srNyPtymUkBQD84Pl1GWRYx05XdUHDmnX0JV3lg0BfYJZgZv0ehPQrMfY Fd9abTkf9FHQYz1JtsC8wUuRgqElRd6+YAGf8Tt9uQENBFJBztUBCADLtSrP44El2VoJmH14 OFrlOgxzZnbn+Y/Gf1k12mJBiR+A+pBeRLD50p7AiTrjHRxO3cHcl9Dh0uf1VSbXgp8Or0ye iP/86fZPd4k5HXNmDTLL0HecPE08SCqGZ0W8vllQrokB1QxxRUB+fFMPJyMCjDAZ7P9fFTOS dTw1bJSTtOD8Sx8MpZUa9ti06bXFlVYDlaqSdgk181SSx+ZbSKkQR8CIMARlHwiLsa3Z9q9O EJr20HPyxe0AlTvwvFndH61hg7ds63eRvglwRnNON28VXO/lvKXq7Br/CiiyhFdKfINIx2Z5 htYq22tgGTW7mBURbIKoECFBTX9Lv6BXz6w9ABEBAAGJASUEGAEKAA8FAlJBztUCGwwFCRNP zzsACgkQfJ+WJvzb8UZcJQf+IsTCxUEqY7W/pT84sMg5/QD3s6ufTRncvq14fEOxCNq1Rf4Q 9P+tOFa8GZfKDGB2BFGIrW7uT5mlmKdK1vO6ZIA930y5kUsnCmBUEBJkE2ciSQk01aB/1o62 Q3Gk/F6BwtNY9OXiqF7AcAo+K/BMIaqb26QKeh+IIgK1NN9dQiq3ByTbl4zpGZa6MmsnnRTu mzGKt2nkz7vBzH6+hZp1OzGZikgjjhYWVFoJo1dvf/rv4obs0ZJEqFPQs/1Qa1dbkKBv6odB XJpPH0ssOluTY24d1XxTiKTwmWvHeQkOKRAIfD7VTtF4TesoZYkf7hsh3e3VwXhptSLFnEOi WwYofg== Message-ID: Date: Wed, 3 Jun 2020 22:30:18 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <202006032054.053KsbSs081539@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 02:30:24 -0000 On 20. 6. 3., Konstantin Belousov wrote: > Author: kib > Date: Wed Jun 3 20:54:36 2020 > New Revision: 361770 > URL: https://svnweb.freebsd.org/changeset/base/361770 > > Log: > Add pthread_getname_np() and pthread_setname_np() aliases > > for pthread_get_name_np() and pthread_set_name_np(), to be > compatible with Linux. > > PR: 238404 > Proposed and reviewed by: markj > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D25117 > > Modified: > head/include/pthread_np.h > head/lib/libthr/pthread.map > head/lib/libthr/thread/thr_info.c > head/share/man/man3/Makefile > head/share/man/man3/pthread_set_name_np.3 > > Modified: head/include/pthread_np.h > ============================================================================== > --- head/include/pthread_np.h Wed Jun 3 20:42:52 2020 (r361769) > +++ head/include/pthread_np.h Wed Jun 3 20:54:36 2020 (r361770) > @@ -50,6 +50,7 @@ int pthread_attr_get_np(pthread_t, pthread_attr_t *); > int pthread_attr_getaffinity_np(const pthread_attr_t *, size_t, cpuset_t *); > int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const cpuset_t *); > void pthread_get_name_np(pthread_t, char *, size_t); > +void pthread_getname_np(pthread_t, char *, size_t); > int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); > int pthread_getthreadid_np(void); > int pthread_main_np(void); > @@ -65,6 +66,7 @@ void pthread_resume_all_np(void); > int pthread_resume_np(pthread_t); > int pthread_peekjoin_np(pthread_t, void **); > void pthread_set_name_np(pthread_t, const char *); > +void pthread_setname_np(pthread_t, const char *); > int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); > int pthread_single_np(void); > void pthread_suspend_all_np(void); > > Modified: head/lib/libthr/pthread.map > ============================================================================== > --- head/lib/libthr/pthread.map Wed Jun 3 20:42:52 2020 (r361769) > +++ head/lib/libthr/pthread.map Wed Jun 3 20:54:36 2020 (r361770) > @@ -328,5 +328,7 @@ FBSD_1.5 { > }; > > FBSD_1.6 { > + pthread_getname_np; > pthread_peekjoin_np; > + pthread_setname_np; > }; > > Modified: head/lib/libthr/thread/thr_info.c > ============================================================================== > --- head/lib/libthr/thread/thr_info.c Wed Jun 3 20:42:52 2020 (r361769) > +++ head/lib/libthr/thread/thr_info.c Wed Jun 3 20:54:36 2020 (r361770) > @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); > #include "thr_private.h" > > __weak_reference(_pthread_set_name_np, pthread_set_name_np); > +__weak_reference(_pthread_set_name_np, pthread_setname_np); > > static void > thr_set_name_np(struct pthread *thread, const char *name) > @@ -89,6 +90,7 @@ thr_get_name_np(struct pthread *thread, char *buf, siz > } > > __weak_reference(_pthread_get_name_np, pthread_get_name_np); > +__weak_reference(_pthread_get_name_np, pthread_getname_np); > > void > _pthread_get_name_np(pthread_t thread, char *buf, size_t len) > > Modified: head/share/man/man3/Makefile > ============================================================================== > --- head/share/man/man3/Makefile Wed Jun 3 20:42:52 2020 (r361769) > +++ head/share/man/man3/Makefile Wed Jun 3 20:54:36 2020 (r361770) > @@ -493,7 +493,9 @@ PTHREAD_MLINKS+=pthread_rwlock_rdlock.3 pthread_rwlock > PTHREAD_MLINKS+=pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 > PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ > pthread_schedparam.3 pthread_setschedparam.3 > -PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 > +PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ > + pthread_set_name_np.3 pthread_getname_np.3 \ > + pthread_set_name_np.3 pthread_setname_np.3 > PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ > pthread_spin_lock.3 pthread_spin_trylock.3 \ > pthread_spin_lock.3 pthread_spin_unlock.3 > > Modified: head/share/man/man3/pthread_set_name_np.3 > ============================================================================== > --- head/share/man/man3/pthread_set_name_np.3 Wed Jun 3 20:42:52 2020 (r361769) > +++ head/share/man/man3/pthread_set_name_np.3 Wed Jun 3 20:54:36 2020 (r361770) > @@ -24,12 +24,14 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd August 12, 2018 > +.Dd June 3, 2020 > .Dt PTHREAD_SET_NAME_NP 3 > .Os > .Sh NAME > .Nm pthread_get_name_np , > +.Nm pthread_getname_np , > .Nm pthread_set_name_np > +.Nm pthread_setname_np > .Nd set and retrieve the thread name > .Sh LIBRARY > .Lb libpthread > @@ -38,18 +40,26 @@ > .Ft void > .Fn pthread_get_name_np "pthread_t thread" "char *name" "size_t len" > .Ft void > +.Fn pthread_getname_np "pthread_t thread" "char *name" "size_t len" > +.Ft void > .Fn pthread_set_name_np "pthread_t thread" "const char *name" > +.Ft void > +.Fn pthread_setname_np "pthread_t thread" "const char *name" > .Sh DESCRIPTION > The > .Fn pthread_set_name_np > -function applies a copy of the given > +and > +.Fn pthread_setname_np > +functions applies a copy of the given > .Fa name > to the given > .Fa thread . > .Pp > The > .Fn pthread_get_name_np > -function retrieves the > +and > +.Fn pthread_getname_np > +functions retrieves the > .Fa name > associated with > .Fa thread . > @@ -70,6 +80,11 @@ appear inside are silently ignored. > and > .Fn pthread_get_name_np > are non-standard extensions. > +.Fn pthread_setname_np > +and > +.Fn pthread_getname_np > +are also non-standard, but are implemented by larger number of operating > +systems so they are in fact more portable. > .Sh AUTHORS > This manual page was written by > .An Alexey Zelkin Aq Mt phantom@FreeBSD.org It broke Firefox build and I found Linux pthread_{get,set}name_np(3) returns int. https://linux.die.net/man/3/pthread_getname_np I guess you need to write a wrapper. Please revert this patch for now. Jung-uk Kim From owner-svn-src-head@freebsd.org Thu Jun 4 02:36:42 2020 Return-Path: Delivered-To: svn-src-head@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 5AE8C2FDBAA; Thu, 4 Jun 2020 02:36:42 +0000 (UTC) (envelope-from gonzo@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cqff1nXPz4Pst; Thu, 4 Jun 2020 02:36:42 +0000 (UTC) (envelope-from gonzo@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 38868185FA; Thu, 4 Jun 2020 02:36:42 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0542aglW095816; Thu, 4 Jun 2020 02:36:42 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0542afUs095814; Thu, 4 Jun 2020 02:36:41 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <202006040236.0542afUs095814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 4 Jun 2020 02:36:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361782 - head/sys/dts/arm64/overlays X-SVN-Group: head X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: head/sys/dts/arm64/overlays X-SVN-Commit-Revision: 361782 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 02:36:42 -0000 Author: gonzo Date: Thu Jun 4 02:36:41 2020 New Revision: 361782 URL: https://svnweb.freebsd.org/changeset/base/361782 Log: Add copyright headers to spigen overlays for rpi3 and rpi4 Reported by: Rodney W. Grimes (for rpi4) Modified: head/sys/dts/arm64/overlays/spigen-rpi3.dtso head/sys/dts/arm64/overlays/spigen-rpi4.dtso Modified: head/sys/dts/arm64/overlays/spigen-rpi3.dtso ============================================================================== --- head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 01:49:29 2020 (r361781) +++ head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 02:36:41 2020 (r361782) @@ -1,4 +1,31 @@ -/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2019 Bob Frazier + * + * 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$ + */ /dts-v1/; /plugin/; Modified: head/sys/dts/arm64/overlays/spigen-rpi4.dtso ============================================================================== --- head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 01:49:29 2020 (r361781) +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 02:36:41 2020 (r361782) @@ -1,4 +1,31 @@ -/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Gergely Czuczy + * + * 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$ + */ /dts-v1/; /plugin/; From owner-svn-src-head@freebsd.org Thu Jun 4 02:47:13 2020 Return-Path: Delivered-To: svn-src-head@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 E91F62FE6A7 for ; Thu, 4 Jun 2020 02:47:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cqtm6qGpz4Qqh for ; Thu, 4 Jun 2020 02:47:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82b.google.com with SMTP id g18so4002486qtu.13 for ; Wed, 03 Jun 2020 19:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eBbvrSwXu9Qw5XMjHa2aY15vLmnxuLKbqOdfAdZM56k=; b=FM4DHVrdoDRT59OeN3FjvNgm2cu2JpoyVhLtglkACsu+dVrWJzCpxJ52SlgBOhm9bC NqPpxx82yyU66ISyyKflmK/0HWdpFUIZNis7ww961ucAEQlUCtVnEjE7iayG+cLeI6CZ YCY8Y3HEBOA0Tgqd/KQ9dqNIlX2NuvjocoM3nKAI7JXtutNMsIxZQOBhZU4kEW5bR58l nSPY3Y9Y3npKJBMMyMqRlACue2CLY+qNq+5Y0fCuGHNJGhi29NZFKKLgUgwyNXPEJMKL 9sa3RyRJqVj+6UkHFAWRFDmHKW2Fr+ztQNjb4Zos0YhDUpGkM51D0nKxYHhu7BRU17W9 Q/lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eBbvrSwXu9Qw5XMjHa2aY15vLmnxuLKbqOdfAdZM56k=; b=S48L/A9o1oR8hC1T+8g0cPsxLoOwhGYmDkVPofeM+97g46COS8ONSfguttGB1TkXFD LS6HMrK5ia57jvNsrkmUQ2uQIYxFGIeQHMWvot5SoIab45NjVpVKqHimVuJZ/V/RXak6 QM/ABMnJgHGG5K++I6vZigdA5OLMHSB6FZugo4NmanQdZFZb/BLAbDHbPgsR8Hgj1Nem Ol02GQK7PcJwi+JKPyj0iaGp7fZAVhnzVg+irxVIOoihgguZjlor+lwZHzDPN5prTkm2 Dj7bQC8agHyoWs4z6Jyp96+LtDaR/I2GpFczwPiTlxiKSSHPwag3o0dmVMjvKPxsX8on No2w== X-Gm-Message-State: AOAM533PsNKXFrvAqB0+33uEE0S9lQ2X0bHAcz6qenDae77UGSG+3tTT OxucmOEbxzmN5+1PXEFBDTVp4tacAKrGgXiEUe2USQ== X-Google-Smtp-Source: ABdhPJyrEaLp7a48uM00CASduMbCJqepyzs746dTREHDRmQkmqsEhXDQ1XDnGF+OqY2cBFKg8gcooFvOJUt+ohZv6cY= X-Received: by 2002:aed:2d87:: with SMTP id i7mr2464226qtd.291.1591238831484; Wed, 03 Jun 2020 19:47:11 -0700 (PDT) MIME-Version: 1.0 References: <202006032218.053MIGPn032354@repo.freebsd.org> <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> In-Reply-To: <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> From: Warner Losh Date: Wed, 3 Jun 2020 20:46:59 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Oleksandr Tymoshenko , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 49cqtm6qGpz4Qqh X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=FM4DHVrd; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.92 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.99)[-0.986]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.03)[0.031]; NEURAL_HAM_LONG(-0.97)[-0.969]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82b:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 02:47:14 -0000 On Wed, Jun 3, 2020, 6:28 PM Rodney W. Grimes wrote: > [ Charset UTF-8 unsupported, converting... ] > > Author: gonzo > > Date: Wed Jun 3 22:18:15 2020 > > New Revision: 361775 > > URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > Log: > > Add spigen overlay for Raspberry Pi 4 > > > > Submitted by: gergely.czuczy@harmless.hu > > > > Added: > > head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > changed) > > Modified: > > head/sys/modules/dtb/rpi/Makefile > > > > Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > ============================================================================== > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > 22:18:15 2020 (r361775) > > @@ -0,0 +1,30 @@ > > +/* $FreeBSD$ */ > > This file needs some form of copyright/license. > Dts files are like database files: they likely have no copyright protection. Warner > + > > +/dts-v1/; > > +/plugin/; > > + > > +/ { > > + compatible = "brcm,bcm2711"; > > +}; > > + > > +&{/soc/spi@7e204000} { > > + status = "okay"; > > + spigen0: spigen0 { > > + compatible = "freebsd,spigen"; > > + reg = <0>; > > + spi-max-frequency = <500000>; /* Req'd property, override > with spi(8) */ > > + status = "okay"; > > + }; > > + spigen1: spigen1 { > > + compatible = "freebsd,spigen"; > > + reg = <1>; > > + spi-max-frequency = <500000>; /* Req'd property, override > with spi(8) */ > > + status = "okay"; > > + }; > > +}; > > + > > +&{/soc/gpio@7e200000/spi0_cs_pins} { > > + brcm,pins = <8 7>; > > + brcm,function = <4>; /* ALT0 */ > > +}; > > + > > > > Modified: head/sys/modules/dtb/rpi/Makefile > > > ============================================================================== > > --- head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:15:11 2020 > (r361774) > > +++ head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:18:15 2020 > (r361775) > > @@ -6,7 +6,8 @@ DTSO= \ > > spigen-rpi2.dtso > > .elif ${MACHINE_ARCH} == "aarch64" > > DTSO= \ > > - spigen-rpi3.dtso > > + spigen-rpi3.dtso \ > > + spigen-rpi4.dtso > > .endif > > > > .include > > > > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 02:59:17 2020 Return-Path: Delivered-To: svn-src-head@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 EE0592FEE4C for ; Thu, 4 Jun 2020 02:59:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cr8j3YL2z4SP8 for ; Thu, 4 Jun 2020 02:59:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x843.google.com with SMTP id q14so4043757qtr.9 for ; Wed, 03 Jun 2020 19:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XQwFGxLWe5lU0Ldrv7B/I0K3xTYX/JVrXkML0OfzC8Q=; b=NFBJKC9myyFB33r5wXwWJjegfAXcQWjcDpu2M1hvaQCb44jYPuRkuh4Nko7Gc60e8x /nUJFjjxtaj87R+GXhQ0TyrNdNSYcJK881XkDa9jRcGtQJIR2RKenGH7kQMDZV02ODwk apzuJoxVwNPKQRWu+0JonvSwC3WgV4scX9WL1O/kq494P1HOyv2PQvyG09u8d6cebgPU 2vvqmUA8ndWeEFtsz6InaZt2NY17UsNrwIKhwtHJBh+skZkw31HZhtPKSpSOhjPHAl6V E8HxYZ5Yl9Y0eyXeMR4n+w10P+2oHl/YIhfM3UcUO4h5V9tY8CvMdOtgUaNKuiXhIn1L QZxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XQwFGxLWe5lU0Ldrv7B/I0K3xTYX/JVrXkML0OfzC8Q=; b=mwSonai0AmDqLO1KxhU0M2bZHMG+ReesHaH0RPSrx3DE0OdUf6+6SQrZrtkKlI3Mhq DI8hL7YAK1IqIisC2sg1HZUO0PI2FXFVYtHQPXYbMnSUvLcks47X4ryqhfeM2cZX/1iN /U4+oR1X1KXNPGJSzraxwIEtICX6zWcs6uK64r//YL1uXdMzAGrSckHEg+e0cxL4gPGk yDsrkgOlOXbvwTYnkqwH3CPK0C0KN4UpilC7QYCBSB75JfhOxrJnknrS9Xt/nONKAaXF BO6obVYMxrRQtGtCMK/Tc57Hf/mZKKsnp8m52cGWbdhi7aiYZNdjb0CIDpWyWxzBjfUL 14Ig== X-Gm-Message-State: AOAM533dgLquxgQ5s8UVQEGvlaPIeaoN+6snU78gvAoH682PGlJaMjqD 3MyFGv+0AI7Dg1V0f4Plpq84wViXDq5fgirM1akv2w== X-Google-Smtp-Source: ABdhPJxUvAzW0QIIPmQ5JNHtXvLu3ZZbmyTqKT5Vafr0GMWPpvYqAH3BL1/1zyY3EdqF3WndB54tFW8jFVCK2FOyjKs= X-Received: by 2002:aed:2d87:: with SMTP id i7mr2491311qtd.291.1591239556770; Wed, 03 Jun 2020 19:59:16 -0700 (PDT) MIME-Version: 1.0 References: <202006032218.053MIGPn032354@repo.freebsd.org> <202006040027.0540RuJK023664@gndrsh.dnsmgr.net> <20200604005940.GA89166@bluezbox.com> <1351bb12-b6e4-b751-4556-8c7751cdf3a5@FreeBSD.org> In-Reply-To: <1351bb12-b6e4-b751-4556-8c7751cdf3a5@FreeBSD.org> From: Warner Losh Date: Wed, 3 Jun 2020 20:59:04 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: Pedro Giffuni Cc: Oleksandr Tymoshenko , "Rodney W. Grimes" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 49cr8j3YL2z4SP8 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=NFBJKC9m; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::843) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.92 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.99)[-0.985]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.04)[0.037]; NEURAL_HAM_LONG(-0.97)[-0.968]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::843:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 02:59:18 -0000 On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni wrote: > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > >> [ Charset UTF-8 unsupported, converting... ] > >>> Author: gonzo > >>> Date: Wed Jun 3 22:18:15 2020 > >>> New Revision: 361775 > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > >>> > >>> Log: > >>> Add spigen overlay for Raspberry Pi 4 > >>> > >>> Submitted by: gergely.czuczy@harmless.hu > >>> > >>> Added: > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > changed) > >>> Modified: > >>> head/sys/modules/dtb/rpi/Makefile > >>> > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > >>> > ============================================================================== > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > added) > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > 22:18:15 2020 (r361775) > >>> @@ -0,0 +1,30 @@ > >>> +/* $FreeBSD$ */ > >> This file needs some form of copyright/license. > > Whom should I put as a copyright folder, The FreeBSD Project or the > > person who submitted the patch? > > The person that submitted the patch. > If it can be copyrighted. Note that the FreeBSD Project is not an entity and cannot hold > copyrights True, but the FreeBSD Project can be the name in the copyright line. It is the eponymous author of the FreeBSD collection. (The Foundation can but unless they sponsored it, that > usually involves paperwork). > Yup. Warner > Pedro. > > From owner-svn-src-head@freebsd.org Thu Jun 4 03:12:27 2020 Return-Path: Delivered-To: svn-src-head@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 39C9F2FF987 for ; Thu, 4 Jun 2020 03:12:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49crRt3Q3sz4VCD for ; Thu, 4 Jun 2020 03:12:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id c12so4608986qkk.13 for ; Wed, 03 Jun 2020 20:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Vt2GEkkrG9HclfyaemFfza1Rx1ElN4CT3crgoe9XbKg=; b=JwLOyY+wnCLGWeMNIQ6i3uqYkbT+EYBYZ3XmySYOmYc+smORP7IcXab7yDMM54VHfF YnsbJFKxuTPi6O/xeoYc1yrOp9ABKGPtHoVXI4ngCzGaEHZh1D0FFrVCxuLqHGH0Toi7 /j//jKZSe2zATdcW/WlVhIflHipHfKPiOIaY7HgrTp+iQcOX2wV4FcyLKEIIr5YuI7WA VXSitLZL18T80JpJ1uXmqxICsQ7F3a+hoEiQRtf4cogmG5fubcJ96o5PtdfU5aaBtV2+ YP9/VuOoCZyCzeE2wjnXQ/PnPshxDlkcBJu72y2HQUTRPgs/ehRD+59fQmQZAxzPE6Ud aCNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Vt2GEkkrG9HclfyaemFfza1Rx1ElN4CT3crgoe9XbKg=; b=mhmRFB5DOCF4HqkzFH1nyTtG8m8FuTCj5xLFDGsJ2m7OU7pH1w+VH7/IgDscg3ZFC2 hrh/EJQzoej7t38BVFo4BJPQgnezvS1AtuEUx3VpaqvULQlowy1RTgLDfcjm3C2+cFBG wFzeR4xgVCg7C0x0ppCM2zuDwfO+UEG1pLR/8OrZB4lN4Wkmm9QmmEg5on7OEv9p2jIv 0MPVpyhjWVzfo+CWGrvqPL8CjLQjGeSQW+luYXKQvqnHeM8ds/e2YC4G1HBkD3G2AJKq QvwOZ/xgsWR65PEW9fHocOscyzlf9crS/MbvcL7n/1YsJNlv6HOzvYmHslb7+9NXaDj/ Gqlg== X-Gm-Message-State: AOAM533TzseDFE346MobCYRqm+9Vv49j/sJmvj3VOPGWni9iKq3O3fZt ULN5lFNtLLENjQLiq2tTeOO2ujYrYgwDBVa+XfJJzw== X-Google-Smtp-Source: ABdhPJwtyYAf8Ffgvec6FySkUFe8IENu6F+Y4z5Q2H8nj14rCSlrobnL8Zkpgm1c/T/AxsGCcYwUl+6f2nREJxvTXLg= X-Received: by 2002:a37:7143:: with SMTP id m64mr2966495qkc.215.1591240345439; Wed, 03 Jun 2020 20:12:25 -0700 (PDT) MIME-Version: 1.0 References: <202006040236.0542afUs095814@repo.freebsd.org> In-Reply-To: <202006040236.0542afUs095814@repo.freebsd.org> From: Warner Losh Date: Wed, 3 Jun 2020 21:12:13 -0600 Message-ID: Subject: Re: svn commit: r361782 - head/sys/dts/arm64/overlays To: Oleksandr Tymoshenko Cc: src-committers , svn-src-all , svn-src-head@freebsd.org X-Rspamd-Queue-Id: 49crRt3Q3sz4VCD X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=JwLOyY+w; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::731) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.93 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.99)[-0.994]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.981]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; NEURAL_SPAM_SHORT(0.05)[0.046]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 03:12:27 -0000 Unless you got their explicit permission to license this under BSDL, please back this out. Warner On Wed, Jun 3, 2020, 8:36 PM Oleksandr Tymoshenko wrote: > Author: gonzo > Date: Thu Jun 4 02:36:41 2020 > New Revision: 361782 > URL: https://svnweb.freebsd.org/changeset/base/361782 > > Log: > Add copyright headers to spigen overlays for rpi3 and rpi4 > > Reported by: Rodney W. Grimes (for rpi4) > > Modified: > head/sys/dts/arm64/overlays/spigen-rpi3.dtso > head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > Modified: head/sys/dts/arm64/overlays/spigen-rpi3.dtso > > ============================================================================== > --- head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 > 01:49:29 2020 (r361781) > +++ head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 > 02:36:41 2020 (r361782) > @@ -1,4 +1,31 @@ > -/* $FreeBSD$ */ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2019 Bob Frazier > + * > + * 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$ > + */ > > /dts-v1/; > /plugin/; > > Modified: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > ============================================================================== > --- head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 > 01:49:29 2020 (r361781) > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 > 02:36:41 2020 (r361782) > @@ -1,4 +1,31 @@ > -/* $FreeBSD$ */ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2020 Gergely Czuczy > + * > + * 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$ > + */ > > /dts-v1/; > /plugin/; > From owner-svn-src-head@freebsd.org Thu Jun 4 04:29:43 2020 Return-Path: Delivered-To: svn-src-head@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 EB81932ADB0; Thu, 4 Jun 2020 04:29:43 +0000 (UTC) (envelope-from bjk@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ct935t7Jz4f0L; Thu, 4 Jun 2020 04:29:43 +0000 (UTC) (envelope-from bjk@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 C46F919B62; Thu, 4 Jun 2020 04:29:43 +0000 (UTC) (envelope-from bjk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0544ThiD064785; Thu, 4 Jun 2020 04:29:43 GMT (envelope-from bjk@FreeBSD.org) Received: (from bjk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0544ThUC064784; Thu, 4 Jun 2020 04:29:43 GMT (envelope-from bjk@FreeBSD.org) Message-Id: <202006040429.0544ThUC064784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org using -f From: Benjamin Kaduk Date: Thu, 4 Jun 2020 04:29:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361783 - head/usr.bin/killall X-SVN-Group: head X-SVN-Commit-Author: bjk X-SVN-Commit-Paths: head/usr.bin/killall X-SVN-Commit-Revision: 361783 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 04:29:44 -0000 Author: bjk (doc committer) Date: Thu Jun 4 04:29:43 2020 New Revision: 361783 URL: https://svnweb.freebsd.org/changeset/base/361783 Log: Add EXAMPLES to killall(1) Submitted by: fernape Differential Revision: https://reviews.freebsd.org/D25002 Modified: head/usr.bin/killall/killall.1 Modified: head/usr.bin/killall/killall.1 ============================================================================== --- head/usr.bin/killall/killall.1 Thu Jun 4 02:36:41 2020 (r361782) +++ head/usr.bin/killall/killall.1 Thu Jun 4 04:29:43 2020 (r361783) @@ -145,6 +145,50 @@ utility exits 0 if some processes have been found and signalled successfully. Otherwise, a status of 1 will be returned. +.Sh EXAMPLES +Send +.Dv SIGTERM +to all firefox processes: +.Bd -literal -offset indent +killall firefox +.Ed +.Pp +Send +.Dv SIGTERM +to firefox processes belonging to +.Va USER : +.Bd -literal -offset indent +killall -u ${USER} firefox +.Ed +.Pp +Stop all firefox processes: +.Bd -literal -offset indent +killall -SIGSTOP firefox +.Ed +.Pp +Resume firefox processes: +.Bd -literal -offset indent +killall -SIGCONT firefox +.Ed +.Pp +Show what would be done to firefox processes, but do not actually signal them: +.Bd -literal -offset indent +killall -s firefox +.Ed +.Pp +Send +.Dv SIGKILL +to csh process running inside jail ID 282: +.Bd -literal -offset indent +killall -9 -j282 csh +.Ed +.Pp +Send +.Dv SIGTERM +to all processes matching provided pattern (like vim and vimdiff): +.Bd -literal -offset indent +killall -m 'vim*' +.Ed .Sh DIAGNOSTICS Diagnostic messages will only be printed if requested by .Fl d From owner-svn-src-head@freebsd.org Thu Jun 4 04:45:04 2020 Return-Path: Delivered-To: svn-src-head@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 1CDB532AF76 for ; Thu, 4 Jun 2020 04:45:04 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-21.consmr.mail.gq1.yahoo.com (sonic306-21.consmr.mail.gq1.yahoo.com [98.137.68.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49ctVk5grpz3RVj for ; Thu, 4 Jun 2020 04:45:02 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-YMail-OSG: VaV.roAVM1mEWg_H9b2G.pMELqK0mSJsKLL_QeGBUc.MqEEHR1.14UtDYtYWHvT .LBhEvv_YRuZR.FpYGIoIIkAQOapiNTm9cwANYjxS8pS69cRgx.rG48RKNzU9bEGfVznSHIxEn5T YKMkrCzMwIuj_Jp775RSu9RrbRSQmJu0nkRbOqFQCec.GuVb0KdfD4odKuBf3K6eiwwkMGNBMXMM H75By_EAvzw.eBC22SQUHectGqXLvsUTX3qaid6y9czevy8EEubwWFdFgP4HBL65DuPx5NHhimhc BYswbRuzTH1mNFbJu_fVE7wglCWdgCkbqn3srAFl2iT4DAEWdKtOdP7fOMDmvQCYQRCq4C.WELIt sDTLwa1PnPBhofp7ml7mRXWbh8vKqxZ159xqKHeafm6G0KXxcBF9bAofWSBd.hJQ.GMnytuL0v4q zKk62x5cQMVbYDg4cWHxHA8fJ_B2kNxDnjGH0h0cKhwxWn1zKF1ASRBlHI1m_L_hoBVuKrJyTLhe 5WkYUwrFVfPGas1GqVZNeA7xsfUkaPwPDBV1JCWBA3w6HFCzGiuxuajiTWKIUTHY1Pug7weyfEhd 0zk7_q6R5sc08BauD_ItHgsiGcK7iaWHQ1Io1kG0Mi7b86M5f9vk59ZPg4ooWU2Hyu2n.YdL7HJt PMuw2T751JtsfmHTcUpScdrOZwfJ9eXs4NCALd.9SI3f1ApdXoCiCJvSEE_IBfR2DocJarb292NV JSi9UD702905hMZybNsc.OJ6diywAGYdkNJ2JPe3KvoIx4dlJcCJxpp1x4Qi4u1QCO7Fdw3fQiST RM7E5fgiBv8VOcUKyrh0uA1ld3QOavuksTn_eVOmM2rGi7uqHxNUi2h4H6_Rdi3IGhuChJneqe7S UtxDANHtmARyHZuqicNWZg8cJwRwMOYzynfgKUPfckcQqSvN2zT4WokjpJ6DE8ZdLVfd.4bf8TO7 agzuVO9Kj6YdtZFSOErODo95Hrqnj93n6Igl0L_aSLyGii_XeBh4rvK5BkO.9YL14Wug3NmrP_0u mnRvY145voHfA6nUN4AvpOHhtu0UtijGKsQn_DQqBsDqafbR3BcKZt8ohqPZUnaTTcMDIwdo..gX 6DqBe_RESMjDp4x3XFLRqXNzepOf6hQjybUWdcXXTUpD5lRnHpfr2oWopazf4y0ggAxHPpYWEdBD JFTeX7oRMbvQjY00VNEObjcD0sodDwoU2oU2RHDYIHG8YkH7mY5TMrSmZ.lACK1b68nQWePFlT68 70ZjSaZ1IJEY2SoPG.WuJMWCXfAsQi030PNmmAlKdlzoPLr.b4hKEsn3c1UOUKPK6Ong2ztn5nDl Rfk8ss7sw_d7WxszDlyeiH0ExNy5igGacvVnJNUtnpUdAk7i199ghOFckmE7EyJdXY9OC9IPHHbK TTYGtx4wUiiJF90n8NzcFbEt_qlyG8dKx.EU5rhXkXqQzS5BRjxwzm4AQ7jQMpQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Thu, 4 Jun 2020 04:45:00 +0000 Received: by smtp430.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 09686d61bde9448d017e89fe93f871c1; Thu, 04 Jun 2020 04:44:56 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi Message-Id: <2CFA852F-51A8-4AB4-BDB8-03D703D236C4@yahoo.com> Date: Wed, 3 Jun 2020 21:44:55 -0700 To: Warner Losh , svn-src-head@freebsd.org X-Mailer: Apple Mail (2.3608.80.23.2.2) References: <2CFA852F-51A8-4AB4-BDB8-03D703D236C4.ref@yahoo.com> X-Rspamd-Queue-Id: 49ctVk5grpz3RVj X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.36 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-0.98)[-0.979]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; NEURAL_HAM_LONG(-1.02)[-1.022]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.84:from]; NEURAL_HAM_SHORT(-0.86)[-0.859]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/21, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.84:from] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 04:45:04 -0000 Warner Losh imp at bsdimp.com wrote on Thu Jun 4 02:47:14 UTC 2020 : > On Wed, Jun 3, 2020, 6:28 PM Rodney W. Grimes > wrote: >=20 > > [ Charset UTF-8 unsupported, converting... ] > > > Author: gonzo > > > Date: Wed Jun 3 22:18:15 2020 > > > New Revision: 361775 > > > URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > > Log: > > > Add spigen overlay for Raspberry Pi 4 > > > > > > Submitted by: gergely.czuczy at harmless.hu > > > > > > Added: > > > head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > > changed) > > > Modified: > > > head/sys/modules/dtb/rpi/Makefile > > > > > > Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > > = =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=3D=3D=3D=3D=3D= =3D=3D=3D > > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > 22:18:15 2020 (r361775) > > > @@ -0,0 +1,30 @@ > > > +/* $FreeBSD$ */ > > > > This file needs some form of copyright/license. > > >=20 > Dts files are like database files: they likely have no copyright > protection. >=20 The below is not making claims about status-in-law. It just notes example file content. Cross checking a vague memory of what I'd seen sometime in the past, using my head -r360311 context. # egrep -ri "SPDX|Copyright" /usr/src/sys/gnu/dts/ | more shows lots of Copyright notices and SPDX notices, including a lot of "GPL-2.0", "GPL-2.0-only", "GPL-2.0+", and "GPL-2.0-or-later" SPDX notices in the .dts , .dtsi , and .h files. It also showed some license lines with the word "copyright" in the lines (whatever the capitalization status). By contrast, # egrep -r "SPDX|Copyright" /usr/src/sys/dts/ | more showed lots of Copyright notices but no SPDX notices. It did show license lines with the word "copyright" in the line as well. For both egrep's, no *.dtso files were found as far as I could tell. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-svn-src-head@freebsd.org Thu Jun 4 05:51:56 2020 Return-Path: Delivered-To: svn-src-head@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 8712C32C4F2; Thu, 4 Jun 2020 05:51:56 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49cvzw0kFxz3YgS; Thu, 4 Jun 2020 05:51:55 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-qv1-f65.google.com with SMTP id e2so2368290qvw.7; Wed, 03 Jun 2020 22:51:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OQsfiZeMrkw+ZDf/vrdPlyN4a8KFRgOYA+08DAIIa18=; b=FL8OdIzCQU792r28XHyzmRZB2oGfiOGNzOiLaltV42Fep53aiU+Kpcr4DPC9vKuZsn tM+lgB9yfM168XTu24e29jJ6P0uj3pRvsY9qp50H5JElogsyKPyYNFKz65gde5L7WUEh eSTlUWKWfeeEQtl0UR3c63ympkKuNRY6W3L0ny7NcpSDS930iZZ3bEUXkIoFDDdQ6ckh Nl5YMTjV+DRIbvjszsquN03r7qU0GlyJyjfWUfremUvVeYTXorFsI/qX3sdzBJ83jxFs OQ8S425BvHnORwIO2bQnjtofrkOzkMHNChqoIuiahuEof7724b81NydD4NTlMVLOVtnG Dthw== X-Gm-Message-State: AOAM532+wGfDK7xXbVfLOn/VH39ZAjPTtU8j1K5mXcAbKqj8d4hvAdxI eObhGNyJ9lqYliT9gVcHESxmeTKBqROhvs5WJGLjZ3gC X-Google-Smtp-Source: ABdhPJzGXqK2LB4zmLeedF6btgH4sHigV91v4Q1gEwJyMRyyY9MQNAvPBrzii2TEkvMEjPaPPzbIOI4Dw5nl8FeLuZ8= X-Received: by 2002:a0c:b297:: with SMTP id r23mr2795729qve.241.1591249914494; Wed, 03 Jun 2020 22:51:54 -0700 (PDT) MIME-Version: 1.0 References: <202006032054.053KsbSs081539@repo.freebsd.org> In-Reply-To: From: Antoine Brodin Date: Thu, 4 Jun 2020 07:51:42 +0200 Message-ID: Subject: Re: svn commit: r361770 - in head: include lib/libthr lib/libthr/thread share/man/man3 To: Jung-uk Kim Cc: Konstantin Belousov , src-committers , svn-src-all , svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49cvzw0kFxz3YgS X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 05:51:56 -0000 On Thu, Jun 4, 2020 at 4:30 AM Jung-uk Kim wrote: > > On 20. 6. 3., Konstantin Belousov wrote: > > Author: kib > > Date: Wed Jun 3 20:54:36 2020 > > New Revision: 361770 > > URL: https://svnweb.freebsd.org/changeset/base/361770 > > > > Log: > > Add pthread_getname_np() and pthread_setname_np() aliases > > > > for pthread_get_name_np() and pthread_set_name_np(), to be > > compatible with Linux. > > > > PR: 238404 > > Proposed and reviewed by: markj > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D25117 > > > > Modified: > > head/include/pthread_np.h > > head/lib/libthr/pthread.map > > head/lib/libthr/thread/thr_info.c > > head/share/man/man3/Makefile > > head/share/man/man3/pthread_set_name_np.3 > > > > Modified: head/include/pthread_np.h > > ============================================================================== > > --- head/include/pthread_np.h Wed Jun 3 20:42:52 2020 (r361769) > > +++ head/include/pthread_np.h Wed Jun 3 20:54:36 2020 (r361770) > > @@ -50,6 +50,7 @@ int pthread_attr_get_np(pthread_t, pthread_attr_t *); > > int pthread_attr_getaffinity_np(const pthread_attr_t *, size_t, cpuset_t *); > > int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const cpuset_t *); > > void pthread_get_name_np(pthread_t, char *, size_t); > > +void pthread_getname_np(pthread_t, char *, size_t); > > int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); > > int pthread_getthreadid_np(void); > > int pthread_main_np(void); > > @@ -65,6 +66,7 @@ void pthread_resume_all_np(void); > > int pthread_resume_np(pthread_t); > > int pthread_peekjoin_np(pthread_t, void **); > > void pthread_set_name_np(pthread_t, const char *); > > +void pthread_setname_np(pthread_t, const char *); > > int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); > > int pthread_single_np(void); > > void pthread_suspend_all_np(void); > > > > Modified: head/lib/libthr/pthread.map > > ============================================================================== > > --- head/lib/libthr/pthread.map Wed Jun 3 20:42:52 2020 (r361769) > > +++ head/lib/libthr/pthread.map Wed Jun 3 20:54:36 2020 (r361770) > > @@ -328,5 +328,7 @@ FBSD_1.5 { > > }; > > > > FBSD_1.6 { > > + pthread_getname_np; > > pthread_peekjoin_np; > > + pthread_setname_np; > > }; > > > > Modified: head/lib/libthr/thread/thr_info.c > > ============================================================================== > > --- head/lib/libthr/thread/thr_info.c Wed Jun 3 20:42:52 2020 (r361769) > > +++ head/lib/libthr/thread/thr_info.c Wed Jun 3 20:54:36 2020 (r361770) > > @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); > > #include "thr_private.h" > > > > __weak_reference(_pthread_set_name_np, pthread_set_name_np); > > +__weak_reference(_pthread_set_name_np, pthread_setname_np); > > > > static void > > thr_set_name_np(struct pthread *thread, const char *name) > > @@ -89,6 +90,7 @@ thr_get_name_np(struct pthread *thread, char *buf, siz > > } > > > > __weak_reference(_pthread_get_name_np, pthread_get_name_np); > > +__weak_reference(_pthread_get_name_np, pthread_getname_np); > > > > void > > _pthread_get_name_np(pthread_t thread, char *buf, size_t len) > > > > Modified: head/share/man/man3/Makefile > > ============================================================================== > > --- head/share/man/man3/Makefile Wed Jun 3 20:42:52 2020 (r361769) > > +++ head/share/man/man3/Makefile Wed Jun 3 20:54:36 2020 (r361770) > > @@ -493,7 +493,9 @@ PTHREAD_MLINKS+=pthread_rwlock_rdlock.3 pthread_rwlock > > PTHREAD_MLINKS+=pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 > > PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ > > pthread_schedparam.3 pthread_setschedparam.3 > > -PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 > > +PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ > > + pthread_set_name_np.3 pthread_getname_np.3 \ > > + pthread_set_name_np.3 pthread_setname_np.3 > > PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ > > pthread_spin_lock.3 pthread_spin_trylock.3 \ > > pthread_spin_lock.3 pthread_spin_unlock.3 > > > > Modified: head/share/man/man3/pthread_set_name_np.3 > > ============================================================================== > > --- head/share/man/man3/pthread_set_name_np.3 Wed Jun 3 20:42:52 2020 (r361769) > > +++ head/share/man/man3/pthread_set_name_np.3 Wed Jun 3 20:54:36 2020 (r361770) > > @@ -24,12 +24,14 @@ > > .\" > > .\" $FreeBSD$ > > .\" > > -.Dd August 12, 2018 > > +.Dd June 3, 2020 > > .Dt PTHREAD_SET_NAME_NP 3 > > .Os > > .Sh NAME > > .Nm pthread_get_name_np , > > +.Nm pthread_getname_np , > > .Nm pthread_set_name_np > > +.Nm pthread_setname_np > > .Nd set and retrieve the thread name > > .Sh LIBRARY > > .Lb libpthread > > @@ -38,18 +40,26 @@ > > .Ft void > > .Fn pthread_get_name_np "pthread_t thread" "char *name" "size_t len" > > .Ft void > > +.Fn pthread_getname_np "pthread_t thread" "char *name" "size_t len" > > +.Ft void > > .Fn pthread_set_name_np "pthread_t thread" "const char *name" > > +.Ft void > > +.Fn pthread_setname_np "pthread_t thread" "const char *name" > > .Sh DESCRIPTION > > The > > .Fn pthread_set_name_np > > -function applies a copy of the given > > +and > > +.Fn pthread_setname_np > > +functions applies a copy of the given > > .Fa name > > to the given > > .Fa thread . > > .Pp > > The > > .Fn pthread_get_name_np > > -function retrieves the > > +and > > +.Fn pthread_getname_np > > +functions retrieves the > > .Fa name > > associated with > > .Fa thread . > > @@ -70,6 +80,11 @@ appear inside are silently ignored. > > and > > .Fn pthread_get_name_np > > are non-standard extensions. > > +.Fn pthread_setname_np > > +and > > +.Fn pthread_getname_np > > +are also non-standard, but are implemented by larger number of operating > > +systems so they are in fact more portable. > > .Sh AUTHORS > > This manual page was written by > > .An Alexey Zelkin Aq Mt phantom@FreeBSD.org > > It broke Firefox build and I found Linux pthread_{get,set}name_np(3) > returns int. > > https://linux.die.net/man/3/pthread_getname_np > > I guess you need to write a wrapper. Please revert this patch for now. Hi, It broke devel/glib20 too, which now tries to use the function without including the header: http://beefy18.nyi.freebsd.org/data/head-amd64-default/p537862_s361780/logs/errors/glib-2.56.3_7,1.log Antoine From owner-svn-src-head@freebsd.org Thu Jun 4 09:06:04 2020 Return-Path: Delivered-To: svn-src-head@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 B10F0331877; Thu, 4 Jun 2020 09:06:04 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d0Hw4K1kz4CRX; Thu, 4 Jun 2020 09:06:04 +0000 (UTC) (envelope-from kib@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 8F3DF1CAEF; Thu, 4 Jun 2020 09:06:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054964LA036916; Thu, 4 Jun 2020 09:06:04 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0549639H036912; Thu, 4 Jun 2020 09:06:03 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006040906.0549639H036912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 4 Jun 2020 09:06:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361784 - in head: include lib/libthr lib/libthr/thread share/man/man3 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head: include lib/libthr lib/libthr/thread share/man/man3 X-SVN-Commit-Revision: 361784 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 09:06:04 -0000 Author: kib Date: Thu Jun 4 09:06:03 2020 New Revision: 361784 URL: https://svnweb.freebsd.org/changeset/base/361784 Log: Revert r361770 "Add pthread_getname_np() and pthread_setname_np() aliases" for now. It is not compatible enough with Linux. Requested by: antoine, jkim Sponsored by: The FreeBSD Foundation Modified: head/include/pthread_np.h head/lib/libthr/pthread.map head/lib/libthr/thread/thr_info.c head/share/man/man3/Makefile head/share/man/man3/pthread_set_name_np.3 Modified: head/include/pthread_np.h ============================================================================== --- head/include/pthread_np.h Thu Jun 4 04:29:43 2020 (r361783) +++ head/include/pthread_np.h Thu Jun 4 09:06:03 2020 (r361784) @@ -50,7 +50,6 @@ int pthread_attr_get_np(pthread_t, pthread_attr_t *); int pthread_attr_getaffinity_np(const pthread_attr_t *, size_t, cpuset_t *); int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const cpuset_t *); void pthread_get_name_np(pthread_t, char *, size_t); -void pthread_getname_np(pthread_t, char *, size_t); int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); int pthread_getthreadid_np(void); int pthread_main_np(void); @@ -66,7 +65,6 @@ void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); int pthread_peekjoin_np(pthread_t, void **); void pthread_set_name_np(pthread_t, const char *); -void pthread_setname_np(pthread_t, const char *); int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); int pthread_single_np(void); void pthread_suspend_all_np(void); Modified: head/lib/libthr/pthread.map ============================================================================== --- head/lib/libthr/pthread.map Thu Jun 4 04:29:43 2020 (r361783) +++ head/lib/libthr/pthread.map Thu Jun 4 09:06:03 2020 (r361784) @@ -328,7 +328,5 @@ FBSD_1.5 { }; FBSD_1.6 { - pthread_getname_np; pthread_peekjoin_np; - pthread_setname_np; }; Modified: head/lib/libthr/thread/thr_info.c ============================================================================== --- head/lib/libthr/thread/thr_info.c Thu Jun 4 04:29:43 2020 (r361783) +++ head/lib/libthr/thread/thr_info.c Thu Jun 4 09:06:03 2020 (r361784) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "thr_private.h" __weak_reference(_pthread_set_name_np, pthread_set_name_np); -__weak_reference(_pthread_set_name_np, pthread_setname_np); static void thr_set_name_np(struct pthread *thread, const char *name) @@ -90,7 +89,6 @@ thr_get_name_np(struct pthread *thread, char *buf, siz } __weak_reference(_pthread_get_name_np, pthread_get_name_np); -__weak_reference(_pthread_get_name_np, pthread_getname_np); void _pthread_get_name_np(pthread_t thread, char *buf, size_t len) Modified: head/share/man/man3/Makefile ============================================================================== --- head/share/man/man3/Makefile Thu Jun 4 04:29:43 2020 (r361783) +++ head/share/man/man3/Makefile Thu Jun 4 09:06:03 2020 (r361784) @@ -493,9 +493,7 @@ PTHREAD_MLINKS+=pthread_rwlock_rdlock.3 pthread_rwlock PTHREAD_MLINKS+=pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ pthread_schedparam.3 pthread_setschedparam.3 -PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ - pthread_set_name_np.3 pthread_getname_np.3 \ - pthread_set_name_np.3 pthread_setname_np.3 +PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 Modified: head/share/man/man3/pthread_set_name_np.3 ============================================================================== --- head/share/man/man3/pthread_set_name_np.3 Thu Jun 4 04:29:43 2020 (r361783) +++ head/share/man/man3/pthread_set_name_np.3 Thu Jun 4 09:06:03 2020 (r361784) @@ -24,14 +24,12 @@ .\" .\" $FreeBSD$ .\" -.Dd June 3, 2020 +.Dd August 12, 2018 .Dt PTHREAD_SET_NAME_NP 3 .Os .Sh NAME .Nm pthread_get_name_np , -.Nm pthread_getname_np , .Nm pthread_set_name_np -.Nm pthread_setname_np .Nd set and retrieve the thread name .Sh LIBRARY .Lb libpthread @@ -40,26 +38,18 @@ .Ft void .Fn pthread_get_name_np "pthread_t thread" "char *name" "size_t len" .Ft void -.Fn pthread_getname_np "pthread_t thread" "char *name" "size_t len" -.Ft void .Fn pthread_set_name_np "pthread_t thread" "const char *name" -.Ft void -.Fn pthread_setname_np "pthread_t thread" "const char *name" .Sh DESCRIPTION The .Fn pthread_set_name_np -and -.Fn pthread_setname_np -functions applies a copy of the given +function applies a copy of the given .Fa name to the given .Fa thread . .Pp The .Fn pthread_get_name_np -and -.Fn pthread_getname_np -functions retrieves the +function retrieves the .Fa name associated with .Fa thread . @@ -80,11 +70,6 @@ appear inside are silently ignored. and .Fn pthread_get_name_np are non-standard extensions. -.Fn pthread_setname_np -and -.Fn pthread_getname_np -are also non-standard, but are implemented by larger number of operating -systems so they are in fact more portable. .Sh AUTHORS This manual page was written by .An Alexey Zelkin Aq Mt phantom@FreeBSD.org From owner-svn-src-head@freebsd.org Thu Jun 4 10:43:00 2020 Return-Path: Delivered-To: svn-src-head@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 CA5DC334853; Thu, 4 Jun 2020 10:43:00 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:c2c:26d8::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d2Rl3ZdDz4PLT; Thu, 4 Jun 2020 10:42:59 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id 054Ago2u042110 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 4 Jun 2020 10:42:51 GMT (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: bjk@FreeBSD.org Received: from [10.58.0.10] (dadvw [10.58.0.10]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id 054AfXLc028713 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 4 Jun 2020 17:41:33 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: svn commit: r361783 - head/usr.bin/killall To: Benjamin Kaduk , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006040429.0544ThUC064784@repo.freebsd.org> From: Eugene Grosbein Message-ID: <9f04697e-91d9-1221-2c8f-136fdf564f5d@grosbein.net> Date: Thu, 4 Jun 2020 17:41:24 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <202006040429.0544ThUC064784@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=0.3 required=5.0 tests=BAYES_00,LOCAL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.0 SPF_PASS SPF: sender matches SPF record * 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record * 2.6 LOCAL_FROM From my domains X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 49d2Rl3ZdDz4PLT X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=permerror (mx1.freebsd.org: domain of eugen@grosbein.net uses mechanism not recognized by this client) smtp.mailfrom=eugen@grosbein.net X-Spamd-Result: default: False [-0.60 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.44)[-0.437]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grosbein.net]; NEURAL_HAM_LONG(-0.41)[-0.411]; NEURAL_SPAM_SHORT(0.35)[0.350]; RCVD_COUNT_THREE(0.00)[3]; R_SPF_PERMFAIL(0.00)[empty SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 10:43:00 -0000 04.06.2020 11:29, Benjamin Kaduk wrote: > Author: bjk (doc committer) > Date: Thu Jun 4 04:29:43 2020 > New Revision: 361783 > URL: https://svnweb.freebsd.org/changeset/base/361783 > > Log: > Add EXAMPLES to killall(1) > > Submitted by: fernape > Differential Revision: https://reviews.freebsd.org/D25002 > > Modified: > head/usr.bin/killall/killall.1 > > Modified: head/usr.bin/killall/killall.1 > ============================================================================== > --- head/usr.bin/killall/killall.1 Thu Jun 4 02:36:41 2020 (r361782) > +++ head/usr.bin/killall/killall.1 Thu Jun 4 04:29:43 2020 (r361783) > @@ -145,6 +145,50 @@ utility exits 0 if some processes have been found and > signalled successfully. > Otherwise, a status of 1 will be > returned. > +.Sh EXAMPLES > +Send > +.Dv SIGTERM > +to all firefox processes: > +.Bd -literal -offset indent > +killall firefox > +.Ed > +.Pp > +Send > +.Dv SIGTERM > +to firefox processes belonging to > +.Va USER : > +.Bd -literal -offset indent > +killall -u ${USER} firefox > +.Ed > +.Pp > +Stop all firefox processes: > +.Bd -literal -offset indent > +killall -SIGSTOP firefox > +.Ed > +.Pp > +Resume firefox processes: > +.Bd -literal -offset indent > +killall -SIGCONT firefox > +.Ed > +.Pp > +Show what would be done to firefox processes, but do not actually signal them: > +.Bd -literal -offset indent > +killall -s firefox > +.Ed > +.Pp > +Send > +.Dv SIGKILL > +to csh process running inside jail ID 282: > +.Bd -literal -offset indent > +killall -9 -j282 csh > +.Ed > +.Pp > +Send > +.Dv SIGTERM > +to all processes matching provided pattern (like vim and vimdiff): > +.Bd -literal -offset indent > +killall -m 'vim*' > +.Ed > .Sh DIAGNOSTICS > Diagnostic messages will only be printed if requested by > .Fl d "Firefox" is a trade mark (type of intellectual property) of Mozilla Foundation. Is it OK for us to use this name such way? Isn't it better using a name of some utility we have in the base system like systat(1) ? From owner-svn-src-head@freebsd.org Thu Jun 4 11:58:03 2020 Return-Path: Delivered-To: svn-src-head@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 3E337337054; Thu, 4 Jun 2020 11:58:03 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49d46L5Crdz4Y8W; Thu, 4 Jun 2020 11:58:02 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 054Bvl1O077564 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 4 Jun 2020 14:57:51 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 054Bvl1O077564 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 054BvlLe077563; Thu, 4 Jun 2020 14:57:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 4 Jun 2020 14:57:47 +0300 From: Konstantin Belousov To: Antoine Brodin Cc: Jung-uk Kim , src-committers , svn-src-all , svn-src-head@freebsd.org Subject: Re: svn commit: r361770 - in head: include lib/libthr lib/libthr/thread share/man/man3 Message-ID: <20200604115747.GP48478@kib.kiev.ua> References: <202006032054.053KsbSs081539@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49d46L5Crdz4Y8W X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 11:58:03 -0000 On Thu, Jun 04, 2020 at 07:51:42AM +0200, Antoine Brodin wrote: > On Thu, Jun 4, 2020 at 4:30 AM Jung-uk Kim wrote: > > > > It broke Firefox build and I found Linux pthread_{get,set}name_np(3) > > returns int. > > > > https://linux.die.net/man/3/pthread_getname_np > > > > I guess you need to write a wrapper. Please revert this patch for now. > > Hi, > > It broke devel/glib20 too, which now tries to use the function > without including the header: > http://beefy18.nyi.freebsd.org/data/head-amd64-default/p537862_s361780/logs/errors/glib-2.56.3_7,1.log I reworked the change, please see the updated review https://reviews.freebsd.org/D25117 From owner-svn-src-head@freebsd.org Thu Jun 4 12:23:16 2020 Return-Path: Delivered-To: svn-src-head@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 465B62F0B9C; Thu, 4 Jun 2020 12:23:16 +0000 (UTC) (envelope-from kib@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d4gS169qz4cfb; Thu, 4 Jun 2020 12:23:16 +0000 (UTC) (envelope-from kib@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 213051F35A; Thu, 4 Jun 2020 12:23:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054CNGxZ060485; Thu, 4 Jun 2020 12:23:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054CNFhZ060481; Thu, 4 Jun 2020 12:23:15 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006041223.054CNFhZ060481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 4 Jun 2020 12:23:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361785 - in head/sys/ufs: ffs ufs X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys/ufs: ffs ufs X-SVN-Commit-Revision: 361785 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 12:23:16 -0000 Author: kib Date: Thu Jun 4 12:23:15 2020 New Revision: 361785 URL: https://svnweb.freebsd.org/changeset/base/361785 Log: UFS: write inode block for fdatasync(2) if pointers in inode where allocated The fdatasync() description in POSIX specifies that all I/O operations shall be completed as defined for synchronized I/O data integrity completion. and then the explanation of Synchronized I/O Data Integrity Completion says The write is complete only when the data specified in the write request is successfully transferred and all file system information required to retrieve the data is successfully transferred. For UFS this means that all pointers must be on disk. Indirect pointers already contribute to the list of dirty data blocks, so only direct blocks and root pointers to indirect blocks, both of which reside in the inode block, should be taken care of. In ffs_balloc(), mark the inode with the new flag IN_IBLKDATA that specifies that ffs_syncvnode(DATA_ONLY) needs a call to ffs_update() to flush the inode block. Reviewed by: mckusick Discussed with: tmunro Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D25072 Modified: head/sys/ufs/ffs/ffs_balloc.c head/sys/ufs/ffs/ffs_inode.c head/sys/ufs/ffs/ffs_vnops.c head/sys/ufs/ufs/inode.h Modified: head/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 09:06:03 2020 (r361784) +++ head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 12:23:15 2020 (r361785) @@ -224,7 +224,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i nsize, 0, bp); } dp->di_db[lbn] = dbtofsb(fs, bp->b_blkno); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE | IN_IBLKDATA); *bpp = bp; return (0); } @@ -280,7 +280,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i } allocib = &dp->di_ib[indirs[0].in_off]; *allocib = nb; - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE | IN_IBLKDATA); } /* * Fetch through the indirect blocks, allocating as necessary. @@ -721,7 +721,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i nsize, 0, bp); } dp->di_extb[lbn] = dbtofsb(fs, bp->b_blkno); - UFS_INODE_SET_FLAG(ip, IN_CHANGE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_IBLKDATA); *bpp = bp; return (0); } @@ -750,7 +750,8 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i ip->i_size = smalllblktosize(fs, nb + 1); dp->di_size = ip->i_size; dp->di_db[nb] = dbtofsb(fs, bp->b_blkno); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE | + IN_IBLKDATA); if (flags & IO_SYNC) bwrite(bp); else @@ -820,7 +821,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i nsize, 0, bp); } dp->di_db[lbn] = dbtofsb(fs, bp->b_blkno); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE | IN_IBLKDATA); *bpp = bp; return (0); } @@ -877,7 +878,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i } allocib = &dp->di_ib[indirs[0].in_off]; *allocib = nb; - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE | IN_IBLKDATA); } /* * Fetch through the indirect blocks, allocating as necessary. Modified: head/sys/ufs/ffs/ffs_inode.c ============================================================================== --- head/sys/ufs/ffs/ffs_inode.c Thu Jun 4 09:06:03 2020 (r361784) +++ head/sys/ufs/ffs/ffs_inode.c Thu Jun 4 12:23:15 2020 (r361785) @@ -94,7 +94,7 @@ ffs_update(vp, waitfor) ip = VTOI(vp); if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor == 0) return (0); - ip->i_flag &= ~(IN_LAZYACCESS | IN_LAZYMOD | IN_MODIFIED); + ip->i_flag &= ~(IN_LAZYACCESS | IN_LAZYMOD | IN_MODIFIED | IN_IBLKDATA); fs = ITOFS(ip); if (fs->fs_ronly && ITOUMP(ip)->um_fsckpid == 0) return (0); Modified: head/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vnops.c Thu Jun 4 09:06:03 2020 (r361784) +++ head/sys/ufs/ffs/ffs_vnops.c Thu Jun 4 12:23:15 2020 (r361785) @@ -416,6 +416,8 @@ next: error = ffs_update(vp, 1); if (DOINGSUJ(vp)) softdep_journal_fsync(VTOI(vp)); + } else if ((ip->i_flags & IN_IBLKDATA) != 0) { + error = ffs_update(vp, 1); } return (error); } Modified: head/sys/ufs/ufs/inode.h ============================================================================== --- head/sys/ufs/ufs/inode.h Thu Jun 4 09:06:03 2020 (r361784) +++ head/sys/ufs/ufs/inode.h Thu Jun 4 12:23:15 2020 (r361785) @@ -129,13 +129,13 @@ struct inode { suspension finished */ #define IN_EA_LOCKED 0x0080 #define IN_EA_LOCKWAIT 0x0100 - #define IN_TRUNCATED 0x0200 /* Journaled truncation pending. */ - #define IN_UFS2 0x0400 /* UFS2 vs UFS1 */ +#define IN_IBLKDATA 0x0800 /* datasync requires inode block + update */ #define PRINT_INODE_FLAGS "\20\20b16\17b15\16b14\15b13" \ - "\14b12\13is_ufs2\12truncated\11ea_lockwait\10ea_locked" \ + "\14iblkdata\13is_ufs2\12truncated\11ea_lockwait\10ea_locked" \ "\7lazyaccess\6lazymod\5needsync\4modified\3update\2change\1access" #define UFS_INODE_FLAG_LAZY_MASK \ From owner-svn-src-head@freebsd.org Thu Jun 4 12:51:04 2020 Return-Path: Delivered-To: svn-src-head@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 CE9CF2F1B69; Thu, 4 Jun 2020 12:51:04 +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 49d5HX2xWYz3S1D; Thu, 4 Jun 2020 12:51:04 +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 054Cp2QF025897; Thu, 4 Jun 2020 05:51:02 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054Cp2aQ025896; Thu, 4 Jun 2020 05:51:02 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041251.054Cp2aQ025896@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: <20200604005940.GA89166@bluezbox.com> To: Oleksandr Tymoshenko Date: Thu, 4 Jun 2020 05:51:02 -0700 (PDT) CC: rgrimes@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49d5HX2xWYz3S1D X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 12:51:04 -0000 > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > [ Charset UTF-8 unsupported, converting... ] > > > Author: gonzo > > > Date: Wed Jun 3 22:18:15 2020 > > > New Revision: 361775 > > > URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > > Log: > > > Add spigen overlay for Raspberry Pi 4 > > > > > > Submitted by: gergely.czuczy@harmless.hu > > > > > > Added: > > > head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props changed) > > > Modified: > > > head/sys/modules/dtb/rpi/Makefile > > > > > > Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > ============================================================================== > > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 22:18:15 2020 (r361775) > > > @@ -0,0 +1,30 @@ > > > +/* $FreeBSD$ */ > > > > This file needs some form of copyright/license. > > Whom should I put as a copyright folder, The FreeBSD Project or the > person who submitted the patch? You need to obtain there permission too, you can not just slap someones name in a copyright statement. They can also make the file "in the public domain". -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 12:54:13 2020 Return-Path: Delivered-To: svn-src-head@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 46A112F217E; Thu, 4 Jun 2020 12:54:13 +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 49d5M86wYrz3SST; Thu, 4 Jun 2020 12:54:12 +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 054CsBjB025919; Thu, 4 Jun 2020 05:54:11 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054CsBTs025918; Thu, 4 Jun 2020 05:54:11 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041254.054CsBTs025918@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: <1351bb12-b6e4-b751-4556-8c7751cdf3a5@FreeBSD.org> To: Pedro Giffuni Date: Thu, 4 Jun 2020 05:54:11 -0700 (PDT) CC: Oleksandr Tymoshenko , rgrimes@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49d5M86wYrz3SST X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 12:54:13 -0000 > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > >> [ Charset UTF-8 unsupported, converting... ] > >>> Author: gonzo > >>> Date: Wed Jun 3 22:18:15 2020 > >>> New Revision: 361775 > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > >>> > >>> Log: > >>> Add spigen overlay for Raspberry Pi 4 > >>> > >>> Submitted by: gergely.czuczy@harmless.hu > >>> > >>> Added: > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props changed) > >>> Modified: > >>> head/sys/modules/dtb/rpi/Makefile > >>> > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > >>> ============================================================================== > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly added) > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 22:18:15 2020 (r361775) > >>> @@ -0,0 +1,30 @@ > >>> +/* $FreeBSD$ */ > >> This file needs some form of copyright/license. > > Whom should I put as a copyright folder, The FreeBSD Project or the > > person who submitted the patch? > > The person that submitted the patch. > > Note that the FreeBSD Project is not an entity and cannot hold > copyrights (The Foundation can but unless they sponsored it, that > usually involves paperwork). I am glad at least one other person understands that point in law: :root {1002}# find . -type f | xargs grep Copyright | grep -i freebsd | grep -i project ./cddl/compat/opensolaris/kern/opensolaris_dtrace.c: * Copyright 2014 The FreeBSD Project. ./net/if_enc.h: * Copyright (c) 2008 The FreeBSD Project. ./net/if_enc.c: * Copyright (c) 2006 The FreeBSD Project. ./kern/kern_idle.c: * Copyright (C) 2000-2004 The FreeBSD Project. All rights reserved. ./kern/subr_kdb.c: * Copyright (c) 2004 The FreeBSD Project ./conf/newvers.sh: year=$(sed -Ee '/^Copyright .* The FreeBSD Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) ./conf/newvers.sh: * Copyright (c) 1992-$year The FreeBSD Project. ./sys/copyright.h: * Copyright (C) 1992-2018 The FreeBSD Project. All rights reserved. ./sys/copyright.h: "Copyright (c) 1992-2019 The FreeBSD Project.\n" ^^^ The copyright we spit out on every boot :-( ./compat/linux/linux_uid16.c: * Copyright (c) 2001 The FreeBSD Project ./tools/embed_mfs.sh:# Copyright (C) 2008 The FreeBSD Project. All rights reserved. ./dev/mfi/mfi_syspd.c: * Copyright 1994-2009 The FreeBSD Project. ./dev/mfi/mfi_tbolt.c: * Copyright 1994-2009 The FreeBSD Project. ./dev/chromebook_platform/chromebook_platform.c: * Copyright (c) 2016 The FreeBSD Project. ./dev/pccard/pccarddevs: * Copyright (c) 1999-2004 The FreeBSD Project. ./dev/tdfx/tdfx_linux.c: * Copyright (c) 2006 The FreeBSD Project ./powerpc/powerpc/uma_machdep.c: * Copyright (c) 2003 The FreeBSD Project ./libkern/memset.c: * Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved. > > Pedro. > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 12:55:08 2020 Return-Path: Delivered-To: svn-src-head@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 2DD082F1C73; Thu, 4 Jun 2020 12:55:08 +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 49d5NC6RGTz3SR1; Thu, 4 Jun 2020 12:55:07 +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 054Ct6TP025951; Thu, 4 Jun 2020 05:55:06 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054Ct6kP025950; Thu, 4 Jun 2020 05:55:06 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041255.054Ct6kP025950@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361782 - head/sys/dts/arm64/overlays In-Reply-To: <202006040236.0542afUs095814@repo.freebsd.org> To: Oleksandr Tymoshenko Date: Thu, 4 Jun 2020 05:55:06 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49d5NC6RGTz3SR1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 12:55:08 -0000 > Author: gonzo > Date: Thu Jun 4 02:36:41 2020 > New Revision: 361782 > URL: https://svnweb.freebsd.org/changeset/base/361782 > > Log: > Add copyright headers to spigen overlays for rpi3 and rpi4 > > Reported by: Rodney W. Grimes (for rpi4) Thank you, and you did obtain Bob's permission I hope? > Modified: > head/sys/dts/arm64/overlays/spigen-rpi3.dtso > head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > Modified: head/sys/dts/arm64/overlays/spigen-rpi3.dtso > ============================================================================== > --- head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 01:49:29 2020 (r361781) > +++ head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 02:36:41 2020 (r361782) > @@ -1,4 +1,31 @@ > -/* $FreeBSD$ */ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2019 Bob Frazier > + * > + * 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$ > + */ > > /dts-v1/; > /plugin/; > > Modified: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > ============================================================================== > --- head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 01:49:29 2020 (r361781) > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 02:36:41 2020 (r361782) > @@ -1,4 +1,31 @@ > -/* $FreeBSD$ */ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2020 Gergely Czuczy > + * > + * 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$ > + */ > > /dts-v1/; > /plugin/; > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 12:57:24 2020 Return-Path: Delivered-To: svn-src-head@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 B2A912F1977; Thu, 4 Jun 2020 12:57:24 +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 49d5Qq3cN2z3SvT; Thu, 4 Jun 2020 12:57:23 +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 054CvKbQ025967; Thu, 4 Jun 2020 05:57:20 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054CvKZ0025966; Thu, 4 Jun 2020 05:57:20 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041257.054CvKZ0025966@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: To: Warner Losh Date: Thu, 4 Jun 2020 05:57:20 -0700 (PDT) CC: "Rodney W. Grimes" , Oleksandr Tymoshenko , src-committers , svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49d5Qq3cN2z3SvT X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [0.89 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.08)[-0.078]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.02)[-0.015]; NEURAL_SPAM_LONG(0.09)[0.087]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 12:57:24 -0000 > On Wed, Jun 3, 2020, 6:28 PM Rodney W. Grimes > wrote: > > > [ Charset UTF-8 unsupported, converting... ] > > > Author: gonzo > > > Date: Wed Jun 3 22:18:15 2020 > > > New Revision: 361775 > > > URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > > Log: > > > Add spigen overlay for Raspberry Pi 4 > > > > > > Submitted by: gergely.czuczy@harmless.hu > > > > > > Added: > > > head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > > changed) > > > Modified: > > > head/sys/modules/dtb/rpi/Makefile > > > > > > Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > > ============================================================================== > > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > > +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > 22:18:15 2020 (r361775) > > > @@ -0,0 +1,30 @@ > > > +/* $FreeBSD$ */ > > > > This file needs some form of copyright/license. > > > > Dts files are like database files: they likely have no copyright > protection. THough I concur on that, it seems the project has lost much insite on that, as has the industry. I now see copyrights and licenses on almost any thing in our tree, shell scripts, Makefiles, etc, etc... If we infact feel these files are non copyrightable/licensable perhaps they should have a statement making that clear? The Berne convention leaves files with no copyright/license statement in them subject to dispute. > Warner > > > > + > > > +/dts-v1/; > > > +/plugin/; > > > + > > > +/ { > > > + compatible = "brcm,bcm2711"; > > > +}; > > > + > > > +&{/soc/spi@7e204000} { > > > + status = "okay"; > > > + spigen0: spigen0 { > > > + compatible = "freebsd,spigen"; > > > + reg = <0>; > > > + spi-max-frequency = <500000>; /* Req'd property, override > > with spi(8) */ > > > + status = "okay"; > > > + }; > > > + spigen1: spigen1 { > > > + compatible = "freebsd,spigen"; > > > + reg = <1>; > > > + spi-max-frequency = <500000>; /* Req'd property, override > > with spi(8) */ > > > + status = "okay"; > > > + }; > > > +}; > > > + > > > +&{/soc/gpio@7e200000/spi0_cs_pins} { > > > + brcm,pins = <8 7>; > > > + brcm,function = <4>; /* ALT0 */ > > > +}; > > > + > > > > > > Modified: head/sys/modules/dtb/rpi/Makefile > > > > > ============================================================================== > > > --- head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:15:11 2020 > > (r361774) > > > +++ head/sys/modules/dtb/rpi/Makefile Wed Jun 3 22:18:15 2020 > > (r361775) > > > @@ -6,7 +6,8 @@ DTSO= \ > > > spigen-rpi2.dtso > > > .elif ${MACHINE_ARCH} == "aarch64" > > > DTSO= \ > > > - spigen-rpi3.dtso > > > + spigen-rpi3.dtso \ > > > + spigen-rpi4.dtso > > > .endif > > > > > > .include > > > > > > > -- > > Rod Grimes > > rgrimes@freebsd.org > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 13:03:59 2020 Return-Path: Delivered-To: svn-src-head@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 A801B2F236F; Thu, 4 Jun 2020 13:03:59 +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 49d5ZQ5fK3z3TqS; Thu, 4 Jun 2020 13:03:58 +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 054D3uBQ026008; Thu, 4 Jun 2020 06:03:56 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054D3uwf026007; Thu, 4 Jun 2020 06:03:56 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041303.054D3uwf026007@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: To: Warner Losh Date: Thu, 4 Jun 2020 06:03:56 -0700 (PDT) CC: Pedro Giffuni , Oleksandr Tymoshenko , "Rodney W. Grimes" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49d5ZQ5fK3z3TqS X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [1.22 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.11)[0.114]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.02)[0.017]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(0.19)[0.188]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:03:59 -0000 > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni wrote: > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > >> [ Charset UTF-8 unsupported, converting... ] > > >>> Author: gonzo > > >>> Date: Wed Jun 3 22:18:15 2020 > > >>> New Revision: 361775 > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > >>> > > >>> Log: > > >>> Add spigen overlay for Raspberry Pi 4 > > >>> > > >>> Submitted by: gergely.czuczy@harmless.hu > > >>> > > >>> Added: > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > > changed) > > >>> Modified: > > >>> head/sys/modules/dtb/rpi/Makefile > > >>> > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > >>> > > ============================================================================== > > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > > added) > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > 22:18:15 2020 (r361775) > > >>> @@ -0,0 +1,30 @@ > > >>> +/* $FreeBSD$ */ > > >> This file needs some form of copyright/license. > > > Whom should I put as a copyright folder, The FreeBSD Project or the > > > person who submitted the patch? > > > > The person that submitted the patch. > > > > If it can be copyrighted. > > Note that the FreeBSD Project is not an entity and cannot hold > > copyrights > > > True, but the FreeBSD Project can be the name in the copyright line. It is > the eponymous author of the FreeBSD collection. Thats a very slippery slope, though US copyright law allows pseudonyms as the copyright holder, I know of nothing that allows eponymous names. And I do not believe pseudonyms are support in other jurisdiction. https://www.copyright.gov/fls/fl101.pdf > (The Foundation can but unless they sponsored it, that > > usually involves paperwork). > > > > Yup. > > Warner > > > Pedro. > > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 13:06:49 2020 Return-Path: Delivered-To: svn-src-head@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 D7EFC2F221A; Thu, 4 Jun 2020 13:06:49 +0000 (UTC) (envelope-from avg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d5dj5R8sz3TvC; Thu, 4 Jun 2020 13:06:49 +0000 (UTC) (envelope-from avg@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 B0E241FE2C; Thu, 4 Jun 2020 13:06:49 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054D6nQF086147; Thu, 4 Jun 2020 13:06:49 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054D6ni4086146; Thu, 4 Jun 2020 13:06:49 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202006041306.054D6ni4086146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 4 Jun 2020 13:06:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361787 - head/sbin/ifconfig X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sbin/ifconfig X-SVN-Commit-Revision: 361787 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:06:49 -0000 Author: avg Date: Thu Jun 4 13:06:49 2020 New Revision: 361787 URL: https://svnweb.freebsd.org/changeset/base/361787 Log: ifconfig.8: fix cpability and flag descriptions for list scan / sta Some capability descriptions under list scan actually described flags. Some capability descriptions were missing. Some flag descriptions under list sta actually described capabilites. Reviewed by: adrian MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D25014 Modified: head/sbin/ifconfig/ifconfig.8 Modified: head/sbin/ifconfig/ifconfig.8 ============================================================================== --- head/sbin/ifconfig/ifconfig.8 Thu Jun 4 13:03:13 2020 (r361786) +++ head/sbin/ifconfig/ifconfig.8 Thu Jun 4 13:06:49 2020 (r361787) @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd December 17, 2019 +.Dd June 4, 2020 .Dt IFCONFIG 8 .Os .Sh NAME @@ -1511,39 +1511,30 @@ Depending on the capabilities of the stations the foll flags can be included in the output: .Bl -tag -width 3n .It Li A -Authorized. -Indicates that the station is permitted to send/receive data frames. +Channel agility. +.It Li B +PBCC modulation. +.It Li C +Poll request capability. +.It Li D +DSSS/OFDM capability. .It Li E -Extended Rate Phy (ERP). -Indicates that the station is operating in an 802.11g network -using extended transmit rates. -.It Li H -High Throughput (HT). -Indicates that the station is using HT transmit rates. -If a `+' follows immediately after then the station associated -using deprecated mechanisms supported only when -.Cm htcompat -is enabled. +Extended Service Set (ESS). +.It Li I +Independent Basic Service Set (IBSS). .It Li P -Power Save. -Indicates that the station is operating in power save mode. -.It Li Q -Quality of Service (QoS). -Indicates that the station is using QoS encapsulation for -data frame. -QoS encapsulation is enabled only when WME mode is enabled. +Privacy capability. +The station requires authentication. +.It Li R +Robust Secure Network (RSN). .It Li S Short Preamble. Indicates that the station is doing short preamble to optionally improve throughput performance with 802.11g and 802.11b. -.It Li T -Transitional Security Network (TSN). -Indicates that the station associated using TSN; see also -.Cm tsn -below. -.It Li W -Wi-Fi Protected Setup (WPS). -Indicates that the station associated using WPS. +.It Li c +Pollable capability. +.It Li s +Short slot time capability. .El .Pp By default interesting information elements captured from the neighboring @@ -1585,8 +1576,7 @@ Capabilities advertised by the stations are described the .Cm scan request. -Depending on the capabilities of the stations the following -flags can be included in the output: +The following flags can be included in the output: .Bl -tag -width 3n .It Li A Authorized. @@ -1598,7 +1588,9 @@ using extended transmit rates. .It Li H High Throughput (HT). Indicates that the station is using HT transmit rates. -If a `+' follows immediately after then the station associated +If a +.Sq Li + +follows immediately after then the station associated using deprecated mechanisms supported only when .Cm htcompat is enabled. @@ -1611,9 +1603,10 @@ Indicates that the station is using QoS encapsulation data frame. QoS encapsulation is enabled only when WME mode is enabled. .It Li S -Short Preamble. -Indicates that the station is doing short preamble to optionally -improve throughput performance with 802.11g and 802.11b. +Short GI in HT 40MHz mode enabled. +If a +.Sq Li + +follows immediately after then short GI in HT 20MHz mode is enabled as well. .It Li T Transitional Security Network (TSN). Indicates that the station associated using TSN; see also @@ -1622,6 +1615,8 @@ below. .It Li W Wi-Fi Protected Setup (WPS). Indicates that the station associated using WPS. +.It Li s +Short GI in HT 20MHz mode enabled. .El .Pp By default information elements received from associated stations From owner-svn-src-head@freebsd.org Thu Jun 4 13:12:09 2020 Return-Path: Delivered-To: svn-src-head@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 0BD602F23C2; Thu, 4 Jun 2020 13:12:09 +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 49d5lr1cS7z3Vcy; Thu, 4 Jun 2020 13:12:07 +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 054DC6PB026051; Thu, 4 Jun 2020 06:12:06 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054DC5gj026050; Thu, 4 Jun 2020 06:12:05 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041312.054DC5gj026050@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361783 - head/usr.bin/killall In-Reply-To: <9f04697e-91d9-1221-2c8f-136fdf564f5d@grosbein.net> To: Eugene Grosbein Date: Thu, 4 Jun 2020 06:12:05 -0700 (PDT) CC: Benjamin Kaduk , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49d5lr1cS7z3Vcy X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [0.83 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.11)[-0.108]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.03)[-0.026]; NEURAL_SPAM_LONG(0.06)[0.062]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:12:09 -0000 > 04.06.2020 11:29, Benjamin Kaduk wrote: > > > Author: bjk (doc committer) > > Date: Thu Jun 4 04:29:43 2020 > > New Revision: 361783 > > URL: https://svnweb.freebsd.org/changeset/base/361783 > > > > Log: > > Add EXAMPLES to killall(1) > > > > Submitted by: fernape > > Differential Revision: https://reviews.freebsd.org/D25002 > > > > Modified: > > head/usr.bin/killall/killall.1 > > > > Modified: head/usr.bin/killall/killall.1 > > ============================================================================== > > --- head/usr.bin/killall/killall.1 Thu Jun 4 02:36:41 2020 (r361782) > > +++ head/usr.bin/killall/killall.1 Thu Jun 4 04:29:43 2020 (r361783) > > @@ -145,6 +145,50 @@ utility exits 0 if some processes have been found and > > signalled successfully. > > Otherwise, a status of 1 will be > > returned. > > +.Sh EXAMPLES > > +Send > > +.Dv SIGTERM > > +to all firefox processes: > > +.Bd -literal -offset indent > > +killall firefox > > +.Ed > > +.Pp > > +Send > > +.Dv SIGTERM > > +to firefox processes belonging to > > +.Va USER : > > +.Bd -literal -offset indent > > +killall -u ${USER} firefox > > +.Ed > > +.Pp > > +Stop all firefox processes: > > +.Bd -literal -offset indent > > +killall -SIGSTOP firefox > > +.Ed > > +.Pp > > +Resume firefox processes: > > +.Bd -literal -offset indent > > +killall -SIGCONT firefox > > +.Ed > > +.Pp > > +Show what would be done to firefox processes, but do not actually signal them: > > +.Bd -literal -offset indent > > +killall -s firefox > > +.Ed > > +.Pp > > +Send > > +.Dv SIGKILL > > +to csh process running inside jail ID 282: > > +.Bd -literal -offset indent > > +killall -9 -j282 csh > > +.Ed > > +.Pp > > +Send > > +.Dv SIGTERM > > +to all processes matching provided pattern (like vim and vimdiff): > > +.Bd -literal -offset indent > > +killall -m 'vim*' > > +.Ed > > .Sh DIAGNOSTICS > > Diagnostic messages will only be printed if requested by > > .Fl d > > "Firefox" is a trade mark (type of intellectual property) of Mozilla Foundation. > Is it OK for us to use this name such way? > > Isn't it better using a name of some utility we have in the base system like systat(1) ? Purley out of simple safety I agree here. Though I doubt a case could be made for infringement it is just too easy to do the safe thing. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 13:18:21 2020 Return-Path: Delivered-To: svn-src-head@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 BF5682F2D08; Thu, 4 Jun 2020 13:18:21 +0000 (UTC) (envelope-from avg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d5v14c6Tz3WK6; Thu, 4 Jun 2020 13:18:21 +0000 (UTC) (envelope-from avg@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 994E420114; Thu, 4 Jun 2020 13:18:21 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054DILDA092214; Thu, 4 Jun 2020 13:18:21 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054DILea092213; Thu, 4 Jun 2020 13:18:21 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202006041318.054DILea092213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 4 Jun 2020 13:18:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361788 - head/sys/dev/superio X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/dev/superio X-SVN-Commit-Revision: 361788 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:18:21 -0000 Author: avg Date: Thu Jun 4 13:18:21 2020 New Revision: 361788 URL: https://svnweb.freebsd.org/changeset/base/361788 Log: superio: do not assume that current LDN cannot change after config exit That assumption should be true when superio(4) uses the hardware exlusively. But it turns out to not hold on some real systems. So, err on the side of correctness rather than performance. Clear current_ldn in sio_conf_exit. Reported by: bz Tested by: bz MFC after: 1 week Modified: head/sys/dev/superio/superio.c Modified: head/sys/dev/superio/superio.c ============================================================================== --- head/sys/dev/superio/superio.c Thu Jun 4 13:06:49 2020 (r361787) +++ head/sys/dev/superio/superio.c Thu Jun 4 13:18:21 2020 (r361788) @@ -190,6 +190,7 @@ static void sio_conf_exit(struct siosc *sc) { sc->methods->exit(sc->io_res, sc->io_port); + sc->current_ldn = 0xff; mtx_unlock(&sc->conf_lock); } From owner-svn-src-head@freebsd.org Thu Jun 4 13:20:57 2020 Return-Path: Delivered-To: svn-src-head@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 C8EEE2F2CFA for ; Thu, 4 Jun 2020 13:20:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d5y03rxwz3Wwg for ; Thu, 4 Jun 2020 13:20:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf31.google.com with SMTP id er17so2862314qvb.8 for ; Thu, 04 Jun 2020 06:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tgxgc4LJcK4t0kd2X8xc7JKjaQLNKXJXYRlQPPQ8hxE=; b=Qo6/qD7gxTapUSGOy6bf2jAdBfTroFpQ2j94miPR0qhpzDJ3KRpZmxqSCCmPp9TboP DHrDWEDxIexYxo8dg+ZPnSGA/oIFcUHCS1JXoFFQx+qNZUEi7BFurRassDKnn5Uoumox yYoV8CSW9V+bJTOTAxkvrUufpSpjHC7039Z5X0jmGWPFSF3YJK4h4qGp5Ma+ZhE4bT6N 6mhu12Whzl6i5b/OzxOe5usZNymMbd11L2EnexVbeW2XeGqOsKo9SNVPjYq5gg8Wn4Lx LrqSVr4VKwsui+9paGRfJq2kFZe0bjGSFKuCv1fAbUbFegYvzNeyEsPYmh6qNGn/mqZ4 pzKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tgxgc4LJcK4t0kd2X8xc7JKjaQLNKXJXYRlQPPQ8hxE=; b=Q/ZY5nk8DR9QvYQSg2j7thnd7E1OIqcsf0WPN4S7v+FsFWQtK2mYN95wRIeq+hw2Fq rqUHrnnUchcNuJhAj+J4zgAcKarPhlRfO0XdOuFvUV3Fe4g5vT5QrZVNmbtNBasPLofU s5yZtre2wIep9Th3LG89Omo9nnzwT+t7/kdHs4PnMpYwjrOFfGordTqBqHkh+vvEiIrc M7y6RbSTNABNAiY4fgNGayJmxFTp0HQrtvPbFOGmSh49wuTY+xFDdKp/OalKs5YtiiJ1 oJljuWop3Rs9pWJQkEERq9o1mtt+T+M9iCGUVCKW8dOAWjqppKOfXVwRNUQvY3/klPcI hHlA== X-Gm-Message-State: AOAM5317trEf6aGex64R4HF7AHB1ccYeQKpRaQ3eurhurE1UwzWyJLTE pfTFNb2DBW60giS6QLNNU13lcoSVJF0w87exHoM5xQ== X-Google-Smtp-Source: ABdhPJyu5xhiWWycogHrAaO7rXl9NeXU6Gb1L9pKFbepvjyDPWRntn1NxA0tLNp1pbOACmYei0sio03xNeaSwlPL/xM= X-Received: by 2002:a0c:f9c3:: with SMTP id j3mr4840629qvo.125.1591276855302; Thu, 04 Jun 2020 06:20:55 -0700 (PDT) MIME-Version: 1.0 References: <202006041303.054D3uwf026007@gndrsh.dnsmgr.net> In-Reply-To: <202006041303.054D3uwf026007@gndrsh.dnsmgr.net> From: Warner Losh Date: Thu, 4 Jun 2020 07:20:44 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49d5y03rxwz3Wwg X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Qo6/qD7g; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f31) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.40 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.95)[-0.954]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.980]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.46)[-0.465]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f31:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:20:57 -0000 On Thu, Jun 4, 2020 at 7:04 AM Rodney W. Grimes wrote: > > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni wrote: > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > >> [ Charset UTF-8 unsupported, converting... ] > > > >>> Author: gonzo > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > >>> New Revision: 361775 > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > >>> > > > >>> Log: > > > >>> Add spigen overlay for Raspberry Pi 4 > > > >>> > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > >>> > > > >>> Added: > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > > > changed) > > > >>> Modified: > > > >>> head/sys/modules/dtb/rpi/Makefile > > > >>> > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > >>> > > > > ============================================================================== > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > > > added) > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > > 22:18:15 2020 (r361775) > > > >>> @@ -0,0 +1,30 @@ > > > >>> +/* $FreeBSD$ */ > > > >> This file needs some form of copyright/license. > > > > Whom should I put as a copyright folder, The FreeBSD Project or the > > > > person who submitted the patch? > > > > > > The person that submitted the patch. > > > > > > > If it can be copyrighted. > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > copyrights > > > > > > True, but the FreeBSD Project can be the name in the copyright line. It > is > > the eponymous author of the FreeBSD collection. > > Thats a very slippery slope, though US copyright law allows pseudonyms > as the copyright holder, I know of nothing that allows eponymous names. > And I do not believe pseudonyms are support in other jurisdiction. > > https://www.copyright.gov/fls/fl101.pdf It is not. Legally, there's no real difference from a pseudonym and an eponymous name. How could there be? I should have added that the project decided, years ago, to only use it for the collection copyright holder in the /COPYRIGHT file. All other files require an actual copyright holder at the time of submission. The project generally doesn't track successors in interest, though there are exceptions when the copyright holder themselves make the change. Warner > > > (The Foundation can but unless they sponsored it, that > > > usually involves paperwork). > > > > > > > Yup. > > > > Warner > > > > > Pedro. > > > > > > > > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 13:23:08 2020 Return-Path: Delivered-To: svn-src-head@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 7C5AC2F2F9D; Thu, 4 Jun 2020 13:23:08 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d60W4Nv1z3XRT; Thu, 4 Jun 2020 13:23:07 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lf1-f49.google.com with SMTP id u16so3578381lfl.8; Thu, 04 Jun 2020 06:23:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=aM7vr+Klf9OqxO7d/LLltn0sXF6sio4rigaOFIcZWnQ=; b=dVAL6q2GjZ3vOlucYY6307vhdcEkfz2cRfffF1ADfzSbX+2myYrxSiwg9/iHh71Mhb SK/EXCC2y5tYSmMwsEk3A1gRLDK3uBt9sjT76iw4ChOpt5tGjAtT4eP3bAfrEJPx1wv4 AX0ySkp0CMISOYV7p2eidbvLKfqsHIa0dxCSIIwTglk6eqyUHZVzo6V1e/IYEAglmMaP Awtny4hHNeCHIPua7sUea23jUA7sa8xeAMFfw8RKpxImUacw+Z+bMynu7lhPXdWKaz0v rc1cTrBNpkx9ZD90RjD7vvsoN5qpQulr8p8gZkNUap+ABzUd2NTYkKBc2t6D5tN1Fb+5 pb0Q== X-Gm-Message-State: AOAM531HhfLhCmeNmhcRHWcRgc4WMflciMIVGsdANVwwjB87wv3EDya9 lO5QQTjfpl68CWa3/NVHvPpmBvIbAgQ= X-Google-Smtp-Source: ABdhPJzDvqULPgChj1BiXtztu6DZlpH2CgfeA49Kso/gaw6p1/gYaFGJUMMDpvzyT5YawvhZ0LdQ1A== X-Received: by 2002:ac2:5481:: with SMTP id t1mr2551659lfk.102.1591276985662; Thu, 04 Jun 2020 06:23:05 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id s8sm1468302lfc.83.2020.06.04.06.23.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Jun 2020 06:23:04 -0700 (PDT) Subject: Re: svn commit: r361787 - head/sbin/ifconfig To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006041306.054D6ni4086146@repo.freebsd.org> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= mQINBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABtB5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz6JAlQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryLkCDQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAYkCPAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: <062dfac5-4124-045a-e1dd-5c76fcc29575@FreeBSD.org> Date: Thu, 4 Jun 2020 16:23:03 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Firefox/60.0 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <202006041306.054D6ni4086146@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49d60W4Nv1z3XRT X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of agapon@gmail.com designates 209.85.167.49 as permitted sender) smtp.mailfrom=agapon@gmail.com X-Spamd-Result: default: False [-1.96 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-0.73)[-0.734]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.60)[-0.602]; NEURAL_HAM_SHORT(-0.62)[-0.621]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.49:from]; FORGED_SENDER(0.30)[avg@FreeBSD.org,agapon@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.49:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[avg@FreeBSD.org,agapon@gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[93.72.151.96:received] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:23:08 -0000 On 04/06/2020 16:06, Andriy Gapon wrote: > +Channel agility. > +.It Li B > +PBCC modulation. > +.It Li C > +Poll request capability. I would like to invite anyone who can expand short descriptions like the above to do so. -- Andriy Gapon From owner-svn-src-head@freebsd.org Thu Jun 4 13:27:50 2020 Return-Path: Delivered-To: svn-src-head@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 55B212F32BD; Thu, 4 Jun 2020 13:27:50 +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 49d65x3Mtfz3XhQ; Thu, 4 Jun 2020 13:27:49 +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 054DRl0J026150; Thu, 4 Jun 2020 06:27:47 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054DRlUk026149; Thu, 4 Jun 2020 06:27:47 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041327.054DRlUk026149@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: To: Warner Losh Date: Thu, 4 Jun 2020 06:27:47 -0700 (PDT) CC: "Rodney W. Grimes" , Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head 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 X-Rspamd-Queue-Id: 49d65x3Mtfz3XhQ X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [1.81 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.18)[0.185]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.32)[0.322]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_SPAM_LONG(0.40)[0.405]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:27:50 -0000 > On Thu, Jun 4, 2020 at 7:04 AM Rodney W. Grimes > wrote: > > > > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni wrote: > > > > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > > >> [ Charset UTF-8 unsupported, converting... ] > > > > >>> Author: gonzo > > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > > >>> New Revision: 361775 > > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > >>> > > > > >>> Log: > > > > >>> Add spigen overlay for Raspberry Pi 4 > > > > >>> > > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > > >>> > > > > >>> Added: > > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > > > > changed) > > > > >>> Modified: > > > > >>> head/sys/modules/dtb/rpi/Makefile > > > > >>> > > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > >>> > > > > > > ============================================================================== > > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > > > > added) > > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > > > 22:18:15 2020 (r361775) > > > > >>> @@ -0,0 +1,30 @@ > > > > >>> +/* $FreeBSD$ */ > > > > >> This file needs some form of copyright/license. > > > > > Whom should I put as a copyright folder, The FreeBSD Project or the > > > > > person who submitted the patch? > > > > > > > > The person that submitted the patch. > > > > > > > > > > If it can be copyrighted. > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > > copyrights > > > > > > > > > True, but the FreeBSD Project can be the name in the copyright line. It > > is > > > the eponymous author of the FreeBSD collection. > > > > Thats a very slippery slope, though US copyright law allows pseudonyms > > as the copyright holder, I know of nothing that allows eponymous names. > > And I do not believe pseudonyms are support in other jurisdiction. > > > > https://www.copyright.gov/fls/fl101.pdf > > > It is not. Legally, there's no real difference from a pseudonym and an > eponymous name. How could there be? Based on what? eponymous appears no place in the copyright law, so I shall strongly disagree with you on that point. > > I should have added that the project decided, years ago, to only use it for > the collection copyright holder in the /COPYRIGHT file. All other files It appears as if it is used many other places, as my find/grep showed. > require an actual copyright holder at the time of submission. The project > generally doesn't track successors in interest, though there are exceptions > when the copyright holder themselves make the change. > > Warner > > > > > > > (The Foundation can but unless they sponsored it, that > > > > usually involves paperwork). > > > > > > > > > > Yup. > > > > > > Warner > > > > > > > Pedro. > > > > > > > > > > > > -- > > Rod Grimes > > rgrimes@freebsd.org > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 13:28:15 2020 Return-Path: Delivered-To: svn-src-head@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 B4ED52F3261 for ; Thu, 4 Jun 2020 13:28:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d66R1cQgz3Xwt for ; Thu, 4 Jun 2020 13:28:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x744.google.com with SMTP id v79so5903110qkb.10 for ; Thu, 04 Jun 2020 06:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+wS8XB5Qe8FqQzyME8UoMOToQaifizaFJ2YjJ3H4DxI=; b=1D80zktT0iMTk1fXVcjfsJhd7vPy8T11pUAGQvimjtlxdPaVPCUayMnf13ZIwA5Haw LECYrYWCLo+0evieuwogjVAl+775n5TlFPdmAOpRaiMT9ojusxllx8hZCrXO2a5AsD2x 0B7CCVKAc8OEacKlZN5NxGHr6tvhkuTDh4UCpYD5LDYYQSYSna5SzA5HsXmxKtB5dZm2 b5iFwlTdawvd7vWggLTV3aMNl4SCMZJMaY45myOJuZIiGhNBp3902j9jwefq6Wd72ZuL yftowjbnfK9/4TcVECOYX46+uHNdoKbcdS1gBySdpN4jml6EI3C1/26FYlApyzc76YKi tw7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+wS8XB5Qe8FqQzyME8UoMOToQaifizaFJ2YjJ3H4DxI=; b=fSPRuwlsN8qBCJAEvdULinpuBDN7jlF/jC1xqEa+EdAxIXsc3ydKCOeBinNPtAyyPd sR8uWDwK604HJxrL0LZ/6Ij0Imc5W3Y2E2k2k8LkC5+sdeA3LraPLIzBlv9nSkovVUOL fByybKjPZ0PteiUFOSQFDB0XuopoX+6GH9hvNTj8D8512kdFfSY92HTU7UtyJBDoE+/H umkUcg6tc0teZPAfY9i2go3wZ4RpmJBWtHcNdmLgmTwWpIF4x16HYC8GxWOIlboO0ePv oV8MCQumA6GB9ehIUPslB/pKCfV0Yc5O3KBS5hC1thviEvEggLO24joD/S/H86vrA5eB e00g== X-Gm-Message-State: AOAM532130WJtrhFBYaS1xMBd6MuHwM7Va4NC3Zyw/PUJXF2lnC1gXeF 74+qHRbiPZXeh7C+MGKyIoz0LyQNeePaSwdDeX4/Ow== X-Google-Smtp-Source: ABdhPJzk+XKz8/g1Dc2MzQFkb44Po1maJnSU/t2Vsm3llWrkr7a3XmbPZUMK/S20ATmPQi+R9v9NzmzeSGvGioWfcv4= X-Received: by 2002:a37:ef18:: with SMTP id j24mr2103756qkk.380.1591277294338; Thu, 04 Jun 2020 06:28:14 -0700 (PDT) MIME-Version: 1.0 References: <1351bb12-b6e4-b751-4556-8c7751cdf3a5@FreeBSD.org> <202006041254.054CsBTs025918@gndrsh.dnsmgr.net> In-Reply-To: <202006041254.054CsBTs025918@gndrsh.dnsmgr.net> From: Warner Losh Date: Thu, 4 Jun 2020 07:28:03 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49d66R1cQgz3Xwt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=1D80zktT; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::744) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.41 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.96)[-0.956]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.981]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.47)[-0.474]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::744:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:28:15 -0000 On Thu, Jun 4, 2020 at 6:54 AM Rodney W. Grimes wrote: > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > >> [ Charset UTF-8 unsupported, converting... ] > > >>> Author: gonzo > > >>> Date: Wed Jun 3 22:18:15 2020 > > >>> New Revision: 361775 > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > >>> > > >>> Log: > > >>> Add spigen overlay for Raspberry Pi 4 > > >>> > > >>> Submitted by: gergely.czuczy@harmless.hu > > >>> > > >>> Added: > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > changed) > > >>> Modified: > > >>> head/sys/modules/dtb/rpi/Makefile > > >>> > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > >>> > ============================================================================== > > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > added) > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > 22:18:15 2020 (r361775) > > >>> @@ -0,0 +1,30 @@ > > >>> +/* $FreeBSD$ */ > > >> This file needs some form of copyright/license. > > > Whom should I put as a copyright folder, The FreeBSD Project or the > > > person who submitted the patch? > > > > The person that submitted the patch. > > > > Note that the FreeBSD Project is not an entity and cannot hold > > copyrights (The Foundation can but unless they sponsored it, that > > usually involves paperwork). > > I am glad at least one other person understands that point in law: > > :root {1002}# find . -type f | xargs grep Copyright | grep -i freebsd | > grep -i project > ./cddl/compat/opensolaris/kern/opensolaris_dtrace.c: * Copyright 2014 The > FreeBSD Project. > ./net/if_enc.h: * Copyright (c) 2008 The FreeBSD Project. > ./net/if_enc.c: * Copyright (c) 2006 The FreeBSD Project. > ./kern/kern_idle.c: * Copyright (C) 2000-2004 The FreeBSD Project. All > rights reserved. ./kern/subr_kdb.c: * Copyright (c) 2004 The FreeBSD Project > These should be changed to the actual author. > ./conf/newvers.sh: year=$(sed -Ee '/^Copyright .* The FreeBSD > Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) > ./conf/newvers.sh: * Copyright (c) 1992-$year The FreeBSD Project. > ./sys/copyright.h: * Copyright (C) 1992-2018 The FreeBSD Project. All > rights reserved. > ./sys/copyright.h: "Copyright (c) 1992-2019 The FreeBSD Project.\n" > ^^^ The copyright we spit out on every boot :-( > These four are fine. They were cleared by lawyers long ago. This is a point that was extensively litigated during your absence and has been settled practice for a long, long time. Those four instances and /COPYRIGHT are the only places in the tree we should have this, however. ./compat/linux/linux_uid16.c: * Copyright (c) 2001 The FreeBSD Project > ./tools/embed_mfs.sh:# Copyright (C) 2008 The FreeBSD Project. All rights > reserved. > ./dev/mfi/mfi_syspd.c: * Copyright 1994-2009 The FreeBSD > Project. > ./dev/mfi/mfi_tbolt.c: * Copyright 1994-2009 The FreeBSD > Project. > ./dev/chromebook_platform/chromebook_platform.c: * Copyright (c) 2016 The > FreeBSD Project. > ./dev/pccard/pccarddevs: * Copyright (c) 1999-2004 The FreeBSD Project. > ./dev/tdfx/tdfx_linux.c: * Copyright (c) 2006 The FreeBSD Project > ./powerpc/powerpc/uma_machdep.c: * Copyright (c) 2003 The FreeBSD Project > ./libkern/memset.c: * Copyright (C) 1992-2007 The FreeBSD Project. All > rights reserved. > These are also not fine and should be similarly changed. It would be a great project for someone to do the svn diving and find who committed those files originally and correct it. Warner > > > > Pedro. > > > > > > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 13:37:34 2020 Return-Path: Delivered-To: svn-src-head@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 06A4E2F3A85; Thu, 4 Jun 2020 13:37:34 +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 49d6K92tb3z3Z9C; Thu, 4 Jun 2020 13:37:33 +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 054DbVAN026213; Thu, 4 Jun 2020 06:37:31 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054DbVDT026212; Thu, 4 Jun 2020 06:37:31 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041337.054DbVDT026212@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: To: Warner Losh Date: Thu, 4 Jun 2020 06:37:31 -0700 (PDT) CC: "Rodney W. Grimes" , Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head 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 X-Rspamd-Queue-Id: 49d6K92tb3z3Z9C X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [1.80 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.22)[0.223]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.30)[0.300]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_SPAM_LONG(0.38)[0.381]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:37:34 -0000 > On Thu, Jun 4, 2020 at 6:54 AM Rodney W. Grimes > wrote: > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > >> [ Charset UTF-8 unsupported, converting... ] > > > >>> Author: gonzo > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > >>> New Revision: 361775 > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > >>> > > > >>> Log: > > > >>> Add spigen overlay for Raspberry Pi 4 > > > >>> > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > >>> > > > >>> Added: > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, props > > changed) > > > >>> Modified: > > > >>> head/sys/modules/dtb/rpi/Makefile > > > >>> > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > >>> > > ============================================================================== > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > > added) > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > 22:18:15 2020 (r361775) > > > >>> @@ -0,0 +1,30 @@ > > > >>> +/* $FreeBSD$ */ > > > >> This file needs some form of copyright/license. > > > > Whom should I put as a copyright folder, The FreeBSD Project or the > > > > person who submitted the patch? > > > > > > The person that submitted the patch. > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > copyrights (The Foundation can but unless they sponsored it, that > > > usually involves paperwork). > > > > I am glad at least one other person understands that point in law: > > > > :root {1002}# find . -type f | xargs grep Copyright | grep -i freebsd | > > grep -i project > > ./cddl/compat/opensolaris/kern/opensolaris_dtrace.c: * Copyright 2014 The > > FreeBSD Project. > > ./net/if_enc.h: * Copyright (c) 2008 The FreeBSD Project. > > ./net/if_enc.c: * Copyright (c) 2006 The FreeBSD Project. > > ./kern/kern_idle.c: * Copyright (C) 2000-2004 The FreeBSD Project. All > > rights reserved. > > ./kern/subr_kdb.c: * Copyright (c) 2004 The FreeBSD Project > > > > These should be changed to the actual author. > > > > ./conf/newvers.sh: year=$(sed -Ee '/^Copyright .* The FreeBSD > > Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) > > ./conf/newvers.sh: * Copyright (c) 1992-$year The FreeBSD Project. > > ./sys/copyright.h: * Copyright (C) 1992-2018 The FreeBSD Project. All > > rights reserved. > > ./sys/copyright.h: "Copyright (c) 1992-2019 The FreeBSD Project.\n" > > ^^^ The copyright we spit out on every boot :-( > > > > These four are fine. They were cleared by lawyers long ago. This is a point > that was extensively litigated during your absence and has been settled There was a lawsuit? Cleared by which lawyers, you have some documentation of opinion? > practice for a long, long time. Those four instances and /COPYRIGHT are the > only places in the tree we should have this, however. One can operate outside the law... until one gets caught. As can be seen just having this copyright statement in the tree has lead to others to copy it thinking it was ok, and those "tending the house" did not catch it. > > ./compat/linux/linux_uid16.c: * Copyright (c) 2001 The FreeBSD Project > > ./tools/embed_mfs.sh:# Copyright (C) 2008 The FreeBSD Project. All rights > > reserved. > > ./dev/mfi/mfi_syspd.c: * Copyright 1994-2009 The FreeBSD > > Project. > > ./dev/mfi/mfi_tbolt.c: * Copyright 1994-2009 The FreeBSD > > Project. > > ./dev/chromebook_platform/chromebook_platform.c: * Copyright (c) 2016 The > > FreeBSD Project. > > ./dev/pccard/pccarddevs: * Copyright (c) 1999-2004 The FreeBSD Project. > > ./dev/tdfx/tdfx_linux.c: * Copyright (c) 2006 The FreeBSD Project > > ./powerpc/powerpc/uma_machdep.c: * Copyright (c) 2003 The FreeBSD Project > > ./libkern/memset.c: * Copyright (C) 1992-2007 The FreeBSD Project. All > > rights reserved. > > > > These are also not fine and should be similarly changed. > > It would be a great project for someone to do the svn diving and find who > committed those files originally and correct it. > > Warner > > > Pedro. > > -- > > Rod Grimes > > rgrimes@freebsd.org -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 13:37:57 2020 Return-Path: Delivered-To: svn-src-head@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 4D83D2F3A8E for ; Thu, 4 Jun 2020 13:37:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d6KZ5nLLz3ZBn for ; Thu, 4 Jun 2020 13:37:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x735.google.com with SMTP id v79so5938385qkb.10 for ; Thu, 04 Jun 2020 06:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IocVAvDDAmKO5f+bwMouTm/9HEhSYaT/na0XFIwHOAk=; b=zHlNdQpWCwn8RFMp6lADB1Oy6Zupf/3Utxxbk1sw1Pt3caEXOac5Df7vaB2Sworai5 vcFaAndLPdyG8dufUKi5V/yyOo/bCxmnPvE5ZrdANormx7cuXSS78CHJQNobc6OjLHHb MZXTudU0qO3MP7wPfx2dS3UwlLF8dX5GW5Q0zStTrI1184nJcOdEP9NDOuWN3UCoR8Yv 2Pj6cgSphFxUsIwFaomvAoGD8D1koReTxnLeIJF9eovKmjYvWDs4ltbYGXyiDy8f6Gu7 InJuNPxqjak0sWKBtHOi1AVw15IcaS4MhyneHB0sOavahjv/OfQtYn8REsgfEzobETNP lREg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IocVAvDDAmKO5f+bwMouTm/9HEhSYaT/na0XFIwHOAk=; b=EDbjMcryiTpQ+seeJ9dVXm2g4RdkY7uKk059kVCnQVR3/GhnwGuYiVhH87xDQcnKXl Dor1KTHWSW/sZ98sDZ12VYNubCx0+2G5mGf7VYbR3XljgoemGdytFmfJSetnOQ6NfhYa zJw3YmQUSKUZWD49hnykYzOBjib7rF7diMo9MGP0YoayhMnHM3ibnDPrAtAbVgED6g+z NoOmj50u8QTGQRfaZq+VcxVDX7SyRctAeuuoq0rumauKz0qXzwcD9VhadBQMSEa3H0gP JX/W3OZDjbTW+T5tZgktG9YB573VHG5Lz0IYRidihGN0gn65PcDV5OS8FbYGb0cEWkB6 HcIw== X-Gm-Message-State: AOAM530Ru1lh813kmqH29yGiOTR9vub1jtxuPwDJ5xyB3Xgs8mkoS3xw rIbMB4vNHxkLf/vcd7fDPln+sNDlCm+8E3DC5O0/PA== X-Google-Smtp-Source: ABdhPJxvn93DHPGpfPVQiYCPFfCpwKH/pOnWz1ufCNSZPj+NMrVV/lVxdKa4EcFkb/r/0cd6B4J+4IDoKYccT3pt1QU= X-Received: by 2002:a37:99c6:: with SMTP id b189mr4318877qke.240.1591277871939; Thu, 04 Jun 2020 06:37:51 -0700 (PDT) MIME-Version: 1.0 References: <202006041327.054DRlUk026149@gndrsh.dnsmgr.net> In-Reply-To: <202006041327.054DRlUk026149@gndrsh.dnsmgr.net> From: Warner Losh Date: Thu, 4 Jun 2020 07:37:40 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49d6KZ5nLLz3ZBn X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=zHlNdQpW; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::735) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.63 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.95)[-0.954]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.980]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.69)[-0.694]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::735:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:37:57 -0000 On Thu, Jun 4, 2020 at 7:27 AM Rodney W. Grimes wrote: > > On Thu, Jun 4, 2020 at 7:04 AM Rodney W. Grimes < > freebsd@gndrsh.dnsmgr.net> > > wrote: > > > > > > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni wrote: > > > > > > > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > > > >> [ Charset UTF-8 unsupported, converting... ] > > > > > >>> Author: gonzo > > > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > > > >>> New Revision: 361775 > > > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > >>> > > > > > >>> Log: > > > > > >>> Add spigen overlay for Raspberry Pi 4 > > > > > >>> > > > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > > > >>> > > > > > >>> Added: > > > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, > props > > > > > changed) > > > > > >>> Modified: > > > > > >>> head/sys/modules/dtb/rpi/Makefile > > > > > >>> > > > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > > >>> > > > > > > > > > ============================================================================== > > > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is > newly > > > > > added) > > > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > > > > 22:18:15 2020 (r361775) > > > > > >>> @@ -0,0 +1,30 @@ > > > > > >>> +/* $FreeBSD$ */ > > > > > >> This file needs some form of copyright/license. > > > > > > Whom should I put as a copyright folder, The FreeBSD Project or > the > > > > > > person who submitted the patch? > > > > > > > > > > The person that submitted the patch. > > > > > > > > > > > > > If it can be copyrighted. > > > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > > > copyrights > > > > > > > > > > > > True, but the FreeBSD Project can be the name in the copyright line. > It > > > is > > > > the eponymous author of the FreeBSD collection. > > > > > > Thats a very slippery slope, though US copyright law allows pseudonyms > > > as the copyright holder, I know of nothing that allows eponymous names. > > > And I do not believe pseudonyms are support in other jurisdiction. > > > > > > https://www.copyright.gov/fls/fl101.pdf > > > > > > It is not. Legally, there's no real difference from a pseudonym and an > > eponymous name. How could there be? > > Based on what? eponymous appears no place in the copyright law, so > I shall strongly disagree with you on that point. > An eponym is a type of pseudonym. It's not a nickname, nor an abbreviated form of a company. > I should have added that the project decided, years ago, to only use it > for > > the collection copyright holder in the /COPYRIGHT file. All other files > > It appears as if it is used many other places, as my find/grep showed. > Yes. And apart from the 3 files I identified, the others should be fixed. I did this the last time we did a sweep maybe in the late 90s / early 2000s based on advice from an IP attorney who specialized in open source. For various reasons, it's fine in the collection copyright context, but we don't want to have it anywhere else if we can help it. Warner > > require an actual copyright holder at the time of submission. The project > > generally doesn't track successors in interest, though there are > exceptions > > when the copyright holder themselves make the change. > > > > Warner > > > > > > > > > > > (The Foundation can but unless they sponsored it, that > > > > > usually involves paperwork). > > > > > > > > > > > > > Yup. > > > > > > > > Warner > > > > > > > > > Pedro. > > > > > > > > > > > > > > > > -- > > > Rod Grimes > > > rgrimes@freebsd.org > > > > > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 13:44:04 2020 Return-Path: Delivered-To: svn-src-head@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 4F9512F4092 for ; Thu, 4 Jun 2020 13:44:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d6Sg6lWjz3b8t for ; Thu, 4 Jun 2020 13:44:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x743.google.com with SMTP id n141so6002564qke.2 for ; Thu, 04 Jun 2020 06:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lFGFea7C9/aYHgIqE3GQDRPPnIj3xsOolA8ul0Yv5nc=; b=aYFdl5FqOTzmmD5k1bo4VsAikpOwWrP5EMu+IQ3HkxZ4om7oY1tWCAFgMCIt3ztg5j J/pQKzRW5qfwZZsyaeJo4ADx/YfNJ4UybviwsiyqnlfKTJrUHTpGDaAyka/qqXwQXmed UdkJ4TfD6gXFJF9CuW6Ax9+rtJtIsKP4Nhxya6f47NhVvnq9AEbdOuGn9mU8bTi+gvNx /8uVnHNEammiELod8PbyYYdoV71UCYTiO+05d6E4ec+/h1TVyNXXWfa2hAhFPk/LWD93 Y5bqvKOM0G6fUdmK3wbzIvPVQhY1cv1jfl+sSls7aZt/OaRtiL3ItXM595RAyEa2Fph1 AwtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lFGFea7C9/aYHgIqE3GQDRPPnIj3xsOolA8ul0Yv5nc=; b=lvj9nHs+mgCuuiHiGOHW5dpbpjTW2OUdzX416pYJM6xGLyQIyOF6zY5CqPPMm0rvFm 4WfBKyR4p1+GaRelkIJmHthKVxzGzbd9QQYx587hRkjYgh9JJ0ByCRZ14GWUc40Mp6hV Bb0FRfXuy1+kWdL6gE+foscgG3wtPR9ovSQFcdmDBrdwsd5+l6N/v5F+v0lFCRArylGe f5/Rja7YeftbKE94TlESPH8WCRGPffzJVZCttQzaa3YsIolurUr5sTEH0mLSomV7s8Yr 6e8TGSkln7+zXDHFJeSjUClJvyS7ryVwebEYLTfjKF6oH0WtJ/geXpsYJmfE/0NBnxys 2NlA== X-Gm-Message-State: AOAM531WG4F12pB7/Qw3S21R+uBOWn3aOP40hD2d4EeoZ8/eljZOE4J/ BbJC7uXPx8xiMnKrBLjNNQGjSyIu/xvVVvxTMSs+ZQ== X-Google-Smtp-Source: ABdhPJz0h5lNcdXqcJygyXQnMM50Cfc08A1kPL5j40AiH9PMf5WoqX3ZAIoHQSECU4vmKfyiovQkqw73R0CG5uH6L9A= X-Received: by 2002:a37:9f09:: with SMTP id i9mr4847546qke.60.1591278242373; Thu, 04 Jun 2020 06:44:02 -0700 (PDT) MIME-Version: 1.0 References: <202006041337.054DbVDT026212@gndrsh.dnsmgr.net> In-Reply-To: <202006041337.054DbVDT026212@gndrsh.dnsmgr.net> From: Warner Losh Date: Thu, 4 Jun 2020 07:43:51 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49d6Sg6lWjz3b8t X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=aYFdl5Fq; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::743) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.64 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.956]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.981]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.70)[-0.698]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::743:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:44:04 -0000 On Thu, Jun 4, 2020 at 7:37 AM Rodney W. Grimes wrote: > > On Thu, Jun 4, 2020 at 6:54 AM Rodney W. Grimes < > freebsd@gndrsh.dnsmgr.net> > > wrote: > > > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > > >> [ Charset UTF-8 unsupported, converting... ] > > > > >>> Author: gonzo > > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > > >>> New Revision: 361775 > > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > >>> > > > > >>> Log: > > > > >>> Add spigen overlay for Raspberry Pi 4 > > > > >>> > > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > > >>> > > > > >>> Added: > > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, > props > > > changed) > > > > >>> Modified: > > > > >>> head/sys/modules/dtb/rpi/Makefile > > > > >>> > > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > >>> > > > > ============================================================================== > > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is newly > > > added) > > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > > 22:18:15 2020 (r361775) > > > > >>> @@ -0,0 +1,30 @@ > > > > >>> +/* $FreeBSD$ */ > > > > >> This file needs some form of copyright/license. > > > > > Whom should I put as a copyright folder, The FreeBSD Project or the > > > > > person who submitted the patch? > > > > > > > > The person that submitted the patch. > > > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > > copyrights (The Foundation can but unless they sponsored it, that > > > > usually involves paperwork). > > > > > > I am glad at least one other person understands that point in law: > > > > > > :root {1002}# find . -type f | xargs grep Copyright | grep -i freebsd | > > > grep -i project > > > ./cddl/compat/opensolaris/kern/opensolaris_dtrace.c: * Copyright 2014 > The > > > FreeBSD Project. > > > ./net/if_enc.h: * Copyright (c) 2008 The FreeBSD Project. > > > ./net/if_enc.c: * Copyright (c) 2006 The FreeBSD Project. > > > ./kern/kern_idle.c: * Copyright (C) 2000-2004 The FreeBSD Project. All > > > rights reserved. > > > > ./kern/subr_kdb.c: * Copyright (c) 2004 The FreeBSD Project > > > > > > > These should be changed to the actual author. > > > > > > > ./conf/newvers.sh: year=$(sed -Ee '/^Copyright .* The FreeBSD > > > Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) > > > ./conf/newvers.sh: * Copyright (c) 1992-$year The FreeBSD Project. > > > ./sys/copyright.h: * Copyright (C) 1992-2018 The FreeBSD Project. All > > > rights reserved. > > > ./sys/copyright.h: "Copyright (c) 1992-2019 The FreeBSD > Project.\n" > > > ^^^ The copyright we spit out on every boot :-( > > > > > > > These four are fine. They were cleared by lawyers long ago. This is a > point > > that was extensively litigated during your absence and has been settled > > There was a lawsuit? > > Cleared by which lawyers, you have some documentation of opinion? > There was no lawsuit. I have no written documentation of my conversations. Others were involved in the discussions and the one clear item was for the collection copyright it's fine, since that doesn't protect much since we allow anybody to copy it (the FreeBSD trademark protects much more). For other files, it's not fine because you want traceability to the original sources should there be a dispute about a specific technology. > > practice for a long, long time. Those four instances and /COPYRIGHT are > the > > only places in the tree we should have this, however. > > One can operate outside the law... until one gets caught. As can be > seen just having this copyright statement in the tree has lead to others > to copy it thinking it was ok, and those "tending the house" did not > catch it. > Yes. We didn't. We're not perfect. Now that you've found it, it would be great if you took the initiative to fix the other instances in the tree by digging into svn, contacting the original authors and asking for permission to make the appropriate changes. If you expect someone else to do that work, you'll likely be disappointed. Warner > > > > ./compat/linux/linux_uid16.c: * Copyright (c) 2001 The FreeBSD Project > > > ./tools/embed_mfs.sh:# Copyright (C) 2008 The FreeBSD Project. All > rights > > > reserved. > > > ./dev/mfi/mfi_syspd.c: * Copyright 1994-2009 The FreeBSD > > > Project. > > > ./dev/mfi/mfi_tbolt.c: * Copyright 1994-2009 The FreeBSD > > > Project. > > > ./dev/chromebook_platform/chromebook_platform.c: * Copyright (c) 2016 > The > > > FreeBSD Project. > > > ./dev/pccard/pccarddevs: * Copyright (c) 1999-2004 The FreeBSD Project. > > > ./dev/tdfx/tdfx_linux.c: * Copyright (c) 2006 The FreeBSD Project > > > ./powerpc/powerpc/uma_machdep.c: * Copyright (c) 2003 The FreeBSD > Project > > > ./libkern/memset.c: * Copyright (C) 1992-2007 The FreeBSD Project. All > > > rights reserved. > > > > > > > These are also not fine and should be similarly changed. > > > > It would be a great project for someone to do the svn diving and find who > > committed those files originally and correct it. > > > > Warner > > > > Pedro. > > > -- > > > Rod Grimes > > > rgrimes@freebsd.org > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 13:46:05 2020 Return-Path: Delivered-To: svn-src-head@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 617872F428F; Thu, 4 Jun 2020 13:46:05 +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 49d6W04sCvz3bS3; Thu, 4 Jun 2020 13:46:04 +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 054Dk28s026274; Thu, 4 Jun 2020 06:46:02 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 054Dk2KE026273; Thu, 4 Jun 2020 06:46:02 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006041346.054Dk2KE026273@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi In-Reply-To: To: Warner Losh Date: Thu, 4 Jun 2020 06:46:02 -0700 (PDT) CC: "Rodney W. Grimes" , Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head 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 X-Rspamd-Queue-Id: 49d6W04sCvz3bS3 X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [1.86 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.23)[0.230]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.32)[0.323]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_SPAM_LONG(0.41)[0.406]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:46:05 -0000 > On Thu, Jun 4, 2020 at 7:27 AM Rodney W. Grimes > wrote: > > > > On Thu, Jun 4, 2020 at 7:04 AM Rodney W. Grimes < > > freebsd@gndrsh.dnsmgr.net> > > > wrote: > > > > > > > > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni wrote: > > > > > > > > > > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > > > > >> [ Charset UTF-8 unsupported, converting... ] > > > > > > >>> Author: gonzo > > > > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > > > > >>> New Revision: 361775 > > > > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > > >>> > > > > > > >>> Log: > > > > > > >>> Add spigen overlay for Raspberry Pi 4 > > > > > > >>> > > > > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > > > > >>> > > > > > > >>> Added: > > > > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso (contents, > > props > > > > > > changed) > > > > > > >>> Modified: > > > > > > >>> head/sys/modules/dtb/rpi/Makefile > > > > > > >>> > > > > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > > > >>> > > > > > > > > > > > > ============================================================================== > > > > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is > > newly > > > > > > added) > > > > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed Jun 3 > > > > > > 22:18:15 2020 (r361775) > > > > > > >>> @@ -0,0 +1,30 @@ > > > > > > >>> +/* $FreeBSD$ */ > > > > > > >> This file needs some form of copyright/license. > > > > > > > Whom should I put as a copyright folder, The FreeBSD Project or > > the > > > > > > > person who submitted the patch? > > > > > > > > > > > > The person that submitted the patch. > > > > > > > > > > > > > > > > If it can be copyrighted. > > > > > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > > > > copyrights > > > > > > > > > > > > > > > True, but the FreeBSD Project can be the name in the copyright line. > > It > > > > is > > > > > the eponymous author of the FreeBSD collection. > > > > > > > > Thats a very slippery slope, though US copyright law allows pseudonyms > > > > as the copyright holder, I know of nothing that allows eponymous names. > > > > And I do not believe pseudonyms are support in other jurisdiction. > > > > > > > > https://www.copyright.gov/fls/fl101.pdf > > > > > > > > > It is not. Legally, there's no real difference from a pseudonym and an > > > eponymous name. How could there be? > > > > Based on what? eponymous appears no place in the copyright law, so > > I shall strongly disagree with you on that point. > > > > An eponym is a type of pseudonym. It's not a nickname, nor an abbreviated > form of a company. And the usage "The FreeBSD Project" does not meet the definition of either: eponym A person after whom a discovery, invention, place, etc., is named or thought to be named. pseudonym A fictitious name, especially one used by an author. My keypoint is "A/AN PERSON". > > I should have added that the project decided, years ago, to only use it > > for > > > the collection copyright holder in the /COPYRIGHT file. All other files > > > > It appears as if it is used many other places, as my find/grep showed. > > > > Yes. And apart from the 3 files I identified, the others should be fixed. I > did this the last time we did a sweep maybe in the late 90s / early 2000s > based on advice from an IP attorney who specialized in open source. For > various reasons, it's fine in the collection copyright context, but we > don't want to have it anywhere else if we can help it. I find it very hard to believe that using anything in 3 copyrights is somehow valid if it can not be used in all copyrights. That, again, is just a slippery slope. Further, let me speculate, more "Free" advice? Free legal advice is worth exactly what you paid for it, nothing. Especially if you do not have the advice in writting. > Warner > > > > > require an actual copyright holder at the time of submission. The project > > > generally doesn't track successors in interest, though there are > > exceptions > > > when the copyright holder themselves make the change. > > > > > > Warner > > > > > > > > > > > > > > > (The Foundation can but unless they sponsored it, that > > > > > > usually involves paperwork). > > > > > > > > > > > > > > > > Yup. > > > > > > > > > > Warner > > > > > > > > > > > Pedro. > > > > > > > > > > > > > > > > > > > > -- > > > > Rod Grimes > > > > rgrimes@freebsd.org > > > > > > > > -- > > Rod Grimes > > rgrimes@freebsd.org > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Thu Jun 4 13:52:50 2020 Return-Path: Delivered-To: svn-src-head@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 6434F2F470A; Thu, 4 Jun 2020 13:52:50 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d6fn22rxz3cPJ; Thu, 4 Jun 2020 13:52:49 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-ot1-f45.google.com with SMTP id e5so4769373ote.11; Thu, 04 Jun 2020 06:52:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc:content-transfer-encoding; bh=SHAwFY58s9MYzQVjWM8W/99wULNJEBxN27rvDKSbwhE=; b=R555AInYX+v/IvLrwipHSFtGJKsrIk0qK1iXgp/xY8G1BaemwDVKqmNhlHB65JY2x8 f5mLJKLWr74t9heEF/bkkg6Ztc3yd/DhiGlj9I2FRrbMCFbBLwcMinqzRjG+9u4GLqmX SBgpuS49pRkSsxSrY21GAXTkWQHPdAXvw9t/POpMpyJ8jZCW1qhGpFxub4hhc6ugWtua /Qa/dEgGqjd2cbw8iQbvsonpNdhz7rA8y1KOPB6zRDljbj9VpS6iz2vCwtUGEp0XzsN6 FjXs29u1fg/gbLIE8EM2yRh36sFuJbkRUl0hba7izwHCRKNxLr3lXwpBhHkhS6ztEKFZ tCwA== X-Gm-Message-State: AOAM532YN7rYqlWCP/N3aPJFeZMkmG8zSE3hcvwzGi78xnho/yZjvv1z BSNXTPkJh6jEa8Y8cBM3khKhp93C X-Google-Smtp-Source: ABdhPJwZx7UBW99HMdW7Ct+JuQ1n1OVWlQ8Kg436wJDre9gGpvdg+L1KoRLYScea6o5/MgQn//gc3g== X-Received: by 2002:a9d:4e5:: with SMTP id 92mr3571275otm.146.1591278767880; Thu, 04 Jun 2020 06:52:47 -0700 (PDT) Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com. [209.85.210.51]) by smtp.gmail.com with ESMTPSA id c9sm1158272oov.35.2020.06.04.06.52.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Jun 2020 06:52:47 -0700 (PDT) Received: by mail-ot1-f51.google.com with SMTP id e5so4769317ote.11; Thu, 04 Jun 2020 06:52:47 -0700 (PDT) X-Received: by 2002:a9d:6044:: with SMTP id v4mr1117407otj.157.1591278767320; Thu, 04 Jun 2020 06:52:47 -0700 (PDT) MIME-Version: 1.0 References: <202006040429.0544ThUC064784@repo.freebsd.org> <9f04697e-91d9-1221-2c8f-136fdf564f5d@grosbein.net> In-Reply-To: <9f04697e-91d9-1221-2c8f-136fdf564f5d@grosbein.net> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Thu, 4 Jun 2020 06:52:36 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361783 - head/usr.bin/killall To: Eugene Grosbein Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49d6fn22rxz3cPJ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.210.45 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-3.04 / 15.00]; HAS_REPLYTO(0.00)[cem@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_TLS_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_ADDR_EQ_FROM(0.00)[]; ARC_NA(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.45:from]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.97)[-0.970]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.14)[-1.138]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.45:from]; NEURAL_HAM_MEDIUM(-0.93)[-0.929]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 13:52:50 -0000 On Thu, Jun 4, 2020 at 3:43 AM Eugene Grosbein wrote: > > 04.06.2020 11:29, Benjamin Kaduk wrote: > > --- head/usr.bin/killall/killall.1 Thu Jun 4 02:36:41 2020 (= r361782) > > +++ head/usr.bin/killall/killall.1 Thu Jun 4 04:29:43 2020 (= r361783) > > @@ -145,6 +145,50 @@ utility exits 0 if some processes have been found = and > > signalled successfully. > > Otherwise, a status of 1 will be > > returned. > > +.Sh EXAMPLES > > +Send > > +.Dv SIGTERM > > +to all firefox processes: > > +.Bd -literal -offset indent > > +killall firefox > > +.Ed > > +.Pp > > +Send > > +.Dv SIGTERM > > +to firefox processes belonging to > > +.Va USER : > > +.Bd -literal -offset indent > > +killall -u ${USER} firefox > > +.Ed > > +.Pp > > +Stop all firefox processes: > > +.Bd -literal -offset indent > > +killall -SIGSTOP firefox > > +.Ed > > +.Pp > > +Resume firefox processes: > > +.Bd -literal -offset indent > > +killall -SIGCONT firefox > > +.Ed > > +.Pp > > +Show what would be done to firefox processes, but do not actually sign= al them: > > +.Bd -literal -offset indent > > +killall -s firefox > > +.Ed > > "Firefox" is a trade mark (type of intellectual property) of Mozilla Foun= dation. > Is it OK for us to use this name such way? Yes. You can of course refer to trademarks in writing, or else no one could write news or blog about Firefox=E2=84=A2, Chrome=E2=84=A2, Windows= =E2=84=A2, Linux=E2=84=A2, or even FreeBSD=E2=84=A2. There is no likelihood of confusion with the firefo= x product or dilution of the trademark, and the use is non-commerical. Conrad From owner-svn-src-head@freebsd.org Thu Jun 4 14:15:39 2020 Return-Path: Delivered-To: svn-src-head@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 CDDEC2F4B53; Thu, 4 Jun 2020 14:15:39 +0000 (UTC) (envelope-from eugen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d79757sdz3fSq; Thu, 4 Jun 2020 14:15:39 +0000 (UTC) (envelope-from eugen@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 ABAF420DD7; Thu, 4 Jun 2020 14:15:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054EFdQR029198; Thu, 4 Jun 2020 14:15:39 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054EFdlu029197; Thu, 4 Jun 2020 14:15:39 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202006041415.054EFdlu029197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Thu, 4 Jun 2020 14:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361789 - head/sys/netpfil/ipfw X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/sys/netpfil/ipfw X-SVN-Commit-Revision: 361789 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 14:15:39 -0000 Author: eugen Date: Thu Jun 4 14:15:39 2020 New Revision: 361789 URL: https://svnweb.freebsd.org/changeset/base/361789 Log: ipfw: unbreak matching with big table type flow. Test case: # n=32769 # ipfw -q table 1 create type flow:proto,dst-ip,dst-port # jot -w 'table 1 add tcp,127.0.0.1,' $n 1 | ipfw -q /dev/stdin # ipfw -q add 5 unreach filter-prohib flow 'table(1)' The rule 5 matches nothing without the fix if n>=32769. With the fix, it works: # telnet localhost 10001 Trying 127.0.0.1... telnet: connect to address 127.0.0.1: Permission denied telnet: Unable to connect to remote host MFC after: 2 weeks Discussed with: ae, melifaro Modified: head/sys/netpfil/ipfw/ip_fw_table_algo.c Modified: head/sys/netpfil/ipfw/ip_fw_table_algo.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_table_algo.c Thu Jun 4 13:18:21 2020 (r361788) +++ head/sys/netpfil/ipfw/ip_fw_table_algo.c Thu Jun 4 14:15:39 2020 (r361789) @@ -3204,7 +3204,8 @@ ta_lookup_fhash(struct table_info *ti, void *key, uint struct fhashentry *ent; struct fhashentry4 *m4; struct ipfw_flow_id *id; - uint16_t hash, hsize; + uint32_t hsize; + uint16_t hash; id = (struct ipfw_flow_id *)key; head = (struct fhashbhead *)ti->state; From owner-svn-src-head@freebsd.org Thu Jun 4 14:33:48 2020 Return-Path: Delivered-To: svn-src-head@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 BF0232F5FB4 for ; Thu, 4 Jun 2020 14:33:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d7Z40t7Dz3yls for ; Thu, 4 Jun 2020 14:33:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id 205so6195617qkg.3 for ; Thu, 04 Jun 2020 07:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=j/oFHNrLpn0u8Ru5b/OOMONDe2QtHzurDwSEwvzMR6U=; b=CwljBk/oggFLVWfBz/hmoLv9kEW1C8E6G/4naNIPM/6Y3euZn3BXkkkpRxhZHAegRI G21VYnN0o/HFZokD+e3QY0JLfkKN8fN5rYLYU3fTrppEiDZr7JQ/jIYjuvA8qPOSVTwd 7pL94+ZofC1Rqu9P21PE8cp3dpggqO2GV0Rq3bcbIFkDIDvfBj2CL/8R4FwX+tV0q+5r 4AHBIHXkrZGWzYfUtdNGrJK1pKmEtpAIf659dqnL2rblEF6s9fdkBckAWJ68blMySESv QZJgwWEGA1WnJcpNUWcdNReuvSs8sDewP80w8hZPY3QvV/Frc15X86d75kurDT4XwhhP 48uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=j/oFHNrLpn0u8Ru5b/OOMONDe2QtHzurDwSEwvzMR6U=; b=QEDFU+hpq/5YVcJVv2vKtcvIy+I5Ryuzn5hbUzBnlg+/Y/WoiSQa0c20ztVOf2nudO 1f85g0sq0iUadIkh6epm9SNx1y39ZVXxGi4pOA5QoTINhDO2ZtlodcIx4m2DzYLnHJ8u F3VFpiyGxFyxp/573GpXx39MP9/3KRrC5NcvaJMaqkn04Wbd5y4Ti3JwM51kwCuxdUrW GMcgbQqMKRg59Sh6mXgGsc9e01OiKqlujnbd4LEHxO4j0fmLwIBkVZKDriQXlVx00tTM 8F26oy5cIOjhjY8PWgdLjYGK+BVfg3F1ZnjxAgdPyVtiquhdS+PVrFtx+r1pXauXtXfi EAMQ== X-Gm-Message-State: AOAM5324mwHyg/osYqIVuNHhLgcuzCAn1DrSLmmxWnOqrL3rpGslXlUb ovzPyC0dkTVZtofFNYPYyPJdsquPy2aR7ATz2anxTg== X-Google-Smtp-Source: ABdhPJyyHESCTog0+UyJB8290D8SVPP33PXrb5/BwhYJdBftrHkxYCUPhpYhsBimQsYj56gXEjWXhlmyLrYjURoo4HU= X-Received: by 2002:a37:5c47:: with SMTP id q68mr4818073qkb.495.1591281227057; Thu, 04 Jun 2020 07:33:47 -0700 (PDT) MIME-Version: 1.0 References: <202006041346.054Dk2KE026273@gndrsh.dnsmgr.net> In-Reply-To: <202006041346.054Dk2KE026273@gndrsh.dnsmgr.net> From: Warner Losh Date: Thu, 4 Jun 2020 08:33:36 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49d7Z40t7Dz3yls X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=CwljBk/o; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72f) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.98 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.003]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.980]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.99)[-0.995]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72f:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 14:33:48 -0000 I look forward to your working with the contributors of all the other files to get them corrected. Then we could consider the last three once we come up with what's more proper than "The FreeBSD Project" for those remaining cases. Warner On Thu, Jun 4, 2020 at 7:46 AM Rodney W. Grimes wrote: > > On Thu, Jun 4, 2020 at 7:27 AM Rodney W. Grimes < > freebsd@gndrsh.dnsmgr.net> > > wrote: > > > > > > On Thu, Jun 4, 2020 at 7:04 AM Rodney W. Grimes < > > > freebsd@gndrsh.dnsmgr.net> > > > > wrote: > > > > > > > > > > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni > wrote: > > > > > > > > > > > > > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > > > > > >> [ Charset UTF-8 unsupported, converting... ] > > > > > > > >>> Author: gonzo > > > > > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > > > > > >>> New Revision: 361775 > > > > > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > > > >>> > > > > > > > >>> Log: > > > > > > > >>> Add spigen overlay for Raspberry Pi 4 > > > > > > > >>> > > > > > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > > > > > >>> > > > > > > > >>> Added: > > > > > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso > (contents, > > > props > > > > > > > changed) > > > > > > > >>> Modified: > > > > > > > >>> head/sys/modules/dtb/rpi/Makefile > > > > > > > >>> > > > > > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > > > > >>> > > > > > > > > > > > > > > > > ============================================================================== > > > > > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is > > > newly > > > > > > > added) > > > > > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed > Jun 3 > > > > > > > 22:18:15 2020 (r361775) > > > > > > > >>> @@ -0,0 +1,30 @@ > > > > > > > >>> +/* $FreeBSD$ */ > > > > > > > >> This file needs some form of copyright/license. > > > > > > > > Whom should I put as a copyright folder, The FreeBSD Project > or > > > the > > > > > > > > person who submitted the patch? > > > > > > > > > > > > > > The person that submitted the patch. > > > > > > > > > > > > > > > > > > > If it can be copyrighted. > > > > > > > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > > > > > copyrights > > > > > > > > > > > > > > > > > > True, but the FreeBSD Project can be the name in the copyright > line. > > > It > > > > > is > > > > > > the eponymous author of the FreeBSD collection. > > > > > > > > > > Thats a very slippery slope, though US copyright law allows > pseudonyms > > > > > as the copyright holder, I know of nothing that allows eponymous > names. > > > > > And I do not believe pseudonyms are support in other jurisdiction. > > > > > > > > > > https://www.copyright.gov/fls/fl101.pdf > > > > > > > > > > > > It is not. Legally, there's no real difference from a pseudonym and > an > > > > eponymous name. How could there be? > > > > > > Based on what? eponymous appears no place in the copyright law, so > > > I shall strongly disagree with you on that point. > > > > > > > An eponym is a type of pseudonym. It's not a nickname, nor an abbreviated > > form of a company. > > And the usage "The FreeBSD Project" does not meet the definition of > either: > > eponym > A person after whom a discovery, invention, place, etc., is named or > thought to be named. > > pseudonym > A fictitious name, especially one used by an author. > > My keypoint is "A/AN PERSON". > > > > I should have added that the project decided, years ago, to only use it > > > for > > > > the collection copyright holder in the /COPYRIGHT file. All other > files > > > > > > It appears as if it is used many other places, as my find/grep showed. > > > > > > > Yes. And apart from the 3 files I identified, the others should be > fixed. I > > did this the last time we did a sweep maybe in the late 90s / early 2000s > > based on advice from an IP attorney who specialized in open source. For > > various reasons, it's fine in the collection copyright context, but we > > don't want to have it anywhere else if we can help it. > > I find it very hard to believe that using anything in 3 copyrights is > somehow valid if it can not be used in all copyrights. That, again, > is just a slippery slope. > > Further, let me speculate, more "Free" advice? Free legal advice is > worth exactly what you paid for it, nothing. Especially if you do not > have the advice in writting. > > > Warner > > > > > > > > require an actual copyright holder at the time of submission. The > project > > > > generally doesn't track successors in interest, though there are > > > exceptions > > > > when the copyright holder themselves make the change. > > > > > > > > Warner > > > > > > > > > > > > > > > > > > > (The Foundation can but unless they sponsored it, that > > > > > > > usually involves paperwork). > > > > > > > > > > > > > > > > > > > Yup. > > > > > > > > > > > > Warner > > > > > > > > > > > > > Pedro. > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > Rod Grimes > > > > > rgrimes@freebsd.org > > > > > > > > > > > -- > > > Rod Grimes > > > rgrimes@freebsd.org > > > > > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 14:44:45 2020 Return-Path: Delivered-To: svn-src-head@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 AEAF02F64CC; Thu, 4 Jun 2020 14:44:45 +0000 (UTC) (envelope-from eugen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d7pj49NWz40qn; Thu, 4 Jun 2020 14:44:45 +0000 (UTC) (envelope-from eugen@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 8A3C221122; Thu, 4 Jun 2020 14:44:45 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054Eij7o047938; Thu, 4 Jun 2020 14:44:45 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054EijxB047937; Thu, 4 Jun 2020 14:44:45 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202006041444.054EijxB047937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Thu, 4 Jun 2020 14:44:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361790 - head/sbin/ifconfig X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/sbin/ifconfig X-SVN-Commit-Revision: 361790 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 14:44:45 -0000 Author: eugen Date: Thu Jun 4 14:44:44 2020 New Revision: 361790 URL: https://svnweb.freebsd.org/changeset/base/361790 Log: ifconfig(8): make it possible to filter output by interface group. Now options -g/-G allow to select/unselect interfaces by groups in the "ifconfig -a" output just like already existing -d/-u. Examples: to exclude loopback from the list: ifconfig -a -G lo to show vlan interfaces only: ifconfig -a -g vlan to show tap interfaces that are up: ifconfig -aug tap Arguments to -g/-G may be shell patterns and both may be specified. Later options -g/-G override previous ones. MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D25029 Modified: head/sbin/ifconfig/ifconfig.8 head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/ifconfig.8 ============================================================================== --- head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:15:39 2020 (r361789) +++ head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:44:44 2020 (r361790) @@ -56,6 +56,7 @@ .Fl a .Op Fl L .Op Fl d +.Op Fl [gG] Ar groupname .Op Fl m .Op Fl u .Op Fl v @@ -2910,9 +2911,26 @@ This flag instructs to display information about all interfaces in the system. The .Fl d -flag limits this to interfaces that are down, and +flag limits this to interfaces that are down, .Fl u -limits this to interfaces that are up. +limits this to interfaces that are up, +limits this to interfaces that are up, +.Fl g +limits this to members of the specified group of interfaces, and +.Fl G +excludes members of the specified group from the list. +Both +.Fl g +and +.Fl G +flags may be specified to apply both conditions. +Only one option +.Fl g +should be specified as later override previous ones +(same for +.Fl G ) . +.Sy groupname +may contain shell patterns in which case it should be quoted. When no arguments are given, .Fl a is implied. @@ -3036,6 +3054,9 @@ Display available wireless networks using .Pp Display inet and inet6 address subnet masks in CIDR notation .Dl # ifconfig -f inet:cidr,inet6:cidr +.Pp +Display interfaces that are up with the exception of loopback +.Dl # ifconfig -a -u -G lo .Sh DIAGNOSTICS Messages indicating the specified interface does not exist, the requested address is unknown, or the user is not privileged and Modified: head/sbin/ifconfig/ifconfig.c ============================================================================== --- head/sbin/ifconfig/ifconfig.c Thu Jun 4 14:15:39 2020 (r361789) +++ head/sbin/ifconfig/ifconfig.c Thu Jun 4 14:44:44 2020 (r361790) @@ -63,6 +63,7 @@ static const char rcsid[] = #include #include +#include #include #include #include @@ -105,6 +106,8 @@ int exit_code = 0; /* Formatter Strings */ char *f_inet, *f_inet6, *f_ether, *f_addr; +static bool group_member(const char *ifname, const char *match, + const char *nomatch); static int ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *afp); static void status(const struct afswtch *afp, const struct sockaddr_dl *sdl, @@ -402,13 +405,14 @@ main(int argc, char *argv[]) char options[1024], *cp, *envformat, *namecp = NULL; struct ifa_queue q = TAILQ_HEAD_INITIALIZER(q); struct ifa_order_elt *cur, *tmp; - const char *ifname; + const char *ifname, *matchgroup, *nogroup; struct option *p; size_t iflen; int flags; all = downonly = uponly = namesonly = noload = verbose = 0; f_inet = f_inet6 = f_ether = f_addr = NULL; + matchgroup = nogroup = NULL; envformat = getenv("IFCONFIG_FORMAT"); if (envformat != NULL) @@ -421,7 +425,7 @@ main(int argc, char *argv[]) atexit(printifnamemaybe); /* Parse leading line options */ - strlcpy(options, "f:adklmnuv", sizeof(options)); + strlcpy(options, "G:adf:klmnuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -437,6 +441,11 @@ main(int argc, char *argv[]) usage(); setformat(optarg); break; + case 'G': + if (optarg == NULL || all == 0) + usage(); + nogroup = optarg; + break; case 'k': printkeys++; break; @@ -455,6 +464,14 @@ main(int argc, char *argv[]) case 'v': verbose++; break; + case 'g': + if (all) { + if (optarg == NULL) + usage(); + matchgroup = optarg; + break; + } + /* FALLTHROUGH */ default: for (p = opts; p != NULL; p = p->next) if (p->opt[0] == c) { @@ -626,6 +643,8 @@ main(int argc, char *argv[]) continue; if (uponly && (ifa->ifa_flags & IFF_UP) == 0) continue; + if (!group_member(ifa->ifa_name, matchgroup, nogroup)) + continue; /* * Are we just listing the interfaces? */ @@ -668,6 +687,73 @@ main(int argc, char *argv[]) done: freeformat(); exit(exit_code); +} + +/* + * Returns true if an interface should be listed because any its groups + * matches shell pattern "match" and none of groups matches pattern "nomatch". + * If any pattern is NULL, corresponding condition is skipped. + */ +static bool +group_member(const char *ifname, const char *match, const char *nomatch) +{ + static int sock = -1; + + struct ifgroupreq ifgr; + struct ifg_req *ifg; + int len; + bool matched, nomatched; + + /* Sanity checks. */ + if (match == NULL && nomatch == NULL) + return (true); + if (ifname == NULL) + return (false); + + memset(&ifgr, 0, sizeof(ifgr)); + strlcpy(ifgr.ifgr_name, ifname, IFNAMSIZ); + + /* The socket is opened once. Let _exit() close it. */ + if (sock == -1) { + sock = socket(AF_LOCAL, SOCK_DGRAM, 0); + if (sock == -1) + errx(1, "%s: socket(AF_LOCAL,SOCK_DGRAM)", __func__); + } + + /* Determine amount of memory for the list of groups. */ + if (ioctl(sock, SIOCGIFGROUP, (caddr_t)&ifgr) == -1) { + if (errno == EINVAL || errno == ENOTTY) + return (false); + else + errx(1, "%s: SIOCGIFGROUP", __func__); + } + + /* Obtain the list of groups. */ + len = ifgr.ifgr_len; + ifgr.ifgr_groups = + (struct ifg_req *)calloc(len / sizeof(*ifg), sizeof(*ifg)); + + if (ifgr.ifgr_groups == NULL) + errx(1, "%s: no memory", __func__); + if (ioctl(sock, SIOCGIFGROUP, (caddr_t)&ifgr) == -1) + errx(1, "%s: SIOCGIFGROUP", __func__); + + /* Perform matching. */ + matched = false; + nomatched = true; + for (ifg = ifgr.ifgr_groups; ifg && len >= sizeof(*ifg); ifg++) { + len -= sizeof(struct ifg_req); + if (match) + matched |= !fnmatch(match, ifg->ifgrq_group, 0); + if (nomatch) + nomatched &= fnmatch(nomatch, ifg->ifgrq_group, 0); + } + + if (match && !nomatch) + return (matched); + if (!match && nomatch) + return (nomatched); + return (matched && nomatched); } static struct afswtch *afs = NULL; From owner-svn-src-head@freebsd.org Thu Jun 4 15:28:39 2020 Return-Path: Delivered-To: svn-src-head@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 156312F7607 for ; Thu, 4 Jun 2020 15:28:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d8nL1dRqz45Vy for ; Thu, 4 Jun 2020 15:28:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf32.google.com with SMTP id er17so3098039qvb.8 for ; Thu, 04 Jun 2020 08:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nQt3dzsjIIwkIvKm7GJRSOY8z7H62TQRRpOlTEM73nw=; b=ou/iQXdHpth+uCexK8KZcyx2guXICAQODzvrEfhWobR2qij05pO/ETmPzxbrKY4OaL QwY+W9gvINxq56eRFu9gOE/YbnovproBtAgaJnalUxBH6txQM5dlKQegHVGMqLI85+36 sL4+1bpw5hgAeUnPjzNngXO2Grnfzz2aY8OFyxiLrH0w19XsTyKQR7HkQsvyfqoqVlRD F6ubatmaKD0l8CdcRPXVPtcGPWdBDBDOxUM6IWIx/rQeWLn4dP5bSEtF3BkiVINGpjeQ wg7i+w6JwAM0fqaBpSlGuwDvu/7k36QSvY3omEeh9covwC21ViNZ2225dO5KgM2dBaUx jevg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nQt3dzsjIIwkIvKm7GJRSOY8z7H62TQRRpOlTEM73nw=; b=PVNdpnlmBR5aetJQZtCVzN6zDjlVT2p63aK/Y1ho8iuEqc7MbizZU9YPNmaJj5bVKM CYCwpMu+nFUmvRSAyO1JU+7xIlS/cvYq6iyCE78aAM0ETLHHX3BuHx5Rk/L8errakIDI 697S0Kd2HfLZklunmU8TItDqKjpCz5OS9PsD04zSHA6wsKO06RduZdbRASYCMn6TOyXl 2i5NYdOf8SAu2NwTATG6SsZwL9fAAS72YkITpRYuaY5n3clhQTLkHjenhs/w/iH4hY43 sbHeGtLF1DveOyB/JMeKcROkOg2UrE5/SNrw9uRA6CFN8aftK41T3A2ZyWRei2d/wZb+ 58DA== X-Gm-Message-State: AOAM530VkM0YkV4ABX1bvqHhGJYtov4FDgaWuqBAByGl3b5Jy/tWrLb1 kbhPTbY2uNDWkDLLR3mAs/b+cG67vJgR6WJAfllM7fD7 X-Google-Smtp-Source: ABdhPJym1ZMhhij0RVzBNq9w+fy13AJUpZTT86xBD6v7AfuXUJL1L539RDBUIXxFUijl3hNa3sjB+Bm05Ng+Gcn9RRY= X-Received: by 2002:a05:6214:17cb:: with SMTP id cu11mr5295212qvb.202.1591284517166; Thu, 04 Jun 2020 08:28:37 -0700 (PDT) MIME-Version: 1.0 References: <202006041346.054Dk2KE026273@gndrsh.dnsmgr.net> In-Reply-To: <202006041346.054Dk2KE026273@gndrsh.dnsmgr.net> From: Warner Losh Date: Thu, 4 Jun 2020 09:28:26 -0600 Message-ID: Subject: Re: svn commit: r361775 - in head/sys: dts/arm64/overlays modules/dtb/rpi To: "Rodney W. Grimes" Cc: Pedro Giffuni , Oleksandr Tymoshenko , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49d8nL1dRqz45Vy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=ou/iQXdH; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f32) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.69 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.003]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.980]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.71)[-0.706]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f32:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 15:28:39 -0000 On Thu, Jun 4, 2020 at 7:46 AM Rodney W. Grimes wrote: > > On Thu, Jun 4, 2020 at 7:27 AM Rodney W. Grimes < > freebsd@gndrsh.dnsmgr.net> > > wrote: > > > > > > On Thu, Jun 4, 2020 at 7:04 AM Rodney W. Grimes < > > > freebsd@gndrsh.dnsmgr.net> > > > > wrote: > > > > > > > > > > On Wed, Jun 3, 2020, 8:10 PM Pedro Giffuni > wrote: > > > > > > > > > > > > > > > > > > > > On 03/06/2020 19:59, Oleksandr Tymoshenko wrote: > > > > > > > > Rodney W. Grimes (freebsd@gndrsh.dnsmgr.net) wrote: > > > > > > > >> [ Charset UTF-8 unsupported, converting... ] > > > > > > > >>> Author: gonzo > > > > > > > >>> Date: Wed Jun 3 22:18:15 2020 > > > > > > > >>> New Revision: 361775 > > > > > > > >>> URL: https://svnweb.freebsd.org/changeset/base/361775 > > > > > > > >>> > > > > > > > >>> Log: > > > > > > > >>> Add spigen overlay for Raspberry Pi 4 > > > > > > > >>> > > > > > > > >>> Submitted by: gergely.czuczy@harmless.hu > > > > > > > >>> > > > > > > > >>> Added: > > > > > > > >>> head/sys/dts/arm64/overlays/spigen-rpi4.dtso > (contents, > > > props > > > > > > > changed) > > > > > > > >>> Modified: > > > > > > > >>> head/sys/modules/dtb/rpi/Makefile > > > > > > > >>> > > > > > > > >>> Added: head/sys/dts/arm64/overlays/spigen-rpi4.dtso > > > > > > > >>> > > > > > > > > > > > > > > > > ============================================================================== > > > > > > > >>> --- /dev/null 00:00:00 1970 (empty, because file is > > > newly > > > > > > > added) > > > > > > > >>> +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Wed > Jun 3 > > > > > > > 22:18:15 2020 (r361775) > > > > > > > >>> @@ -0,0 +1,30 @@ > > > > > > > >>> +/* $FreeBSD$ */ > > > > > > > >> This file needs some form of copyright/license. > > > > > > > > Whom should I put as a copyright folder, The FreeBSD Project > or > > > the > > > > > > > > person who submitted the patch? > > > > > > > > > > > > > > The person that submitted the patch. > > > > > > > > > > > > > > > > > > > If it can be copyrighted. > > > > > > > > > > > > Note that the FreeBSD Project is not an entity and cannot hold > > > > > > > copyrights > > > > > > > > > > > > > > > > > > True, but the FreeBSD Project can be the name in the copyright > line. > > > It > > > > > is > > > > > > the eponymous author of the FreeBSD collection. > > > > > > > > > > Thats a very slippery slope, though US copyright law allows > pseudonyms > > > > > as the copyright holder, I know of nothing that allows eponymous > names. > > > > > And I do not believe pseudonyms are support in other jurisdiction. > > > > > > > > > > https://www.copyright.gov/fls/fl101.pdf > > > > > > > > > > > > It is not. Legally, there's no real difference from a pseudonym and > an > > > > eponymous name. How could there be? > > > > > > Based on what? eponymous appears no place in the copyright law, so > > > I shall strongly disagree with you on that point. > > > > > > > An eponym is a type of pseudonym. It's not a nickname, nor an abbreviated > > form of a company. > > And the usage "The FreeBSD Project" does not meet the definition of > either: > > eponym > A person after whom a discovery, invention, place, etc., is named or > thought to be named. > > pseudonym > A fictitious name, especially one used by an author. > > My keypoint is "A/AN PERSON". > > > > I should have added that the project decided, years ago, to only use it > > > for > > > > the collection copyright holder in the /COPYRIGHT file. All other > files > > > > > > It appears as if it is used many other places, as my find/grep showed. > > > > > > > Yes. And apart from the 3 files I identified, the others should be > fixed. I > > did this the last time we did a sweep maybe in the late 90s / early 2000s > > based on advice from an IP attorney who specialized in open source. For > > various reasons, it's fine in the collection copyright context, but we > > don't want to have it anywhere else if we can help it. > > I find it very hard to believe that using anything in 3 copyrights is > somehow valid if it can not be used in all copyrights. That, again, > is just a slippery slope. > > Further, let me speculate, more "Free" advice? Free legal advice is > worth exactly what you paid for it, nothing. Especially if you do not > have the advice in writting. > You are getting quite toxic in your tone. It's quite rude and disrespectful. You know, as well as anybody, that conversations with lawyers are covered by attorney client privilege. But then again, neither one of us are lawyers. Unless I see you working to fix all the other non-disputed areas, I'm not going to reply further. Warner > > Warner > > > > > > > > require an actual copyright holder at the time of submission. The > project > > > > generally doesn't track successors in interest, though there are > > > exceptions > > > > when the copyright holder themselves make the change. > > > > > > > > Warner > > > > > > > > > > > > > > > > > > > (The Foundation can but unless they sponsored it, that > > > > > > > usually involves paperwork). > > > > > > > > > > > > > > > > > > > Yup. > > > > > > > > > > > > Warner > > > > > > > > > > > > > Pedro. > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > Rod Grimes > > > > > rgrimes@freebsd.org > > > > > > > > > > > -- > > > Rod Grimes > > > rgrimes@freebsd.org > > > > > -- > Rod Grimes > rgrimes@freebsd.org > From owner-svn-src-head@freebsd.org Thu Jun 4 16:04:20 2020 Return-Path: Delivered-To: svn-src-head@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 681CD32873D; Thu, 4 Jun 2020 16:04:20 +0000 (UTC) (envelope-from cem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d9ZX2619z49jJ; Thu, 4 Jun 2020 16:04:20 +0000 (UTC) (envelope-from cem@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 4365F220F7; Thu, 4 Jun 2020 16:04:20 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054G4KdU098396; Thu, 4 Jun 2020 16:04:20 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054G4KAb098395; Thu, 4 Jun 2020 16:04:20 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202006041604.054G4KAb098395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Thu, 4 Jun 2020 16:04:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361791 - head/etc/mtree X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/etc/mtree X-SVN-Commit-Revision: 361791 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 16:04:20 -0000 Author: cem Date: Thu Jun 4 16:04:19 2020 New Revision: 361791 URL: https://svnweb.freebsd.org/changeset/base/361791 Log: Restrict default /root permissions Remove world-readability from the root directory. Sensitive information may be stored in /root and we diverge here from normative administrative practice, as well as installation defaults of other Unix-alikes. The wheel group is still permitted to read the directory. 750 is no more restrictive than defaults for the rest of the open source Unix-alike world. In particular, Ben Woods surveyed DragonFly, NetBSD, OpenBSD, ArchLinux, CentOS, Debian, Fedora, Slackware, and Ubuntu. None have a world-readable /root by default. Submitted by: Gordon Bergling Reviewed by: ian, myself Discussed with: emaste (informal approval) Relnotes: sure? Differential Revision: https://reviews.freebsd.org/D23392 Modified: head/etc/mtree/BSD.root.dist Modified: head/etc/mtree/BSD.root.dist ============================================================================== --- head/etc/mtree/BSD.root.dist Thu Jun 4 14:44:44 2020 (r361790) +++ head/etc/mtree/BSD.root.dist Thu Jun 4 16:04:19 2020 (r361791) @@ -117,7 +117,7 @@ .. rescue .. - root + root mode=0750 .. sbin .. From owner-svn-src-head@freebsd.org Thu Jun 4 16:05:25 2020 Return-Path: Delivered-To: svn-src-head@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 498D0328846; Thu, 4 Jun 2020 16:05:25 +0000 (UTC) (envelope-from markj@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49d9bn1LK2z49vf; Thu, 4 Jun 2020 16:05:25 +0000 (UTC) (envelope-from markj@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 292B821FB1; Thu, 4 Jun 2020 16:05:25 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054G5Oec098535; Thu, 4 Jun 2020 16:05:24 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054G5Oln098532; Thu, 4 Jun 2020 16:05:24 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202006041605.054G5Oln098532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 4 Jun 2020 16:05:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361792 - in head: share/man/man4 sys/conf X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head: share/man/man4 sys/conf X-SVN-Commit-Revision: 361792 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 16:05:25 -0000 Author: markj Date: Thu Jun 4 16:05:24 2020 New Revision: 361792 URL: https://svnweb.freebsd.org/changeset/base/361792 Log: Update vt(4) config option names to chase r303043. PR: 246080 Submitted by: David Marec MFC after: 1 week Modified: head/share/man/man4/vt.4 head/sys/conf/NOTES head/sys/conf/options Modified: head/share/man/man4/vt.4 ============================================================================== --- head/share/man/man4/vt.4 Thu Jun 4 16:04:19 2020 (r361791) +++ head/share/man/man4/vt.4 Thu Jun 4 16:05:24 2020 (r361792) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 28, 2017 +.Dd June 4, 2020 .Dt "VT" 4 .Os .Sh NAME @@ -145,11 +145,11 @@ In effect, this makes the right-hand mouse button perf These options are checked in the order shown. .It Dv SC_NO_CUTPASTE Disable mouse support. -.It VT_FB_DEFAULT_WIDTH=X -Set the default width to +.It VT_FB_MAX_WIDTH=X +Set the maximum width to .Fa X . -.It VT_FB_DEFAULT_HEIGHT=Y -Set the default height to +.It VT_FB_MAX_HEIGHT=Y +Set the maximum height to .Fa Y . .El .Sh BACKWARDS COMPATIBILITY Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Thu Jun 4 16:04:19 2020 (r361791) +++ head/sys/conf/NOTES Thu Jun 4 16:05:24 2020 (r361792) @@ -1487,9 +1487,9 @@ options VT_ALT_TO_ESC_HACK=1 # Prepend ESC sequence t options VT_MAXWINDOWS=16 # Number of virtual consoles options VT_TWOBUTTON_MOUSE # Use right mouse button to paste -# The following options set the default framebuffer size. -options VT_FB_DEFAULT_HEIGHT=480 -options VT_FB_DEFAULT_WIDTH=640 +# The following options set the maximum framebuffer size. +options VT_FB_MAX_HEIGHT=480 +options VT_FB_MAX_WIDTH=640 # The following options will let you change the default vt terminal colors. options TERMINAL_NORM_ATTR=(FG_GREEN|BG_BLACK) Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Thu Jun 4 16:04:19 2020 (r361791) +++ head/sys/conf/options Thu Jun 4 16:05:24 2020 (r361792) @@ -773,8 +773,8 @@ SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h VT_ALT_TO_ESC_HACK opt_syscons.h -VT_FB_DEFAULT_WIDTH opt_syscons.h -VT_FB_DEFAULT_HEIGHT opt_syscons.h +VT_FB_MAX_WIDTH opt_syscons.h +VT_FB_MAX_HEIGHT opt_syscons.h VT_MAXWINDOWS opt_syscons.h VT_TWOBUTTON_MOUSE opt_syscons.h DEV_SC opt_syscons.h From owner-svn-src-head@freebsd.org Thu Jun 4 16:19:42 2020 Return-Path: Delivered-To: svn-src-head@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 1F55F328AE4; Thu, 4 Jun 2020 16:19:42 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d9wF3cHKz4CW6; Thu, 4 Jun 2020 16:19:41 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id gsaejgtrsYYpxgsagjGMTS; Thu, 04 Jun 2020 10:19:39 -0600 X-Authority-Analysis: v=2.3 cv=OubUNx3t c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=nTHF0DUjJn0A:10 a=6I5d2MoRAAAA:8 a=pGLkceISAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=G3puiCzhEVrEPl4KyZUA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 40BF2247; Thu, 4 Jun 2020 09:19:36 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 054GJZYC018927; Thu, 4 Jun 2020 09:19:35 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 054GJZ3C018924; Thu, 4 Jun 2020 09:19:35 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202006041619.054GJZ3C018924@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Conrad Meyer cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361791 - head/etc/mtree In-reply-to: <202006041604.054G4KAb098395@repo.freebsd.org> References: <202006041604.054G4KAb098395@repo.freebsd.org> Comments: In-reply-to Conrad Meyer message dated "Thu, 04 Jun 2020 16:04:20 -0000." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 04 Jun 2020 09:19:35 -0700 X-CMAE-Envelope: MS4wfGK6gJONCI2Ry4EYscbQcvy+ZRcGOK/q/ZmGrFcusVkFWSEELVTwWgGj1S95CHpc19RIFStYq/ne3GkyZY2iWq+KvCvdRB3hxLh51c3nq7VBw4+NNPN5 I6cCx+W3ppLgdHFShNpctUiUg2K1BDeAAxhFeIGQg2xuC6jK/VkOzXZmr/n/OpMp16iIOasykbn+LTx2hSuLh7lxZdLuZnoXY4aAY2HCpUf/CelgxKNPzNTr tE5/TY+3XpZ1+MqytEEmHQEwwpXSB51SMWiZ9hedUQYIfov2KRIfZf52SW6/uFmt X-Rspamd-Queue-Id: 49d9wF3cHKz4CW6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 16:19:42 -0000 In message <202006041604.054G4KAb098395@repo.freebsd.org>, Conrad Meyer writes: > Author: cem > Date: Thu Jun 4 16:04:19 2020 > New Revision: 361791 > URL: https://svnweb.freebsd.org/changeset/base/361791 > > Log: > Restrict default /root permissions > > Remove world-readability from the root directory. Sensitive information ma > y be > stored in /root and we diverge here from normative administrative practice, > as > well as installation defaults of other Unix-alikes. The wheel group is sti > ll > permitted to read the directory. > > 750 is no more restrictive than defaults for the rest of the open source > Unix-alike world. In particular, Ben Woods surveyed DragonFly, NetBSD, > OpenBSD, ArchLinux, CentOS, Debian, Fedora, Slackware, and Ubuntu. None ha > ve a > world-readable /root by default. > > Submitted by: Gordon Bergling > Reviewed by: ian, myself > Discussed with: emaste (informal approval) > Relnotes: sure? > Differential Revision: https://reviews.freebsd.org/D23392 > > Modified: > head/etc/mtree/BSD.root.dist > > Modified: head/etc/mtree/BSD.root.dist > ============================================================================= > = > --- head/etc/mtree/BSD.root.dist Thu Jun 4 14:44:44 2020 (r36179 > 0) > +++ head/etc/mtree/BSD.root.dist Thu Jun 4 16:04:19 2020 (r36179 > 1) > @@ -117,7 +117,7 @@ > .. > rescue > .. > - root > + root mode=0750 > .. > sbin > .. > Recent CIS benchmarks recommend 0700. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Thu Jun 4 16:24:14 2020 Return-Path: Delivered-To: svn-src-head@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 1D3D1328D6F; Thu, 4 Jun 2020 16:24:14 +0000 (UTC) (envelope-from markj@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dB1T736Rz4DHV; Thu, 4 Jun 2020 16:24:13 +0000 (UTC) (envelope-from markj@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 ECB8E21FEA; Thu, 4 Jun 2020 16:24:13 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054GODNq011669; Thu, 4 Jun 2020 16:24:13 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054GODUi011668; Thu, 4 Jun 2020 16:24:13 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202006041624.054GODUi011668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 4 Jun 2020 16:24:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361793 - head/sbin/dhclient X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sbin/dhclient X-SVN-Commit-Revision: 361793 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 16:24:14 -0000 Author: markj Date: Thu Jun 4 16:24:13 2020 New Revision: 361793 URL: https://svnweb.freebsd.org/changeset/base/361793 Log: dhclient: Fix a logic bug remove_protocol(). A logic bug in remove_protocol() meant that it would remove (leak) all structures in the list preceding the one intended for removal. PR: 245971 Submitted by: joost@jodocus.org (original version) MFC after: 1 week Modified: head/sbin/dhclient/dispatch.c Modified: head/sbin/dhclient/dispatch.c ============================================================================== --- head/sbin/dhclient/dispatch.c Thu Jun 4 16:05:24 2020 (r361792) +++ head/sbin/dhclient/dispatch.c Thu Jun 4 16:24:13 2020 (r361793) @@ -474,13 +474,16 @@ add_protocol(const char *name, int fd, void (*handler) void remove_protocol(struct protocol *proto) { - struct protocol *p, *next; + struct protocol *p, *prev; - for (p = protocols; p; p = next) { - next = p->next; + for (p = protocols, prev = NULL; p != NULL; prev = p, p = p->next) { if (p == proto) { - protocols = p->next; + if (prev == NULL) + protocols = p->next; + else + prev->next = p->next; free(p); + break; } } } From owner-svn-src-head@freebsd.org Thu Jun 4 16:38:17 2020 Return-Path: Delivered-To: svn-src-head@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 721C43292E5 for ; Thu, 4 Jun 2020 16:38:17 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dBKh4Fzfz4Fbn for ; Thu, 4 Jun 2020 16:38:16 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi1-f182.google.com with SMTP id d67so5637434oig.6 for ; Thu, 04 Jun 2020 09:38:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:cc; bh=HfBaqgPRdHLCcpfjfoLzI5rhJ6VOQvJAvJb+HRz63OU=; b=hZyw0MKCiD2Wbf0BeSjRJYWAIBcPVEGxR6nvdBGJvXhynTieySblYZplGFkzuH5If2 gNG4K4hAmhClpY6yoenD6BZyrxp/b5fVP/gfhEk/JhSjH4IgAyRpAjvFH5dNIOU+Q8Va 2A4K580JEjQyjdN2cxYdH28BOMQb8NB6n3O/QZBM8N0ZttdD5LZQh7L2mD29IxfvNQwb 963Wt4Of072hDo82mM3Xnqo/Gg11bDfxEgvtWS7mQwbSJ0v7MDR+Z9JDuBNKC93GbEo3 KmVn30sBYKETTVee5yfdQVJYpm2+Yp6tTESAoJnMP5n0UQKxfdmnmNJgUK1APo3Z3sX9 aGMg== X-Gm-Message-State: AOAM531Wqn/Z2feIyTQjNPMwhfeWSAG+PleyW7aHhorCq2Xv4OVwdRDJ 8hp02YRFV3E00QwqXkrUwjB3Tnpe X-Google-Smtp-Source: ABdhPJx6Q/wlwddOdokQjVZc5nVRB6Hj4baciy5F6XvrKgWyMouzhvk10zkFkHXon4yUCaNYbZwc+w== X-Received: by 2002:aca:ed42:: with SMTP id l63mr3460437oih.101.1591288695326; Thu, 04 Jun 2020 09:38:15 -0700 (PDT) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com. [209.85.167.182]) by smtp.gmail.com with ESMTPSA id w12sm234962otq.40.2020.06.04.09.38.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Jun 2020 09:38:15 -0700 (PDT) Received: by mail-oi1-f182.google.com with SMTP id t25so5622282oij.7 for ; Thu, 04 Jun 2020 09:38:14 -0700 (PDT) X-Received: by 2002:aca:accd:: with SMTP id v196mt4621397oie.135.1591288694792; Thu, 04 Jun 2020 09:38:14 -0700 (PDT) MIME-Version: 1.0 References: <202006041604.054G4KAb098395@repo.freebsd.org> In-Reply-To: <202006041604.054G4KAb098395@repo.freebsd.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Thu, 4 Jun 2020 09:38:04 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361791 - head/etc/mtree Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49dBKh4Fzfz4Fbn X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.167.182 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-0.07 / 15.00]; HAS_REPLYTO(0.00)[cem@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.31)[-0.308]; MISSING_TO(2.00)[]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.80)[-0.804]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-0.96)[-0.958]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.182:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.182:from]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 16:38:17 -0000 On Thu, Jun 4, 2020 at 9:04 AM Conrad Meyer wrote: > 750 is no more restrictive than defaults for the rest of the open source > Unix-alike world. In particular, Ben Woods surveyed DragonFly, NetBSD, > OpenBSD, ArchLinux, CentOS, Debian, Fedora, Slackware, and Ubuntu. None have a > world-readable /root by default. A minor correction: NetBSD does have a world-readable /root by default. The rest do not. Conrad From owner-svn-src-head@freebsd.org Thu Jun 4 17:20:59 2020 Return-Path: Delivered-To: svn-src-head@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 A532E32A83B; Thu, 4 Jun 2020 17:20:59 +0000 (UTC) (envelope-from gonzo@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dCGz40G0z4LHT; Thu, 4 Jun 2020 17:20:59 +0000 (UTC) (envelope-from gonzo@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 846D022FB2; Thu, 4 Jun 2020 17:20:59 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054HKxZF045532; Thu, 4 Jun 2020 17:20:59 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054HKx9T045530; Thu, 4 Jun 2020 17:20:59 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <202006041720.054HKx9T045530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 4 Jun 2020 17:20:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361796 - head/sys/dts/arm64/overlays X-SVN-Group: head X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: head/sys/dts/arm64/overlays X-SVN-Commit-Revision: 361796 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 17:20:59 -0000 Author: gonzo Date: Thu Jun 4 17:20:58 2020 New Revision: 361796 URL: https://svnweb.freebsd.org/changeset/base/361796 Log: Remove licenses I haven't requested explicit permission from authors and shouldn't have added BSDL headers without it. Requestes by: imp Modified: head/sys/dts/arm64/overlays/spigen-rpi3.dtso head/sys/dts/arm64/overlays/spigen-rpi4.dtso Modified: head/sys/dts/arm64/overlays/spigen-rpi3.dtso ============================================================================== --- head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 17:08:07 2020 (r361795) +++ head/sys/dts/arm64/overlays/spigen-rpi3.dtso Thu Jun 4 17:20:58 2020 (r361796) @@ -1,31 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2019 Bob Frazier - * - * 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$ - */ +/* $FreeBSD$ */ /dts-v1/; /plugin/; Modified: head/sys/dts/arm64/overlays/spigen-rpi4.dtso ============================================================================== --- head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 17:08:07 2020 (r361795) +++ head/sys/dts/arm64/overlays/spigen-rpi4.dtso Thu Jun 4 17:20:58 2020 (r361796) @@ -1,31 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2020 Gergely Czuczy - * - * 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$ - */ +/* $FreeBSD$ */ /dts-v1/; /plugin/; From owner-svn-src-head@freebsd.org Thu Jun 4 18:09:57 2020 Return-Path: Delivered-To: svn-src-head@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 25FEF32B90D; Thu, 4 Jun 2020 18:09:57 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dDMT0F0kz4RSn; Thu, 4 Jun 2020 18:09:57 +0000 (UTC) (envelope-from kevans@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 030AC235DF; Thu, 4 Jun 2020 18:09:57 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054I9ukP078379; Thu, 4 Jun 2020 18:09:56 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054I9uCs078374; Thu, 4 Jun 2020 18:09:56 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006041809.054I9uCs078374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 4 Jun 2020 18:09:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361798 - in head: bin/csh bin/sh lib/libc/sys sys/kern X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: bin/csh bin/sh lib/libc/sys sys/kern X-SVN-Commit-Revision: 361798 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 18:09:57 -0000 Author: kevans Date: Thu Jun 4 18:09:55 2020 New Revision: 361798 URL: https://svnweb.freebsd.org/changeset/base/361798 Log: vfs: add restrictions to read(2) of a directory [1/2] Historically, we've allowed read() of a directory and some filesystems will accommodate (e.g. ufs/ffs, msdosfs). From the history department staffed by Warner: <uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; + + /* + * The ability to read(2) on a directory has historically been + * allowed for all users, but this can and has been the source of + * at least one security issue in the past. As such, it is now hidden + * away behind a sysctl for those that actually need it to use it. + */ + if (vp->v_type == VDIR) { + KASSERT(uio->uio_rw == UIO_READ, + ("illegal write attempted on a directory")); + if (!vfs_allow_read_dir) + return (EISDIR); + } + foffset_lock_uio(fp, uio, flags); if (do_vn_io_fault(vp, uio)) { args.kind = VN_IO_FAULT_FOP; From owner-svn-src-head@freebsd.org Thu Jun 4 18:17:27 2020 Return-Path: Delivered-To: svn-src-head@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 52B2432BF43; Thu, 4 Jun 2020 18:17:27 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dDX71Fc7z4SwX; Thu, 4 Jun 2020 18:17:27 +0000 (UTC) (envelope-from kevans@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 258F123D02; Thu, 4 Jun 2020 18:17:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054IHQ29084754; Thu, 4 Jun 2020 18:17:26 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054IHQeB084749; Thu, 4 Jun 2020 18:17:26 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006041817.054IHQeB084749@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 4 Jun 2020 18:17:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361799 - in head: lib/libc/sys sys/kern sys/sys X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: lib/libc/sys sys/kern sys/sys X-SVN-Commit-Revision: 361799 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 18:17:27 -0000 Author: kevans Date: Thu Jun 4 18:17:25 2020 New Revision: 361799 URL: https://svnweb.freebsd.org/changeset/base/361799 Log: vfs: add restrictions to read(2) of a directory [2/2] This commit adds the priv(9) that waters down the sysctl to make it only allow read(2) of a dirfd by the system root. Jailed root is not allowed, but jail policy and superuser policy will abstain from allowing/denying it so that a MAC module can fully control the policy. Such a MAC module has been written, and can be found at: https://people.freebsd.org/~kevans/mac_read_dir-0.1.0.tar.gz It is expected that the MAC module won't be needed by many, as most only need to do such diagnostics that require this behavior as system root anyways. Interested parties are welcome to grab the MAC module above and create a port or locally integrate it, and with enough support it could see introduction to base. As noted in mac_read_dir.c, it is released under the BSD 2 clause license and allows the restrictions to be lifted for only jailed root or for all unprivileged users. PR: 246412 Reviewed by: mckusick, kib, emaste, jilles, cy, phk, imp (all previous) Reviewed by: rgrimes (latest version) Differential Revision: https://reviews.freebsd.org/D24596 Modified: head/lib/libc/sys/read.2 head/sys/kern/kern_jail.c head/sys/kern/kern_priv.c head/sys/kern/vfs_vnops.c head/sys/sys/priv.h Modified: head/lib/libc/sys/read.2 ============================================================================== --- head/lib/libc/sys/read.2 Thu Jun 4 18:09:55 2020 (r361798) +++ head/lib/libc/sys/read.2 Thu Jun 4 18:17:25 2020 (r361799) @@ -200,7 +200,7 @@ The file was marked for non-blocking I/O, and no data were ready to be read. .It Bq Er EISDIR The file descriptor is associated with a directory. -Directories may only be read directly if the filesystem supports it and +Directories may only be read directly by root if the filesystem supports it and the .Dv security.bsd.allow_read_dir sysctl MIB is set to a non-zero value. Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Thu Jun 4 18:09:55 2020 (r361798) +++ head/sys/kern/kern_jail.c Thu Jun 4 18:17:25 2020 (r361799) @@ -3324,6 +3324,14 @@ prison_priv_check(struct ucred *cred, int priv) return (EPERM); /* + * Jails should hold no disposition on the PRIV_VFS_READ_DIR + * policy. priv_check_cred will not specifically allow it, and + * we may want a MAC policy to allow it. + */ + case PRIV_VFS_READ_DIR: + return (0); + + /* * Conditionnaly allow locking (unlocking) physical pages * in memory. */ Modified: head/sys/kern/kern_priv.c ============================================================================== --- head/sys/kern/kern_priv.c Thu Jun 4 18:09:55 2020 (r361798) +++ head/sys/kern/kern_priv.c Thu Jun 4 18:17:25 2020 (r361799) @@ -194,6 +194,14 @@ priv_check_cred(struct ucred *cred, int priv) goto out; } break; + case PRIV_VFS_READ_DIR: + /* + * Allow PRIV_VFS_READ_DIR for root if we're not in a + * jail, otherwise deny unless a MAC policy grants it. + */ + if (jailed(cred)) + break; + /* FALLTHROUGH */ default: if (cred->cr_uid == 0) { error = 0; Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Thu Jun 4 18:09:55 2020 (r361798) +++ head/sys/kern/vfs_vnops.c Thu Jun 4 18:17:25 2020 (r361799) @@ -1226,12 +1226,16 @@ vn_io_fault(struct file *fp, struct uio *uio, struct u * The ability to read(2) on a directory has historically been * allowed for all users, but this can and has been the source of * at least one security issue in the past. As such, it is now hidden - * away behind a sysctl for those that actually need it to use it. + * away behind a sysctl for those that actually need it to use it, and + * restricted to root when it's turned on to make it relatively safe to + * leave on for longer sessions of need. */ if (vp->v_type == VDIR) { KASSERT(uio->uio_rw == UIO_READ, ("illegal write attempted on a directory")); if (!vfs_allow_read_dir) + return (EISDIR); + if ((error = priv_check(td, PRIV_VFS_READ_DIR)) != 0) return (EISDIR); } Modified: head/sys/sys/priv.h ============================================================================== --- head/sys/sys/priv.h Thu Jun 4 18:09:55 2020 (r361798) +++ head/sys/sys/priv.h Thu Jun 4 18:17:25 2020 (r361799) @@ -283,6 +283,7 @@ #define PRIV_VFS_SYSFLAGS 342 /* Can modify system flags. */ #define PRIV_VFS_UNMOUNT 343 /* Can unmount(). */ #define PRIV_VFS_STAT 344 /* Override vnode MAC stat perm. */ +#define PRIV_VFS_READ_DIR 345 /* Can read(2) a dirfd, needs sysctl. */ /* * Virtual memory privileges. From owner-svn-src-head@freebsd.org Thu Jun 4 18:19:17 2020 Return-Path: Delivered-To: svn-src-head@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 A51E332C12E; Thu, 4 Jun 2020 18:19:17 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dDZF40Kzz4TN1; Thu, 4 Jun 2020 18:19:17 +0000 (UTC) (envelope-from kevans@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 8479B2355F; Thu, 4 Jun 2020 18:19:17 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054IJH3t085254; Thu, 4 Jun 2020 18:19:17 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054IJH4D085223; Thu, 4 Jun 2020 18:19:17 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006041819.054IJH4D085223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 4 Jun 2020 18:19:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361800 - head X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 361800 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 18:19:17 -0000 Author: kevans Date: Thu Jun 4 18:19:16 2020 New Revision: 361800 URL: https://svnweb.freebsd.org/changeset/base/361800 Log: RELNOTES and UPDATING: Document the new policy on read(2) of dirfd These changes have been completely flushed as of r361799; note it. Modified: head/RELNOTES head/UPDATING Modified: head/RELNOTES ============================================================================== --- head/RELNOTES Thu Jun 4 18:17:25 2020 (r361799) +++ head/RELNOTES Thu Jun 4 18:19:16 2020 (r361800) @@ -10,8 +10,17 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. -r361238: - ZFS will now reject read(2) of a dirfd with EISDIR. +r361238, r361798, r361799: + ZFS will now unconditionally reject read(2) of a directory with EISDIR. + Additionally, read(2) of a directory is now rejected with EISDIR by + default and may be re-enabled for non-ZFS filesystems that allow it with + the sysctl(8) MIB 'security.bsd.allow_read_dir'. + + Aliases for grep to default to '-d skip' may be desired if commonly + non-recursively grepping a list that includes directories and the + possibility of EISDIR errors in stderr is not tolerable. Example + aliases, commented out, have been installed in /root/.cshrc and + /root/.shrc. r361066: Add exec.prepare and exec.release hooks for jail(8) and jail.conf(5). Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Jun 4 18:17:25 2020 (r361799) +++ head/UPDATING Thu Jun 4 18:19:16 2020 (r361800) @@ -26,6 +26,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20200604: + read(2) of a directory fd is now rejected by default. root may + re-enable it for system root only on non-ZFS filesystems with the + security.bsd.allow_read_dir sysctl(8) MIB if + security.bsd.suser_enabled=1. + + It may be advised to setup aliases for grep to default to `-d skip` if + commonly non-recursively grepping a list that includes directories and + the potential for the resulting stderr output is not tolerable. Example + aliases are now installed, commented out, in /root/.cshrc and + /root/.shrc. + 20200523: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have been upgraded to 10.0.1. Please see the 20141231 entry below for From owner-svn-src-head@freebsd.org Thu Jun 4 18:35:22 2020 Return-Path: Delivered-To: svn-src-head@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 0019332C62A; Thu, 4 Jun 2020 18:35:22 +0000 (UTC) (envelope-from mckusick@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dDwn6F8hz4W70; Thu, 4 Jun 2020 18:35:21 +0000 (UTC) (envelope-from mckusick@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 D16E323E75; Thu, 4 Jun 2020 18:35:21 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054IZLDA097932; Thu, 4 Jun 2020 18:35:21 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054IZLMs097931; Thu, 4 Jun 2020 18:35:21 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <202006041835.054IZLMs097931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Thu, 4 Jun 2020 18:35:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361801 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 361801 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 18:35:22 -0000 Author: mckusick Date: Thu Jun 4 18:35:21 2020 New Revision: 361801 URL: https://svnweb.freebsd.org/changeset/base/361801 Log: Two additional places that need to identify IN_IBLKDATA. Reviewed by: kib MFC with: -r361785 Differential Revision: https://reviews.freebsd.org/D25072 Modified: head/sys/ufs/ffs/ffs_balloc.c Modified: head/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 18:19:16 2020 (r361800) +++ head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 18:35:21 2020 (r361801) @@ -154,7 +154,8 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i ip->i_size = smalllblktosize(fs, nb + 1); dp->di_size = ip->i_size; dp->di_db[nb] = dbtofsb(fs, bp->b_blkno); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, + IN_CHANGE | IN_UPDATE | IN_IBLKDATA); if (flags & IO_SYNC) bwrite(bp); else if (DOINGASYNC(vp)) @@ -647,7 +648,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i dp->di_extsize = smalllblktosize(fs, nb + 1); dp->di_extb[nb] = dbtofsb(fs, bp->b_blkno); bp->b_xflags |= BX_ALTDATA; - UFS_INODE_SET_FLAG(ip, IN_CHANGE); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_BLKDATA); if (flags & IO_SYNC) bwrite(bp); else From owner-svn-src-head@freebsd.org Thu Jun 4 19:21:44 2020 Return-Path: Delivered-To: svn-src-head@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 2CC8132DF3F; Thu, 4 Jun 2020 19:21:44 +0000 (UTC) (envelope-from mhorne@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dFyJ0hQRz4clm; Thu, 4 Jun 2020 19:21:44 +0000 (UTC) (envelope-from mhorne@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 10AB324B03; Thu, 4 Jun 2020 19:21:44 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054JLim1028061; Thu, 4 Jun 2020 19:21:44 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054JLfBw026270; Thu, 4 Jun 2020 19:21:41 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202006041921.054JLfBw026270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 4 Jun 2020 19:21:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361802 - in head/sys/contrib/edk2: . Include Include/Guid Include/IndustryStandard Include/Library Include/Protocol Include/Uefi X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: in head/sys/contrib/edk2: . Include Include/Guid Include/IndustryStandard Include/Library Include/Protocol Include/Uefi X-SVN-Commit-Revision: 361802 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 19:21:44 -0000 Author: mhorne Date: Thu Jun 4 19:21:41 2020 New Revision: 361802 URL: https://svnweb.freebsd.org/changeset/base/361802 Log: Update edk2 headers to stable202005 We use these to compile libefivar. The particular motivation for this update is the inclusion of the RISC-V machine definitions that allow us to build the library on the platform. This support could easily have been submitted as a small local diff, but the timing of the release coincided with this work, and it has been over 3 years since these sources were initially imported. Note that this comes with a license change from regular BSD 2-clause to the BSD+Patent license. This has been approved by core@ for this particular project [1]. As with the original import, we retain only the subset of headers that we actually need to build libefivar. I adapted imp@'s process slightly for this update: # Generate list of the headers needed to build cp -r ../vendor/edk2/dist/MdePkg/Include sys/contrib/edk2 cd lib/libefivar make pushd `make -V .OBJDIR` cat .depend*.o | grep sys/contrib | cut -d' ' -f 3 | sort -u | sed -e 's=/full/path/sys/contrib/edk2/==' > /tmp/xxx popd # Merge the needed files cd ../../sys/contrib/edk2 svn revert -R . for i in `cat /tmp/xxx`; do svn merge -c VendorRevision svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/$i $i done svn merge -c VendorRevision svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/MdePkg.dec MdePkg.dec [1] https://www.freebsd.org/internal/software-license.html Modified: head/sys/contrib/edk2/Include/Base.h (contents, props changed) head/sys/contrib/edk2/Include/Guid/HiiFormMapMethodGuid.h (contents, props changed) head/sys/contrib/edk2/Include/Guid/PcAnsi.h (contents, props changed) head/sys/contrib/edk2/Include/Guid/WinCertificate.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi10.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi20.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi30.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi40.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi50.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi51.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Acpi60.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/AcpiAml.h (contents, props changed) head/sys/contrib/edk2/Include/IndustryStandard/Bluetooth.h (contents, props changed) head/sys/contrib/edk2/Include/Library/BaseLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/BaseMemoryLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/DebugLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/DevicePathLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/MemoryAllocationLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/PcdLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/PrintLib.h (contents, props changed) head/sys/contrib/edk2/Include/Library/UefiBootServicesTableLib.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/DebugPort.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/DevicePath.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/DevicePathFromText.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/DevicePathToText.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/DevicePathUtilities.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/SimpleTextIn.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/SimpleTextInEx.h (contents, props changed) head/sys/contrib/edk2/Include/Protocol/SimpleTextOut.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi/UefiBaseType.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi/UefiGpt.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi/UefiInternalFormRepresentation.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi/UefiMultiPhase.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi/UefiPxe.h (contents, props changed) head/sys/contrib/edk2/Include/Uefi/UefiSpec.h (contents, props changed) head/sys/contrib/edk2/MdePkg.dec (contents, props changed) Directory Properties: head/sys/contrib/edk2/ (props changed) Modified: head/sys/contrib/edk2/Include/Base.h ============================================================================== --- head/sys/contrib/edk2/Include/Base.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/Base.h Thu Jun 4 19:21:41 2020 (r361802) @@ -6,16 +6,10 @@ environment. There are a set of base libraries in the Mde Package that can be used to implement base modules. -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. +SPDX-License-Identifier: BSD-2-Clause-Patent -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - **/ @@ -34,64 +28,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EIT #pragma warning ( disable : 4200 ) #endif -/** - Verifies the storage size of a given data type. - - This macro generates a divide by zero error or a zero size array declaration in - the preprocessor if the size is incorrect. These are declared as "extern" so - the space for these arrays will not be in the modules. - - @param TYPE The date type to determine the size of. - @param Size The expected size for the TYPE. - -**/ -#define VERIFY_SIZE_OF(TYPE, Size) extern UINT8 _VerifySizeof##TYPE[(sizeof(TYPE) == (Size)) / (sizeof(TYPE) == (Size))] - // -// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with -// Section 2.3.1 of the UEFI 2.3 Specification. -// -VERIFY_SIZE_OF (BOOLEAN, 1); -VERIFY_SIZE_OF (INT8, 1); -VERIFY_SIZE_OF (UINT8, 1); -VERIFY_SIZE_OF (INT16, 2); -VERIFY_SIZE_OF (UINT16, 2); -VERIFY_SIZE_OF (INT32, 4); -VERIFY_SIZE_OF (UINT32, 4); -VERIFY_SIZE_OF (INT64, 8); -VERIFY_SIZE_OF (UINT64, 8); -VERIFY_SIZE_OF (CHAR8, 1); -VERIFY_SIZE_OF (CHAR16, 2); - -// -// The following three enum types are used to verify that the compiler -// configuration for enum types is compliant with Section 2.3.1 of the -// UEFI 2.3 Specification. These enum types and enum values are not -// intended to be used. A prefix of '__' is used avoid conflicts with -// other types. -// -typedef enum { - __VerifyUint8EnumValue = 0xff -} __VERIFY_UINT8_ENUM_SIZE; - -typedef enum { - __VerifyUint16EnumValue = 0xffff -} __VERIFY_UINT16_ENUM_SIZE; - -typedef enum { - __VerifyUint32EnumValue = 0xffffffff -} __VERIFY_UINT32_ENUM_SIZE; - -VERIFY_SIZE_OF (__VERIFY_UINT8_ENUM_SIZE, 4); -VERIFY_SIZE_OF (__VERIFY_UINT16_ENUM_SIZE, 4); -VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4); - -// // The Microsoft* C compiler can removed references to unreferenced data items // if the /OPT:REF linker option is used. We defined a macro as this is a // a non standard extension // -#if defined(_MSC_EXTENSIONS) && !defined (MDE_CPU_EBC) +#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined (MDE_CPU_EBC) /// /// Remove global variable from the linked image if there are no references to /// it after all compiler and linker optimizations have been performed. @@ -112,11 +54,10 @@ VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4); // warnings. // #ifndef UNREACHABLE - #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4) + #ifdef __GNUC__ /// /// Signal compilers and analyzers that this call is not reachable. It is /// up to the compiler to remove any code past that point. - /// Not implemented by GCC 4.4 or earlier. /// #define UNREACHABLE() __builtin_unreachable () #elif defined (__has_feature) @@ -218,6 +159,26 @@ VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4); #endif #endif +/// +/// Tell the code optimizer that the function will return twice. +/// This prevents wrong optimizations which can cause bugs. +/// +#ifndef RETURNS_TWICE + #if defined (__GNUC__) || defined (__clang__) + /// + /// Tell the code optimizer that the function will return twice. + /// This prevents wrong optimizations which can cause bugs. + /// + #define RETURNS_TWICE __attribute__((returns_twice)) + #else + /// + /// Tell the code optimizer that the function will return twice. + /// This prevents wrong optimizations which can cause bugs. + /// + #define RETURNS_TWICE + #endif +#endif + // // For symbol name in assembly code, an extra "_" is sometimes necessary // @@ -234,7 +195,7 @@ VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4); /// #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name) -#if __APPLE__ +#ifdef __APPLE__ // // Apple extension that is used by the linker to optimize code size // with assembly functions. Put at the end of your .S files @@ -376,6 +337,14 @@ struct _LIST_ENTRY { #define MAX_INT64 ((INT64)0x7FFFFFFFFFFFFFFFULL) #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL) +/// +/// Minimum values for the signed UEFI Data Types +/// +#define MIN_INT8 (((INT8) -127) - 1) +#define MIN_INT16 (((INT16) -32767) - 1) +#define MIN_INT32 (((INT32) -2147483647) - 1) +#define MIN_INT64 (((INT64) -9223372036854775807LL) - 1) + #define BIT0 0x00000001 #define BIT1 0x00000002 #define BIT2 0x00000004 @@ -552,21 +521,24 @@ struct _LIST_ENTRY { #define BASE_8EB 0x8000000000000000ULL // -// Support for variable length argument lists using the ANSI standard. +// Support for variable argument lists in freestanding edk2 modules. // -// Since we are using the ANSI standard we used the standard naming and -// did not follow the coding convention +// For modules that use the ISO C library interfaces for variable +// argument lists, refer to "StdLib/Include/stdarg.h". // // VA_LIST - typedef for argument list. // VA_START (VA_LIST Marker, argument before the ...) - Init Marker for use. // VA_END (VA_LIST Marker) - Clear Marker -// VA_ARG (VA_LIST Marker, var arg size) - Use Marker to get an argument from -// the ... list. You must know the size and pass it in this macro. +// VA_ARG (VA_LIST Marker, var arg type) - Use Marker to get an argument from +// the ... list. You must know the type and pass it in this macro. Type +// must be compatible with the type of the actual next argument (as promoted +// according to the default argument promotions.) // VA_COPY (VA_LIST Dest, VA_LIST Start) - Initialize Dest as a copy of Start. // -// example: +// Example: // // UINTN +// EFIAPI // ExampleVarArg ( // IN UINTN NumberOfArgs, // ... @@ -582,15 +554,21 @@ struct _LIST_ENTRY { // VA_START (Marker, NumberOfArgs); // for (Index = 0, Result = 0; Index < NumberOfArgs; Index++) { // // -// // The ... list is a series of UINTN values, so average them up. +// // The ... list is a series of UINTN values, so sum them up. // // // Result += VA_ARG (Marker, UINTN); // } // // VA_END (Marker); -// return Result +// return Result; // } // +// Notes: +// - Functions that call VA_START() / VA_END() must have a variable +// argument list and must be declared EFIAPI. +// - Functions that call VA_COPY() / VA_END() must be declared EFIAPI. +// - Functions that only use VA_LIST and VA_ARG() need not be EFIAPI. +// /** Return the size of argument that has been aligned to sizeof (UINTN). @@ -631,8 +609,20 @@ struct _LIST_ENTRY { #define VA_COPY(Dest, Start) __va_copy (Dest, Start) -#elif defined(__GNUC__) +#elif defined(_M_ARM) || defined(_M_ARM64) +// +// MSFT ARM variable argument list support. +// +typedef char* VA_LIST; + +#define VA_START(Marker, Parameter) __va_start (&Marker, &Parameter, _INT_SIZE_OF (Parameter), __alignof(Parameter), &Parameter) +#define VA_ARG(Marker, TYPE) (*(TYPE *) ((Marker += _INT_SIZE_OF (TYPE) + ((-(INTN)Marker) & (sizeof(TYPE) - 1))) - _INT_SIZE_OF (TYPE))) +#define VA_END(Marker) (Marker = (VA_LIST) 0) +#define VA_COPY(Dest, Start) ((void)((Dest) = (Start))) + +#elif defined(__GNUC__) || defined(__clang__) + #if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS) // // X64 only. Use MS ABI version of GCC built-in macros for variable argument lists. @@ -736,7 +726,7 @@ typedef CHAR8 *VA_LIST; This macro initializes Dest as a copy of Start, as if the VA_START macro had been applied to Dest followed by the same sequence of uses of the VA_ARG macro as had previously been used to reach - the present state of Start. + the present state of Start. @param Dest VA_LIST used to traverse the list of arguments. @param Start VA_LIST used to traverse the list of arguments. @@ -791,17 +781,71 @@ typedef UINTN *BASE_LIST; @return Offset, in bytes, of field. **/ -#ifdef __GNUC__ -#if __GNUC__ >= 4 +#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__) #define OFFSET_OF(TYPE, Field) ((UINTN) __builtin_offsetof(TYPE, Field)) #endif -#endif #ifndef OFFSET_OF #define OFFSET_OF(TYPE, Field) ((UINTN) &(((TYPE *)0)->Field)) #endif /** + Portable definition for compile time assertions. + Equivalent to C11 static_assert macro from assert.h. + + @param Expression Boolean expression. + @param Message Raised compiler diagnostic message when expression is false. + +**/ +#ifdef MDE_CPU_EBC + #define STATIC_ASSERT(Expression, Message) +#elif defined(_MSC_EXTENSIONS) + #define STATIC_ASSERT static_assert +#else + #define STATIC_ASSERT _Static_assert +#endif + +// +// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with +// Section 2.3.1 of the UEFI 2.3 Specification. +// + +STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (INT16) == 2, "sizeof (INT16) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (UINT16) == 2, "sizeof (UINT16) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (INT32) == 4, "sizeof (INT32) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (UINT32) == 4, "sizeof (UINT32) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (UINT64) == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); + +// +// The following three enum types are used to verify that the compiler +// configuration for enum types is compliant with Section 2.3.1 of the +// UEFI 2.3 Specification. These enum types and enum values are not +// intended to be used. A prefix of '__' is used avoid conflicts with +// other types. +// +typedef enum { + __VerifyUint8EnumValue = 0xff +} __VERIFY_UINT8_ENUM_SIZE; + +typedef enum { + __VerifyUint16EnumValue = 0xffff +} __VERIFY_UINT16_ENUM_SIZE; + +typedef enum { + __VerifyUint32EnumValue = 0xffffffff +} __VERIFY_UINT32_ENUM_SIZE; + +STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); + +/** Macro that returns a pointer to the data structure that contains a specified field of that data structure. This is a lightweight method to hide information by placing a public data structure inside a larger private data structure and using a pointer to @@ -820,7 +864,7 @@ typedef UINTN *BASE_LIST; @return A pointer to the structure from one of it's elements. **/ -#define BASE_CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - (CHAR8 *) &(((TYPE *) 0)->Field))) +#define BASE_CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - OFFSET_OF (TYPE, Field))) /** Rounds a value up to the next boundary using a specified alignment. @@ -1213,6 +1257,7 @@ typedef UINTN RETURN_STATUS; (SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32)) #if defined(_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) && !defined (MDE_CPU_EBC) + void * _ReturnAddress(void); #pragma intrinsic(_ReturnAddress) /** Get the return address of the calling function. @@ -1227,7 +1272,7 @@ typedef UINTN RETURN_STATUS; **/ #define RETURN_ADDRESS(L) ((L == 0) ? _ReturnAddress() : (VOID *) 0) -#elif defined(__GNUC__) +#elif defined (__GNUC__) || defined (__clang__) void * __builtin_return_address (unsigned int level); /** Get the return address of the calling function. Modified: head/sys/contrib/edk2/Include/Guid/HiiFormMapMethodGuid.h ============================================================================== --- head/sys/contrib/edk2/Include/Guid/HiiFormMapMethodGuid.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/Guid/HiiFormMapMethodGuid.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,14 +1,8 @@ /** @file Guid used to identify HII FormMap configuration method. - Copyright (c) 2009, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent @par Revision Reference: GUID defined in UEFI 2.2 spec. Modified: head/sys/contrib/edk2/Include/Guid/PcAnsi.h ============================================================================== --- head/sys/contrib/edk2/Include/Guid/PcAnsi.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/Guid/PcAnsi.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,15 +1,9 @@ /** @file Terminal Device Path Vendor Guid. - Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - @par Revision Reference: GUIDs defined in UEFI 2.0 spec. @@ -42,7 +36,7 @@ { \ 0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 } \ } - + #define EFI_SAS_DEVICE_PATH_GUID \ { \ 0xd487ddb4, 0x008b, 0x11d9, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \ Modified: head/sys/contrib/edk2/Include/Guid/WinCertificate.h ============================================================================== --- head/sys/contrib/edk2/Include/Guid/WinCertificate.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/Guid/WinCertificate.h Thu Jun 4 19:21:41 2020 (r361802) @@ -2,13 +2,7 @@ GUID for UEFI WIN_CERTIFICATE structure. Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + SPDX-License-Identifier: BSD-2-Clause-Patent @par Revision Reference: GUID defined in UEFI 2.0 spec. Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi10.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi10.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi10.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,14 +1,8 @@ -/** @file +/** @file ACPI 1.0b definitions from the ACPI Specification, revision 1.0b -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. -The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_1_0_H_ @@ -43,7 +37,7 @@ typedef struct { #pragma pack() // -// Define for Desriptor +// Define for Descriptor // #define ACPI_SMALL_ITEM_FLAG 0x00 #define ACPI_LARGE_ITEM_FLAG 0x01 @@ -115,7 +109,7 @@ typedef struct { #pragma pack(1) /// -/// The commond definition of QWORD, DWORD, and WORD +/// The common definition of QWORD, DWORD, and WORD /// Address Space Descriptors. /// typedef PACKED struct { @@ -357,7 +351,7 @@ typedef struct { #define EFI_ACPI_DMA_SPEED_TYPE_A 0x20 #define EFI_ACPI_DMA_SPEED_TYPE_B 0x40 #define EFI_ACPI_DMA_SPEED_TYPE_F 0x60 - + #define EFI_ACPI_DMA_BUS_MASTER_MASK 0x04 #define EFI_ACPI_DMA_BUS_MASTER 0x04 @@ -403,7 +397,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi20.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi20.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi20.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,14 +1,8 @@ -/** @file +/** @file ACPI 2.0 definitions from the ACPI Specification, revision 2.0 - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_2_0_H_ @@ -17,7 +11,7 @@ #include // -// Define for Desriptor +// Define for Descriptor // #define ACPI_LARGE_GENERIC_REGISTER_DESCRIPTOR_NAME 0x02 @@ -103,7 +97,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // @@ -114,7 +108,7 @@ typedef struct { // // Extended System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers. // @@ -511,7 +505,7 @@ typedef struct { #define EFI_ACPI_2_0_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE SIGNATURE_32('S', 'L', 'I', 'T') /// -/// "SPCR" Serial Port Concole Redirection Table +/// "SPCR" Serial Port Console Redirection Table /// #define EFI_ACPI_2_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE SIGNATURE_32('S', 'P', 'C', 'R') Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi30.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi30.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi30.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,14 +1,8 @@ -/** @file +/** @file ACPI 3.0 definitions from the ACPI Specification Revision 3.0b October 10, 2006 - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_3_0_H_ @@ -17,7 +11,7 @@ #include // -// Define for Desriptor +// Define for Descriptor // #define ACPI_LARGE_EXTENDED_ADDRESS_SPACE_DESCRIPTOR_NAME 0x0B @@ -128,7 +122,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // @@ -139,7 +133,7 @@ typedef struct { // // Extended System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers. // @@ -597,7 +591,7 @@ typedef struct { /// /// "RSD PTR " Root System Description Pointer /// -#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') +#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') /// /// "APIC" Multiple APIC Description Table @@ -690,7 +684,7 @@ typedef struct { #define EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE SIGNATURE_32('M', 'C', 'F', 'G') /// -/// "SPCR" Serial Port Concole Redirection Table +/// "SPCR" Serial Port Console Redirection Table /// #define EFI_ACPI_3_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE SIGNATURE_32('S', 'P', 'C', 'R') Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi40.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi40.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi40.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,14 +1,8 @@ -/** @file +/** @file ACPI 4.0 definitions from the ACPI Specification Revision 4.0a April 5, 2010 - Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_4_0_H_ @@ -86,7 +80,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // @@ -97,7 +91,7 @@ typedef struct { // // Extended System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers. // @@ -1132,7 +1126,7 @@ typedef struct { /// /// "RSD PTR " Root System Description Pointer /// -#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') +#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') /// /// "APIC" Multiple APIC Description Table @@ -1270,7 +1264,7 @@ typedef struct { #define EFI_ACPI_4_0_MANAGEMENT_CONTROLLER_HOST_INTERFACE_TABLE_SIGNATURE SIGNATURE_32('M', 'C', 'H', 'I') /// -/// "SPCR" Serial Port Concole Redirection Table +/// "SPCR" Serial Port Console Redirection Table /// #define EFI_ACPI_4_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE SIGNATURE_32('S', 'P', 'C', 'R') Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi50.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi50.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi50.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,15 +1,10 @@ -/** @file +/** @file ACPI 5.0 definitions from the ACPI Specification Revision 5.0a November 13, 2013. Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2020, ARM Ltd. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_5_0_H_ @@ -18,7 +13,7 @@ #include // -// Define for Desriptor +// Define for Descriptor // #define ACPI_SMALL_FIXED_DMA_DESCRIPTOR_NAME 0x0A #define ACPI_LARGE_GPIO_CONNECTION_DESCRIPTOR_NAME 0x0C @@ -208,7 +203,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // @@ -219,7 +214,7 @@ typedef struct { // // Extended System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers. // @@ -1207,7 +1202,7 @@ typedef struct { /// UINT64 ExitBootServicesEntry; /// - /// Timer value logged at the point just prior towhen the OS loader gaining + /// Timer value logged at the point just prior to when the OS loader gaining /// control back from calls the ExitBootServices function for UEFI compatible firmware. /// For non-UEFI compatible boots, this field must be zero. /// @@ -1876,7 +1871,7 @@ typedef struct { /// /// "RSD PTR " Root System Description Pointer /// -#define EFI_ACPI_5_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') +#define EFI_ACPI_5_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') /// /// "APIC" Multiple APIC Description Table @@ -2064,12 +2059,17 @@ typedef struct { #define EFI_ACPI_5_0_DATA_MANAGEMENT_TABLE_SIGNATURE SIGNATURE_32('M', 'S', 'D', 'M') /// +/// "PCCT" Platform Communications Channel Table +/// +#define EFI_ACPI_5_0_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE SIGNATURE_32('P', 'C', 'C', 'T') + +/// /// "SLIC" MS Software Licensing Table Specification /// #define EFI_ACPI_5_0_SOFTWARE_LICENSING_TABLE_SIGNATURE SIGNATURE_32('S', 'L', 'I', 'C') /// -/// "SPCR" Serial Port Concole Redirection Table +/// "SPCR" Serial Port Console Redirection Table /// #define EFI_ACPI_5_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE SIGNATURE_32('S', 'P', 'C', 'R') Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi51.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi51.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi51.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,16 +1,11 @@ -/** @file +/** @file ACPI 5.1 definitions from the ACPI Specification Revision 5.1 Errata B January, 2016. Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2020, ARM Ltd. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_5_1_H_ @@ -89,7 +84,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // @@ -100,7 +95,7 @@ typedef struct { // // Extended System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers. // @@ -1160,7 +1155,7 @@ typedef struct { /// UINT64 ExitBootServicesEntry; /// - /// Timer value logged at the point just prior towhen the OS loader gaining + /// Timer value logged at the point just prior to when the OS loader gaining /// control back from calls the ExitBootServices function for UEFI compatible firmware. /// For non-UEFI compatible boots, this field must be zero. /// @@ -1874,7 +1869,7 @@ typedef struct { UINT8 CommandComplete:1; UINT8 SciDoorbell:1; UINT8 Error:1; - UINT8 PlatformNotification:1; + UINT8 PlatformNotification:1; UINT8 Reserved:4; UINT8 Reserved1; } EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS; @@ -1892,7 +1887,7 @@ typedef struct { /// /// "RSD PTR " Root System Description Pointer /// -#define EFI_ACPI_5_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') +#define EFI_ACPI_5_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') /// /// "APIC" Multiple APIC Description Table @@ -2085,12 +2080,17 @@ typedef struct { #define EFI_ACPI_5_1_DATA_MANAGEMENT_TABLE_SIGNATURE SIGNATURE_32('M', 'S', 'D', 'M') /// +/// "PCCT" Platform Communications Channel Table +/// +#define EFI_ACPI_5_1_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE SIGNATURE_32('P', 'C', 'C', 'T') + +/// /// "SLIC" MS Software Licensing Table Specification /// #define EFI_ACPI_5_1_SOFTWARE_LICENSING_TABLE_SIGNATURE SIGNATURE_32('S', 'L', 'I', 'C') /// -/// "SPCR" Serial Port Concole Redirection Table +/// "SPCR" Serial Port Console Redirection Table /// #define EFI_ACPI_5_1_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE SIGNATURE_32('S', 'P', 'C', 'R') Modified: head/sys/contrib/edk2/Include/IndustryStandard/Acpi60.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Acpi60.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Acpi60.h Thu Jun 4 19:21:41 2020 (r361802) @@ -1,15 +1,10 @@ -/** @file +/** @file ACPI 6.0 definitions from the ACPI Specification Revision 6.0 Errata A January, 2016. - Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2020, ARM Ltd. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #ifndef _ACPI_6_0_H_ @@ -88,7 +83,7 @@ typedef struct { // // Root System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers. // @@ -99,7 +94,7 @@ typedef struct { // // Extended System Description Table -// No definition needed as it is a common description table header, the same with +// No definition needed as it is a common description table header, the same with // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers. // @@ -1175,7 +1170,7 @@ typedef struct { /// UINT64 ExitBootServicesEntry; /// - /// Timer value logged at the point just prior towhen the OS loader gaining + /// Timer value logged at the point just prior to when the OS loader gaining /// control back from calls the ExitBootServices function for UEFI compatible firmware. /// For non-UEFI compatible boots, this field must be zero. /// @@ -2020,7 +2015,9 @@ typedef struct { // // PCCT Subspace type // -#define EFI_ACPI_6_0_PCCT_SUBSPACE_TYPE_GENERIC 0x00 +#define EFI_ACPI_6_0_PCCT_SUBSPACE_TYPE_GENERIC 0x00 +#define EFI_ACPI_6_0_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS 0x01 +#define EFI_ACPI_6_0_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS 0x02 /// /// PCC Subspace Structure Header @@ -2061,7 +2058,7 @@ typedef struct { UINT8 CommandComplete:1; UINT8 SciDoorbell:1; UINT8 Error:1; - UINT8 PlatformNotification:1; + UINT8 PlatformNotification:1; UINT8 Reserved:4; UINT8 Reserved1; } EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS; @@ -2072,6 +2069,50 @@ typedef struct { EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS Status; } EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_HEADER; +#define EFI_ACPI_6_0_PCCT_SUBSPACE_DOORBELL_INTERRUPT_FLAGS_POLARITY BIT0 +#define EFI_ACPI_6_0_PCCT_SUBSPACE_DOORBELL_INTERRUPT_FLAGS_MODE BIT1 + +/// +/// Type 1 HW-Reduced Communications Subspace Structure +/// +typedef struct { + UINT8 Type; + UINT8 Length; + UINT32 DoorbellInterrupt; + UINT8 DoorbellInterruptFlags; + UINT8 Reserved; + UINT64 BaseAddress; + UINT64 AddressLength; + EFI_ACPI_6_0_GENERIC_ADDRESS_STRUCTURE DoorbellRegister; + UINT64 DoorbellPreserve; + UINT64 DoorbellWrite; + UINT32 NominalLatency; + UINT32 MaximumPeriodicAccessRate; + UINT16 MinimumRequestTurnaroundTime; +} EFI_ACPI_6_0_PCCT_SUBSPACE_1_HW_REDUCED_COMMUNICATIONS; + +/// +/// Type 2 HW-Reduced Communications Subspace Structure +/// +typedef struct { + UINT8 Type; + UINT8 Length; + UINT32 DoorbellInterrupt; + UINT8 DoorbellInterruptFlags; + UINT8 Reserved; + UINT64 BaseAddress; + UINT64 AddressLength; + EFI_ACPI_6_0_GENERIC_ADDRESS_STRUCTURE DoorbellRegister; + UINT64 DoorbellPreserve; + UINT64 DoorbellWrite; + UINT32 NominalLatency; + UINT32 MaximumPeriodicAccessRate; + UINT16 MinimumRequestTurnaroundTime; + EFI_ACPI_6_0_GENERIC_ADDRESS_STRUCTURE DoorbellAckRegister; + UINT64 DoorbellAckPreserve; + UINT64 DoorbellAckWrite; +} EFI_ACPI_6_0_PCCT_SUBSPACE_2_HW_REDUCED_COMMUNICATIONS; + // // Known table signatures // @@ -2079,7 +2120,7 @@ typedef struct { /// /// "RSD PTR " Root System Description Pointer /// -#define EFI_ACPI_6_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') +#define EFI_ACPI_6_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') /// /// "APIC" Multiple APIC Description Table @@ -2282,12 +2323,17 @@ typedef struct { #define EFI_ACPI_6_0_DATA_MANAGEMENT_TABLE_SIGNATURE SIGNATURE_32('M', 'S', 'D', 'M') /// +/// "PCCT" Platform Communications Channel Table +/// +#define EFI_ACPI_6_0_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE SIGNATURE_32('P', 'C', 'C', 'T') + +/// /// "SLIC" MS Software Licensing Table Specification /// #define EFI_ACPI_6_0_SOFTWARE_LICENSING_TABLE_SIGNATURE SIGNATURE_32('S', 'L', 'I', 'C') /// -/// "SPCR" Serial Port Concole Redirection Table +/// "SPCR" Serial Port Console Redirection Table /// #define EFI_ACPI_6_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE SIGNATURE_32('S', 'P', 'C', 'R') Modified: head/sys/contrib/edk2/Include/IndustryStandard/AcpiAml.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/AcpiAml.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/AcpiAml.h Thu Jun 4 19:21:41 2020 (r361802) @@ -2,14 +2,9 @@ This file contains AML code definition in the latest ACPI spec. Copyright (c) 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php + Copyright (c) 2019, ARM Limited. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - **/ #ifndef _ACPI_AML_H_ @@ -36,6 +31,7 @@ #define AML_PACKAGE_OP 0x12 #define AML_VAR_PACKAGE_OP 0x13 #define AML_METHOD_OP 0x14 +#define AML_EXTERNAL_OP 0x15 #define AML_DUAL_NAME_PREFIX 0x2e #define AML_MULTI_NAME_PREFIX 0x2f #define AML_NAME_CHAR_A 0x41 @@ -171,5 +167,13 @@ #define AML_EXT_INDEX_FIELD_OP 0x86 #define AML_EXT_BANK_FIELD_OP 0x87 #define AML_EXT_DATA_REGION_OP 0x88 + +// +// FieldElement OpCode +// +#define AML_FIELD_RESERVED_OP 0x00 +#define AML_FIELD_ACCESS_OP 0x01 +#define AML_FIELD_CONNECTION_OP 0x02 +#define AML_FIELD_EXT_ACCESS_OP 0x03 #endif Modified: head/sys/contrib/edk2/Include/IndustryStandard/Bluetooth.h ============================================================================== --- head/sys/contrib/edk2/Include/IndustryStandard/Bluetooth.h Thu Jun 4 18:35:21 2020 (r361801) +++ head/sys/contrib/edk2/Include/IndustryStandard/Bluetooth.h Thu Jun 4 19:21:41 2020 (r361802) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Thu Jun 4 19:48:59 2020 Return-Path: Delivered-To: svn-src-head@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 37C5032F35F; Thu, 4 Jun 2020 19:48:59 +0000 (UTC) (envelope-from kevans@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dGYl0nJcz3SMF; Thu, 4 Jun 2020 19:48:59 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 1007112A61; Thu, 4 Jun 2020 19:48:59 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f170.google.com with SMTP id c14so7381530qka.11; Thu, 04 Jun 2020 12:48:59 -0700 (PDT) X-Gm-Message-State: AOAM533LIgf3DLQ/GMIpMvCjVcsofxosRp0bYQvdhs+Yb1OY3unBnaZP NxfeN69cWKOkbGqoQtFbuTFQsoLQsN04Suoxc3M= X-Google-Smtp-Source: ABdhPJwp+LRVG/pgvxtBZmQY4kGmn8I+9uvjdF1cV8OVHmbsGoH2CPSTnRiFczblHayZtkm94sImQ8dBmcbSs8zM+f4= X-Received: by 2002:a37:9f44:: with SMTP id i65mr6564517qke.103.1591300138559; Thu, 04 Jun 2020 12:48:58 -0700 (PDT) MIME-Version: 1.0 References: <202006041835.054IZLMs097931@repo.freebsd.org> In-Reply-To: <202006041835.054IZLMs097931@repo.freebsd.org> From: Kyle Evans Date: Thu, 4 Jun 2020 14:48:44 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361801 - head/sys/ufs/ffs To: Kirk McKusick Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 19:48:59 -0000 On Thu, Jun 4, 2020 at 1:35 PM Kirk McKusick wrote: > > Author: mckusick > Date: Thu Jun 4 18:35:21 2020 > New Revision: 361801 > URL: https://svnweb.freebsd.org/changeset/base/361801 > > Log: > Two additional places that need to identify IN_IBLKDATA. > > Reviewed by: kib > MFC with: -r361785 > Differential Revision: https://reviews.freebsd.org/D25072 > > Modified: > head/sys/ufs/ffs/ffs_balloc.c > > Modified: head/sys/ufs/ffs/ffs_balloc.c > ============================================================================== > --- head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 18:19:16 2020 (r361800) > +++ head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 18:35:21 2020 (r361801) > @@ -154,7 +154,8 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i > ip->i_size = smalllblktosize(fs, nb + 1); > dp->di_size = ip->i_size; > dp->di_db[nb] = dbtofsb(fs, bp->b_blkno); > - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); > + UFS_INODE_SET_FLAG(ip, > + IN_CHANGE | IN_UPDATE | IN_IBLKDATA); > if (flags & IO_SYNC) > bwrite(bp); > else if (DOINGASYNC(vp)) > @@ -647,7 +648,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i > dp->di_extsize = smalllblktosize(fs, nb + 1); > dp->di_extb[nb] = dbtofsb(fs, bp->b_blkno); > bp->b_xflags |= BX_ALTDATA; > - UFS_INODE_SET_FLAG(ip, IN_CHANGE); > + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_BLKDATA); > if (flags & IO_SYNC) > bwrite(bp); > else Hello! This second one seems to have been accidentally misspelled as "IN_BLKDATA" Thanks, Kyle Evans From owner-svn-src-head@freebsd.org Thu Jun 4 19:54:26 2020 Return-Path: Delivered-To: svn-src-head@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 8287B32F7D2; Thu, 4 Jun 2020 19:54:26 +0000 (UTC) (envelope-from se@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dGh22wBPz3TX1; Thu, 4 Jun 2020 19:54:26 +0000 (UTC) (envelope-from se@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 5F4F02510C; Thu, 4 Jun 2020 19:54:26 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054JsQxT049230; Thu, 4 Jun 2020 19:54:26 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054JsQIK049229; Thu, 4 Jun 2020 19:54:26 GMT (envelope-from se@FreeBSD.org) Message-Id: <202006041954.054JsQIK049229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Thu, 4 Jun 2020 19:54:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361803 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: se X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 361803 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 19:54:26 -0000 Author: se Date: Thu Jun 4 19:54:25 2020 New Revision: 361803 URL: https://svnweb.freebsd.org/changeset/base/361803 Log: Fix obvious typo: IN_BLKDATA should be IN_IBLKDATA Modified: head/sys/ufs/ffs/ffs_balloc.c Modified: head/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 19:21:41 2020 (r361802) +++ head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 19:54:25 2020 (r361803) @@ -648,7 +648,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i dp->di_extsize = smalllblktosize(fs, nb + 1); dp->di_extb[nb] = dbtofsb(fs, bp->b_blkno); bp->b_xflags |= BX_ALTDATA; - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_BLKDATA); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_IBLKDATA); if (flags & IO_SYNC) bwrite(bp); else From owner-svn-src-head@freebsd.org Thu Jun 4 20:12:35 2020 Return-Path: Delivered-To: svn-src-head@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 759713300D8; Thu, 4 Jun 2020 20:12:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dH4z2Td4z3Wyc; Thu, 4 Jun 2020 20:12:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5089625498; Thu, 4 Jun 2020 20:12:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054KCZDV063034; Thu, 4 Jun 2020 20:12:35 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054KCZ3K063033; Thu, 4 Jun 2020 20:12:35 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006042012.054KCZ3K063033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 4 Jun 2020 20:12:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361804 - head/sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/opencrypto X-SVN-Commit-Revision: 361804 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:12:35 -0000 Author: jhb Date: Thu Jun 4 20:12:34 2020 New Revision: 361804 URL: https://svnweb.freebsd.org/changeset/base/361804 Log: Use separate output buffers for OCF requests in KTLS. KTLS encryption requests for file-backed data such as from sendfile(2) require the encrypted data to be stored in a separate buffer from the unencrypted file input data. Previously the OCF backend for KTLS manually copied the data from the input buffer to the output buffer before queueing the crypto request. Now the OCF backend will use a separate output buffer for such requests and avoid the copy. This mostly helps when an async co-processor is used by saving CPU cycles used on the copy. Reviewed by: gallatin (earlier version) Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D24545 Modified: head/sys/opencrypto/ktls_ocf.c Modified: head/sys/opencrypto/ktls_ocf.c ============================================================================== --- head/sys/opencrypto/ktls_ocf.c Thu Jun 4 19:54:25 2020 (r361803) +++ head/sys/opencrypto/ktls_ocf.c Thu Jun 4 20:12:34 2020 (r361804) @@ -73,6 +73,16 @@ SYSCTL_COUNTER_U64(_kern_ipc_tls_stats_ocf, OID_AUTO, CTLFLAG_RD, &ocf_tls13_gcm_crypts, "Total number of OCF TLS 1.3 GCM encryption operations"); +static counter_u64_t ocf_inplace; +SYSCTL_COUNTER_U64(_kern_ipc_tls_stats_ocf, OID_AUTO, inplace, + CTLFLAG_RD, &ocf_inplace, + "Total number of OCF in-place operations"); + +static counter_u64_t ocf_separate_output; +SYSCTL_COUNTER_U64(_kern_ipc_tls_stats_ocf, OID_AUTO, separate_output, + CTLFLAG_RD, &ocf_separate_output, + "Total number of OCF operations with a separate output buffer"); + static counter_u64_t ocf_retries; SYSCTL_COUNTER_U64(_kern_ipc_tls_stats_ocf, OID_AUTO, retries, CTLFLAG_RD, &ocf_retries, @@ -97,22 +107,34 @@ ktls_ocf_tls12_gcm_encrypt(struct ktls_session *tls, struct iovec *outiov, int iovcnt, uint64_t seqno, uint8_t record_type __unused) { - struct uio uio; + struct uio uio, out_uio, *tag_uio; struct tls_aead_data ad; struct cryptop *crp; struct ocf_session *os; struct ocf_operation *oo; - struct iovec *iov; + struct iovec *iov, *out_iov; int i, error; uint16_t tls_comp_len; + bool inplace; os = tls->cipher; - oo = malloc(sizeof(*oo) + (iovcnt + 2) * sizeof(*iov), M_KTLS_OCF, + oo = malloc(sizeof(*oo) + (iovcnt + 2) * sizeof(*iov) * 2, M_KTLS_OCF, M_WAITOK | M_ZERO); oo->os = os; iov = oo->iov; + out_iov = iov + iovcnt + 2; + uio.uio_iov = iov; + uio.uio_offset = 0; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_td = curthread; + + out_uio.uio_iov = out_iov; + out_uio.uio_offset = 0; + out_uio.uio_segflg = UIO_SYSSPACE; + out_uio.uio_td = curthread; + crp = crypto_getreq(os->sid, M_WAITOK); /* Setup the IV. */ @@ -129,44 +151,50 @@ ktls_ocf_tls12_gcm_encrypt(struct ktls_session *tls, ad.tls_length = htons(tls_comp_len); iov[0].iov_base = &ad; iov[0].iov_len = sizeof(ad); - uio.uio_resid = sizeof(ad); + crp->crp_aad_start = 0; + crp->crp_aad_length = sizeof(ad); - /* - * OCF always does encryption in place, so copy the data if - * needed. Ugh. - */ + /* Copy iov's. */ + memcpy(iov + 1, iniov, iovcnt * sizeof(*iov)); + uio.uio_iovcnt = iovcnt + 1; + memcpy(out_iov, outiov, iovcnt * sizeof(*out_iov)); + out_uio.uio_iovcnt = iovcnt; + + /* Compute payload length and determine if encryption is in place. */ + inplace = true; + crp->crp_payload_start = sizeof(ad); for (i = 0; i < iovcnt; i++) { - iov[i + 1] = outiov[i]; if (iniov[i].iov_base != outiov[i].iov_base) - memcpy(outiov[i].iov_base, iniov[i].iov_base, - outiov[i].iov_len); - uio.uio_resid += outiov[i].iov_len; + inplace = false; + crp->crp_payload_length += iniov[i].iov_len; } + uio.uio_resid = sizeof(ad) + crp->crp_payload_length; + out_uio.uio_resid = crp->crp_payload_length; - iov[iovcnt + 1].iov_base = trailer; - iov[iovcnt + 1].iov_len = AES_GMAC_HASH_LEN; - uio.uio_resid += AES_GMAC_HASH_LEN; + if (inplace) + tag_uio = &uio; + else + tag_uio = &out_uio; - uio.uio_iov = iov; - uio.uio_iovcnt = iovcnt + 2; - uio.uio_offset = 0; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_td = curthread; + tag_uio->uio_iov[tag_uio->uio_iovcnt].iov_base = trailer; + tag_uio->uio_iov[tag_uio->uio_iovcnt].iov_len = AES_GMAC_HASH_LEN; + tag_uio->uio_iovcnt++; + crp->crp_digest_start = tag_uio->uio_resid; + tag_uio->uio_resid += AES_GMAC_HASH_LEN; crp->crp_op = CRYPTO_OP_ENCRYPT | CRYPTO_OP_COMPUTE_DIGEST; crp->crp_flags = CRYPTO_F_CBIMM | CRYPTO_F_IV_SEPARATE; crypto_use_uio(crp, &uio); + if (!inplace) + crypto_use_output_uio(crp, &out_uio); crp->crp_opaque = oo; crp->crp_callback = ktls_ocf_callback; - crp->crp_aad_start = 0; - crp->crp_aad_length = sizeof(ad); - crp->crp_payload_start = sizeof(ad); - crp->crp_payload_length = uio.uio_resid - - (sizeof(ad) + AES_GMAC_HASH_LEN); - crp->crp_digest_start = uio.uio_resid - AES_GMAC_HASH_LEN; - counter_u64_add(ocf_tls12_gcm_crypts, 1); + if (inplace) + counter_u64_add(ocf_inplace, 1); + else + counter_u64_add(ocf_separate_output, 1); for (;;) { error = crypto_dispatch(crp); if (error) @@ -198,22 +226,35 @@ ktls_ocf_tls13_gcm_encrypt(struct ktls_session *tls, const struct tls_record_layer *hdr, uint8_t *trailer, struct iovec *iniov, struct iovec *outiov, int iovcnt, uint64_t seqno, uint8_t record_type) { - struct uio uio; + struct uio uio, out_uio; struct tls_aead_data_13 ad; char nonce[12]; struct cryptop *crp; struct ocf_session *os; struct ocf_operation *oo; - struct iovec *iov; + struct iovec *iov, *out_iov; int i, error; + bool inplace; os = tls->cipher; - oo = malloc(sizeof(*oo) + (iovcnt + 2) * sizeof(*iov), M_KTLS_OCF, + oo = malloc(sizeof(*oo) + (iovcnt + 2) * sizeof(*iov) * 2, M_KTLS_OCF, M_WAITOK | M_ZERO); oo->os = os; iov = oo->iov; + out_iov = iov + iovcnt + 2; + + uio.uio_iov = iov; + uio.uio_offset = 0; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_td = curthread; + + out_uio.uio_iov = out_iov; + out_uio.uio_offset = 0; + out_uio.uio_segflg = UIO_SYSSPACE; + out_uio.uio_td = curthread; + crp = crypto_getreq(os->sid, M_WAITOK); /* Setup the nonce. */ @@ -227,46 +268,59 @@ ktls_ocf_tls13_gcm_encrypt(struct ktls_session *tls, ad.tls_length = hdr->tls_length; iov[0].iov_base = &ad; iov[0].iov_len = sizeof(ad); - uio.uio_resid = sizeof(ad); + crp->crp_aad_start = 0; + crp->crp_aad_length = sizeof(ad); - /* - * OCF always does encryption in place, so copy the data if - * needed. Ugh. - */ + /* Copy iov's. */ + memcpy(iov + 1, iniov, iovcnt * sizeof(*iov)); + uio.uio_iovcnt = iovcnt + 1; + memcpy(out_iov, outiov, iovcnt * sizeof(*out_iov)); + out_uio.uio_iovcnt = iovcnt; + + /* Compute payload length and determine if encryption is in place. */ + inplace = true; + crp->crp_payload_start = sizeof(ad); for (i = 0; i < iovcnt; i++) { - iov[i + 1] = outiov[i]; if (iniov[i].iov_base != outiov[i].iov_base) - memcpy(outiov[i].iov_base, iniov[i].iov_base, - outiov[i].iov_len); - uio.uio_resid += outiov[i].iov_len; + inplace = false; + crp->crp_payload_length += iniov[i].iov_len; } + uio.uio_resid = sizeof(ad) + crp->crp_payload_length; + out_uio.uio_resid = crp->crp_payload_length; + /* + * Always include the full trailer as input to get the + * record_type even if only the first byte is used. + */ trailer[0] = record_type; iov[iovcnt + 1].iov_base = trailer; iov[iovcnt + 1].iov_len = AES_GMAC_HASH_LEN + 1; + uio.uio_iovcnt++; uio.uio_resid += AES_GMAC_HASH_LEN + 1; + if (inplace) { + crp->crp_digest_start = uio.uio_resid - AES_GMAC_HASH_LEN; + } else { + out_iov[iovcnt] = iov[iovcnt + 1]; + out_uio.uio_iovcnt++; + out_uio.uio_resid += AES_GMAC_HASH_LEN + 1; + crp->crp_digest_start = out_uio.uio_resid - AES_GMAC_HASH_LEN; + } - uio.uio_iov = iov; - uio.uio_iovcnt = iovcnt + 2; - uio.uio_offset = 0; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_td = curthread; - crp->crp_op = CRYPTO_OP_ENCRYPT | CRYPTO_OP_COMPUTE_DIGEST; crp->crp_flags = CRYPTO_F_CBIMM | CRYPTO_F_IV_SEPARATE; crypto_use_uio(crp, &uio); + if (!inplace) + crypto_use_output_uio(crp, &out_uio); crp->crp_opaque = oo; crp->crp_callback = ktls_ocf_callback; - crp->crp_aad_start = 0; - crp->crp_aad_length = sizeof(ad); - crp->crp_payload_start = sizeof(ad); - crp->crp_payload_length = uio.uio_resid - - (sizeof(ad) + AES_GMAC_HASH_LEN); - crp->crp_digest_start = uio.uio_resid - AES_GMAC_HASH_LEN; memcpy(crp->crp_iv, nonce, sizeof(nonce)); counter_u64_add(ocf_tls13_gcm_crypts, 1); + if (inplace) + counter_u64_add(ocf_inplace, 1); + else + counter_u64_add(ocf_separate_output, 1); for (;;) { error = crypto_dispatch(crp); if (error) @@ -313,6 +367,7 @@ ktls_ocf_try(struct socket *so, struct ktls_session *t int error; memset(&csp, 0, sizeof(csp)); + csp.csp_flags |= CSP_F_SEPARATE_OUTPUT; switch (tls->params.cipher_algorithm) { case CRYPTO_AES_NIST_GCM_16: @@ -376,6 +431,8 @@ ktls_ocf_modevent(module_t mod, int what, void *arg) case MOD_LOAD: ocf_tls12_gcm_crypts = counter_u64_alloc(M_WAITOK); ocf_tls13_gcm_crypts = counter_u64_alloc(M_WAITOK); + ocf_inplace = counter_u64_alloc(M_WAITOK); + ocf_separate_output = counter_u64_alloc(M_WAITOK); ocf_retries = counter_u64_alloc(M_WAITOK); return (ktls_crypto_backend_register(&ocf_backend)); case MOD_UNLOAD: @@ -384,6 +441,8 @@ ktls_ocf_modevent(module_t mod, int what, void *arg) return (error); counter_u64_free(ocf_tls12_gcm_crypts); counter_u64_free(ocf_tls13_gcm_crypts); + counter_u64_free(ocf_inplace); + counter_u64_free(ocf_separate_output); counter_u64_free(ocf_retries); return (0); default: From owner-svn-src-head@freebsd.org Thu Jun 4 20:35:19 2020 Return-Path: Delivered-To: svn-src-head@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 09CFE330DB8; Thu, 4 Jun 2020 20:35:19 +0000 (UTC) (envelope-from gonzo@freebsd.org) Received: from id.bluezbox.com (id.bluezbox.com [45.55.20.155]) (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 49dHbB3zJnz3Zhr; Thu, 4 Jun 2020 20:35:18 +0000 (UTC) (envelope-from gonzo@freebsd.org) Received: from localhost ([127.0.0.1] helo=id.bluezbox.com) by id.bluezbox.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92 (FreeBSD)) (envelope-from ) id 1jgwa4-0001ef-Qo; Thu, 04 Jun 2020 13:35:17 -0700 Received: (from gonzo@localhost) by id.bluezbox.com (8.15.2/8.15.2/Submit) id 054KZGgv006364; Thu, 4 Jun 2020 13:35:16 -0700 (PDT) (envelope-from gonzo@freebsd.org) X-Authentication-Warning: id.bluezbox.com: gonzo set sender to gonzo@freebsd.org using -f Date: Thu, 4 Jun 2020 13:35:16 -0700 From: Oleksandr Tymoshenko To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361796 - head/sys/dts/arm64/overlays Message-ID: <20200604203516.GA5827@bluezbox.com> References: <202006041720.054HKx9T045530@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006041720.054HKx9T045530@repo.freebsd.org> X-Operating-System: FreeBSD/11.2-RELEASE-p10 (amd64) User-Agent: Mutt/1.12.1 (2019-06-15) X-Spam-Level: -- X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see The administrator of that system for details. Content preview: Oleksandr Tymoshenko (gonzo@FreeBSD.org) wrote: > Author: gonzo > Date: Thu Jun 4 17:20:58 2020 > New Revision: 361796 > URL: https://svnweb.freebsd.org/changeset/base/361796 > > Log: > Remove license [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Rspamd-Queue-Id: 49dHbB3zJnz3Zhr X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:14061, ipnet:45.55.0.0/19, country:US]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:35:19 -0000 Oleksandr Tymoshenko (gonzo@FreeBSD.org) wrote: > Author: gonzo > Date: Thu Jun 4 17:20:58 2020 > New Revision: 361796 > URL: https://svnweb.freebsd.org/changeset/base/361796 > > Log: > Remove licenses > > I haven't requested explicit permission from authors and shouldn't have > added BSDL headers without it. > > Requestes by: imp Some comments on this commit. Adding license texts was a knee-jerk reaction to the request to get over with a minor change. Not asking actual contributors for permissions was the wrong thing to do, so I reverted it. I agree with Warner's view that dts files are not subject to copyright because they're statements of facts. I also checked other files in sys/dts/{arm,arm64}/overlays/ - none of them has a license header, so my original commit was consistent with the standards of that particular part of the codebase and didn't introduce any legal exposure (hypothetical or not) FreeBSD didn't have at the time of the commit. Summing up everything above: I think r361796 brings files to the form they should be in. If the eventual consensus in the Project is that dtso files require licenses and copyright statements there need to be a wider effort organized to get permissions from the respective contributors. -- gonzo From owner-svn-src-head@freebsd.org Thu Jun 4 20:39:13 2020 Return-Path: Delivered-To: svn-src-head@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 2C30A330F28; Thu, 4 Jun 2020 20:39:13 +0000 (UTC) (envelope-from se@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dHgj0PdDz3b4Y; Thu, 4 Jun 2020 20:39:13 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MBP-WLAN.fritz.box (p200300cd5f201e00f8c796e30214bfbc.dip0.t-ipconnect.de [IPv6:2003:cd:5f20:1e00:f8c7:96e3:214:bfbc]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4C47A13066; Thu, 4 Jun 2020 20:39:12 +0000 (UTC) (envelope-from se@freebsd.org) Subject: Re: svn commit: r361801 - head/sys/ufs/ffs To: Kyle Evans , Kirk McKusick Cc: src-committers , svn-src-all , svn-src-head References: <202006041835.054IZLMs097931@repo.freebsd.org> From: =?UTF-8?Q?Stefan_E=c3=9fer?= Autocrypt: addr=se@freebsd.org; keydata= mQENBFVxiRIBCADOLNOZBsqlplHUQ3tG782FNtVT33rQli9EjNt2fhFERHIo4NxHlWBpHLnU b0s4L/eItx7au0i7Gegv01A9LUMwOnAc9EFAm4EW3Wmoa6MYrcP7xDClohg/Y69f7SNpEs3x YATBy+L6NzWZbJjZXD4vqPgZSDuMcLU7BEdJf0f+6h1BJPnGuwHpsSdnnMrZeIM8xQ8PPUVQ L0GZkVojHgNUngJH6e21qDrud0BkdiBcij0M3TCP4GQrJ/YMdurfc8mhueLpwGR2U1W8TYB7 4UY+NLw0McThOCLCxXflIeF/Y7jSB0zxzvb/H3LWkodUTkV57yX9IbUAGA5RKRg9zsUtABEB AAG0J1N0ZWZhbiBFw59lciAoRnJlZUJTRCkgPHNlQGZyZWVic2Qub3JnPokBVAQTAQoAPgIb AwULCQgHAwUVCgkICwUWAwIBAAIeAQIXgBYhBKNx6mWcC+zIK3FTE0frte9a/fVEBQJa8u+q BQkLJQETAAoJEEfrte9a/fVEOeMH/icmdK1eZQvB3U8quJo9VMaZsaTuCMbUE4NThyfsIvIm MCd+rb/yULmMYwqNfjyKB1x4ikR4x+94l+yJoz7K0Usks+eNKDmMGJM6pWWssTigaJubFdVd hVVC+C1QJi7JshYSib08uONoPmO4lv5Az0TDYGtsMzsES2sIlc62c9go5WPGYhQFRbX3Lk6y V6m8OHh+G9XGSj3oPO4UteRwu+SzTdOLunZBWG1wu34+IeZm663D+2gOppQLWpLa2qaTerqw THu377ayZ2B2LPJ5JkvkZeHYPkwDQ+b5PGn0UhfkxPnDVYki5F7qKxvQ5uq1/q9YaCX7mmOl H2yO7tgVsrW5AQ0EVXGJEgEIALEj9qCXMZVucjpcd3QxM/TlUr98m5viEd1z4tCnPUyRWcIC EVtj2h5xMH+2iB0q1+KWhq+NsWtvScmEmfHnsr7dJ1K677OdpDhKVaJk61eeRulFY1R4yb6C 1MMxK+WgYB+vvpG0UeyR0M4uBewcPvRsq4yGUHFQKtLAbMdoPTSryJA+ElnmK1vdY+rPcHgi OIMBZM7ahsPXC0C9K4e5SP9clGyIoMpbfHXdx9q+Rp3zVtlbhyk3BS/xccu/+9pk9ICXL6GR js2sNnJ0wxdU1DsAlC59a5MnSruwiZFwRnkQhr3x6wk97Lg7sLS9jjTnCN7LGlVmSmpOEMy6 uq1AWfUAEQEAAYkBPAQYAQoAJgIbDBYhBKNx6mWcC+zIK3FTE0frte9a/fVEBQJa8u+rBQkL JQEZAAoJEEfrte9a/fVEuesH/2DNxGWnHvWwMyiyhlQtafvDKwEn/wAgR8gHJFodB7emf8rA TnukH7MVttCoHtjN5lvv9RSBHjNTZls5wR/ANlwdRuPQHd8ZGxLe3S6IuUB3zDSwFltLGurO N2kOMhs5mTGyypSa+uw3rtQbUAVYf1oPbiR4FLtiM8FLyEvE95hX5fPq9Qvx9FmN79kmCIEw jDKPqDaUf/OR2fEF0LSIbXHEk4tNqCEwx5DIJ0fp5/z5UzICUAmwxyRs5O/Hre1jzPsMVyud Ml9t7UTOJGKVWwRory1PMnOFxN+iz5/d4FhYSKXF7kfMiFgol4LuWaxJRwbBrr71VGBrRy2a L1nw6Bc= Message-ID: Date: Thu, 4 Jun 2020 22:39:10 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:39:13 -0000 Am 04.06.20 um 21:48 schrieb Kyle Evans: > On Thu, Jun 4, 2020 at 1:35 PM Kirk McKusick wrote: [...] >> Modified: head/sys/ufs/ffs/ffs_balloc.c >> ============================================================================== >> --- head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 18:19:16 2020 (r361800) >> +++ head/sys/ufs/ffs/ffs_balloc.c Thu Jun 4 18:35:21 2020 (r361801) >> @@ -154,7 +154,8 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i >> ip->i_size = smalllblktosize(fs, nb + 1); >> dp->di_size = ip->i_size; >> dp->di_db[nb] = dbtofsb(fs, bp->b_blkno); >> - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); >> + UFS_INODE_SET_FLAG(ip, >> + IN_CHANGE | IN_UPDATE | IN_IBLKDATA); >> if (flags & IO_SYNC) >> bwrite(bp); >> else if (DOINGASYNC(vp)) >> @@ -647,7 +648,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i >> dp->di_extsize = smalllblktosize(fs, nb + 1); >> dp->di_extb[nb] = dbtofsb(fs, bp->b_blkno); >> bp->b_xflags |= BX_ALTDATA; >> - UFS_INODE_SET_FLAG(ip, IN_CHANGE); >> + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_BLKDATA); >> if (flags & IO_SYNC) >> bwrite(bp); >> else > > Hello! > > This second one seems to have been accidentally misspelled as "IN_BLKDATA" I had noticed this independently since my kernel builds failed and took liberty to commit a fix of this obvious typo. Regards, STefan From owner-svn-src-head@freebsd.org Thu Jun 4 20:39:30 2020 Return-Path: Delivered-To: svn-src-head@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 2154933109B; Thu, 4 Jun 2020 20:39:30 +0000 (UTC) (envelope-from erj@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dHh204djz3bTP; Thu, 4 Jun 2020 20:39:30 +0000 (UTC) (envelope-from erj@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 D7D37254F6; Thu, 4 Jun 2020 20:39:29 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054KdTdQ075988; Thu, 4 Jun 2020 20:39:29 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054KdSc5075983; Thu, 4 Jun 2020 20:39:28 GMT (envelope-from erj@FreeBSD.org) Message-Id: <202006042039.054KdSc5075983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Thu, 4 Jun 2020 20:39:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361805 - head/sys/dev/e1000 X-SVN-Group: head X-SVN-Commit-Author: erj X-SVN-Commit-Paths: head/sys/dev/e1000 X-SVN-Commit-Revision: 361805 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:39:30 -0000 Author: erj Date: Thu Jun 4 20:39:28 2020 New Revision: 361805 URL: https://svnweb.freebsd.org/changeset/base/361805 Log: em(4): Add support for Comet Lake Mobile Platform, update shared code This change introduces Comet Lake Mobile Platform support in the e1000 driver along with shared code patches described below. - Cast return value of e1000_ltr2ns() to higher type to avoid overflow - Remove useless statement of assigning act_offset - Add initialization of identification LED - Fix flow control setup after connected standby: After connected standby the driver blocks resets during "AdapterStart" and skips flow control setup. This change adds condition in e1000_setup_link_ich8lan() to always setup flow control and to setup physical interface only when there is no need to block resets. Signed-off-by: Piotr Pietruszewski Submitted by: Piotr Pietruszewski Reviewed by: erj@ Tested by: Jeffrey Pieper MFC after: 1 week Relnotes: yes Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D25035 Modified: head/sys/dev/e1000/e1000_api.c head/sys/dev/e1000/e1000_hw.h head/sys/dev/e1000/e1000_i210.c head/sys/dev/e1000/e1000_ich8lan.c head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/e1000_api.c ============================================================================== --- head/sys/dev/e1000/e1000_api.c Thu Jun 4 20:12:34 2020 (r361804) +++ head/sys/dev/e1000/e1000_api.c Thu Jun 4 20:39:28 2020 (r361805) @@ -309,6 +309,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_SPT_I219_V4: case E1000_DEV_ID_PCH_SPT_I219_LM5: case E1000_DEV_ID_PCH_SPT_I219_V5: + case E1000_DEV_ID_PCH_CMP_I219_LM12: + case E1000_DEV_ID_PCH_CMP_I219_V12: mac->type = e1000_pch_spt; break; case E1000_DEV_ID_PCH_CNP_I219_LM6: @@ -319,7 +321,10 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_ICP_I219_V8: case E1000_DEV_ID_PCH_ICP_I219_LM9: case E1000_DEV_ID_PCH_ICP_I219_V9: - case E1000_DEV_ID_PCH_ICP_I219_V10: + case E1000_DEV_ID_PCH_CMP_I219_LM10: + case E1000_DEV_ID_PCH_CMP_I219_V10: + case E1000_DEV_ID_PCH_CMP_I219_LM11: + case E1000_DEV_ID_PCH_CMP_I219_V11: mac->type = e1000_pch_cnp; break; case E1000_DEV_ID_82575EB_COPPER: Modified: head/sys/dev/e1000/e1000_hw.h ============================================================================== --- head/sys/dev/e1000/e1000_hw.h Thu Jun 4 20:12:34 2020 (r361804) +++ head/sys/dev/e1000/e1000_hw.h Thu Jun 4 20:39:28 2020 (r361805) @@ -155,7 +155,12 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_ICP_I219_V8 0x15E0 #define E1000_DEV_ID_PCH_ICP_I219_LM9 0x15E1 #define E1000_DEV_ID_PCH_ICP_I219_V9 0x15E2 -#define E1000_DEV_ID_PCH_ICP_I219_V10 0x0D4F +#define E1000_DEV_ID_PCH_CMP_I219_LM10 0x0D4E +#define E1000_DEV_ID_PCH_CMP_I219_V10 0x0D4F +#define E1000_DEV_ID_PCH_CMP_I219_LM11 0x0D4C +#define E1000_DEV_ID_PCH_CMP_I219_V11 0x0D4D +#define E1000_DEV_ID_PCH_CMP_I219_LM12 0x0D53 +#define E1000_DEV_ID_PCH_CMP_I219_V12 0x0D55 #define E1000_DEV_ID_82576 0x10C9 #define E1000_DEV_ID_82576_FIBER 0x10E6 #define E1000_DEV_ID_82576_SERDES 0x10E7 Modified: head/sys/dev/e1000/e1000_i210.c ============================================================================== --- head/sys/dev/e1000/e1000_i210.c Thu Jun 4 20:12:34 2020 (r361804) +++ head/sys/dev/e1000/e1000_i210.c Thu Jun 4 20:39:28 2020 (r361805) @@ -774,6 +774,7 @@ static s32 e1000_get_cfg_done_i210(struct e1000_hw *hw **/ s32 e1000_init_hw_i210(struct e1000_hw *hw) { + struct e1000_mac_info *mac = &hw->mac; s32 ret_val; DEBUGFUNC("e1000_init_hw_i210"); @@ -784,6 +785,10 @@ s32 e1000_init_hw_i210(struct e1000_hw *hw) return ret_val; } hw->phy.ops.get_cfg_done = e1000_get_cfg_done_i210; + + /* Initialize identification LED */ + mac->ops.id_led_init(hw); + ret_val = e1000_init_hw_82575(hw); return ret_val; } Modified: head/sys/dev/e1000/e1000_ich8lan.c ============================================================================== --- head/sys/dev/e1000/e1000_ich8lan.c Thu Jun 4 20:12:34 2020 (r361804) +++ head/sys/dev/e1000/e1000_ich8lan.c Thu Jun 4 20:39:28 2020 (r361805) @@ -1091,7 +1091,7 @@ static u64 e1000_ltr2ns(u16 ltr) value = ltr & E1000_LTRV_VALUE_MASK; scale = (ltr & E1000_LTRV_SCALE_MASK) >> E1000_LTRV_SCALE_SHIFT; - return value * (1 << (scale * E1000_LTRV_SCALE_FACTOR)); + return value * (1ULL << (scale * E1000_LTRV_SCALE_FACTOR)); } /** @@ -4161,13 +4161,6 @@ static s32 e1000_update_nvm_checksum_spt(struct e1000_ if (ret_val) goto release; - /* And invalidate the previously valid segment by setting - * its signature word (0x13) high_byte to 0b. This can be - * done without an erase because flash erase sets all bits - * to 1's. We can write 1's to 0's without an erase - */ - act_offset = (old_bank_offset + E1000_ICH_NVM_SIG_WORD) * 2 + 1; - /* offset in words but we read dword*/ act_offset = old_bank_offset + E1000_ICH_NVM_SIG_WORD - 1; ret_val = e1000_read_flash_dword_ich8lan(hw, act_offset, &dword); @@ -5235,9 +5228,6 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *h DEBUGFUNC("e1000_setup_link_ich8lan"); - if (hw->phy.ops.check_reset_block(hw)) - return E1000_SUCCESS; - /* ICH parts do not have a word in the NVM to determine * the default flow control setting, so we explicitly * set it to full. @@ -5253,10 +5243,12 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *h DEBUGOUT1("After fix-ups FlowControl is now = %x\n", hw->fc.current_mode); - /* Continue to configure the copper link. */ - ret_val = hw->mac.ops.setup_physical_interface(hw); - if (ret_val) - return ret_val; + if (!hw->phy.ops.check_reset_block(hw)) { + /* Continue to configure the copper link. */ + ret_val = hw->mac.ops.setup_physical_interface(hw); + if (ret_val) + return ret_val; + } E1000_WRITE_REG(hw, E1000_FCTTV, hw->fc.pause_time); if ((hw->phy.type == e1000_phy_82578) || Modified: head/sys/dev/e1000/if_em.c ============================================================================== --- head/sys/dev/e1000/if_em.c Thu Jun 4 20:12:34 2020 (r361804) +++ head/sys/dev/e1000/if_em.c Thu Jun 4 20:39:28 2020 (r361805) @@ -174,7 +174,12 @@ static pci_vendor_info_t em_vendor_info_array[] = PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V8, "Intel(R) PRO/1000 Network Connection"), PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_LM9, "Intel(R) PRO/1000 Network Connection"), PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V9, "Intel(R) PRO/1000 Network Connection"), - PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V10, "Intel(R) PRO/1000 Network Connection"), + PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_LM10, "Intel(R) PRO/1000 Network Connection"), + PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_V10, "Intel(R) PRO/1000 Network Connection"), + PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_LM11, "Intel(R) PRO/1000 Network Connection"), + PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_V11, "Intel(R) PRO/1000 Network Connection"), + PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_LM12, "Intel(R) PRO/1000 Network Connection"), + PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_V12, "Intel(R) PRO/1000 Network Connection"), /* required last entry */ PVID_END }; From owner-svn-src-head@freebsd.org Thu Jun 4 20:47:12 2020 Return-Path: Delivered-To: svn-src-head@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 CC4B53315F8; Thu, 4 Jun 2020 20:47:12 +0000 (UTC) (envelope-from rscheff@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dHrw52q8z3cG4; Thu, 4 Jun 2020 20:47:12 +0000 (UTC) (envelope-from rscheff@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 A87F6258AD; Thu, 4 Jun 2020 20:47:12 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054KlCEe082031; Thu, 4 Jun 2020 20:47:12 GMT (envelope-from rscheff@FreeBSD.org) Received: (from rscheff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054KlBUY082027; Thu, 4 Jun 2020 20:47:11 GMT (envelope-from rscheff@FreeBSD.org) Message-Id: <202006042047.054KlBUY082027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rscheff set sender to rscheff@FreeBSD.org using -f From: Richard Scheffenegger Date: Thu, 4 Jun 2020 20:47:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361806 - head/bin/dd X-SVN-Group: head X-SVN-Commit-Author: rscheff X-SVN-Commit-Paths: head/bin/dd X-SVN-Commit-Revision: 361806 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:47:12 -0000 Author: rscheff Date: Thu Jun 4 20:47:11 2020 New Revision: 361806 URL: https://svnweb.freebsd.org/changeset/base/361806 Log: Add O_DIRECT flag to DD for cache bypass FreeBSD DD utility has not had support for the O_DIRECT flag, which is useful to bypass local caching, e.g. for unconditionally issuing NFS IO requests during testing. Reviewed by: rgrimes (mentor) Approved by: rgrimes (mentor, blanket) MFC after: 3 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D25066 Modified: head/bin/dd/args.c head/bin/dd/dd.1 head/bin/dd/dd.c head/bin/dd/dd.h Modified: head/bin/dd/args.c ============================================================================== --- head/bin/dd/args.c Thu Jun 4 20:39:28 2020 (r361805) +++ head/bin/dd/args.c Thu Jun 4 20:47:11 2020 (r361806) @@ -266,6 +266,7 @@ static const struct iflag { const char *name; uint64_t set, noset; } ilist[] = { + { "direct", C_IDIRECT, 0 }, { "fullblock", C_IFULLBLOCK, C_SYNC }, }; @@ -410,6 +411,7 @@ static const struct oflag { const char *name; uint64_t set; } olist[] = { + { "direct", C_ODIRECT }, { "fsync", C_OFSYNC }, { "sync", C_OFSYNC }, }; Modified: head/bin/dd/dd.1 ============================================================================== --- head/bin/dd/dd.1 Thu Jun 4 20:39:28 2020 (r361805) +++ head/bin/dd/dd.1 Thu Jun 4 20:47:11 2020 (r361806) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd March 26, 2019 +.Dd June 4, 2020 .Dt DD 1 .Os .Sh NAME @@ -117,6 +117,8 @@ limits the number of times is called on the input rather than the number of blocks copied in full. May not be combined with .Cm conv=sync . +.It Cm direct +Set the O_DIRECT flag on the input file to make reads bypass any local caching. .El .It Cm iseek Ns = Ns Ar n Seek on the input file @@ -143,7 +145,7 @@ the output file is truncated at that point. Where .Cm value is one of the symbols from the following list. -.Bl -tag -width "fsync" +.Bl -tag -width "direct" .It Cm fsync Set the O_FSYNC flag on the output file to make writes synchronous. .It Cm sync @@ -151,6 +153,8 @@ Set the O_SYNC flag on the output file to make writes This is synonymous with the .Cm fsync value. +.It Cm direct +Set the O_DIRECT flag on the output file to make writes bypass any local caching. .El .It Cm oseek Ns = Ns Ar n Seek on the output file Modified: head/bin/dd/dd.c ============================================================================== --- head/bin/dd/dd.c Thu Jun 4 20:39:28 2020 (r361805) +++ head/bin/dd/dd.c Thu Jun 4 20:47:11 2020 (r361806) @@ -143,7 +143,7 @@ static void setup(void) { u_int cnt; - int oflags; + int iflags, oflags; cap_rights_t rights; unsigned long cmds[] = { FIODTYPE, MTIOCTOP }; @@ -151,7 +151,10 @@ setup(void) in.name = "stdin"; in.fd = STDIN_FILENO; } else { - in.fd = open(in.name, O_RDONLY, 0); + iflags = 0; + if (ddflags & C_IDIRECT) + iflags |= O_DIRECT; + in.fd = open(in.name, O_RDONLY | iflags, 0); if (in.fd == -1) err(1, "%s", in.name); } @@ -186,6 +189,8 @@ setup(void) oflags |= O_TRUNC; if (ddflags & C_OFSYNC) oflags |= O_FSYNC; + if (ddflags & C_ODIRECT) + oflags |= O_DIRECT; out.fd = open(out.name, O_RDWR | oflags, DEFFILEMODE); /* * May not have read access, so try again with write only. Modified: head/bin/dd/dd.h ============================================================================== --- head/bin/dd/dd.h Thu Jun 4 20:39:28 2020 (r361805) +++ head/bin/dd/dd.h Thu Jun 4 20:47:11 2020 (r361806) @@ -105,6 +105,8 @@ typedef struct { #define C_FDATASYNC 0x0000000100000000ULL #define C_OFSYNC 0x0000000200000000ULL #define C_IFULLBLOCK 0x0000000400000000ULL +#define C_IDIRECT 0x0000000800000000ULL +#define C_ODIRECT 0x0000001000000000ULL #define C_PARITY (C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET) From owner-svn-src-head@freebsd.org Thu Jun 4 20:48:58 2020 Return-Path: Delivered-To: svn-src-head@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 403B1331890; Thu, 4 Jun 2020 20:48:58 +0000 (UTC) (envelope-from mhorne@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dHty0ynFz3cgX; Thu, 4 Jun 2020 20:48:58 +0000 (UTC) (envelope-from mhorne@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 1C62E25B08; Thu, 4 Jun 2020 20:48:58 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054Kmv3Z082150; Thu, 4 Jun 2020 20:48:57 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054Kmv0D082149; Thu, 4 Jun 2020 20:48:57 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202006042048.054Kmv0D082149@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 4 Jun 2020 20:48:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361807 - head/sys/contrib/edk2 X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/sys/contrib/edk2 X-SVN-Commit-Revision: 361807 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:48:58 -0000 Author: mhorne Date: Thu Jun 4 20:48:57 2020 New Revision: 361807 URL: https://svnweb.freebsd.org/changeset/base/361807 Log: Document upgrade procedure in FREEBSD-upgrade It was pointed out to me that this is the convention for documenting upgrade instructions, rather than just leaving the instructions in the commit message. It's possible these commands won't be used again before we transition to git, but then at least they'll give a path forward for whoever touches this next. Suggested by: lwhsu Added: head/sys/contrib/edk2/FREEBSD-upgrade (contents, props changed) Added: head/sys/contrib/edk2/FREEBSD-upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/edk2/FREEBSD-upgrade Thu Jun 4 20:48:57 2020 (r361807) @@ -0,0 +1,23 @@ +$FreeBSD$ + +We try to maintain the minimal set of headers required to build, as the full +set of files from MdePkg is quite large (10MB at the time of writing). To do +this when performing an upgrade, execute the following: + +# Generate list of the headers needed to build +cp -r ../vendor/edk2/dist/MdePkg/Include sys/contrib/edk2 +cd lib/libefivar +make +pushd `make -V .OBJDIR` +cat .depend*.o | grep sys/contrib | cut -d' ' -f 3 | + sort -u | sed -e 's=/full/path/sys/contrib/edk2/==' > /tmp/xxx +popd + +# Merge the needed files +cd ../../sys/contrib/edk2 +svn revert -R . +for i in `cat /tmp/xxx`; do + svn merge -c VendorRevision svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/$i $i +done +svn merge -c VendorRevision \ + svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/MdePkg.dec MdePkg.dec From owner-svn-src-head@freebsd.org Thu Jun 4 21:45:27 2020 Return-Path: Delivered-To: svn-src-head@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 7F5B2333358 for ; Thu, 4 Jun 2020 21:45:27 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dK865VQCz42qN for ; Thu, 4 Jun 2020 21:45:26 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x735.google.com with SMTP id c185so7791339qke.7 for ; Thu, 04 Jun 2020 14:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=4V45qUtbjjapUmJWqL3mkUpoLXbYD4yEtUDDLOUiotw=; b=ApNN16pzVTvSpECtOgyTX97AlRSKRPQW4w8vdJMVNdwdp4vebZbVsSN9R0mkpfFrws AtSC7KmcV6cQagWfOiSJ3Awf5k9QRkJgHhNNKAfQdA6Khx/Mq635noQbvdnCZ4di/49Y XXEekms27lTAzsrD4Km4zyQBDFsnAPCcooXyGCd09hGxy7ALCrRJ/p78DzV9HXrFFS7P HHADWNIlt3Itb0nejx0I6Rc33wm5sq0htnGnV3Eu7T/gpn/E7sBeGq4/OQUPz2r+Irui o2cj3VtaZFe9+Z0hIWpj4aTCQ9iLiKsEJNHppmRlVtZles+wxM68c8xBK7fSf0w6Yaq5 pj6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=4V45qUtbjjapUmJWqL3mkUpoLXbYD4yEtUDDLOUiotw=; b=mSUXsZpXnSNg8T4bPiqvV2v1kwEokZzqFQc48OMBdswd6Jdn5E6WQnCd3Gu6G1creJ Ch3yOiapyQxIbSTpzicD+uU+9SOCtvk6vQR+Z5EARzEuv/FsUBQOIYlCKKVvFls5c1Tx f6SWcA51pL1X3MSgrkI6DDJIB6iSQLbl2yrykQhgttW3m700mRcpjMB9kvegUnc27g8o OSOQeh58agJ9dMD6H+3QMGw8YT/3zfc/t/QWCp9LunvRkE3A42v5EoKxubq7LH6CEM/T abk6UICoScZuz2/gYG9etvQvfF5BVkgaBizamT9KMd7hYToYdi6MpYfkPdUhovPxfJnf hyFA== X-Gm-Message-State: AOAM531kW0+dK9zFkC39KB/pth7pwkoAAUqYIzKTHBspMUX271zyYMDe MSKFeSy6aI16M+SFZDY+IpQ6ow== X-Google-Smtp-Source: ABdhPJz1sVrDSxXPm5S1w/yBj4+Ymah7oaQYEbNEscP3kYYmR6znGKuRK27pxRcspb1Hbjm9SwtpDQ== X-Received: by 2002:a37:49cb:: with SMTP id w194mr7138710qka.40.1591307125789; Thu, 04 Jun 2020 14:45:25 -0700 (PDT) Received: from mutt-hbsd (75-148-2-186-WashingtonDC.hfc.comcastbusiness.net. [75.148.2.186]) by smtp.gmail.com with ESMTPSA id x14sm5440158qkb.67.2020.06.04.14.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2020 14:45:24 -0700 (PDT) Date: Thu, 4 Jun 2020 17:45:10 -0400 From: Shawn Webb To: Eugene Grosbein Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361790 - head/sbin/ifconfig Message-ID: <20200604214510.4my3xa6d2ce75zba@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <202006041444.054EijxB047937@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2sn3w3grpra42psf" Content-Disposition: inline In-Reply-To: <202006041444.054EijxB047937@repo.freebsd.org> X-Rspamd-Queue-Id: 49dK865VQCz42qN X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=ApNN16pz; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::735 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-4.81 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; NEURAL_HAM_MEDIUM(-1.00)[-1.003]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-0.97)[-0.972]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; NEURAL_HAM_SHORT(-0.74)[-0.737]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::735:from]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 21:45:27 -0000 --2sn3w3grpra42psf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 04, 2020 at 02:44:45PM +0000, Eugene Grosbein wrote: > Author: eugen > Date: Thu Jun 4 14:44:44 2020 > New Revision: 361790 > URL: https://svnweb.freebsd.org/changeset/base/361790 >=20 > Log: > ifconfig(8): make it possible to filter output by interface group. > =20 > Now options -g/-G allow to select/unselect interfaces by groups > in the "ifconfig -a" output just like already existing -d/-u. > =20 > Examples: > =20 > to exclude loopback from the list: ifconfig -a -G lo > to show vlan interfaces only: ifconfig -a -g vlan > to show tap interfaces that are up: ifconfig -aug tap > =20 > Arguments to -g/-G may be shell patterns and both may be specified. > Later options -g/-G override previous ones. > =20 > MFC after: 2 weeks > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D25029 >=20 > Modified: > head/sbin/ifconfig/ifconfig.8 > head/sbin/ifconfig/ifconfig.c >=20 > Modified: head/sbin/ifconfig/ifconfig.8 > =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=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:15:39 2020 (r361789) > +++ head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:44:44 2020 (r361790) Hey Eugene, Does the manpage need a date bump? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --2sn3w3grpra42psf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl7Za18ACgkQ/y5nonf4 4foulQ//TMUBTVL6otGnoEMdferM3/B46jFzO9aVowNw033b3MZHjlYIu7BM5AMG wMdLUKlnbUDhRE1XBmjXFjmgx45KAnUPUL24H4/scoIOQxtY3MWWgOpt1M6PkNjt jlB62cL1RfFZ62DDskVDoUuiquBzYh41j8JEE9utzdGxaAAzhIGTdLUr0lT0/lAz ntti3NySOXeFGb44ngfak1o1bB78S1QJi0AgXjqs1p/RQaRa3O+DjvBvCSFPaQgK dAWawMmh4TihWQ5hBxLDaJgv54I5liZQ0mz/5lW9EfGbnC4BBCCCyxXmrBt56vi/ F/Y90ExRDFQTSW5UAHcpnUnuDIlBQjgmQkTw2WKXv7aOo0cAT4UrhuaglILlvYs1 oEtDV0ad/G0bMZd+UBgdhATmUYBj1pdi06dCu4QIeEdxDbcj43MQ4HiXRuV8SFcK dpoXfBnfQt0/PLVwULqNmnQ5Bclo7q6Ya/4WtLKOI4gOM8vqniBp6DnyfaBWkXc6 nk5oVBU131+2yAQcBR9KuqtRy6bbcvRODo4fFmksaRpKeL18kHNyrzdWCEvwSAWE J9tNWrWhbVrqp+CmMdaxGqhJhmbr1ecVwf/Q5LzCR66x82Y4LjHm1A8E2VqtjP7H YpPnNOGnxtFNxuhQR7TwI/1YJ39CJH1PVVWCZ7UaOR51qYwmIb8= =WkvI -----END PGP SIGNATURE----- --2sn3w3grpra42psf-- From owner-svn-src-head@freebsd.org Thu Jun 4 22:16:19 2020 Return-Path: Delivered-To: svn-src-head@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 D964A334481; Thu, 4 Jun 2020 22:16:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dKql5XBvz45vY; Thu, 4 Jun 2020 22:16:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADBAE2635F; Thu, 4 Jun 2020 22:16:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054MGJcH037753; Thu, 4 Jun 2020 22:16:19 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054MGJ8Y037752; Thu, 4 Jun 2020 22:16:19 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006042216.054MGJ8Y037752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 4 Jun 2020 22:16:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361809 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 361809 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 22:16:19 -0000 Author: jhb Date: Thu Jun 4 22:16:19 2020 New Revision: 361809 URL: https://svnweb.freebsd.org/changeset/base/361809 Log: Update crypto(7) to list current ciphers. Add descriptions of AES-CCM, Camellia-CBC, and Chacha20. Reviewed by: cem (previous version) Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24963 Modified: head/share/man/man7/crypto.7 Modified: head/share/man/man7/crypto.7 ============================================================================== --- head/share/man/man7/crypto.7 Thu Jun 4 21:02:24 2020 (r361808) +++ head/share/man/man7/crypto.7 Thu Jun 4 22:16:19 2020 (r361809) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 22, 2020 +.Dd June 04, 2020 .Dt CRYPTO 7 .Os .Sh NAME @@ -43,7 +43,7 @@ The following cryptographic algorithms that are part o framework have the following requirements. .Pp Cipher algorithms: -.Bl -tag -width ".Dv CRYPTO_AES_CBC" +.Bl -tag -width "CRYPTO_AES_NIST_GCM_16" .It Dv CRYPTO_AES_CBC .Bl -tag -width "Block size :" -compact -offset indent .It IV size : @@ -54,7 +54,33 @@ Cipher algorithms: 16, 24 or 32 .El .Pp -This algorithm implements Cipher-block chaining. +This algorithm implements Cipher Block Chaining. +.It Dv CRYPTO_AES_CCM_16 +.Bl -tag -width "Block size :" -compact -offset indent +.It IV size : +12 +.It Block size : +16 +.It Key size : +16, 24 or 32 +.It Digest size : +16 +.El +.Pp +This algorithm implements Counter with CBC-MAC Mode. +This cipher uses AEAD +.Pq Authenticated Encryption with Associated Data +mode. +.Pp +The authentication tag will be read from or written to the offset +.Va crp_digest_start +specified in the request. +.Pp +Note: The nonce for each request must be provided in +.Fa crp_iv +via the +.Dv CRYPTO_F_IV_SEPARATE +flag. .It Dv CRYPTO_AES_NIST_GCM_16 .Bl -tag -width "Block size :" -compact -offset indent .It IV size : @@ -72,11 +98,15 @@ This cipher uses AEAD .Pq Authenticated Encryption with Associated Data mode. .Pp -The authentication tag will be read/written from/to the offset +The authentication tag will be read from or written to the offset .Va crp_digest_start specified in the request. .Pp -Note: You must provide an IV on every call. +Note: The nonce for each request must be provided in +.Fa crp_iv +via the +.Dv CRYPTO_F_IV_SEPARATE +flag. .It Dv CRYPTO_AES_ICM .Bl -tag -width "Block size :" -compact -offset indent .It IV size : @@ -95,7 +125,11 @@ This does mean that if a counter is required that roll the transaction need to be split into two parts where the counter rolls over. The counter incremented as a 128-bit big endian number. .Pp -Note: You must provide an IV on every call. +Note: The counter for each request must be provided in +.Fa crp_iv +via the +.Dv CRYPTO_F_IV_SEPARATE +flag. .It Dv CRYPTO_AES_XTS .Bl -tag -width "Block size :" -compact -offset indent .It IV size : @@ -111,6 +145,26 @@ as defined in NIST SP 800-38E. .Pp NOTE: The ciphertext stealing part is not implemented which is why this cipher is listed as having a block size of 16 instead of 1. +.It Dv CRYPTO_CAMELLIA_CBC +.Bl -tag -width "Block size :" -compact -offset indent +.It IV size : +16 +.It Block size : +16 +.It Key size : +16, 24 or 32 +.El +.Pp +This algorithm implements Cipher Block Chaining. +.It Dv CRYPTO_CHACHA20 +.Bl -tag -width "Block size :" -compact -offset indent +.It IV size : +16 +.It Block size : +1 +.It Key size : +16 or 32 +.El .El .Sh HISTORY The From owner-svn-src-head@freebsd.org Thu Jun 4 22:58:39 2020 Return-Path: Delivered-To: svn-src-head@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 52AE0335A95; Thu, 4 Jun 2020 22:58:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dLmb1X06z4ChS; Thu, 4 Jun 2020 22:58:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FA2A26DF7; Thu, 4 Jun 2020 22:58:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054Mwd9w064112; Thu, 4 Jun 2020 22:58:39 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054MwcBb064107; Thu, 4 Jun 2020 22:58:38 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006042258.054MwcBb064107@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 4 Jun 2020 22:58:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361810 - in head: lib/libipsec sbin/setkey sys/net usr.bin/netstat X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head: lib/libipsec sbin/setkey sys/net usr.bin/netstat X-SVN-Commit-Revision: 361810 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 22:58:39 -0000 Author: jhb Date: Thu Jun 4 22:58:37 2020 New Revision: 361810 URL: https://svnweb.freebsd.org/changeset/base/361810 Log: Refer to AES-CBC as "aes-cbc" rather than "rijndael-cbc" for IPsec. At this point, AES is the more common name for Rijndael128. setkey(8) will still accept the old name, and old constants remain for compatiblity. Reviewed by: cem, bcr (manpages) MFC after: 2 weeks Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24964 Modified: head/lib/libipsec/pfkey_dump.c head/sbin/setkey/setkey.8 head/sbin/setkey/token.l head/sys/net/pfkeyv2.h head/usr.bin/netstat/ipsec.c Modified: head/lib/libipsec/pfkey_dump.c ============================================================================== --- head/lib/libipsec/pfkey_dump.c Thu Jun 4 22:16:19 2020 (r361809) +++ head/lib/libipsec/pfkey_dump.c Thu Jun 4 22:58:37 2020 (r361810) @@ -159,8 +159,8 @@ static struct val2str str_alg_enc[] = { #ifdef SADB_X_EALG_RC5CBC { SADB_X_EALG_RC5CBC, "rc5-cbc", }, #endif -#ifdef SADB_X_EALG_RIJNDAELCBC - { SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", }, +#ifdef SADB_X_EALG_AESCBC + { SADB_X_EALG_AESCBC, "aes-cbc", }, #endif #ifdef SADB_X_EALG_TWOFISHCBC { SADB_X_EALG_TWOFISHCBC, "twofish-cbc", }, Modified: head/sbin/setkey/setkey.8 ============================================================================== --- head/sbin/setkey/setkey.8 Thu Jun 4 22:16:19 2020 (r361809) +++ head/sbin/setkey/setkey.8 Thu Jun 4 22:58:37 2020 (r361810) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 04, 2020 +.Dd June 4, 2020 .Dt SETKEY 8 .Os .\" @@ -612,7 +612,7 @@ parameter: .Bd -literal -offset indent algorithm keylen (bits) comment null 0 to 2048 rfc2410 -rijndael-cbc 128/192/256 rfc3602 +aes-cbc 128/192/256 rfc3602 aes-ctr 160/224/288 rfc3686 aes-gcm-16 160/224/288 rfc4106 .Ed Modified: head/sbin/setkey/token.l ============================================================================== --- head/sbin/setkey/token.l Thu Jun 4 22:16:19 2020 (r361809) +++ head/sbin/setkey/token.l Thu Jun 4 22:58:37 2020 (r361810) @@ -159,7 +159,8 @@ tcp { yylval.num = 0; return(PR_TCP); } {hyphen}E { BEGIN S_ENCALG; return(F_ENC); } null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC); } simple { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); } -rijndael-cbc { yylval.num = SADB_X_EALG_RIJNDAELCBC; BEGIN INITIAL; return(ALG_ENC); } +rijndael-cbc { yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); } +aes-cbc { yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); } aes-ctr { yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC_SALT); } aes-gcm-16 { yylval.num = SADB_X_EALG_AESGCM16; BEGIN INITIAL; return(ALG_ENC_SALT); } Modified: head/sys/net/pfkeyv2.h ============================================================================== --- head/sys/net/pfkeyv2.h Thu Jun 4 22:16:19 2020 (r361809) +++ head/sys/net/pfkeyv2.h Thu Jun 4 22:58:37 2020 (r361810) @@ -383,6 +383,7 @@ _Static_assert(sizeof(struct sadb_x_sa_replay) == 8, " #define SADB_EALG_NULL 11 #define SADB_X_EALG_RIJNDAELCBC 12 #define SADB_X_EALG_AES 12 +#define SADB_X_EALG_AESCBC 12 #define SADB_X_EALG_AESCTR 13 #define SADB_X_EALG_AESGCM8 18 /* RFC4106 */ #define SADB_X_EALG_AESGCM12 19 Modified: head/usr.bin/netstat/ipsec.c ============================================================================== --- head/usr.bin/netstat/ipsec.c Thu Jun 4 22:16:19 2020 (r361809) +++ head/usr.bin/netstat/ipsec.c Thu Jun 4 22:58:37 2020 (r361810) @@ -139,7 +139,7 @@ static struct val2str ipsec_ahnames[] = { static struct val2str ipsec_espnames[] = { { SADB_EALG_NONE, "none", }, { SADB_EALG_NULL, "null", }, - { SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", }, + { SADB_X_EALG_AESCBC, "aes-cbc", }, { SADB_X_EALG_AESCTR, "aes-ctr", }, { SADB_X_EALG_AESGCM16, "aes-gcm-16", }, { SADB_X_EALG_AESGMAC, "aes-gmac", }, From owner-svn-src-head@freebsd.org Fri Jun 5 00:11:45 2020 Return-Path: Delivered-To: svn-src-head@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 B60BD337B59; Fri, 5 Jun 2020 00:11:45 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dNNx44gqz4MpK; Fri, 5 Jun 2020 00:11:45 +0000 (UTC) (envelope-from adrian@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 6D22E27F2B; Fri, 5 Jun 2020 00:11:45 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0550Bj7g012459; Fri, 5 Jun 2020 00:11:45 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0550BjmB012458; Fri, 5 Jun 2020 00:11:45 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050011.0550BjmB012458@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 00:11:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361811 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361811 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 00:11:45 -0000 Author: adrian Date: Fri Jun 5 00:11:44 2020 New Revision: 361811 URL: https://svnweb.freebsd.org/changeset/base/361811 Log: [net80211] Send a probe request after IBSS node discovery This sends a probe request after IBSS node discovery through beacon frames. This allows things like HT and VHT capabilities to be "negotiated" in adhoc mode. It is .. kinda fire and pray - this isn't retried after discovery so it's quite possible that nodes occasionally don't come up with HT/VHT rate upgrades. At some point it may be a fun side project to add support for retrying these probe requests/negotiations after IBSS node discovery. Tested: * tested with multiple ath(4) NICs in 11n mode. Differential Revision: https://reviews.freebsd.org/D24979 Modified: head/sys/net80211/ieee80211_adhoc.c Modified: head/sys/net80211/ieee80211_adhoc.c ============================================================================== --- head/sys/net80211/ieee80211_adhoc.c Thu Jun 4 22:58:37 2020 (r361810) +++ head/sys/net80211/ieee80211_adhoc.c Fri Jun 5 00:11:44 2020 (r361811) @@ -715,6 +715,15 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf wh = mtod(m0, struct ieee80211_frame *); frm = (uint8_t *)&wh[1]; efrm = mtod(m0, uint8_t *) + m0->m_len; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_INPUT | IEEE80211_MSG_DEBUG, + "%s: recv mgmt frame, addr2=%6D, ni=%p (%6D) fc=%.02x %.02x\n", + __func__, + wh->i_addr2, ":", + ni, + ni->ni_macaddr, ":", + wh->i_fc[0], + wh->i_fc[1]); switch (subtype) { case IEEE80211_FC0_SUBTYPE_PROBE_RESP: case IEEE80211_FC0_SUBTYPE_BEACON: { @@ -788,6 +797,20 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf } else ni = NULL; + /* + * Send a probe request so we announce 11n + * capabilities. + * + * Don't do this if we're scanning. + */ + if (! (ic->ic_flags & IEEE80211_F_SCAN)) + ieee80211_send_probereq(ni, /* node */ + vap->iv_myaddr, /* SA */ + ni->ni_macaddr, /* DA */ + vap->iv_bss->ni_bssid, /* BSSID */ + vap->iv_bss->ni_essid, + vap->iv_bss->ni_esslen); /* SSID */ + } else if (ni->ni_capinfo == 0) { /* * Update faked node created on transmit. @@ -936,11 +959,11 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf vap->iv_stats.is_rx_mgtdiscard++; } else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { - IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT | IEEE80211_MSG_DEBUG, wh, NULL, "%s", "not for us"); vap->iv_stats.is_rx_mgtdiscard++; } else if (vap->iv_state != IEEE80211_S_RUN) { - IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT | IEEE80211_MSG_DEBUG, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; From owner-svn-src-head@freebsd.org Fri Jun 5 00:14:02 2020 Return-Path: Delivered-To: svn-src-head@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 D8B4C337E1F; Fri, 5 Jun 2020 00:14:02 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dNRZ5Q1sz4NMG; Fri, 5 Jun 2020 00:14:02 +0000 (UTC) (envelope-from adrian@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 B4FE227BF8; Fri, 5 Jun 2020 00:14:02 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0550E2Yd013465; Fri, 5 Jun 2020 00:14:02 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0550E2WK013464; Fri, 5 Jun 2020 00:14:02 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050014.0550E2WK013464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 00:14:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361812 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361812 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 00:14:02 -0000 Author: adrian Date: Fri Jun 5 00:14:02 2020 New Revision: 361812 URL: https://svnweb.freebsd.org/changeset/base/361812 Log: [net80211] Print out a bad PN in both hex and decimal. I've been using this to visually identify when I'm getting corrupted PNs from the hardware. :( Modified: head/sys/net80211/ieee80211_freebsd.c Modified: head/sys/net80211/ieee80211_freebsd.c ============================================================================== --- head/sys/net80211/ieee80211_freebsd.c Fri Jun 5 00:11:44 2020 (r361811) +++ head/sys/net80211/ieee80211_freebsd.c Fri Jun 5 00:14:02 2020 (r361812) @@ -789,8 +789,11 @@ ieee80211_notify_replay_failure(struct ieee80211vap *v struct ifnet *ifp = vap->iv_ifp; IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, - "%s replay detected tid %d ", - k->wk_cipher->ic_name, tid, (intmax_t) rsc, + "%s replay detected tid %d ", + k->wk_cipher->ic_name, tid, + (intmax_t) rsc, + (intmax_t) rsc, + (intmax_t) k->wk_keyrsc[tid], (intmax_t) k->wk_keyrsc[tid], k->wk_keyix, k->wk_rxkeyix); From owner-svn-src-head@freebsd.org Fri Jun 5 00:16:55 2020 Return-Path: Delivered-To: svn-src-head@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 0F0A4338261; Fri, 5 Jun 2020 00:16:55 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dNVt6h3Hz4Nmj; Fri, 5 Jun 2020 00:16:54 +0000 (UTC) (envelope-from adrian@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 C55A68457; Fri, 5 Jun 2020 00:16:54 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0550Gsjb013652; Fri, 5 Jun 2020 00:16:54 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0550Gsnm013650; Fri, 5 Jun 2020 00:16:54 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050016.0550Gsnm013650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 00:16:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361813 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361813 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 00:16:55 -0000 Author: adrian Date: Fri Jun 5 00:16:54 2020 New Revision: 361813 URL: https://svnweb.freebsd.org/changeset/base/361813 Log: [net80211] Add some more debugging during scanning I'm trying to chase down more weird "I am not doing an incremental scan when being asked" issues so these debugging statements help. Notably, I've added more debugging around reasons why the scan is skipped - eg because the cache is considered hot. This should be a no-op unless you care about the debugging output! Modified: head/sys/net80211/ieee80211_scan_sta.c head/sys/net80211/ieee80211_scan_sw.c Modified: head/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- head/sys/net80211/ieee80211_scan_sta.c Fri Jun 5 00:14:02 2020 (r361812) +++ head/sys/net80211/ieee80211_scan_sta.c Fri Jun 5 00:16:54 2020 (r361813) @@ -1276,6 +1276,8 @@ sta_pick_bss(struct ieee80211_scan_state *ss, struct i * handle notification that this has completed. */ ss->ss_flags &= ~IEEE80211_SCAN_NOPICK; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: nopick; return 1\n", __func__); return 1; } /* @@ -1285,7 +1287,9 @@ sta_pick_bss(struct ieee80211_scan_state *ss, struct i /* NB: unlocked read should be ok */ if (TAILQ_FIRST(&st->st_entry) == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: no scan candidate\n", __func__); + "%s: no scan candidate, join=%d, return 0\n", + __func__, + !! (ss->ss_flags & IEEE80211_SCAN_NOJOIN)); if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) return 0; notfound: @@ -1310,6 +1314,8 @@ notfound: chan = demote11b(vap, chan); if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: terminate scan; return 1\n", __func__); return 1; /* terminate scan */ } Modified: head/sys/net80211/ieee80211_scan_sw.c ============================================================================== --- head/sys/net80211/ieee80211_scan_sw.c Fri Jun 5 00:14:02 2020 (r361812) +++ head/sys/net80211/ieee80211_scan_sw.c Fri Jun 5 00:16:54 2020 (r361813) @@ -298,6 +298,11 @@ ieee80211_swscan_check_scan(const struct ieee80211_sca * use. Also discard any frames that might come * in while temporarily marked as scanning. */ + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "cache hot; ic_lastscan=%d, scanvalid=%d, ticks=%d\n", + ic->ic_lastscan, + vap->iv_scanvalid, + ticks); SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_DISCARD; ic->ic_flags |= IEEE80211_F_SCAN; @@ -307,6 +312,8 @@ ieee80211_swscan_check_scan(const struct ieee80211_sca ic->ic_flags &= ~IEEE80211_F_SCAN; SCAN_PRIVATE(ss)->ss_iflags &= ~ISCAN_DISCARD; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: scan_end returned %d\n", __func__, result); if (result) { ieee80211_notify_scan_done(vap); return 1; From owner-svn-src-head@freebsd.org Fri Jun 5 01:00:58 2020 Return-Path: Delivered-To: svn-src-head@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 1E3F2339679; Fri, 5 Jun 2020 01:00:58 +0000 (UTC) (envelope-from mckusick@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dPTj74Bpz4VH0; Fri, 5 Jun 2020 01:00:57 +0000 (UTC) (envelope-from mckusick@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 D450C8C81; Fri, 5 Jun 2020 01:00:57 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05510vwQ040282; Fri, 5 Jun 2020 01:00:57 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05510uuF040273; Fri, 5 Jun 2020 01:00:56 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <202006050100.05510uuF040273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Fri, 5 Jun 2020 01:00:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361814 - in head/sys/ufs: ffs ufs X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: in head/sys/ufs: ffs ufs X-SVN-Commit-Revision: 361814 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 01:00:58 -0000 Author: mckusick Date: Fri Jun 5 01:00:55 2020 New Revision: 361814 URL: https://svnweb.freebsd.org/changeset/base/361814 Log: Further evaluation of the POSIX spec for fdatasync() shows that it requires that new data on growing files be accessible. Thus, the the fsyncdata() system call must update the on-disk inode when the size of the file has changed. This commit adds another inode update flag, IN_SIZEMOD, that gets set any time that the file size changes. If either the IN_IBLKDATA or the IN_SIZEMOD flag is set when fdatasync() is called, the associated inode is synchronously written to disk. We could have overloaded the IN_IBLKDATA flag to also track size changes since the only (current) use case for these flags are for fsyncdata(), but it does seem useful for possible future uses to separately track the file size changes and the inode block pointer changes. Reviewed by: kib MFC with: -r361785 Differential revision: https://reviews.freebsd.org/D25072 Modified: head/sys/ufs/ffs/ffs_alloc.c head/sys/ufs/ffs/ffs_balloc.c head/sys/ufs/ffs/ffs_inode.c head/sys/ufs/ffs/ffs_snapshot.c head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ffs/ffs_vnops.c head/sys/ufs/ufs/inode.h head/sys/ufs/ufs/ufs_lookup.c head/sys/ufs/ufs/ufs_vnops.c Modified: head/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_alloc.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ffs/ffs_alloc.c Fri Jun 5 01:00:55 2020 (r361814) @@ -3306,7 +3306,7 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) break; ip = VTOI(vp); DIP_SET(ip, i_size, cmd.size); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_MODIFIED); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_MODIFIED); error = ffs_update(vp, 1); vput(vp); break; Modified: head/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_balloc.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ffs/ffs_balloc.c Fri Jun 5 01:00:55 2020 (r361814) @@ -155,7 +155,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i dp->di_size = ip->i_size; dp->di_db[nb] = dbtofsb(fs, bp->b_blkno); UFS_INODE_SET_FLAG(ip, - IN_CHANGE | IN_UPDATE | IN_IBLKDATA); + IN_SIZEMOD | IN_CHANGE | IN_UPDATE | IN_IBLKDATA); if (flags & IO_SYNC) bwrite(bp); else if (DOINGASYNC(vp)) @@ -648,7 +648,8 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i dp->di_extsize = smalllblktosize(fs, nb + 1); dp->di_extb[nb] = dbtofsb(fs, bp->b_blkno); bp->b_xflags |= BX_ALTDATA; - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_IBLKDATA); + UFS_INODE_SET_FLAG(ip, + IN_SIZEMOD | IN_CHANGE | IN_IBLKDATA); if (flags & IO_SYNC) bwrite(bp); else @@ -751,8 +752,8 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i ip->i_size = smalllblktosize(fs, nb + 1); dp->di_size = ip->i_size; dp->di_db[nb] = dbtofsb(fs, bp->b_blkno); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE | - IN_IBLKDATA); + UFS_INODE_SET_FLAG(ip, + IN_SIZEMOD |IN_CHANGE | IN_UPDATE | IN_IBLKDATA); if (flags & IO_SYNC) bwrite(bp); else Modified: head/sys/ufs/ffs/ffs_inode.c ============================================================================== --- head/sys/ufs/ffs/ffs_inode.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ffs/ffs_inode.c Fri Jun 5 01:00:55 2020 (r361814) @@ -279,7 +279,7 @@ ffs_truncate(vp, length, flags, cred) oldblks[i] = ip->i_din2->di_extb[i]; ip->i_din2->di_extb[i] = 0; } - UFS_INODE_SET_FLAG(ip, IN_CHANGE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); if ((error = ffs_update(vp, waitforupdate))) return (error); for (i = 0; i < UFS_NXADDR; i++) { @@ -303,7 +303,7 @@ ffs_truncate(vp, length, flags, cred) bzero(SHORTLINK(ip), (u_int)ip->i_size); ip->i_size = 0; DIP_SET(ip, i_size, 0); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); if (needextclean) goto extclean; return (ffs_update(vp, waitforupdate)); @@ -343,7 +343,7 @@ ffs_truncate(vp, length, flags, cred) bdwrite(bp); else bawrite(bp); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); return (ffs_update(vp, waitforupdate)); } /* @@ -429,6 +429,7 @@ ffs_truncate(vp, length, flags, cred) if (blkno != 0 && offset == 0) { ip->i_size = length; DIP_SET(ip, i_size, length); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); } else { lbn = lblkno(fs, length); flags |= BA_CLRBUF; @@ -463,6 +464,7 @@ ffs_truncate(vp, length, flags, cred) bdwrite(bp); else bawrite(bp); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); } /* * Calculate index into inode's block list of @@ -512,6 +514,7 @@ ffs_truncate(vp, length, flags, cred) } ip->i_size = osize; DIP_SET(ip, i_size, osize); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); error = vtruncbuf(vp, length, fs->fs_bsize); if (error && (allerror == 0)) @@ -578,6 +581,7 @@ ffs_truncate(vp, length, flags, cred) oldspace = blksize(fs, ip, lastblock); ip->i_size = length; DIP_SET(ip, i_size, length); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); newspace = blksize(fs, ip, lastblock); if (newspace == 0) panic("ffs_truncate: newspace"); @@ -623,7 +627,7 @@ done: DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - blocksreleased); else /* sanity */ DIP_SET(ip, i_blocks, 0); - UFS_INODE_SET_FLAG(ip, IN_CHANGE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); #ifdef QUOTA (void) chkdq(ip, -blocksreleased, NOCRED, FORCE); #endif Modified: head/sys/ufs/ffs/ffs_snapshot.c ============================================================================== --- head/sys/ufs/ffs/ffs_snapshot.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ffs/ffs_snapshot.c Fri Jun 5 01:00:55 2020 (r361814) @@ -319,7 +319,7 @@ restart: goto out; ip->i_size = lblktosize(fs, (off_t)numblks); DIP_SET(ip, i_size, ip->i_size); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); error = readblock(vp, bp, numblks - 1); bawrite(bp); if (error != 0) Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ffs/ffs_softdep.c Fri Jun 5 01:00:55 2020 (r361814) @@ -6709,6 +6709,7 @@ softdep_journal_freeblocks(ip, cred, length, flags) } ip->i_size = length; DIP_SET(ip, i_size, ip->i_size); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); datablocks = DIP(ip, i_blocks) - extblocks; if (length != 0) datablocks = blkcount(fs, datablocks, length); @@ -6719,6 +6720,7 @@ softdep_journal_freeblocks(ip, cred, length, flags) setup_freeext(freeblks, ip, i, needj); ip->i_din2->di_extsize = 0; datablocks += extblocks; + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); } #ifdef QUOTA /* Reference the quotas in case the block count is wrong in the end. */ @@ -6829,7 +6831,7 @@ softdep_journal_freeblocks(ip, cred, length, flags) } ip->i_size = length; DIP_SET(ip, i_size, length); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); allocbuf(bp, frags); ffs_update(vp, 0); bawrite(bp); @@ -6976,6 +6978,7 @@ softdep_setup_freeblocks(ip, length, flags) setup_freeindir(freeblks, ip, i, -lbn -i, 0); ip->i_size = 0; DIP_SET(ip, i_size, 0); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); datablocks = DIP(ip, i_blocks) - extblocks; } if ((flags & IO_EXT) != 0) { @@ -6983,6 +6986,7 @@ softdep_setup_freeblocks(ip, length, flags) setup_freeext(freeblks, ip, i, 0); ip->i_din2->di_extsize = 0; datablocks += extblocks; + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); } #ifdef QUOTA /* Reference the quotas in case the block count is wrong in the end. */ Modified: head/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vnops.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ffs/ffs_vnops.c Fri Jun 5 01:00:55 2020 (r361814) @@ -416,7 +416,7 @@ next: error = ffs_update(vp, 1); if (DOINGSUJ(vp)) softdep_journal_fsync(VTOI(vp)); - } else if ((ip->i_flags & IN_IBLKDATA) != 0) { + } else if ((ip->i_flags & (IN_SIZEMOD | IN_IBLKDATA)) != 0) { error = ffs_update(vp, 1); } return (error); @@ -825,6 +825,7 @@ ffs_write(ap) if (uio->uio_offset + xfersize > ip->i_size) { ip->i_size = uio->uio_offset + xfersize; DIP_SET(ip, i_size, ip->i_size); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); } size = blksize(fs, ip, lbn) - bp->b_resid; @@ -1108,8 +1109,10 @@ ffs_extwrite(struct vnode *vp, struct uio *uio, int io if ((bp->b_flags & B_CACHE) == 0 && fs->fs_bsize <= xfersize) vfs_bio_clrbuf(bp); - if (uio->uio_offset + xfersize > dp->di_extsize) + if (uio->uio_offset + xfersize > dp->di_extsize) { dp->di_extsize = uio->uio_offset + xfersize; + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE); + } size = sblksize(fs, dp->di_extsize, lbn) - bp->b_resid; if (size < xfersize) Modified: head/sys/ufs/ufs/inode.h ============================================================================== --- head/sys/ufs/ufs/inode.h Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ufs/inode.h Fri Jun 5 01:00:55 2020 (r361814) @@ -127,19 +127,21 @@ struct inode { #define IN_LAZYMOD 0x0020 /* Modified, but don't write yet. */ #define IN_LAZYACCESS 0x0040 /* Process IN_ACCESS after the suspension finished */ -#define IN_EA_LOCKED 0x0080 -#define IN_EA_LOCKWAIT 0x0100 +#define IN_EA_LOCKED 0x0080 /* Extended attributes locked */ +#define IN_EA_LOCKWAIT 0x0100 /* Want extended attributes lock */ #define IN_TRUNCATED 0x0200 /* Journaled truncation pending. */ #define IN_UFS2 0x0400 /* UFS2 vs UFS1 */ #define IN_IBLKDATA 0x0800 /* datasync requires inode block update */ +#define IN_SIZEMOD 0x1000 /* Inode size has been modified */ -#define PRINT_INODE_FLAGS "\20\20b16\17b15\16b14\15b13" \ +#define PRINT_INODE_FLAGS "\20\20b16\17b15\16b14\15sizemod" \ "\14iblkdata\13is_ufs2\12truncated\11ea_lockwait\10ea_locked" \ "\7lazyaccess\6lazymod\5needsync\4modified\3update\2change\1access" #define UFS_INODE_FLAG_LAZY_MASK \ - (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE | IN_LAZYMOD | IN_LAZYACCESS) + (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE | IN_LAZYMOD | \ + IN_LAZYACCESS) /* * Some flags can persist a vnode transitioning to 0 hold count and being tkaen * off the list. Modified: head/sys/ufs/ufs/ufs_lookup.c ============================================================================== --- head/sys/ufs/ufs/ufs_lookup.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ufs/ufs_lookup.c Fri Jun 5 01:00:55 2020 (r361814) @@ -556,7 +556,7 @@ found: ufs_dirbad(dp, i_offset, "i_size too small"); dp->i_size = i_offset + DIRSIZ(OFSFMT(vdp), ep); DIP_SET(dp, i_size, dp->i_size); - UFS_INODE_SET_FLAG(dp, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(dp, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); } brelse(bp); @@ -918,7 +918,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp, isrename) dp->i_size = dp->i_offset + DIRBLKSIZ; DIP_SET(dp, i_size, dp->i_size); dp->i_endoff = dp->i_size; - UFS_INODE_SET_FLAG(dp, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(dp, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); dirp->d_reclen = DIRBLKSIZ; blkoff = dp->i_offset & (VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_iosize - 1); @@ -1004,6 +1004,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp, isrename) if (dp->i_offset + dp->i_count > dp->i_size) { dp->i_size = dp->i_offset + dp->i_count; DIP_SET(dp, i_size, dp->i_size); + UFS_INODE_SET_FLAG(dp, IN_SIZEMOD | IN_MODIFIED); } /* * Get the block containing the space for the new directory entry. Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Fri Jun 5 00:16:54 2020 (r361813) +++ head/sys/ufs/ufs/ufs_vnops.c Fri Jun 5 01:00:55 2020 (r361814) @@ -1932,7 +1932,7 @@ ufs_mkdir(ap) goto bad; ip->i_size = DIRBLKSIZ; DIP_SET(ip, i_size, DIRBLKSIZ); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); bcopy((caddr_t)&dirtemplate, (caddr_t)bp->b_data, sizeof dirtemplate); if (DOINGSOFTDEP(tvp)) { /* @@ -2119,7 +2119,7 @@ ufs_symlink(ap) bcopy(ap->a_target, SHORTLINK(ip), len); ip->i_size = len; DIP_SET(ip, i_size, len); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); + UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); error = UFS_UPDATE(vp, 0); } else error = vn_rdwr(UIO_WRITE, vp, __DECONST(void *, ap->a_target), From owner-svn-src-head@freebsd.org Fri Jun 5 02:21:46 2020 Return-Path: Delivered-To: svn-src-head@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 9843D33BA96; Fri, 5 Jun 2020 02:21:46 +0000 (UTC) (envelope-from mav@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dRGy3Xyfz4gD2; Fri, 5 Jun 2020 02:21:46 +0000 (UTC) (envelope-from mav@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 74E619C07; Fri, 5 Jun 2020 02:21:46 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0552LkJA091615; Fri, 5 Jun 2020 02:21:46 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0552Lk2u091614; Fri, 5 Jun 2020 02:21:46 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202006050221.0552Lk2u091614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 5 Jun 2020 02:21:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361816 - head/sys/dev/ahci X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/dev/ahci X-SVN-Commit-Revision: 361816 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 02:21:46 -0000 Author: mav Date: Fri Jun 5 02:21:46 2020 New Revision: 361816 URL: https://svnweb.freebsd.org/changeset/base/361816 Log: Limit AHCI to only one MSI if more is not needed. My AMD Ryzen system has 4 AHCI controllers, each supporting 16 MSI vectors. Since two of the controllers have only one SATA port, limit to single MSI saves system 30 interrupt vectors for free. It may be possible to also limit number of MSI vectors to 4 and 8 for the other two controllers, but according to the AHCI specification after that controllers may revert to only one vector, that would be a bigger loss to risk. MFC after: 2 weeks Modified: head/sys/dev/ahci/ahci_pci.c Modified: head/sys/dev/ahci/ahci_pci.c ============================================================================== --- head/sys/dev/ahci/ahci_pci.c Fri Jun 5 01:44:33 2020 (r361815) +++ head/sys/dev/ahci/ahci_pci.c Fri Jun 5 02:21:46 2020 (r361816) @@ -470,6 +470,7 @@ ahci_pci_attach(device_t dev) uint8_t revid = pci_get_revid(dev); int msi_count, msix_count; uint8_t table_bar = 0, pba_bar = 0; + uint32_t caps, pi; msi_count = pci_msi_count(dev); msix_count = pci_msix_count(dev); @@ -604,9 +605,12 @@ ahci_pci_attach(device_t dev) /* Setup MSI register parameters */ /* Process hints. */ + caps = ATA_INL(ctlr->r_mem, AHCI_CAP); + pi = ATA_INL(ctlr->r_mem, AHCI_PI); if (ctlr->quirks & AHCI_Q_NOMSI) ctlr->msi = 0; - else if (ctlr->quirks & AHCI_Q_1MSI) + else if ((ctlr->quirks & AHCI_Q_1MSI) || + ((caps & (AHCI_CAP_NPMASK | AHCI_CAP_CCCS)) == 0 && pi == 1)) ctlr->msi = 1; else ctlr->msi = 2; From owner-svn-src-head@freebsd.org Fri Jun 5 04:04:48 2020 Return-Path: Delivered-To: svn-src-head@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 6794233E505; Fri, 5 Jun 2020 04:04:48 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dTYr27xSz3f3t; Fri, 5 Jun 2020 04:04:48 +0000 (UTC) (envelope-from adrian@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 44B47B10E; Fri, 5 Jun 2020 04:04:48 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05544mfR056155; Fri, 5 Jun 2020 04:04:48 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05544mSS056154; Fri, 5 Jun 2020 04:04:48 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050404.05544mSS056154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 04:04:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361819 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361819 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 04:04:48 -0000 Author: adrian Date: Fri Jun 5 04:04:47 2020 New Revision: 361819 URL: https://svnweb.freebsd.org/changeset/base/361819 Log: [net80211] Add field definition for A-MSDU inside A-MPDU. Now that I have A-MSDU and A-MPDU coexisting together, we need to actually announce if (a) it's permitted and (b) figure out if we should use it when transmitting. This just adds the field; it doesn't yet include it in ADDBA exchanges. Modified: head/sys/net80211/ieee80211.h Modified: head/sys/net80211/ieee80211.h ============================================================================== --- head/sys/net80211/ieee80211.h Fri Jun 5 02:56:42 2020 (r361818) +++ head/sys/net80211/ieee80211.h Fri Jun 5 04:04:47 2020 (r361819) @@ -430,6 +430,8 @@ struct ieee80211_action_ht_mimopowersave { #define IEEE80211_BAPS_TID_S 2 #define IEEE80211_BAPS_POLICY 0x0002 /* block ack policy */ #define IEEE80211_BAPS_POLICY_S 1 +#define IEEE80211_BAPS_AMSDU 0x0001 /* A-MSDU permitted */ +#define IEEE80211_BAPS_AMSDU_S 0 #define IEEE80211_BAPS_POLICY_DELAYED (0< Delivered-To: svn-src-head@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 05A9833E9FD; Fri, 5 Jun 2020 04:24:35 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dV0f6SpBz3y1t; Fri, 5 Jun 2020 04:24:34 +0000 (UTC) (envelope-from adrian@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 D89CEAD50; Fri, 5 Jun 2020 04:24:34 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0554OYwW068374; Fri, 5 Jun 2020 04:24:34 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0554OYsr068373; Fri, 5 Jun 2020 04:24:34 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050424.0554OYsr068373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 04:24:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361820 - head/sys/dev/iwn X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/iwn X-SVN-Commit-Revision: 361820 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 04:24:35 -0000 Author: adrian Date: Fri Jun 5 04:24:34 2020 New Revision: 361820 URL: https://svnweb.freebsd.org/changeset/base/361820 Log: [iwn] Set default ampdu parameters. These are from the linux iwlwifi driver ;the default use smaller maximum AMPDUs (8k) and a much smaller density (none.) The latter could cause stability issues. Tested: * Tested on Intel 6300, STA mode. Differential Revision: https://reviews.freebsd.org/D25113 Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Fri Jun 5 04:04:47 2020 (r361819) +++ head/sys/dev/iwn/if_iwn.c Fri Jun 5 04:24:34 2020 (r361820) @@ -1351,6 +1351,8 @@ iwn_vap_create(struct ieee80211com *ic, const char nam ivp->iv_newstate = vap->iv_newstate; vap->iv_newstate = iwn_newstate; sc->ivap[IWN_RXON_BSS_CTX] = vap; + vap->iv_ampdu_rxmax = IEEE80211_HTCAP_MAXRXAMPDU_64K; + vap->iv_ampdu_density = IEEE80211_HTCAP_MPDUDENSITY_4; /* 4uS */ ieee80211_ratectl_init(vap); /* Complete setup. */ From owner-svn-src-head@freebsd.org Fri Jun 5 06:07:24 2020 Return-Path: Delivered-To: svn-src-head@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 8104F3411B0; Fri, 5 Jun 2020 06:07:24 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dXHJ2srzz48Vb; Fri, 5 Jun 2020 06:07:24 +0000 (UTC) (envelope-from adrian@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 43E11C432; Fri, 5 Jun 2020 06:07:24 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05567OWv030514; Fri, 5 Jun 2020 06:07:24 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05567OWa030513; Fri, 5 Jun 2020 06:07:24 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050607.05567OWa030513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 06:07:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361821 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361821 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 06:07:24 -0000 Author: adrian Date: Fri Jun 5 06:07:23 2020 New Revision: 361821 URL: https://svnweb.freebsd.org/changeset/base/361821 Log: [net80211] Add some TODOs around A-MSDU in A-MPDU negotiation. net80211 currently doesn't negotiate A-MSDU in A-MPDU during ADDBA. I've added the field in net80211 and this commit: * Prints out the ADDBA field value during ADDBA; * Adds some comments around where I need to follow up with some negotiation logic. Right now we don't have a driver flag anywhere which controls whether A-MSDU in A-MPDU is allowed. I know it works (I have it manually turned on at home on a couple test APs, heh!) but I can't flip it on until we can negotiate it. Tested: * AR9380, STA/AP mode, printing out ADDBA requests Modified: head/sys/net80211/ieee80211_ht.c Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Fri Jun 5 04:24:34 2020 (r361820) +++ head/sys/net80211/ieee80211_ht.c Fri Jun 5 06:07:23 2020 (r361821) @@ -2237,12 +2237,13 @@ ht_recv_action_ba_addba_request(struct ieee80211_node IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "recv ADDBA request: dialogtoken %u baparamset 0x%x " - "(tid %d bufsiz %d) batimeout %d baseqctl %d:%d", + "(tid %d bufsiz %d) batimeout %d baseqctl %d:%d amsdu %d", dialogtoken, baparamset, tid, MS(baparamset, IEEE80211_BAPS_BUFSIZ), batimeout, MS(baseqctl, IEEE80211_BASEQ_START), - MS(baseqctl, IEEE80211_BASEQ_FRAG)); + MS(baseqctl, IEEE80211_BASEQ_FRAG), + MS(baparamset, IEEE80211_BAPS_AMSDU)); rap = &ni->ni_rx_ampdu[tid]; @@ -2274,6 +2275,7 @@ ht_recv_action_ba_addba_request(struct ieee80211_node | SM(tid, IEEE80211_BAPS_TID) | SM(rap->rxa_wnd, IEEE80211_BAPS_BUFSIZ) ; + /* XXX AMSDU in AMPDU? */ args[3] = 0; args[4] = 0; ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, @@ -2346,6 +2348,8 @@ ht_recv_action_ba_addba_response(struct ieee80211_node return 0; } #endif + + /* XXX TODO: check AMSDU in AMPDU configuration */ IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "recv ADDBA response: dialogtoken %u code %d " "baparamset 0x%x (tid %d bufsiz %d) batimeout %d", @@ -2506,6 +2510,8 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, | SM(tid, IEEE80211_BAPS_TID) | SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ) ; + /* XXX TODO: check AMSDU in AMPDU configuration */ + args[3] = 0; /* batimeout */ /* NB: do first so there's no race against reply */ if (!ic->ic_addba_request(ni, tap, dialogtoken, args[2], args[3])) { From owner-svn-src-head@freebsd.org Fri Jun 5 06:21:25 2020 Return-Path: Delivered-To: svn-src-head@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 B4D31341908; Fri, 5 Jun 2020 06:21:25 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dXbT4KzDz4B36; Fri, 5 Jun 2020 06:21:25 +0000 (UTC) (envelope-from adrian@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 8F60BC997; Fri, 5 Jun 2020 06:21:25 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0556LPcx038482; Fri, 5 Jun 2020 06:21:25 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0556LO1X038473; Fri, 5 Jun 2020 06:21:24 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050621.0556LO1X038473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 06:21:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361822 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361822 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 06:21:25 -0000 Author: adrian Date: Fri Jun 5 06:21:23 2020 New Revision: 361822 URL: https://svnweb.freebsd.org/changeset/base/361822 Log: [net80211] Migrate short slot time configuration into per-vap and deferred taskqueue updates. The 11b/11g ERP and slot time update handling are two things which weren't migrated into the per-VAP state when Sam did the initial VAP work. That makes sense for a lot of setups where net80211 is driving radio state and the radio only cares about the shared state. However, as noted by a now deleted comment, the ERP and slot time updates aren't EXACTLY correct/accurate - they only take into account the most RECENTLY created VAP, and the state updates when one creates/destroys VAPs isn't exactly great. So: * track the short slot logic per VAP; * whenever the slot time configuration changes, just push it into a deferred task queue update so drivers don't have to serialise it themselves; * if a driver registers a per-VAP slot time handler then it'll just get the per VAP one; * .. if a driver registers a global one then the legacy behaviour is maintained - a single slot time is calculated and pushed out. Note that the calculated slot time is better than the existing logic - if ANY of the VAPs require long slot then it's disabled for all VAPs rather than whatever the last configured VAP did. Now, this isn't entirely complete - the rest of ERP tracking around short/long slot capable station tracking needs to be converted into per-VAP, as well as the preamble/barker flags. Luckily those also can be done in a similar fashion - keep per-VAP counters/flags and unify them before doing the driver update. I'll defer that work until later. All the existing drivers can keep doing what they're doing with the global slot time flags as that is maintained. One driver (iwi) used the per-VAP flags instead of the ic flags, so now that driver will work properly. This unblocks some ath10k porting work as the firmware takes the slot time configuration per-VAP rather than globally, and some firmware handles STA+AP and STA+STA (on same/different channels) configurations where the firmware will switch slot time as appropriate. Tested: * AR9380, STA/AP mode * AR9880 (ath10k), STA mode Modified: head/sys/net80211/ieee80211.c head/sys/net80211/ieee80211_node.c head/sys/net80211/ieee80211_output.c head/sys/net80211/ieee80211_phy.h head/sys/net80211/ieee80211_proto.c head/sys/net80211/ieee80211_proto.h head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_var.h Modified: head/sys/net80211/ieee80211.c ============================================================================== --- head/sys/net80211/ieee80211.c Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211.c Fri Jun 5 06:21:23 2020 (r361822) @@ -645,6 +645,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ie ieee80211_scan_vattach(vap); ieee80211_regdomain_vattach(vap); ieee80211_radiotap_vattach(vap); + ieee80211_vap_reset_erp(vap); ieee80211_ratectl_set(vap, IEEE80211_RATECTL_NONE); return 0; @@ -2200,7 +2201,7 @@ ieee80211_setmode(struct ieee80211com *ic, enum ieee80 ieee80211_setbasicrates(&ic->ic_sup_rates[mode], mode); ic->ic_curmode = mode; - ieee80211_reset_erp(ic); /* reset ERP state */ + ieee80211_reset_erp(ic); /* reset global ERP state */ return 0; } Modified: head/sys/net80211/ieee80211_node.c ============================================================================== --- head/sys/net80211/ieee80211_node.c Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_node.c Fri Jun 5 06:21:23 2020 (r361822) @@ -446,7 +446,7 @@ ieee80211_reset_bss(struct ieee80211vap *vap) ieee80211_node_table_reset(&ic->ic_sta, vap); /* XXX multi-bss: wrong */ - ieee80211_reset_erp(ic); + ieee80211_vap_reset_erp(vap); ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr); KASSERT(ni != NULL, ("unable to setup initial BSS node")); @@ -682,7 +682,7 @@ ieee80211_ibss_merge(struct ieee80211_node *ni) "%s: new bssid %s: %s preamble, %s slot time%s\n", __func__, ether_sprintf(ni->ni_bssid), ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", - ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", + vap->iv_flags&IEEE80211_F_SHSLOT ? "short" : "long", ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "" ); return ieee80211_sta_join1(ieee80211_ref_node(ni)); @@ -881,7 +881,7 @@ ieee80211_sta_join1(struct ieee80211_node *selbs) * the auto-select case; this should be redundant if the * mode is locked. */ - ieee80211_reset_erp(ic); + ieee80211_vap_reset_erp(vap); ieee80211_wme_initparams(vap); if (vap->iv_opmode == IEEE80211_M_STA) { @@ -2645,6 +2645,7 @@ static void ieee80211_node_join_11g(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap = ni->ni_vap; IEEE80211_LOCK_ASSERT(ic); @@ -2660,14 +2661,13 @@ ieee80211_node_join_11g(struct ieee80211_node *ni) IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ASSOC, ni, "station needs long slot time, count %d", ic->ic_longslotsta); - /* XXX vap's w/ conflicting needs won't work */ if (!IEEE80211_IS_CHAN_108G(ic->ic_bsschan)) { /* * Don't force slot time when switched to turbo * mode as non-ERP stations won't be present; this * need only be done when on the normal G channel. */ - ieee80211_set_shortslottime(ic, 0); + ieee80211_vap_set_shortslottime(vap, 0); } } /* @@ -2757,7 +2757,7 @@ ieee80211_node_join(struct ieee80211_node *ni, int res "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s", IEEE80211_NODE_AID(ni), ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long", - ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long", + vap->iv_flags & IEEE80211_F_SHSLOT ? "short" : "long", ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", /* XXX update for VHT string */ @@ -2810,6 +2810,7 @@ static void ieee80211_node_leave_11g(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap = ni->ni_vap; IEEE80211_LOCK_ASSERT(ic); @@ -2838,7 +2839,7 @@ ieee80211_node_leave_11g(struct ieee80211_node *ni) IEEE80211_MSG_ASSOC, "%s: re-enable use of short slot time\n", __func__); - ieee80211_set_shortslottime(ic, 1); + ieee80211_vap_set_shortslottime(vap, 1); } } } Modified: head/sys/net80211/ieee80211_output.c ============================================================================== --- head/sys/net80211/ieee80211_output.c Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_output.c Fri Jun 5 06:21:23 2020 (r361822) @@ -2522,7 +2522,7 @@ ieee80211_getcapinfo(struct ieee80211vap *vap, struct if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && IEEE80211_IS_CHAN_2GHZ(chan)) capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; - if (ic->ic_flags & IEEE80211_F_SHSLOT) + if (vap->iv_flags & IEEE80211_F_SHSLOT) capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; if (IEEE80211_IS_CHAN_5GHZ(chan) && (vap->iv_flags & IEEE80211_F_DOTH)) capinfo |= IEEE80211_CAPINFO_SPECTRUM_MGMT; Modified: head/sys/net80211/ieee80211_phy.h ============================================================================== --- head/sys/net80211/ieee80211_phy.h Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_phy.h Fri Jun 5 06:21:23 2020 (r361822) @@ -55,8 +55,23 @@ #define IEEE80211_DUR_SHSLOT 9 /* ERP short slottime */ #define IEEE80211_DUR_OFDM_SLOT 9 /* OFDM slottime */ +/* + * For drivers that don't implement per-VAP slot time + * (ie, they rely on net80211 figuring out the union + * between VAPs to program a single radio) - return + * the current radio configured slot time. + */ #define IEEE80211_GET_SLOTTIME(ic) \ ((ic->ic_flags & IEEE80211_F_SHSLOT) ? \ + IEEE80211_DUR_SHSLOT : IEEE80211_DUR_SLOT) + +/* + * For drivers that implement per-VAP slot time; look + * at the per-VAP flags to determine whether this VAP + * is in short or long slot time. + */ +#define IEEE80211_VAP_GET_SLOTTIME(vap) \ + ((vap->iv_flags & IEEE80211_F_SHSLOT) ? \ IEEE80211_DUR_SHSLOT : IEEE80211_DUR_SLOT) /* Modified: head/sys/net80211/ieee80211_proto.c ============================================================================== --- head/sys/net80211/ieee80211_proto.c Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_proto.c Fri Jun 5 06:21:23 2020 (r361822) @@ -244,6 +244,7 @@ static void update_promisc(void *, int); static void update_channel(void *, int); static void update_chw(void *, int); static void vap_update_wme(void *, int); +static void vap_update_slot(void *, int); static void restart_vaps(void *, int); static void ieee80211_newstate_cb(void *, int); @@ -340,6 +341,7 @@ ieee80211_proto_vattach(struct ieee80211vap *vap) TASK_INIT(&vap->iv_nstate_task, 0, ieee80211_newstate_cb, vap); TASK_INIT(&vap->iv_swbmiss_task, 0, beacon_swmiss, vap); TASK_INIT(&vap->iv_wme_task, 0, vap_update_wme, vap); + TASK_INIT(&vap->iv_slot_task, 0, vap_update_slot, vap); /* * Install default tx rate handling: no fixed rate, lowest * supported rate for mgmt and multicast frames. Default @@ -750,24 +752,39 @@ ieee80211_fix_rate(struct ieee80211_node *ni, /* * Reset 11g-related state. + * + * This is for per-VAP ERP/11g state. + * + * Eventually everything in ieee80211_reset_erp() will be + * per-VAP and in here. */ void -ieee80211_reset_erp(struct ieee80211com *ic) +ieee80211_vap_reset_erp(struct ieee80211vap *vap) { - ic->ic_flags &= ~IEEE80211_F_USEPROT; - ic->ic_nonerpsta = 0; - ic->ic_longslotsta = 0; + struct ieee80211com *ic = vap->iv_ic; + /* * Short slot time is enabled only when operating in 11g * and not in an IBSS. We must also honor whether or not * the driver is capable of doing it. */ - ieee80211_set_shortslottime(ic, + ieee80211_vap_set_shortslottime(vap, IEEE80211_IS_CHAN_A(ic->ic_curchan) || IEEE80211_IS_CHAN_HT(ic->ic_curchan) || (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) && - ic->ic_opmode == IEEE80211_M_HOSTAP && + vap->iv_opmode == IEEE80211_M_HOSTAP && (ic->ic_caps & IEEE80211_C_SHSLOT))); +} + +/* + * Reset 11g-related state. + */ +void +ieee80211_reset_erp(struct ieee80211com *ic) +{ + ic->ic_flags &= ~IEEE80211_F_USEPROT; + ic->ic_nonerpsta = 0; + ic->ic_longslotsta = 0; /* * Set short preamble and ERP barker-preamble flags. */ @@ -782,18 +799,94 @@ ieee80211_reset_erp(struct ieee80211com *ic) } /* + * Deferred slot time update. + * + * For per-VAP slot time configuration, call the VAP + * method if the VAP requires it. Otherwise, just call the + * older global method. + * + * If the per-VAP method is called then it's expected that + * the driver/firmware will take care of turning the per-VAP + * flags into slot time configuration. + * + * If the per-VAP method is not called then the global flags will be + * flipped into sync with the VAPs; ic_flags IEEE80211_F_SHSLOT will + * be set only if all of the vaps will have it set. + */ +static void +vap_update_slot(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211vap *iv; + int num_shslot = 0, num_lgslot = 0; + + /* + * Per-VAP path - we've already had the flags updated; + * so just notify the driver and move on. + */ + if (vap->iv_updateslot != NULL) { + vap->iv_updateslot(vap); + return; + } + + /* + * Iterate over all of the VAP flags to update the + * global flag. + * + * If all vaps have short slot enabled then flip on + * short slot. If any vap has it disabled then + * we leave it globally disabled. This should provide + * correct behaviour in a multi-BSS scenario where + * at least one VAP has short slot disabled for some + * reason. + */ + IEEE80211_LOCK(ic); + TAILQ_FOREACH(iv, &ic->ic_vaps, iv_next) { + if (iv->iv_flags & IEEE80211_F_SHSLOT) + num_shslot++; + else + num_lgslot++; + } + IEEE80211_UNLOCK(ic); + + /* + * It looks backwards but - if the number of short slot VAPs + * is zero then we're not short slot. Else, we have one + * or more short slot VAPs and we're checking to see if ANY + * of them have short slot disabled. + */ + if (num_shslot == 0) + ic->ic_flags &= ~IEEE80211_F_SHSLOT; + else if (num_lgslot == 0) + ic->ic_flags |= IEEE80211_F_SHSLOT; + + /* + * Call the driver with our new global slot time flags. + */ + ic->ic_updateslot(ic); +} + +/* * Set the short slot time state and notify the driver. + * + * This is the per-VAP slot time state. */ void -ieee80211_set_shortslottime(struct ieee80211com *ic, int onoff) +ieee80211_vap_set_shortslottime(struct ieee80211vap *vap, int onoff) { + struct ieee80211com *ic = vap->iv_ic; + + /* + * Only modify the per-VAP slot time. + */ if (onoff) - ic->ic_flags |= IEEE80211_F_SHSLOT; + vap->iv_flags |= IEEE80211_F_SHSLOT; else - ic->ic_flags &= ~IEEE80211_F_SHSLOT; - /* notify driver */ - if (ic->ic_updateslot != NULL) - ic->ic_updateslot(ic); + vap->iv_flags &= ~IEEE80211_F_SHSLOT; + + /* schedule the deferred slot flag update and update */ + ieee80211_runtask(ic, &vap->iv_slot_task); } /* Modified: head/sys/net80211/ieee80211_proto.h ============================================================================== --- head/sys/net80211/ieee80211_proto.h Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_proto.h Fri Jun 5 06:21:23 2020 (r361822) @@ -154,8 +154,9 @@ uint16_t ieee80211_getcapinfo(struct ieee80211vap *, struct ieee80211_wme_state; uint8_t * ieee80211_add_wme_info(uint8_t *frm, struct ieee80211_wme_state *wme); +void ieee80211_vap_reset_erp(struct ieee80211vap *); void ieee80211_reset_erp(struct ieee80211com *); -void ieee80211_set_shortslottime(struct ieee80211com *, int onoff); +void ieee80211_vap_set_shortslottime(struct ieee80211vap *, int onoff); int ieee80211_iserp_rateset(const struct ieee80211_rateset *); void ieee80211_setbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); Modified: head/sys/net80211/ieee80211_sta.c ============================================================================== --- head/sys/net80211/ieee80211_sta.c Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_sta.c Fri Jun 5 06:21:23 2020 (r361822) @@ -1435,7 +1435,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf * * NB: we assume short preamble doesn't * change dynamically */ - ieee80211_set_shortslottime(ic, + ieee80211_vap_set_shortslottime(vap, IEEE80211_IS_CHAN_A(ic->ic_bsschan) || (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); ni->ni_capinfo = (ni->ni_capinfo &~ IEEE80211_CAPINFO_SHORT_SLOTTIME) @@ -1847,7 +1847,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf * ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; ic->ic_flags |= IEEE80211_F_USEBARKER; } - ieee80211_set_shortslottime(ic, + ieee80211_vap_set_shortslottime(vap, IEEE80211_IS_CHAN_A(ic->ic_curchan) || (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); /* @@ -1866,7 +1866,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf * ISREASSOC(subtype) ? "re" : "", IEEE80211_NODE_AID(ni), ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", - ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", + vap->iv_flags&IEEE80211_F_SHSLOT ? "short" : "long", ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", ni->ni_flags & IEEE80211_NODE_HT ? Modified: head/sys/net80211/ieee80211_var.h ============================================================================== --- head/sys/net80211/ieee80211_var.h Fri Jun 5 06:07:23 2020 (r361821) +++ head/sys/net80211/ieee80211_var.h Fri Jun 5 06:21:23 2020 (r361822) @@ -563,6 +563,10 @@ struct ieee80211vap { const struct wmeParams *wme_params); struct task iv_wme_task; /* deferred VAP WME update */ + /* update device state for 802.11 slot time change */ + void (*iv_updateslot)(struct ieee80211vap *); + struct task iv_slot_task; /* deferred slot time update */ + uint64_t iv_spare[6]; }; MALLOC_DECLARE(M_80211_VAP); From owner-svn-src-head@freebsd.org Fri Jun 5 07:12:41 2020 Return-Path: Delivered-To: svn-src-head@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 252F2342D7D; Fri, 5 Jun 2020 07:12:41 +0000 (UTC) (envelope-from danfe@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dYkd0C3tz4HWg; Fri, 5 Jun 2020 07:12:41 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id F18271C83A; Fri, 5 Jun 2020 07:12:40 +0000 (UTC) Date: Fri, 5 Jun 2020 07:12:40 +0000 From: Alexey Dokuchaev To: Cy Schubert Cc: Conrad Meyer , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361791 - head/etc/mtree Message-ID: <20200605071240.GA98879@FreeBSD.org> References: <202006041604.054G4KAb098395@repo.freebsd.org> <202006041619.054GJZ3C018924@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006041619.054GJZ3C018924@slippy.cwsent.com> X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 07:12:41 -0000 On Thu, Jun 04, 2020 at 09:19:35AM -0700, Cy Schubert wrote: > In message <202006041604.054G4KAb098395@repo.freebsd.org>, Conrad Meyer > writes: > > New Revision: 361791 > > URL: https://svnweb.freebsd.org/changeset/base/361791 > > > > Log: > > Restrict default /root permissions > > > > ... > > @@ -117,7 +117,7 @@ > > .. > > rescue > > .. > > - root > > + root mode=0750 > > .. > > Recent CIS benchmarks recommend 0700. Please, let's keep a reasonable balance between security and usability. I often visit /root as a regular user (wheel'ed), and 0700 would make it real PITA. ./danfe From owner-svn-src-head@freebsd.org Fri Jun 5 07:38:11 2020 Return-Path: Delivered-To: svn-src-head@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 CD913343409; Fri, 5 Jun 2020 07:38:11 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dZJ356cxz4KrH; Fri, 5 Jun 2020 07:38:11 +0000 (UTC) (envelope-from adrian@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 AADD4D6F3; Fri, 5 Jun 2020 07:38:11 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0557cBTO085835; Fri, 5 Jun 2020 07:38:11 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0557cBWA085832; Fri, 5 Jun 2020 07:38:11 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050738.0557cBWA085832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 07:38:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361825 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361825 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 07:38:11 -0000 Author: adrian Date: Fri Jun 5 07:38:10 2020 New Revision: 361825 URL: https://svnweb.freebsd.org/changeset/base/361825 Log: [net80211] Add initial A-MSDU in A-MPDU negotation support. This is hopefully a big no-op unless you're running some extra patches to flip on A-MSDU options in a driver. 802.11n supports sending A-MSDU in A-MPDU. That lets you do things like pack small frames into an A-MSDU and stuff /those/ into an A-MPDU. It allows for much more efficient airtime because you're not wasting time sending small frames - which is still a problem when doing A-MPDU as there's still per-frame overhead and minimum A-MPDU density requirements. It, however, is optional for 802.11n. A lot of stuff doesn't advertise it (but does it, just wait!); and I know that ath10k does it and my ath(4) driver work supports it. Now, 802.11ac makes A-MSDU in A-MPDU something that can happen more frequently, because even though you can send very large A-MPDUs (like 1 megabyte and larger) you still have the small frame problem. So, 802.11ac NICs like ath10k and iwm will support A-MSDU in A-MPDU out of the box if it's enabled - and you can negotiate it. So, let's lay down the ground work to enable A-MSDU in A-MPDU. This will allow hardware like iwn(4) and ath(4) which supports software A-MSDU but hardware A-MPDU to be more efficient. Drivers that support A-MSDU in A-MPDU will set TX/RX htcap flags. Note this is separate from the software A-MSDU encap path; /that/ dictates whether net80211 is doing A-MSDU encapsulation or not. These HTC flags control negotiation, NOT encapsulation. Once this negotiation and driver bits are done, hardware like rtwn(4), run(4), and others will be able to use A-MSDU even without A-MPDU working; right now FF and A-MSDU aren't even attempted if you're an 11n node. It's a small hold-over from the initial A-MPDU work and I know how to fix it, but to flip it on properly I need to be able to negotiate or ignore A-MSDU in A-MPDU. Oh and the fun part - some 11ac APs I've tested will quite happily decap A-MSDU in A-MPDU even though they don't negotiate it when doing 802.11n. So hey, I know it works - I just want to properly handle things. :-) Tested: * AR9380, STA/AP mode Modified: head/sys/net80211/_ieee80211.h head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_ht.h Modified: head/sys/net80211/_ieee80211.h ============================================================================== --- head/sys/net80211/_ieee80211.h Fri Jun 5 07:37:52 2020 (r361824) +++ head/sys/net80211/_ieee80211.h Fri Jun 5 07:38:10 2020 (r361825) @@ -529,10 +529,13 @@ struct ieee80211_mimo_info { #define IEEE80211_HTC_TXUNEQUAL 0x00800000 /* CAPABILITY: TX unequal MCS */ #define IEEE80211_HTC_TXMCS32 0x01000000 /* CAPABILITY: MCS32 support */ #define IEEE80211_HTC_TXLDPC 0x02000000 /* CAPABILITY: TX using LDPC */ +#define IEEE80211_HTC_RX_AMSDU_AMPDU 0x04000000 /* CAPABILITY: RX A-MSDU in A-MPDU */ +#define IEEE80211_HTC_TX_AMSDU_AMPDU 0x08000000 /* CAPABILITY: TX A-MSDU in A-MPDU */ #define IEEE80211_C_HTCAP_BITS \ "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \ - "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS\32TXLDPC" + "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS\32TXLDPC\33RXAMSDUAMPDU" \ + "\34TXAMSDUAMPDU" /* * RX status notification - which fields are valid. Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Fri Jun 5 07:37:52 2020 (r361824) +++ head/sys/net80211/ieee80211_ht.c Fri Jun 5 07:38:10 2020 (r361825) @@ -592,6 +592,7 @@ static int ampdu_rx_start(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap, int baparamset, int batimeout, int baseqctl) { + struct ieee80211vap *vap = ni->ni_vap; int bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ); if (rap->rxa_flags & IEEE80211_AGGR_RUNNING) { @@ -607,6 +608,13 @@ ampdu_rx_start(struct ieee80211_node *ni, struct ieee8 rap->rxa_start = MS(baseqctl, IEEE80211_BASEQ_START); rap->rxa_flags |= IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_XCHGPEND; + /* XXX this should be a configuration flag */ + if ((vap->iv_htcaps & IEEE80211_HTC_RX_AMSDU_AMPDU) && + (MS(baparamset, IEEE80211_BAPS_AMSDU))) + rap->rxa_flags |= IEEE80211_AGGR_AMSDU; + else + rap->rxa_flags &= ~IEEE80211_AGGR_AMSDU; + return 0; } @@ -642,6 +650,8 @@ ieee80211_ampdu_rx_start_ext(struct ieee80211_node *ni } rap->rxa_flags |= IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_XCHGPEND; + /* XXX TODO: no amsdu flag */ + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, "%s: tid=%d, start=%d, wnd=%d, flags=0x%08x", __func__, @@ -1163,7 +1173,8 @@ ieee80211_ht_node_init(struct ieee80211_node *ni) ieee80211_txampdu_init_pps(tap); /* NB: further initialization deferred */ } - ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU; + ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU | + IEEE80211_NODE_AMSDU; } /* @@ -1329,7 +1340,8 @@ ieee80211_ht_wds_init(struct ieee80211_node *ni) ieee80211_txampdu_init_pps(tap); } /* NB: AMPDU tx/rx governed by IEEE80211_FHT_AMPDU_{TX,RX} */ - ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU; + ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU | + IEEE80211_NODE_AMSDU; } /* @@ -2173,6 +2185,7 @@ ieee80211_addba_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, int status, int baparamset, int batimeout) { + struct ieee80211vap *vap = ni->ni_vap; int bufsiz, tid; /* XXX locking */ @@ -2182,10 +2195,16 @@ ieee80211_addba_response(struct ieee80211_node *ni, /* XXX override our request? */ tap->txa_wnd = (bufsiz == 0) ? IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX); - /* XXX AC/TID */ tid = MS(baparamset, IEEE80211_BAPS_TID); tap->txa_flags |= IEEE80211_AGGR_RUNNING; tap->txa_attempts = 0; + /* TODO: this should be a vap flag */ + if ((vap->iv_htcaps & IEEE80211_HTC_TX_AMSDU_AMPDU) && + (ni->ni_flags & IEEE80211_NODE_AMSDU_TX) && + (MS(baparamset, IEEE80211_BAPS_AMSDU))) + tap->txa_flags |= IEEE80211_AGGR_AMSDU; + else + tap->txa_flags &= ~IEEE80211_AGGR_AMSDU; } else { /* mark tid so we don't try again */ tap->txa_flags |= IEEE80211_AGGR_NAK; @@ -2204,7 +2223,7 @@ ieee80211_addba_stop(struct ieee80211_node *ni, struct addba_stop_timeout(tap); if (tap->txa_flags & IEEE80211_AGGR_RUNNING) { /* XXX clear aggregation queue */ - tap->txa_flags &= ~IEEE80211_AGGR_RUNNING; + tap->txa_flags &= ~(IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_AMSDU); } tap->txa_attempts = 0; } @@ -2256,7 +2275,7 @@ ht_recv_action_ba_addba_request(struct ieee80211_node */ if ((ni->ni_flags & IEEE80211_NODE_AMPDU_RX) && (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_RX)) { - /* XXX handle ampdu_rx_start failure */ + /* XXX TODO: handle ampdu_rx_start failure */ ic->ic_ampdu_rx_start(ni, rap, baparamset, batimeout, baseqctl); @@ -2275,7 +2294,16 @@ ht_recv_action_ba_addba_request(struct ieee80211_node | SM(tid, IEEE80211_BAPS_TID) | SM(rap->rxa_wnd, IEEE80211_BAPS_BUFSIZ) ; - /* XXX AMSDU in AMPDU? */ + + /* + * TODO: we're out of iv_flags_ht fields; once + * this is extended we should make this configurable. + */ + if ((baparamset & IEEE80211_BAPS_AMSDU) && + (ni->ni_flags & IEEE80211_NODE_AMSDU_RX) && + (vap->iv_htcaps & IEEE80211_HTC_RX_AMSDU_AMPDU)) + args[2] |= IEEE80211_BAPS_AMSDU; + args[3] = 0; args[4] = 0; ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, @@ -2294,6 +2322,7 @@ ht_recv_action_ba_addba_response(struct ieee80211_node uint8_t dialogtoken, policy; uint16_t baparamset, batimeout, code; int tid, bufsiz; + int amsdu; dialogtoken = frm[2]; code = le16dec(frm+3); @@ -2301,6 +2330,7 @@ ht_recv_action_ba_addba_response(struct ieee80211_node tid = MS(baparamset, IEEE80211_BAPS_TID); bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ); policy = MS(baparamset, IEEE80211_BAPS_POLICY); + amsdu = !! MS(baparamset, IEEE80211_BAPS_AMSDU); batimeout = le16dec(frm+7); tap = &ni->ni_tx_ampdu[tid]; @@ -2349,11 +2379,12 @@ ht_recv_action_ba_addba_response(struct ieee80211_node } #endif - /* XXX TODO: check AMSDU in AMPDU configuration */ IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "recv ADDBA response: dialogtoken %u code %d " - "baparamset 0x%x (tid %d bufsiz %d) batimeout %d", - dialogtoken, code, baparamset, tid, bufsiz, + "baparamset 0x%x (tid %d bufsiz %d amsdu %d) batimeout %d", + dialogtoken, code, baparamset, tid, + bufsiz, + amsdu, batimeout); ic->ic_addba_response(ni, tap, code, baparamset, batimeout); return 0; @@ -2510,8 +2541,12 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, | SM(tid, IEEE80211_BAPS_TID) | SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ) ; - /* XXX TODO: check AMSDU in AMPDU configuration */ + /* XXX TODO: this should be a flag, not iv_htcaps */ + if ((ni->ni_flags & IEEE80211_NODE_AMSDU_TX) && + (ni->ni_vap->iv_htcaps & IEEE80211_HTC_TX_AMSDU_AMPDU)) + args[2] |= IEEE80211_BAPS_AMSDU; + args[3] = 0; /* batimeout */ /* NB: do first so there's no race against reply */ if (!ic->ic_addba_request(ni, tap, dialogtoken, args[2], args[3])) { @@ -2843,11 +2878,11 @@ ht_send_action_ba_addba(struct ieee80211_node *ni, IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "send ADDBA %s: dialogtoken %d status %d " - "baparamset 0x%x (tid %d) batimeout 0x%x baseqctl 0x%x", + "baparamset 0x%x (tid %d amsdu %d) batimeout 0x%x baseqctl 0x%x", (action == IEEE80211_ACTION_BA_ADDBA_REQUEST) ? "request" : "response", args[0], args[1], args[2], MS(args[2], IEEE80211_BAPS_TID), - args[3], args[4]); + MS(args[2], IEEE80211_BAPS_AMSDU), args[3], args[4]); IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__, Modified: head/sys/net80211/ieee80211_ht.h ============================================================================== --- head/sys/net80211/ieee80211_ht.h Fri Jun 5 07:37:52 2020 (r361824) +++ head/sys/net80211/ieee80211_ht.h Fri Jun 5 07:38:10 2020 (r361825) @@ -47,6 +47,7 @@ struct ieee80211_tx_ampdu { #define IEEE80211_AGGR_NAK 0x0010 /* peer NAK'd ADDBA request */ #define IEEE80211_AGGR_BARPEND 0x0020 /* BAR response pending */ #define IEEE80211_AGGR_WAITRX 0x0040 /* Wait for first RX frame to define BAW */ +#define IEEE80211_AGGR_AMSDU 0x0080 /* A-MSDU in A-MPDU TX allowed */ uint8_t txa_tid; uint8_t txa_token; /* dialog token */ int txa_lastsample; /* ticks @ last traffic sample */ @@ -67,6 +68,14 @@ struct ieee80211_tx_ampdu { /* return non-zero if AMPDU tx for the TID is running */ #define IEEE80211_AMPDU_RUNNING(tap) \ (((tap)->txa_flags & IEEE80211_AGGR_RUNNING) != 0) + +/* + * Return non-zero if AMPDU tx for the TID is running and we can do + * A-MSDU in A-MPDU + */ +#define IEEE80211_AMPDU_RUNNING_AMSDU(tap) \ + ((((tap)->txa_flags & (IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_AMSDU)) \ + == (IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_AMSDU)) /* return non-zero if AMPDU tx for the TID was NACKed */ #define IEEE80211_AMPDU_NACKED(tap)\ From owner-svn-src-head@freebsd.org Fri Jun 5 07:38:47 2020 Return-Path: Delivered-To: svn-src-head@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 2814C3432AD; Fri, 5 Jun 2020 07:38:47 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dZJl0M4Zz4Kpw; Fri, 5 Jun 2020 07:38:47 +0000 (UTC) (envelope-from adrian@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 E2E8AD70C; Fri, 5 Jun 2020 07:38:46 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0557ckM8085901; Fri, 5 Jun 2020 07:38:46 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0557ckTw085899; Fri, 5 Jun 2020 07:38:46 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006050738.0557ckTw085899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 07:38:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361826 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361826 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 07:38:47 -0000 Author: adrian Date: Fri Jun 5 07:38:46 2020 New Revision: 361826 URL: https://svnweb.freebsd.org/changeset/base/361826 Log: [net80211] print out node A-MSDU state. Now that the node AMSDU TX/RX flags are correctly set in ieee80211_ht.c, we can print out the AMSDU state here. Modified: head/sys/net80211/ieee80211_node.c head/sys/net80211/ieee80211_sta.c Modified: head/sys/net80211/ieee80211_node.c ============================================================================== --- head/sys/net80211/ieee80211_node.c Fri Jun 5 07:38:10 2020 (r361825) +++ head/sys/net80211/ieee80211_node.c Fri Jun 5 07:38:46 2020 (r361826) @@ -2754,7 +2754,7 @@ ieee80211_node_join(struct ieee80211_node *ni, int res * XXX VHT - should log VHT channel width, etc */ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, ni, - "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s", + "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s%s", IEEE80211_NODE_AID(ni), ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long", vap->iv_flags & IEEE80211_F_SHSLOT ? "short" : "long", @@ -2764,6 +2764,7 @@ ieee80211_node_join(struct ieee80211_node *ni, int res ni->ni_flags & IEEE80211_NODE_HT ? (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", + ni->ni_flags & IEEE80211_NODE_AMSDU ? " (+ASPDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "", Modified: head/sys/net80211/ieee80211_sta.c ============================================================================== --- head/sys/net80211/ieee80211_sta.c Fri Jun 5 07:38:10 2020 (r361825) +++ head/sys/net80211/ieee80211_sta.c Fri Jun 5 07:38:46 2020 (r361826) @@ -1862,7 +1862,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf * ic->ic_flags &= ~IEEE80211_F_USEPROT; IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, wh->i_addr2, - "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s", + "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s%s", ISREASSOC(subtype) ? "re" : "", IEEE80211_NODE_AID(ni), ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", @@ -1872,6 +1872,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf * ni->ni_flags & IEEE80211_NODE_HT ? (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", + ni->ni_flags & IEEE80211_NODE_AMSDU ? " (+AMSDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "", From owner-svn-src-head@freebsd.org Fri Jun 5 07:57:17 2020 Return-Path: Delivered-To: svn-src-head@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 392AB3438A5; Fri, 5 Jun 2020 07:57:17 +0000 (UTC) (envelope-from hselasky@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dZk50pNlz4MjC; Fri, 5 Jun 2020 07:57:17 +0000 (UTC) (envelope-from hselasky@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 12A07DA2F; Fri, 5 Jun 2020 07:57:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0557vGeR098196; Fri, 5 Jun 2020 07:57:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0557vGS8098193; Fri, 5 Jun 2020 07:57:16 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202006050757.0557vGS8098193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 5 Jun 2020 07:57:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361827 - in head: lib/libusbhid sys/dev/usb X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head: lib/libusbhid sys/dev/usb X-SVN-Commit-Revision: 361827 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 07:57:17 -0000 Author: hselasky Date: Fri Jun 5 07:57:16 2020 New Revision: 361827 URL: https://svnweb.freebsd.org/changeset/base/361827 Log: USB HID descriptors may push/pop the current state to allow description of items residing in a so-called union. FreeBSD currently only supports 4 such pop levels. If the push level is not restored within the processing of the same HID item, an invalid memory location may be used for subsequent HID item processing. Verify that the push level is always valid when processing HID items. Reported by: Andy Nguyen (Google) MFC after: 3 days Sponsored by: Mellanox Technologies Modified: head/lib/libusbhid/parse.c head/sys/dev/usb/usb_hid.c Modified: head/lib/libusbhid/parse.c ============================================================================== --- head/lib/libusbhid/parse.c Fri Jun 5 07:38:46 2020 (r361826) +++ head/lib/libusbhid/parse.c Fri Jun 5 07:57:16 2020 (r361827) @@ -403,26 +403,28 @@ hid_get_item_raw(hid_data_t s, hid_item_t *h) s->loc_count = dval & mask; break; case 10: /* Push */ + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) + return (0); s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->report_size = s->loc_size; - c->report_count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->report_size = s->loc_size; + c->report_count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) + return (0); s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->report_size; - s->loc_count = c->report_count; - c->report_size = 0; - c->report_count = 0; - } + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->report_size; + s->loc_count = c->report_count; + c->report_size = 0; + c->report_count = 0; break; default: break; Modified: head/sys/dev/usb/usb_hid.c ============================================================================== --- head/sys/dev/usb/usb_hid.c Fri Jun 5 07:38:46 2020 (r361826) +++ head/sys/dev/usb/usb_hid.c Fri Jun 5 07:57:16 2020 (r361827) @@ -436,36 +436,36 @@ hid_get_item(struct hid_data *s, struct hid_item *h) s->loc_count = dval & mask; break; case 10: /* Push */ - s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->loc.size = s->loc_size; - c->loc.count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } else { - DPRINTFN(0, "Cannot push " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) { + DPRINTFN(0, "Cannot push item @ %d\n", s->pushlevel); + return (0); } + s->pushlevel ++; + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->loc.size = s->loc_size; + c->loc.count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ - s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - /* preserve position */ - oldpos = c->loc.pos; - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->loc.size; - s->loc_count = c->loc.count; - /* set default item location */ - c->loc.pos = oldpos; - c->loc.size = 0; - c->loc.count = 0; - } else { - DPRINTFN(0, "Cannot pop " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) { + DPRINTFN(0, "Cannot pop item @ 0\n"); + return (0); } + s->pushlevel --; + /* preserve position */ + oldpos = c->loc.pos; + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->loc.size; + s->loc_count = c->loc.count; + /* set default item location */ + c->loc.pos = oldpos; + c->loc.size = 0; + c->loc.count = 0; break; default: DPRINTFN(0, "Global bTag=%d\n", bTag); From owner-svn-src-head@freebsd.org Fri Jun 5 08:12:09 2020 Return-Path: Delivered-To: svn-src-head@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 86533343BEC; Fri, 5 Jun 2020 08:12:09 +0000 (UTC) (envelope-from hselasky@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49db3F32wsz4PcR; Fri, 5 Jun 2020 08:12:09 +0000 (UTC) (envelope-from hselasky@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 63C92DF66; Fri, 5 Jun 2020 08:12:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0558C9NB008528; Fri, 5 Jun 2020 08:12:09 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0558C9tD008527; Fri, 5 Jun 2020 08:12:09 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202006050812.0558C9tD008527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 5 Jun 2020 08:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361828 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 361828 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 08:12:09 -0000 Author: hselasky Date: Fri Jun 5 08:12:08 2020 New Revision: 361828 URL: https://svnweb.freebsd.org/changeset/base/361828 Log: Ensure pci_channel_offline() actually queries the PCI register space, and not only the software cache of that register. Else pci_channel_offline() won't detect that the PCI device is gone when using the LinuxKPI. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/pci.h Fri Jun 5 07:57:16 2020 (r361827) +++ head/sys/compat/linuxkpi/common/include/linux/pci.h Fri Jun 5 08:12:08 2020 (r361828) @@ -657,7 +657,7 @@ static inline int pci_channel_offline(struct pci_dev *pdev) { - return (pci_get_vendor(pdev->dev.bsddev) == PCIV_INVALID); + return (pci_read_config(pdev->dev.bsddev, PCIR_VENDOR, 2) == PCIV_INVALID); } static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn) From owner-svn-src-head@freebsd.org Fri Jun 5 08:46:51 2020 Return-Path: Delivered-To: svn-src-head@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 87CFC344AC4; Fri, 5 Jun 2020 08:46:51 +0000 (UTC) (envelope-from arichardson@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dbqH367nz4T8P; Fri, 5 Jun 2020 08:46:51 +0000 (UTC) (envelope-from arichardson@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 613AFE51A; Fri, 5 Jun 2020 08:46:51 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0558kp5M028808; Fri, 5 Jun 2020 08:46:51 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0558kpap028807; Fri, 5 Jun 2020 08:46:51 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202006050846.0558kpap028807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Fri, 5 Jun 2020 08:46:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361829 - in head/lib/libc/tests: gen/posix_spawn sys X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head/lib/libc/tests: gen/posix_spawn sys X-SVN-Commit-Revision: 361829 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 08:46:51 -0000 Author: arichardson Date: Fri Jun 5 08:46:50 2020 New Revision: 361829 URL: https://svnweb.freebsd.org/changeset/base/361829 Log: Avoid using non-portable dd status=none flag Copying the approach chosen in r309412. This fixes building the libc tests on a macOS host since the macOS /bin/dd binary does not support status=none. As there only seem to be two uses, this commit changes the two Makefiles. If this becomes more common, we could also add a wrapper bootstrap script that ignores status= and forwards the remaining args to the real dd. Another alternative would be to remove the status flag and pipe stderr to /dev/null, but them we lose error messages. Reviewed By: brooks Differential Revision: https://reviews.freebsd.org/D24785 Modified: head/lib/libc/tests/gen/posix_spawn/Makefile head/lib/libc/tests/sys/Makefile Modified: head/lib/libc/tests/gen/posix_spawn/Makefile ============================================================================== --- head/lib/libc/tests/gen/posix_spawn/Makefile Fri Jun 5 08:12:08 2020 (r361828) +++ head/lib/libc/tests/gen/posix_spawn/Makefile Fri Jun 5 08:46:50 2020 (r361829) @@ -19,8 +19,12 @@ CLEANFILES+= h_nonexec .include "../../Makefile.netbsd-tests" +# The dd status=none option is non-standard. Only use it when this test succeeds +# rather than require dd to be a bootstrap tool. +DD_NOSTATUS!=(dd status=none count=0 2> /dev/null && echo status=none) || true +DD=dd ${DD_NOSTATUS} h_zero: - dd if=/dev/zero of=h_zero bs=1k count=2 status=none + ${DD} if=/dev/zero of=h_zero bs=1k count=2 chmod a+x h_zero CLEANFILES+= h_zero Modified: head/lib/libc/tests/sys/Makefile ============================================================================== --- head/lib/libc/tests/sys/Makefile Fri Jun 5 08:12:08 2020 (r361828) +++ head/lib/libc/tests/sys/Makefile Fri Jun 5 08:46:50 2020 (r361829) @@ -96,7 +96,11 @@ truncate_test_FILESGRP= wheel truncate_test_FILESPACKAGE= ${PACKAGE} CLEANFILES= truncate_test.root_owned +# The dd status=none option is non-standard. Only use it when this test succeeds +# rather than require dd to be a bootstrap tool. +DD_NOSTATUS!=(dd status=none count=0 2> /dev/null && echo status=none) || true +DD=dd ${DD_NOSTATUS} truncate_test.root_owned: - dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none + ${DD} if=/dev/null bs=1 count=1 of=${.TARGET} .include From owner-svn-src-head@freebsd.org Fri Jun 5 08:47:01 2020 Return-Path: Delivered-To: svn-src-head@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 31360344DB9; Fri, 5 Jun 2020 08:47:01 +0000 (UTC) (envelope-from arichardson@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dbqN6wbcz4TKg; Fri, 5 Jun 2020 08:46:56 +0000 (UTC) (envelope-from arichardson@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 25899E1E1; Fri, 5 Jun 2020 08:46:56 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0558ktna028860; Fri, 5 Jun 2020 08:46:55 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0558ktdP028859; Fri, 5 Jun 2020 08:46:55 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202006050846.0558ktdP028859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Fri, 5 Jun 2020 08:46:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361830 - head/lib/csu/mips X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/lib/csu/mips X-SVN-Commit-Revision: 361830 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 08:47:01 -0000 Author: arichardson Date: Fri Jun 5 08:46:55 2020 New Revision: 361830 URL: https://svnweb.freebsd.org/changeset/base/361830 Log: csu: Avoid additional nops in the MIPS INIT_CALL_SEQ macro Since we had a .set reorder, the nop after the "jal" was being placed after the delay slot, resulting in two nops. While changing this code also guard the .set noreorder with .set push/pop and use $zero as the cpsetup save register since we don't need to save $gp. Reviewed By: jhb Differential Revision: https://reviews.freebsd.org/D25025 Modified: head/lib/csu/mips/crt.h Modified: head/lib/csu/mips/crt.h ============================================================================== --- head/lib/csu/mips/crt.h Fri Jun 5 08:46:50 2020 (r361829) +++ head/lib/csu/mips/crt.h Fri Jun 5 08:46:55 2020 (r361830) @@ -30,29 +30,31 @@ #define CTORS_CONSTRUCTORS #ifdef __mips_o32 #define INIT_CALL_SEQ(func) \ + ".set push \n" \ ".set noreorder \n" \ "bal 1f \n" \ "nop \n" \ "1: \n" \ ".cpload $ra \n" \ "addu $sp, $sp, -8 \n" \ - ".set reorder \n" \ ".cprestore 4 \n" \ ".local " __STRING(func) "\n" \ "jal " __STRING(func) "\n" \ "nop \n" \ - "addu $sp, $sp, 8 \n" + "addu $sp, $sp, 8 \n" \ + ".set pop\n" #else #define INIT_CALL_SEQ(func) \ + ".set push \n" \ ".set noreorder \n" \ "bal 1f \n" \ "nop \n" \ "1: \n" \ - ".set reorder \n" \ - ".cpsetup $ra, $v0, 1b \n" \ + ".cpsetup $ra, $zero, 1b \n" \ ".local " __STRING(func) "\n" \ "jal " __STRING(func) "\n" \ - "nop \n" + "nop \n" \ + ".set pop\n" #endif #endif From owner-svn-src-head@freebsd.org Fri Jun 5 13:54:13 2020 Return-Path: Delivered-To: svn-src-head@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 BF77532B86C; Fri, 5 Jun 2020 13:54:13 +0000 (UTC) (envelope-from arichardson@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dkdx54XPz3b76; Fri, 5 Jun 2020 13:54:13 +0000 (UTC) (envelope-from arichardson@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 9098E11CCF; Fri, 5 Jun 2020 13:54:13 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055DsDZt021080; Fri, 5 Jun 2020 13:54:13 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055DsDOb021079; Fri, 5 Jun 2020 13:54:13 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202006051354.055DsDOb021079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Fri, 5 Jun 2020 13:54:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361833 - head/sys/crypto/skein/amd64 X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/sys/crypto/skein/amd64 X-SVN-Commit-Revision: 361833 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 13:54:13 -0000 Author: arichardson Date: Fri Jun 5 13:54:13 2020 New Revision: 361833 URL: https://svnweb.freebsd.org/changeset/base/361833 Log: Allow assembling skein_block_asm.s with clang GNU as seems to allow macro arguments without the '\' but clang is more strict in that regard. This change makes the source code compatible with LLVM's but does not yet change the build system or rename it to .S. The new code assembles identically with GNU as 2.17.50. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D25143 Modified: head/sys/crypto/skein/amd64/skein_block_asm.s Modified: head/sys/crypto/skein/amd64/skein_block_asm.s ============================================================================== --- head/sys/crypto/skein/amd64/skein_block_asm.s Fri Jun 5 09:58:59 2020 (r361832) +++ head/sys/crypto/skein/amd64/skein_block_asm.s Fri Jun 5 13:54:13 2020 (r361833) @@ -10,7 +10,9 @@ # .text .altmacro +#ifndef __clang__ .psize 0,128 #list file has no page boundaries +#endif # _MASK_ALL_ = (256+512+1024) #all three algorithm bits _MAX_FRAME_ = 240 @@ -240,9 +242,8 @@ RC_1024_7_7 = 20 # Output: <<< RC_BlkSize_roundNum_mixNum, BlkSize=256/512/1024 # .macro RotL64 reg,BLK_SIZE,ROUND_NUM,MIX_NUM -_RCNT_ = RC_\BLK_SIZE&_\ROUND_NUM&_\MIX_NUM - .if _RCNT_ #is there anything to do? - rolq $_RCNT_,%\reg + .if RC_\BLK_SIZE\()_\ROUND_NUM\()_\MIX_NUM #is there anything to do? + rolq $RC_\BLK_SIZE\()_\ROUND_NUM\()_\MIX_NUM,%\reg .endif .endm # @@ -334,7 +335,7 @@ __STK_FRM_OFFS_\BLK_BITS = FRAME_OFFS #---------------------------------------------------------------- # .macro Reset_Stack - addq $LOCAL_SIZE,%rsp #get rid of locals (wipe??) + addq $LOCAL_SIZE,%rsp #get rid of locals (wipe?) .irp _reg_,r15,r14,r13,r12,rbx,rbp popq %\_reg_ #restore caller's regs _PushCnt_ = _PushCnt_ - 1 @@ -724,22 +725,22 @@ C_label Skein_256_Unroll_Cnt .macro R_512_OneRound rn0,rn1,rn2,rn3,rn4,rn5,rn6,rn7,_Rn_,op1,op2,op3,op4 # addReg r\rn0, r\rn1 - RotL64 r\rn1, 512,%((_Rn_) % 8),0 + RotL64 r\rn1, 512,%((\_Rn_) % 8),0 xorReg r\rn1, r\rn0 - op1 + \op1 addReg r\rn2, r\rn3 - RotL64 r\rn3, 512,%((_Rn_) % 8),1 + RotL64 r\rn3, 512,%((\_Rn_) % 8),1 xorReg r\rn3, r\rn2 - op2 + \op2 addReg r\rn4, r\rn5 - RotL64 r\rn5, 512,%((_Rn_) % 8),2 + RotL64 r\rn5, 512,%((\_Rn_) % 8),2 xorReg r\rn5, r\rn4 - op3 + \op3 addReg r\rn6, r\rn7 - RotL64 r\rn7, 512,%((_Rn_) % 8),3 + RotL64 r\rn7, 512,%((\_Rn_) % 8),3 xorReg r\rn7, r\rn6 - op4 - Skein_Debug_Round 512,%(_Rn_+1),-4 + \op4 + Skein_Debug_Round 512,%(\_Rn_+1),-4 # .endm #R_512_OneRound # @@ -749,11 +750,11 @@ C_label Skein_256_Unroll_Cnt .macro R_512_FourRounds _RR_ #RR = base round number (0 % 8) .if (SKEIN_ASM_UNROLL && 512) # here for fully unrolled case. - _II_ = ((_RR_)/4) + 1 #key injection counter - R_512_OneRound 8, 9,10,11,12,13,14,15,%((_RR_)+0),,, - R_512_OneRound 10, 9,12,15,14,13, 8,11,%((_RR_)+1),,, - R_512_OneRound 12, 9,14,11, 8,13,10,15,%((_RR_)+2),,, - R_512_OneRound 14, 9, 8,15,10,13,12,11,%((_RR_)+3),, + _II_ = ((\_RR_)/4) + 1 #key injection counter + R_512_OneRound 8, 9,10,11,12,13,14,15,%((\_RR_)+0),,, + R_512_OneRound 10, 9,12,15,14,13, 8,11,%((\_RR_)+1),,, + R_512_OneRound 12, 9,14,11, 8,13,10,15,%((\_RR_)+2),,, + R_512_OneRound 14, 9, 8,15,10,13,12,11,%((\_RR_)+3),, # inject the key schedule addq ksKey+8*(((_II_)+0)%9)+F_O(%rbp),%r8 addReg r11, rax @@ -766,10 +767,10 @@ C_label Skein_256_Unroll_Cnt .else # here for looping case #"rotate" key/tweak schedule (move up on stack) incq %rdi #bump key injection counter - R_512_OneRound 8, 9,10,11,12,13,14,15,%((_RR_)+0),,, - R_512_OneRound 10, 9,12,15,14,13, 8,11,%((_RR_)+1),,, - R_512_OneRound 12, 9,14,11, 8,13,10,15,%((_RR_)+2),,, - R_512_OneRound 14, 9, 8,15,10,13,12,11,%((_RR_)+3),, + R_512_OneRound 8, 9,10,11,12,13,14,15,%((\_RR_)+0),,, + R_512_OneRound 10, 9,12,15,14,13, 8,11,%((\_RR_)+1),,, + R_512_OneRound 12, 9,14,11, 8,13,10,15,%((\_RR_)+2),,, + R_512_OneRound 14, 9, 8,15,10,13,12,11,%((\_RR_)+3),, # inject the key schedule addq ksKey+8*0+F_O(%rbp,%rdi,8),%r8 addReg r11, rax @@ -814,9 +815,9 @@ Skein_512_block_loop: movq %rbx,ksTwk+ 8+F_O(%rbp) movq %rcx,ksTwk+16+F_O(%rbp) .irp _Rn_,8,9,10,11,12,13,14,15 - movq X_VARS+8*(_Rn_-8)(%rdi),%r\_Rn_ + movq X_VARS+8*(\_Rn_-8)(%rdi),%r\_Rn_ xorq %r\_Rn_,%rdx #compute overall parity - movq %r\_Rn_,ksKey+8*(_Rn_-8)+F_O(%rbp) + movq %r\_Rn_,ksKey+8*(\_Rn_-8)+F_O(%rbp) .endr #load state into %r8 ..%r15, compute parity movq %rdx,ksKey+8*(8)+F_O(%rbp)#save key schedule parity @@ -853,7 +854,7 @@ Skein_512_block_loop: .if _SKEIN_DEBUG .irp _Rn_,8,9,10,11,12,13,14,15 #save values on stack for debug output - movq %r\_Rn_,X_stk+8*(_Rn_-8)(%rsp) + movq %r\_Rn_,X_stk+8*(\_Rn_-8)(%rsp) .endr Skein_Debug_Block 512 #debug dump @@ -891,12 +892,12 @@ _Rbase_ = _Rbase_+1 ################# # feedforward: ctx->X[i] = X[i] ^ w[i], {i=0..7} .irp _Rn_,8,9,10,11,12,13,14,15 - .if (_Rn_ == 8) + .if (\_Rn_ == 8) movq $FIRST_MASK64,%rbx .endif - xorq Wcopy+8*(_Rn_-8)+F_O(%rbp),%r\_Rn_ #feedforward XOR - movq %r\_Rn_,X_VARS+8*(_Rn_-8)(%rdi) #and store result - .if (_Rn_ == 14) + xorq Wcopy+8*(\_Rn_-8)+F_O(%rbp),%r\_Rn_ #feedforward XOR + movq %r\_Rn_,X_VARS+8*(\_Rn_-8)(%rdi) #and store result + .if (\_Rn_ == 14) andq TWEAK+ 8(%rdi),%rbx .endif .endr @@ -917,7 +918,7 @@ Skein_Debug_Round_512: pushq %rsi #save two regs for BLK_BITS-specific parms pushq %rdi .irp _Rn_,8,9,10,11,12,13,14,15 #save X[] state on stack so debug routines can access it - movq %r\_Rn_,X_stk+8*(_Rn_-8)+F_O(%rbp) + movq %r\_Rn_,X_stk+8*(\_Rn_-8)+F_O(%rbp) .endr movq ctxPtr+F_O(%rbp),%rsi #ctx_hdr_ptr movq $512,%rdi #now are set for the call @@ -968,50 +969,50 @@ rIdx_offs = tmpStk_1024 # .macro r1024_Mix w0,w1,reg0,reg1,_RN0_,_Rn1_,op1 addReg \reg0 , \reg1 #perform the MIX - RotL64 \reg1 , 1024,%((_RN0_) % 8),_Rn1_ + RotL64 \reg1 , 1024,%((\_RN0_) % 8),\_Rn1_ xorReg \reg1 , \reg0 -.if ((_RN0_) && 3) == 3 #time to do key injection? +.if ((\_RN0_) && 3) == 3 #time to do key injection? .if _SKEIN_DEBUG - movq %\reg0 , xDebug_1024+8*w0(%rsp) #save intermediate values for Debug_Round - movq %\reg1 , xDebug_1024+8*w1(%rsp) # (before inline key injection) + movq %\reg0 , xDebug_1024+8*\w0(%rsp) #save intermediate values for Debug_Round + movq %\reg1 , xDebug_1024+8*\w1(%rsp) # (before inline key injection) .endif -_II_ = ((_RN0_)/4)+1 #injection count +_II_ = ((\_RN0_)/4)+1 #injection count .if SKEIN_ASM_UNROLL && 1024 #here to do fully unrolled key injection - addq ksKey+ 8*((_II_+w0) % 17)(%rsp),%\reg0 - addq ksKey+ 8*((_II_+w1) % 17)(%rsp),%\reg1 - .if w1 == 13 #tweak injection + addq ksKey+ 8*((_II_+\w0) % 17)(%rsp),%\reg0 + addq ksKey+ 8*((_II_+\w1) % 17)(%rsp),%\reg1 + .if \w1 == 13 #tweak injection addq ksTwk+ 8*((_II_+ 0) % 3)(%rsp),%\reg1 - .elseif w0 == 14 + .elseif \w0 == 14 addq ksTwk+ 8*((_II_+ 1) % 3)(%rsp),%\reg0 - .elseif w1 == 15 + .elseif \w1 == 15 addq $_II_, %\reg1 #(injection counter) .endif .else #here to do looping key injection - .if (w0 == 0) - movq %rdi, X_stk+8*w0(%rsp) #if so, store N0 so we can use reg as index + .if (\w0 == 0) + movq %rdi, X_stk+8*\w0(%rsp) #if so, store N0 so we can use reg as index movq rIdx_offs(%rsp),%rdi #get the injection counter index into rdi .else - addq ksKey+8+8*w0(%rsp,%rdi,8),%\reg0 #even key injection + addq ksKey+8+8*\w0(%rsp,%rdi,8),%\reg0 #even key injection .endif - .if w1 == 13 #tweak injection + .if \w1 == 13 #tweak injection addq ksTwk+8+8* 0(%rsp,%rdi,8),%\reg1 - .elseif w0 == 14 + .elseif \w0 == 14 addq ksTwk+8+8* 1(%rsp,%rdi,8),%\reg0 - .elseif w1 == 15 + .elseif \w1 == 15 addReg \reg1,rdi,,,1 #(injection counter) .endif - addq ksKey+8+8*w1(%rsp,%rdi,8),%\reg1 #odd key injection + addq ksKey+8+8*\w1(%rsp,%rdi,8),%\reg1 #odd key injection .endif .endif # insert the op provided, .if any - op1 + \op1 .endm ################# # MACRO: four rounds for 1024-bit blocks # .macro r1024_FourRounds _RR_ #RR = base round number (0 mod 4) # should be here with X4 set properly, X6 stored on stack -_Rn_ = (_RR_) + 0 +_Rn_ = (\_RR_) + 0 r1024_Mix 0, 1,rdi,rsi,_Rn_,0 r1024_Mix 2, 3,rbp,rax,_Rn_,1 r1024_Mix 4, 5,rcx,rbx,_Rn_,2, #save X4 on stack (x4/x6 alternate) @@ -1023,7 +1024,7 @@ _Rn_ = (_RR_) + 0 .if _SKEIN_DEBUG Skein_Debug_Round 1024,%(_Rn_+1) .endif -_Rn_ = (_RR_) + 1 +_Rn_ = (\_RR_) + 1 r1024_Mix 0, 9,rdi,r9 ,_Rn_,0 r1024_Mix 2,13,rbp,r13,_Rn_,1 r1024_Mix 6,11,rcx,r11,_Rn_,2, #save X6 on stack (x4/x6 alternate) @@ -1035,7 +1036,7 @@ _Rn_ = (_RR_) + 1 .if _SKEIN_DEBUG Skein_Debug_Round 1024,%(_Rn_+1) .endif -_Rn_ = (_RR_) + 2 +_Rn_ = (\_RR_) + 2 r1024_Mix 0, 7,rdi,rdx,_Rn_,0 r1024_Mix 2, 5,rbp,rbx,_Rn_,1 r1024_Mix 4, 3,rcx,rax,_Rn_,2, #save X4 on stack (x4/x6 alternate) @@ -1047,7 +1048,7 @@ _Rn_ = (_RR_) + 2 .if _SKEIN_DEBUG Skein_Debug_Round 1024,%(_Rn_+1) .endif -_Rn_ = (_RR_) + 3 +_Rn_ = (\_RR_) + 3 r1024_Mix 0,15,rdi,r15,_Rn_,0 r1024_Mix 2,11,rbp,r11,_Rn_,1 r1024_Mix 6,13,rcx,r13,_Rn_,2, #save X6 on stack (x4/x6 alternate) @@ -1116,13 +1117,13 @@ Skein1024_block_loop: # the logic here assumes the set {rdi,rsi,rbp,rax} = X[0,1,2,3] .irp _rN_,0,1,2,3,4,6 #process the "initial" words, using r14/r15 as temps - movq X_VARS+8*_rN_(%rdi),%r14 #get state word - movq 8*_rN_(%rsi),%r15 #get msg word + movq X_VARS+8*\_rN_(%rdi),%r14 #get state word + movq 8*\_rN_(%rsi),%r15 #get msg word xorq %r14,%rax #update key schedule overall parity - movq %r14,ksKey +8*_rN_+F_O(%rbp) #save key schedule word on stack - movq %r15,Wcopy +8*_rN_+F_O(%rbp) #save local msg Wcopy + movq %r14,ksKey +8*\_rN_+F_O(%rbp) #save key schedule word on stack + movq %r15,Wcopy +8*\_rN_+F_O(%rbp) #save local msg Wcopy addq %r15,%r14 #do the initial key injection - movq %r14,X_stk +8*_rN_ (%rsp) #save initial state var on stack + movq %r14,X_stk +8*\_rN_ (%rsp) #save initial state var on stack .endr # now process the rest, using the "real" registers # (MUST do it in reverse order to inject tweaks r8/r9 first) @@ -1135,9 +1136,9 @@ _oo_ = o1K_\_rr_ #offset ass movq %rcx,Wcopy+8*_oo_+F_O(%rbp) #save copy of msg word for feedforward addq %rcx,%\_rr_ #do the initial key injection .if _oo_ == 13 #do the initial tweak injection - addReg _rr_,r8 # (only in words 13/14) + addReg \_rr_,r8 # (only in words 13/14) .elseif _oo_ == 14 - addReg _rr_,r9 + addReg \_rr_,r9 .endif .endr movq %rax,ksKey+8*WCNT+F_O(%rbp) #save key schedule parity From owner-svn-src-head@freebsd.org Fri Jun 5 14:03:58 2020 Return-Path: Delivered-To: svn-src-head@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 0AE1032C1A5; Fri, 5 Jun 2020 14:03:58 +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 49dks95t7kz3cYc; Fri, 5 Jun 2020 14:03:57 +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 055E3rKu030894; Fri, 5 Jun 2020 07:03:54 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 055E3rDO030893; Fri, 5 Jun 2020 07:03:53 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006051403.055E3rDO030893@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361791 - head/etc/mtree In-Reply-To: <20200605071240.GA98879@FreeBSD.org> To: Alexey Dokuchaev Date: Fri, 5 Jun 2020 07:03:53 -0700 (PDT) CC: Cy Schubert , Conrad Meyer , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49dks95t7kz3cYc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 14:03:58 -0000 > On Thu, Jun 04, 2020 at 09:19:35AM -0700, Cy Schubert wrote: > > In message <202006041604.054G4KAb098395@repo.freebsd.org>, Conrad Meyer > > writes: > > > New Revision: 361791 > > > URL: https://svnweb.freebsd.org/changeset/base/361791 > > > > > > Log: > > > Restrict default /root permissions > > > > > > ... > > > @@ -117,7 +117,7 @@ > > > .. > > > rescue > > > .. > > > - root > > > + root mode=0750 > > > .. > > > > Recent CIS benchmarks recommend 0700. Can you provide a pointer, I would like to understand how they came to the conclusing that 0700 is more secuire than 0750. I can only think of one situation, in which a member of group wheel does not know the password for root. > > Please, let's keep a reasonable balance between security and usability. > I often visit /root as a regular user (wheel'ed), and 0700 would make > it real PITA. IIRC there is a review and long discussion on this already... > ./danfe -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Fri Jun 5 14:17:19 2020 Return-Path: Delivered-To: svn-src-head@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 A202D32C734; Fri, 5 Jun 2020 14:17:19 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dl8b3vbBz3dqf; Fri, 5 Jun 2020 14:17:19 +0000 (UTC) (envelope-from adrian@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 7C21411DE9; Fri, 5 Jun 2020 14:17:19 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055EHJW5034199; Fri, 5 Jun 2020 14:17:19 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055EHJhN034198; Fri, 5 Jun 2020 14:17:19 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006051417.055EHJhN034198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 5 Jun 2020 14:17:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361834 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361834 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 14:17:19 -0000 Author: adrian Date: Fri Jun 5 14:17:19 2020 New Revision: 361834 URL: https://svnweb.freebsd.org/changeset/base/361834 Log: [net80211] Don't call ic_updateslot if it's not set. Turns out this isn't a required call. I didn't pick it up because my uncommitted changes involve new updateslot methods for cards I'm working on. Dunce hat to: adrian Modified: head/sys/net80211/ieee80211_proto.c Modified: head/sys/net80211/ieee80211_proto.c ============================================================================== --- head/sys/net80211/ieee80211_proto.c Fri Jun 5 13:54:13 2020 (r361833) +++ head/sys/net80211/ieee80211_proto.c Fri Jun 5 14:17:19 2020 (r361834) @@ -864,7 +864,8 @@ vap_update_slot(void *arg, int npending) /* * Call the driver with our new global slot time flags. */ - ic->ic_updateslot(ic); + if (ic->ic_updateslot != NULL) + ic->ic_updateslot(ic); } /* From owner-svn-src-head@freebsd.org Fri Jun 5 15:06:59 2020 Return-Path: Delivered-To: svn-src-head@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 A1F6232DFFD; Fri, 5 Jun 2020 15:06:59 +0000 (UTC) (envelope-from mav@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dmFv3sFKz43ZL; Fri, 5 Jun 2020 15:06:59 +0000 (UTC) (envelope-from mav@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 7EFFA12B4A; Fri, 5 Jun 2020 15:06:59 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055F6xgD065300; Fri, 5 Jun 2020 15:06:59 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055F6wQT065297; Fri, 5 Jun 2020 15:06:58 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202006051506.055F6wQT065297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 5 Jun 2020 15:06:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361835 - head/sys/dev/sound/pci/hda X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/dev/sound/pci/hda X-SVN-Commit-Revision: 361835 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 15:06:59 -0000 Author: mav Date: Fri Jun 5 15:06:58 2020 New Revision: 361835 URL: https://svnweb.freebsd.org/changeset/base/361835 Log: Add bunch of HDA controller and codec IDs. MFC after: 2 weeks Modified: head/sys/dev/sound/pci/hda/hdac.c head/sys/dev/sound/pci/hda/hdac.h head/sys/dev/sound/pci/hda/hdacc.c Modified: head/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- head/sys/dev/sound/pci/hda/hdac.c Fri Jun 5 14:17:19 2020 (r361834) +++ head/sys/dev/sound/pci/hda/hdac.c Fri Jun 5 15:06:58 2020 (r361835) @@ -79,15 +79,19 @@ static const struct { char quirks_off; } hdac_devices[] = { { HDA_INTEL_OAK, "Intel Oaktrail", 0, 0 }, + { HDA_INTEL_CMLKLP, "Intel Comet Lake-LP", 0, 0 }, + { HDA_INTEL_CMLKH, "Intel Comet Lake-H", 0, 0 }, { HDA_INTEL_BAY, "Intel BayTrail", 0, 0 }, { HDA_INTEL_HSW1, "Intel Haswell", 0, 0 }, { HDA_INTEL_HSW2, "Intel Haswell", 0, 0 }, { HDA_INTEL_HSW3, "Intel Haswell", 0, 0 }, { HDA_INTEL_BDW1, "Intel Broadwell", 0, 0 }, { HDA_INTEL_BDW2, "Intel Broadwell", 0, 0 }, + { HDA_INTEL_BXTNT, "Intel Broxton-T", 0, 0 }, { HDA_INTEL_CPT, "Intel Cougar Point", 0, 0 }, { HDA_INTEL_PATSBURG,"Intel Patsburg", 0, 0 }, { HDA_INTEL_PPT1, "Intel Panther Point", 0, 0 }, + { HDA_INTEL_BR, "Intel Braswell", 0, 0 }, { HDA_INTEL_LPT1, "Intel Lynx Point", 0, 0 }, { HDA_INTEL_LPT2, "Intel Lynx Point", 0, 0 }, { HDA_INTEL_WCPT, "Intel Wildcat Point", 0, 0 }, @@ -101,6 +105,7 @@ static const struct { { HDA_INTEL_KBLK, "Intel Kaby Lake", 0, 0 }, { HDA_INTEL_KBLKH, "Intel Kaby Lake-H", 0, 0 }, { HDA_INTEL_CFLK, "Intel Coffee Lake", 0, 0 }, + { HDA_INTEL_CMLKS, "Intel Comet Lake-S", 0, 0 }, { HDA_INTEL_CNLK, "Intel Cannon Lake", 0, 0 }, { HDA_INTEL_ICLK, "Intel Ice Lake", 0, 0 }, { HDA_INTEL_CMLKLP, "Intel Comet Lake-LP", 0, 0 }, @@ -112,10 +117,14 @@ static const struct { { HDA_INTEL_82801G, "Intel 82801G", 0, 0 }, { HDA_INTEL_82801H, "Intel 82801H", 0, 0 }, { HDA_INTEL_82801I, "Intel 82801I", 0, 0 }, + { HDA_INTEL_JLK, "Intel Jasper Lake", 0, 0 }, { HDA_INTEL_82801JI, "Intel 82801JI", 0, 0 }, { HDA_INTEL_82801JD, "Intel 82801JD", 0, 0 }, { HDA_INTEL_PCH, "Intel Ibex Peak", 0, 0 }, { HDA_INTEL_PCH2, "Intel Ibex Peak", 0, 0 }, + { HDA_INTEL_ELLK, "Intel Elkhart Lake", 0, 0 }, + { HDA_INTEL_JLK2, "Intel Jasper Lake", 0, 0 }, + { HDA_INTEL_BXTNP, "Intel Broxton-P", 0, 0 }, { HDA_INTEL_SCH, "Intel SCH", 0, 0 }, { HDA_NVIDIA_MCP51, "NVIDIA MCP51", 0, HDAC_QUIRK_MSI }, { HDA_NVIDIA_MCP55, "NVIDIA MCP55", 0, HDAC_QUIRK_MSI }, @@ -173,6 +182,10 @@ static const struct { { HDA_ATI_RV940, "ATI RV940", 0, 0 }, { HDA_ATI_RV970, "ATI RV970", 0, 0 }, { HDA_ATI_R1000, "ATI R1000", 0, 0 }, + { HDA_AMD_X370, "AMD X370", 0, 0 }, + { HDA_AMD_X570, "AMD X570", 0, 0 }, + { HDA_AMD_STONEY, "AMD Stoney", 0, 0 }, + { HDA_AMD_RAVEN, "AMD Raven", 0, 0 }, { HDA_AMD_HUDSON2, "AMD Hudson-2", 0, 0 }, { HDA_RDC_M3010, "RDC M3010", 0, 0 }, { HDA_VIA_VT82XX, "VIA VT8251/8237A",0, 0 }, Modified: head/sys/dev/sound/pci/hda/hdac.h ============================================================================== --- head/sys/dev/sound/pci/hda/hdac.h Fri Jun 5 14:17:19 2020 (r361834) +++ head/sys/dev/sound/pci/hda/hdac.h Fri Jun 5 15:06:58 2020 (r361835) @@ -43,24 +43,32 @@ /* Intel */ #define INTEL_VENDORID 0x8086 +#define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8) +#define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8) #define HDA_INTEL_OAK HDA_MODEL_CONSTRUCT(INTEL, 0x080a) #define HDA_INTEL_BAY HDA_MODEL_CONSTRUCT(INTEL, 0x0f04) #define HDA_INTEL_HSW1 HDA_MODEL_CONSTRUCT(INTEL, 0x0a0c) #define HDA_INTEL_HSW2 HDA_MODEL_CONSTRUCT(INTEL, 0x0c0c) #define HDA_INTEL_HSW3 HDA_MODEL_CONSTRUCT(INTEL, 0x0d0c) #define HDA_INTEL_BDW1 HDA_MODEL_CONSTRUCT(INTEL, 0x160c) +#define HDA_INTEL_BXTNT HDA_MODEL_CONSTRUCT(INTEL, 0x1a98) #define HDA_INTEL_CPT HDA_MODEL_CONSTRUCT(INTEL, 0x1c20) #define HDA_INTEL_PATSBURG HDA_MODEL_CONSTRUCT(INTEL, 0x1d20) #define HDA_INTEL_PPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x1e20) +#define HDA_INTEL_BR HDA_MODEL_CONSTRUCT(INTEL, 0x2284) #define HDA_INTEL_82801F HDA_MODEL_CONSTRUCT(INTEL, 0x2668) #define HDA_INTEL_63XXESB HDA_MODEL_CONSTRUCT(INTEL, 0x269a) #define HDA_INTEL_82801G HDA_MODEL_CONSTRUCT(INTEL, 0x27d8) #define HDA_INTEL_82801H HDA_MODEL_CONSTRUCT(INTEL, 0x284b) #define HDA_INTEL_82801I HDA_MODEL_CONSTRUCT(INTEL, 0x293e) +#define HDA_INTEL_JLK HDA_MODEL_CONSTRUCT(INTEL, 0x38c8) #define HDA_INTEL_82801JI HDA_MODEL_CONSTRUCT(INTEL, 0x3a3e) #define HDA_INTEL_82801JD HDA_MODEL_CONSTRUCT(INTEL, 0x3a6e) #define HDA_INTEL_PCH HDA_MODEL_CONSTRUCT(INTEL, 0x3b56) #define HDA_INTEL_PCH2 HDA_MODEL_CONSTRUCT(INTEL, 0x3b57) +#define HDA_INTEL_ELLK HDA_MODEL_CONSTRUCT(INTEL, 0x4b55) +#define HDA_INTEL_JLK2 HDA_MODEL_CONSTRUCT(INTEL, 0x4dc8) +#define HDA_INTEL_BXTNP HDA_MODEL_CONSTRUCT(INTEL, 0x5a98) #define HDA_INTEL_MACBOOKPRO92 HDA_MODEL_CONSTRUCT(INTEL, 0x7270) #define HDA_INTEL_SCH HDA_MODEL_CONSTRUCT(INTEL, 0x811b) #define HDA_INTEL_LPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x8c20) @@ -77,6 +85,7 @@ #define HDA_INTEL_KBLK HDA_MODEL_CONSTRUCT(INTEL, 0xa171) #define HDA_INTEL_KBLKH HDA_MODEL_CONSTRUCT(INTEL, 0xa2f0) #define HDA_INTEL_CFLK HDA_MODEL_CONSTRUCT(INTEL, 0xa348) +#define HDA_INTEL_CMLKS HDA_MODEL_CONSTRUCT(INTEL, 0xa3f0) #define HDA_INTEL_CNLK HDA_MODEL_CONSTRUCT(INTEL, 0x9dc8) #define HDA_INTEL_ICLK HDA_MODEL_CONSTRUCT(INTEL, 0x34c8) #define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8) @@ -151,6 +160,10 @@ #define HDA_ATI_ALL HDA_MODEL_CONSTRUCT(ATI, 0xffff) #define AMD_VENDORID 0x1022 +#define HDA_AMD_X370 HDA_MODEL_CONSTRUCT(AMD, 0x1457) +#define HDA_AMD_X570 HDA_MODEL_CONSTRUCT(AMD, 0x1487) +#define HDA_AMD_STONEY HDA_MODEL_CONSTRUCT(AMD, 0x157a) +#define HDA_AMD_RAVEN HDA_MODEL_CONSTRUCT(AMD, 0x15e3) #define HDA_AMD_HUDSON2 HDA_MODEL_CONSTRUCT(AMD, 0x780d) #define HDA_AMD_ALL HDA_MODEL_CONSTRUCT(AMD, 0xffff) @@ -358,12 +371,16 @@ /* Realtek */ #define REALTEK_VENDORID 0x10ec +#define HDA_CODEC_ALC215 HDA_CODEC_CONSTRUCT(REALTEK, 0x0215) #define HDA_CODEC_ALC221 HDA_CODEC_CONSTRUCT(REALTEK, 0x0221) +#define HDA_CODEC_ALC222 HDA_CODEC_CONSTRUCT(REALTEK, 0x0222) #define HDA_CODEC_ALC225 HDA_CODEC_CONSTRUCT(REALTEK, 0x0225) #define HDA_CODEC_ALC231 HDA_CODEC_CONSTRUCT(REALTEK, 0x0231) #define HDA_CODEC_ALC233 HDA_CODEC_CONSTRUCT(REALTEK, 0x0233) #define HDA_CODEC_ALC234 HDA_CODEC_CONSTRUCT(REALTEK, 0x0234) #define HDA_CODEC_ALC235 HDA_CODEC_CONSTRUCT(REALTEK, 0x0235) +#define HDA_CODEC_ALC236 HDA_CODEC_CONSTRUCT(REALTEK, 0x0236) +#define HDA_CODEC_ALC245 HDA_CODEC_CONSTRUCT(REALTEK, 0x0245) #define HDA_CODEC_ALC255 HDA_CODEC_CONSTRUCT(REALTEK, 0x0255) #define HDA_CODEC_ALC256 HDA_CODEC_CONSTRUCT(REALTEK, 0x0256) #define HDA_CODEC_ALC257 HDA_CODEC_CONSTRUCT(REALTEK, 0x0257) @@ -385,6 +402,7 @@ #define HDA_CODEC_ALC285 HDA_CODEC_CONSTRUCT(REALTEK, 0x0285) #define HDA_CODEC_ALC286 HDA_CODEC_CONSTRUCT(REALTEK, 0x0286) #define HDA_CODEC_ALC288 HDA_CODEC_CONSTRUCT(REALTEK, 0x0288) +#define HDA_CODEC_ALC289 HDA_CODEC_CONSTRUCT(REALTEK, 0x0289) #define HDA_CODEC_ALC290 HDA_CODEC_CONSTRUCT(REALTEK, 0x0290) #define HDA_CODEC_ALC292 HDA_CODEC_CONSTRUCT(REALTEK, 0x0292) #define HDA_CODEC_ALC293 HDA_CODEC_CONSTRUCT(REALTEK, 0x0293) @@ -394,6 +412,8 @@ #define HDA_CODEC_ALC299 HDA_CODEC_CONSTRUCT(REALTEK, 0x0299) #define HDA_CODEC_ALC292 HDA_CODEC_CONSTRUCT(REALTEK, 0x0292) #define HDA_CODEC_ALC295 HDA_CODEC_CONSTRUCT(REALTEK, 0x0295) +#define HDA_CODEC_ALC300 HDA_CODEC_CONSTRUCT(REALTEK, 0x0300) +#define HDA_CODEC_ALC623 HDA_CODEC_CONSTRUCT(REALTEK, 0x0623) #define HDA_CODEC_ALC660 HDA_CODEC_CONSTRUCT(REALTEK, 0x0660) #define HDA_CODEC_ALC662 HDA_CODEC_CONSTRUCT(REALTEK, 0x0662) #define HDA_CODEC_ALC663 HDA_CODEC_CONSTRUCT(REALTEK, 0x0663) @@ -416,6 +436,8 @@ #define HDA_CODEC_ALC892 HDA_CODEC_CONSTRUCT(REALTEK, 0x0892) #define HDA_CODEC_ALC899 HDA_CODEC_CONSTRUCT(REALTEK, 0x0899) #define HDA_CODEC_ALC1150 HDA_CODEC_CONSTRUCT(REALTEK, 0x0900) +#define HDA_CODEC_ALCS1200A HDA_CODEC_CONSTRUCT(REALTEK, 0x0b00) +#define HDA_CODEC_ALC1220_1 HDA_CODEC_CONSTRUCT(REALTEK, 0x1168) #define HDA_CODEC_ALC1220 HDA_CODEC_CONSTRUCT(REALTEK, 0x1220) #define HDA_CODEC_ALCXXXX HDA_CODEC_CONSTRUCT(REALTEK, 0xffff) @@ -708,6 +730,11 @@ #define HDA_CODEC_INTELGMLK1 HDA_CODEC_CONSTRUCT(INTEL, 0x280d) #define HDA_CODEC_INTELICLK HDA_CODEC_CONSTRUCT(INTEL, 0x280f) #define HDA_CODEC_INTELTGLK HDA_CODEC_CONSTRUCT(INTEL, 0x2812) +#define HDA_CODEC_INTELJLK HDA_CODEC_CONSTRUCT(INTEL, 0x281a) +#define HDA_CODEC_INTELELLK HDA_CODEC_CONSTRUCT(INTEL, 0x281b) +#define HDA_CODEC_INTELCT HDA_CODEC_CONSTRUCT(INTEL, 0x2880) +#define HDA_CODEC_INTELVV2 HDA_CODEC_CONSTRUCT(INTEL, 0x2882) +#define HDA_CODEC_INTELBR HDA_CODEC_CONSTRUCT(INTEL, 0x2883) #define HDA_CODEC_INTELCL HDA_CODEC_CONSTRUCT(INTEL, 0x29fb) #define HDA_CODEC_INTELXXXX HDA_CODEC_CONSTRUCT(INTEL, 0xffff) Modified: head/sys/dev/sound/pci/hda/hdacc.c ============================================================================== --- head/sys/dev/sound/pci/hda/hdacc.c Fri Jun 5 14:17:19 2020 (r361834) +++ head/sys/dev/sound/pci/hda/hdacc.c Fri Jun 5 15:06:58 2020 (r361835) @@ -77,12 +77,16 @@ static const struct { { HDA_CODEC_CS4206, 0, "Cirrus Logic CS4206" }, { HDA_CODEC_CS4207, 0, "Cirrus Logic CS4207" }, { HDA_CODEC_CS4210, 0, "Cirrus Logic CS4210" }, + { HDA_CODEC_ALC215, 0, "Realtek ALC215" }, { HDA_CODEC_ALC221, 0, "Realtek ALC221" }, + { HDA_CODEC_ALC222, 0, "Realtek ALC222" }, { HDA_CODEC_ALC225, 0, "Realtek ALC225" }, { HDA_CODEC_ALC231, 0, "Realtek ALC231" }, { HDA_CODEC_ALC233, 0, "Realtek ALC233" }, { HDA_CODEC_ALC234, 0, "Realtek ALC234" }, { HDA_CODEC_ALC235, 0, "Realtek ALC235" }, + { HDA_CODEC_ALC236, 0, "Realtek ALC236" }, + { HDA_CODEC_ALC245, 0, "Realtek ALC245" }, { HDA_CODEC_ALC255, 0, "Realtek ALC255" }, { HDA_CODEC_ALC256, 0, "Realtek ALC256" }, { HDA_CODEC_ALC257, 0, "Realtek ALC257" }, @@ -106,6 +110,7 @@ static const struct { { HDA_CODEC_ALC285, 0, "Realtek ALC285" }, { HDA_CODEC_ALC286, 0, "Realtek ALC286" }, { HDA_CODEC_ALC288, 0, "Realtek ALC288" }, + { HDA_CODEC_ALC289, 0, "Realtek ALC289" }, { HDA_CODEC_ALC290, 0, "Realtek ALC290" }, { HDA_CODEC_ALC292, 0, "Realtek ALC292" }, { HDA_CODEC_ALC293, 0, "Realtek ALC293" }, @@ -113,8 +118,12 @@ static const struct { { HDA_CODEC_ALC295, 0, "Realtek ALC295" }, { HDA_CODEC_ALC298, 0, "Realtek ALC298" }, { HDA_CODEC_ALC299, 0, "Realtek ALC299" }, + { HDA_CODEC_ALC300, 0, "Realtek ALC300" }, + { HDA_CODEC_ALC623, 0, "Realtek ALC623" }, { HDA_CODEC_ALC660, 0, "Realtek ALC660-VD" }, { HDA_CODEC_ALC662, 0x0002, "Realtek ALC662 rev2" }, + { HDA_CODEC_ALC662, 0x0101, "Realtek ALC662 rev1" }, + { HDA_CODEC_ALC662, 0x0300, "Realtek ALC662 rev3" }, { HDA_CODEC_ALC662, 0, "Realtek ALC662" }, { HDA_CODEC_ALC663, 0, "Realtek ALC663" }, { HDA_CODEC_ALC665, 0, "Realtek ALC665" }, @@ -140,6 +149,8 @@ static const struct { { HDA_CODEC_ALC892, 0, "Realtek ALC892" }, { HDA_CODEC_ALC899, 0, "Realtek ALC899" }, { HDA_CODEC_ALC1150, 0, "Realtek ALC1150" }, + { HDA_CODEC_ALCS1200A, 0, "Realtek ALCS1200A" }, + { HDA_CODEC_ALC1220_1, 0, "Realtek ALC1220" }, { HDA_CODEC_ALC1220, 0, "Realtek ALC1220" }, { HDA_CODEC_AD1882, 0, "Analog Devices AD1882" }, { HDA_CODEC_AD1882A, 0, "Analog Devices AD1882A" }, @@ -369,6 +380,11 @@ static const struct { { HDA_CODEC_INTELBDW, 0, "Intel Broadwell" }, { HDA_CODEC_INTELSKLK, 0, "Intel Skylake" }, { HDA_CODEC_INTELKBLK, 0, "Intel Kaby Lake" }, + { HDA_CODEC_INTELJLK, 0, "Intel Jasper Lake" }, + { HDA_CODEC_INTELELLK, 0, "Intel Elkhart Lake" }, + { HDA_CODEC_INTELCT, 0, "Intel CedarTrail" }, + { HDA_CODEC_INTELVV2, 0, "Intel Valleyview2" }, + { HDA_CODEC_INTELBR, 0, "Intel Braswell" }, { HDA_CODEC_INTELCL, 0, "Intel Crestline" }, { HDA_CODEC_INTELBXTN, 0, "Intel Broxton" }, { HDA_CODEC_INTELCNLK, 0, "Intel Cannonlake" }, From owner-svn-src-head@freebsd.org Fri Jun 5 16:05:10 2020 Return-Path: Delivered-To: svn-src-head@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 8760C32FE96; Fri, 5 Jun 2020 16:05:10 +0000 (UTC) (envelope-from cem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dnY22vL0z4BFJ; Fri, 5 Jun 2020 16:05:10 +0000 (UTC) (envelope-from cem@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 5A833136D8; Fri, 5 Jun 2020 16:05:10 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055G5AJG003344; Fri, 5 Jun 2020 16:05:10 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055G5AgY003343; Fri, 5 Jun 2020 16:05:10 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202006051605.055G5AgY003343@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 5 Jun 2020 16:05:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361837 - head/sys/geom X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/geom X-SVN-Commit-Revision: 361837 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 16:05:10 -0000 Author: cem Date: Fri Jun 5 16:05:09 2020 New Revision: 361837 URL: https://svnweb.freebsd.org/changeset/base/361837 Log: geom: Don't re-add duplicate aliases Reviewed by: imp (informal +1; extracted from phab 24968) Modified: head/sys/geom/geom_subr.c Modified: head/sys/geom/geom_subr.c ============================================================================== --- head/sys/geom/geom_subr.c Fri Jun 5 15:09:02 2020 (r361836) +++ head/sys/geom/geom_subr.c Fri Jun 5 16:05:09 2020 (r361837) @@ -652,6 +652,15 @@ g_provider_add_alias(struct g_provider *pp, const char sbuf_vprintf(sb, fmt, ap); va_end(ap); sbuf_finish(sb); + + LIST_FOREACH(gap, &pp->aliases, ga_next) { + if (strcmp(gap->ga_alias, sbuf_data(sb)) != 0) + continue; + /* Don't re-add the same alias. */ + sbuf_delete(sb); + return; + } + gap = g_malloc(sizeof(*gap) + sbuf_len(sb) + 1, M_WAITOK | M_ZERO); memcpy((char *)(gap + 1), sbuf_data(sb), sbuf_len(sb)); sbuf_delete(sb); From owner-svn-src-head@freebsd.org Fri Jun 5 16:12:22 2020 Return-Path: Delivered-To: svn-src-head@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 6BC2F33061D; Fri, 5 Jun 2020 16:12:22 +0000 (UTC) (envelope-from cem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dnjL1Dt9z4CG3; Fri, 5 Jun 2020 16:12:22 +0000 (UTC) (envelope-from cem@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 1AD3813772; Fri, 5 Jun 2020 16:12:22 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055GCLvv009494; Fri, 5 Jun 2020 16:12:21 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055GCL11009491; Fri, 5 Jun 2020 16:12:21 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202006051612.055GCL11009491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 5 Jun 2020 16:12:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361838 - in head/sys/geom: . label X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/sys/geom: . label X-SVN-Commit-Revision: 361838 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 16:12:22 -0000 Author: cem Date: Fri Jun 5 16:12:21 2020 New Revision: 361838 URL: https://svnweb.freebsd.org/changeset/base/361838 Log: geom_label: Use provider aliasing to alias upstream geoms For synthetic aliases (just pseudonyms inferred from metadata like GPT or UFS labels, GPT UUIDs, etc), use the GEOM provider aliasing system to create a symlink to the real device instead of creating an independent device. This makes it more clear which labels and devices correspond, and we can safely have multiple labels to a single device accessed at once. The confusingly named geom_label on-disk construct continues to behave identically to how it did before. This requires teaching GEOM's provider aliasing about the possibility that aliases might be added later in time, and GEOM's devfs interaction layer not to worry about existing aliases during retaste. Discussed with: imp Relnotes: sure, if we don't end up reverting it Differential Revision: https://reviews.freebsd.org/D24968 Modified: head/sys/geom/geom_dev.c head/sys/geom/label/g_label.c Modified: head/sys/geom/geom_dev.c ============================================================================== --- head/sys/geom/geom_dev.c Fri Jun 5 16:05:09 2020 (r361837) +++ head/sys/geom/geom_dev.c Fri Jun 5 16:12:21 2020 (r361838) @@ -336,9 +336,20 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, struct cdev *dev, *adev; char buf[SPECNAMELEN + 6]; struct make_dev_args args; + bool retaste; g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); + /* Only one geom_dev per provider. */ + LIST_FOREACH(cp, &pp->consumers, consumers) { + if (cp->geom->class != mp || (cp->flags & G_CF_SPOILED)) + continue; + gp = cp->geom; + sc = cp->private; + dev = sc->sc_dev; + retaste = true; + goto aliases; + } gp = g_new_geomf(mp, "%s", pp->name); sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO); mtx_init(&sc->sc_mtx, "g_dev", NULL, MTX_DEF); @@ -380,6 +391,8 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, g_dev_attrchanged(cp, "GEOM::physpath"); snprintf(buf, sizeof(buf), "cdev=%s", gp->name); devctl_notify_f("GEOM", "DEV", "CREATE", buf, M_WAITOK); + retaste = false; +aliases: /* * Now add all the aliases for this drive */ @@ -387,8 +400,16 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, error = make_dev_alias_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK, &adev, dev, "%s", gap->ga_alias); if (error) { - printf("%s: make_dev_alias_p() failed (name=%s, error=%d)\n", - __func__, gap->ga_alias, error); + /* + * With aliases added after initial taste, we don't + * know which aliases are new in this retaste, so we + * try to create all of them. EEXIST is expected and + * silently ignored or else this becomes really spammy. + */ + if (error != EEXIST || !retaste) + printf("%s: make_dev_alias_p() failed (name=%s," + " error=%d)\n", __func__, gap->ga_alias, + error); continue; } snprintf(buf, sizeof(buf), "cdev=%s", gap->ga_alias); Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Fri Jun 5 16:05:09 2020 (r361837) +++ head/sys/geom/label/g_label.c Fri Jun 5 16:12:21 2020 (r361838) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -344,18 +345,16 @@ g_label_taste(struct g_class *mp, struct g_provider *p { struct g_label_metadata md; struct g_consumer *cp; + struct g_class *clsp; struct g_geom *gp; int i; + bool changed; g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, pp->name); g_topology_assert(); G_LABEL_DEBUG(2, "Tasting %s.", pp->name); - /* Skip providers that are already open for writing. */ - if (pp->acw > 0) - return (NULL); - if (strcmp(pp->geom->class->name, mp->name) == 0) return (NULL); @@ -391,9 +390,16 @@ g_label_taste(struct g_class *mp, struct g_provider *p if (md.md_provsize != pp->mediasize) break; + /* Skip providers that are already open for writing. */ + if (pp->acw > 0) { + g_access(cp, -1, 0, 0); + goto end; + } + g_label_create(NULL, mp, pp, md.md_label, G_LABEL_DIR, pp->mediasize - pp->sectorsize); } while (0); + changed = false; for (i = 0; g_labels[i] != NULL; i++) { char label[128]; @@ -405,8 +411,28 @@ g_label_taste(struct g_class *mp, struct g_provider *p g_topology_lock(); if (label[0] == '\0') continue; - g_label_create(NULL, mp, pp, label, g_labels[i]->ld_dir, - pp->mediasize); + if (!g_label_is_name_ok(label)) { + G_LABEL_DEBUG(0, + "%s contains suspicious label, skipping.", + pp->name); + G_LABEL_DEBUG(1, "%s suspicious label is: %s", + pp->name, label); + continue; + } + g_provider_add_alias(pp, "%s/%s", g_labels[i]->ld_dir, label); + changed = true; + } + /* + * Force devfs interface to retaste the provider, to catch the new + * alias(es). + */ + if (changed) { + LIST_FOREACH(clsp, &g_classes, class) { + if (strcmp(clsp->name, "DEV") != 0) + continue; + clsp->taste(clsp, pp, 0); + break; + } } g_access(cp, -1, 0, 0); end: From owner-svn-src-head@freebsd.org Fri Jun 5 16:56:49 2020 Return-Path: Delivered-To: svn-src-head@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 07391331414; Fri, 5 Jun 2020 16:56:49 +0000 (UTC) (envelope-from kaduk@mit.edu) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) (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 49dphc1ckHz4HlY; Fri, 5 Jun 2020 16:56:47 +0000 (UTC) (envelope-from kaduk@mit.edu) Received: from mit.edu ([24.16.140.251]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 055Gufcc030752 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Jun 2020 12:56:43 -0400 Date: Fri, 5 Jun 2020 09:56:40 -0700 From: Benjamin Kaduk To: rgrimes@freebsd.org Cc: Eugene Grosbein , Benjamin Kaduk , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361783 - head/usr.bin/killall Message-ID: <20200605165640.GG58497@mit.edu> References: <9f04697e-91d9-1221-2c8f-136fdf564f5d@grosbein.net> <202006041312.054DC5gj026050@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006041312.054DC5gj026050@gndrsh.dnsmgr.net> User-Agent: Mutt/1.12.1 (2019-06-15) X-Rspamd-Queue-Id: 49dphc1ckHz4HlY X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of kaduk@mit.edu designates 18.9.28.11 as permitted sender) smtp.mailfrom=kaduk@mit.edu X-Spamd-Result: default: False [-2.60 / 15.00]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.01)[-1.010]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:18.9.28.0/24]; NEURAL_HAM_LONG(-0.98)[-0.977]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[18.9.28.11:from]; NEURAL_HAM_SHORT(-0.41)[-0.408]; FORGED_SENDER(0.30)[bjk@freebsd.org,kaduk@mit.edu]; RECEIVED_SPAMHAUS_PBL(0.00)[24.16.140.251:received]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:3, ipnet:18.9.0.0/16, country:US]; FROM_NEQ_ENVFROM(0.00)[bjk@freebsd.org,kaduk@mit.edu] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 16:56:49 -0000 It seems Conrad dropped me from his reply, so I can't include it directly, but... On Thu, Jun 04, 2020 at 06:12:05AM -0700, Rodney W. Grimes wrote: > > 04.06.2020 11:29, Benjamin Kaduk wrote: > > > > > Author: bjk (doc committer) > > > Date: Thu Jun 4 04:29:43 2020 > > > New Revision: 361783 > > > URL: https://svnweb.freebsd.org/changeset/base/361783 > > > > > > Log: > > > Add EXAMPLES to killall(1) > > > > > > Submitted by: fernape > > > Differential Revision: https://reviews.freebsd.org/D25002 > > > > > > Modified: > > > head/usr.bin/killall/killall.1 > > > > > > Modified: head/usr.bin/killall/killall.1 > > > ============================================================================== > > > --- head/usr.bin/killall/killall.1 Thu Jun 4 02:36:41 2020 (r361782) > > > +++ head/usr.bin/killall/killall.1 Thu Jun 4 04:29:43 2020 (r361783) > > > @@ -145,6 +145,50 @@ utility exits 0 if some processes have been found and > > > signalled successfully. > > > Otherwise, a status of 1 will be > > > returned. > > > +.Sh EXAMPLES > > > +Send > > > +.Dv SIGTERM > > > +to all firefox processes: > > > +.Bd -literal -offset indent > > > +killall firefox > > > +.Ed > > > +.Pp > > > +Send > > > +.Dv SIGTERM > > > +to firefox processes belonging to > > > +.Va USER : > > > +.Bd -literal -offset indent > > > +killall -u ${USER} firefox > > > +.Ed > > > +.Pp > > > +Stop all firefox processes: > > > +.Bd -literal -offset indent > > > +killall -SIGSTOP firefox > > > +.Ed > > > +.Pp > > > +Resume firefox processes: > > > +.Bd -literal -offset indent > > > +killall -SIGCONT firefox > > > +.Ed > > > +.Pp > > > +Show what would be done to firefox processes, but do not actually signal them: > > > +.Bd -literal -offset indent > > > +killall -s firefox > > > +.Ed > > > +.Pp > > > +Send > > > +.Dv SIGKILL > > > +to csh process running inside jail ID 282: > > > +.Bd -literal -offset indent > > > +killall -9 -j282 csh > > > +.Ed > > > +.Pp > > > +Send > > > +.Dv SIGTERM > > > +to all processes matching provided pattern (like vim and vimdiff): > > > +.Bd -literal -offset indent > > > +killall -m 'vim*' > > > +.Ed > > > .Sh DIAGNOSTICS > > > Diagnostic messages will only be printed if requested by > > > .Fl d > > > > "Firefox" is a trade mark (type of intellectual property) of Mozilla Foundation. > > Is it OK for us to use this name such way? > > > > Isn't it better using a name of some utility we have in the base system like systat(1) ? > > Purley out of simple safety I agree here. Though I doubt a case could > be made for infringement it is just too easy to do the safe thing. I'm not aware of any issues with using a trademark-protected term to refer to the product named by the mark, and don't see how one could claim that this usage is an attempt to dilute the mark. I don't currently plan to make any further changes to this example, myself (though I will not stand in the way if someone else wants to blandify the example). Thanks, Ben From owner-svn-src-head@freebsd.org Fri Jun 5 16:59:15 2020 Return-Path: Delivered-To: svn-src-head@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 6F36B331561; Fri, 5 Jun 2020 16:59:15 +0000 (UTC) (envelope-from bjk@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dplR2KTHz4J7s; Fri, 5 Jun 2020 16:59:15 +0000 (UTC) (envelope-from bjk@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 464ED13F72; Fri, 5 Jun 2020 16:59:15 +0000 (UTC) (envelope-from bjk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055GxFW3035392; Fri, 5 Jun 2020 16:59:15 GMT (envelope-from bjk@FreeBSD.org) Received: (from bjk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055GxFMr035391; Fri, 5 Jun 2020 16:59:15 GMT (envelope-from bjk@FreeBSD.org) Message-Id: <202006051659.055GxFMr035391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org using -f From: Benjamin Kaduk Date: Fri, 5 Jun 2020 16:59:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361839 - head/usr.bin/killall X-SVN-Group: head X-SVN-Commit-Author: bjk X-SVN-Commit-Paths: head/usr.bin/killall X-SVN-Commit-Revision: 361839 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 16:59:15 -0000 Author: bjk (doc committer) Date: Fri Jun 5 16:59:14 2020 New Revision: 361839 URL: https://svnweb.freebsd.org/changeset/base/361839 Log: Belatedly bump .Dd for r361783 Reported by: lwhsu Pointy hat to: bjk Modified: head/usr.bin/killall/killall.1 Modified: head/usr.bin/killall/killall.1 ============================================================================== --- head/usr.bin/killall/killall.1 Fri Jun 5 16:12:21 2020 (r361838) +++ head/usr.bin/killall/killall.1 Fri Jun 5 16:59:14 2020 (r361839) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 30, 2013 +.Dd June 4, 2020 .Dt KILLALL 1 .Os .Sh NAME From owner-svn-src-head@freebsd.org Fri Jun 5 17:00:39 2020 Return-Path: Delivered-To: svn-src-head@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 A9E21331365; Fri, 5 Jun 2020 17:00:39 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dpn3401Dz4JFf; Fri, 5 Jun 2020 17:00:39 +0000 (UTC) (envelope-from emaste@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 83E8A14330; Fri, 5 Jun 2020 17:00:39 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055H0dBZ035577; Fri, 5 Jun 2020 17:00:39 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055H0dEg035575; Fri, 5 Jun 2020 17:00:39 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006051700.055H0dEg035575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 5 Jun 2020 17:00:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361840 - in head: lib/libmd sys/modules/crypto X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: lib/libmd sys/modules/crypto X-SVN-Commit-Revision: 361840 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 17:00:39 -0000 Author: emaste Date: Fri Jun 5 17:00:38 2020 New Revision: 361840 URL: https://svnweb.freebsd.org/changeset/base/361840 Log: Apply C SKEIN_LOOP setting only to skein_block.c Otherwise if assembling skein_block_asm.s with Clang's integrated assembler we can pass conflicting SKEIN_LOOP settings (via CFLAGS and ACFLAGS). Modified: head/lib/libmd/Makefile head/sys/modules/crypto/Makefile Modified: head/lib/libmd/Makefile ============================================================================== --- head/lib/libmd/Makefile Fri Jun 5 16:59:14 2020 (r361839) +++ head/lib/libmd/Makefile Fri Jun 5 17:00:38 2020 (r361840) @@ -97,7 +97,7 @@ CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2 CFLAGS+= -I${SRCTOP}/sys/crypto/skein CFLAGS+= -DWEAK_REFS # unroll the 256 and 512 loops, half unroll the 1024 -CFLAGS+= -DSKEIN_LOOP=995 +CFLAGS.skein_block.c+= -DSKEIN_LOOP=995 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 .PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} Modified: head/sys/modules/crypto/Makefile ============================================================================== --- head/sys/modules/crypto/Makefile Fri Jun 5 16:59:14 2020 (r361839) +++ head/sys/modules/crypto/Makefile Fri Jun 5 17:00:38 2020 (r361840) @@ -27,7 +27,7 @@ SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha256c.c sha512c.c SRCS += skein.c skein_block.c # unroll the 256 and 512 loops, half unroll the 1024 -CFLAGS+= -DSKEIN_LOOP=995 +CFLAGS.skein_block.c += -DSKEIN_LOOP=995 .if exists(${MACHINE_ARCH}/skein_block_asm.s) .PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} SRCS += skein_block_asm.s From owner-svn-src-head@freebsd.org Fri Jun 5 18:18:28 2020 Return-Path: Delivered-To: svn-src-head@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 472AA333690; Fri, 5 Jun 2020 18:18:28 +0000 (UTC) (envelope-from tsoome@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49drVr116wz4TBy; Fri, 5 Jun 2020 18:18:28 +0000 (UTC) (envelope-from tsoome@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 197D31502F; Fri, 5 Jun 2020 18:18:28 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055IIRsu085637; Fri, 5 Jun 2020 18:18:27 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055IIRB8085636; Fri, 5 Jun 2020 18:18:27 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <202006051818.055IIRB8085636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Fri, 5 Jun 2020 18:18:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361842 - head/sbin/zfsbootcfg X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sbin/zfsbootcfg X-SVN-Commit-Revision: 361842 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:18:28 -0000 Author: tsoome Date: Fri Jun 5 18:18:27 2020 New Revision: 361842 URL: https://svnweb.freebsd.org/changeset/base/361842 Log: zfsbootcfg: use vfs.root.mountfrom and update nextboot on every vdev vfs.zfs.boot.primary_pool is only set on BIOS boot, use vfs.root.mountfrom instead and update all vdevs on pool. Reviewed by: allanjude Sponsored by: Netflix, Klara Inc. Differential Revision: https://reviews.freebsd.org/D25103 Modified: head/sbin/zfsbootcfg/zfsbootcfg.c Modified: head/sbin/zfsbootcfg/zfsbootcfg.c ============================================================================== --- head/sbin/zfsbootcfg/zfsbootcfg.c Fri Jun 5 18:00:36 2020 (r361841) +++ head/sbin/zfsbootcfg/zfsbootcfg.c Fri Jun 5 18:18:27 2020 (r361842) @@ -40,13 +40,44 @@ __FBSDID("$FreeBSD$"); /* Keep in sync with zfsboot.c. */ #define MAX_COMMAND_LEN 512 +int +install_bootonce(libzfs_handle_t *hdl, uint64_t pool_guid, nvlist_t *nv, + const char * const data) +{ + nvlist_t **child; + uint_t children = 0; + uint64_t guid; + int rv; + + (void) nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_CHILDREN, &child, + &children); + + for (int c = 0; c < children; c++) { + rv = install_bootonce(hdl, pool_guid, child[c], data); + } + + if (children > 0) + return (rv); + + if (nvlist_lookup_uint64(nv, ZPOOL_CONFIG_GUID, &guid) != 0) { + perror("can't get vdev guid"); + return (1); + } + if (zpool_nextboot(hdl, pool_guid, guid, data) != 0) { + perror("ZFS_IOC_NEXTBOOT failed"); + return (1); + } + return (0); +} + int main(int argc, const char * const *argv) { - char buf[32]; + char buf[32], *name; libzfs_handle_t *hdl; + zpool_handle_t *zphdl; uint64_t pool_guid; - uint64_t vdev_guid; - int zfs_fd; + nvlist_t *nv, *config; + int rv; int len; if (argc != 2) { @@ -60,39 +91,56 @@ int main(int argc, const char * const *argv) return (1); } - if (kenv(KENV_GET, "vfs.zfs.boot.primary_pool", buf, sizeof(buf)) <= 0) { - perror("can't get vfs.zfs.boot.primary_pool"); + if (kenv(KENV_GET, "vfs.root.mountfrom", buf, sizeof(buf)) <= 0) { + perror("can't get vfs.root.mountfrom"); return (1); } - pool_guid = strtoumax(buf, NULL, 10); - if (pool_guid == 0) { - perror("can't parse vfs.zfs.boot.primary_pool"); + + if (strncmp(buf, "zfs:", 4) == 0) { + name = strchr(buf + 4, '/'); + if (name != NULL) + *name = '\0'; + name = buf + 4; + } else { + perror("not a zfs root"); return (1); } - - if (kenv(KENV_GET, "vfs.zfs.boot.primary_vdev", buf, sizeof(buf)) <= 0) { - perror("can't get vfs.zfs.boot.primary_vdev"); + + if ((hdl = libzfs_init()) == NULL) { + (void) fprintf(stderr, "internal error: failed to " + "initialize ZFS library\n"); return (1); } - vdev_guid = strtoumax(buf, NULL, 10); - if (vdev_guid == 0) { - perror("can't parse vfs.zfs.boot.primary_vdev"); + + zphdl = zpool_open(hdl, name); + if (zphdl == NULL) { + perror("can't open pool"); + libzfs_fini(hdl); return (1); } - if ((hdl = libzfs_init()) == NULL) { - (void) fprintf(stderr, "internal error: failed to " - "initialize ZFS library\n"); + pool_guid = zpool_get_prop_int(zphdl, ZPOOL_PROP_GUID, NULL); + + config = zpool_get_config(zphdl, NULL); + if (config == NULL) { + perror("can't get pool config"); + zpool_close(zphdl); + libzfs_fini(hdl); return (1); } - if (zpool_nextboot(hdl, pool_guid, vdev_guid, argv[1]) != 0) { - perror("ZFS_IOC_NEXTBOOT failed"); + if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nv) != 0) { + perror("failed to get vdev tree"); + zpool_close(zphdl); libzfs_fini(hdl); return (1); } + rv = install_bootonce(hdl, pool_guid, nv, argv[1]); + + zpool_close(zphdl); libzfs_fini(hdl); - printf("zfs next boot options are successfully written\n"); - return (0); + if (rv == 0) + printf("zfs next boot options are successfully written\n"); + return (rv); } From owner-svn-src-head@freebsd.org Fri Jun 5 18:35:18 2020 Return-Path: Delivered-To: svn-src-head@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 AD8FD333D53; Fri, 5 Jun 2020 18:35:18 +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 49drtF6GXwz4WMd; Fri, 5 Jun 2020 18:35:17 +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 055IZEeg032196; Fri, 5 Jun 2020 11:35:14 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 055IZE1p032195; Fri, 5 Jun 2020 11:35:14 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006051835.055IZE1p032195@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361783 - head/usr.bin/killall In-Reply-To: <20200605165640.GG58497@mit.edu> To: Benjamin Kaduk Date: Fri, 5 Jun 2020 11:35:14 -0700 (PDT) CC: rgrimes@freebsd.org, Eugene Grosbein , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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 X-Rspamd-Queue-Id: 49drtF6GXwz4WMd X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:35:18 -0000 > It seems Conrad dropped me from his reply, so I can't include it directly, > but... > > On Thu, Jun 04, 2020 at 06:12:05AM -0700, Rodney W. Grimes wrote: > > > 04.06.2020 11:29, Benjamin Kaduk wrote: > > > > > > > Author: bjk (doc committer) > > > > Date: Thu Jun 4 04:29:43 2020 > > > > New Revision: 361783 > > > > URL: https://svnweb.freebsd.org/changeset/base/361783 > > > > > > > > Log: > > > > Add EXAMPLES to killall(1) > > > > > > > > Submitted by: fernape > > > > Differential Revision: https://reviews.freebsd.org/D25002 > > > > > > > > Modified: > > > > head/usr.bin/killall/killall.1 > > > > > > > > Modified: head/usr.bin/killall/killall.1 > > > > ============================================================================== > > > > --- head/usr.bin/killall/killall.1 Thu Jun 4 02:36:41 2020 (r361782) > > > > +++ head/usr.bin/killall/killall.1 Thu Jun 4 04:29:43 2020 (r361783) > > > > @@ -145,6 +145,50 @@ utility exits 0 if some processes have been found and > > > > signalled successfully. > > > > Otherwise, a status of 1 will be > > > > returned. > > > > +.Sh EXAMPLES > > > > +Send > > > > +.Dv SIGTERM > > > > +to all firefox processes: > > > > +.Bd -literal -offset indent > > > > +killall firefox > > > > +.Ed > > > > +.Pp > > > > +Send > > > > +.Dv SIGTERM > > > > +to firefox processes belonging to > > > > +.Va USER : > > > > +.Bd -literal -offset indent > > > > +killall -u ${USER} firefox > > > > +.Ed > > > > +.Pp > > > > +Stop all firefox processes: > > > > +.Bd -literal -offset indent > > > > +killall -SIGSTOP firefox > > > > +.Ed > > > > +.Pp > > > > +Resume firefox processes: > > > > +.Bd -literal -offset indent > > > > +killall -SIGCONT firefox > > > > +.Ed > > > > +.Pp > > > > +Show what would be done to firefox processes, but do not actually signal them: > > > > +.Bd -literal -offset indent > > > > +killall -s firefox > > > > +.Ed > > > > +.Pp > > > > +Send > > > > +.Dv SIGKILL > > > > +to csh process running inside jail ID 282: > > > > +.Bd -literal -offset indent > > > > +killall -9 -j282 csh > > > > +.Ed > > > > +.Pp > > > > +Send > > > > +.Dv SIGTERM > > > > +to all processes matching provided pattern (like vim and vimdiff): > > > > +.Bd -literal -offset indent > > > > +killall -m 'vim*' > > > > +.Ed > > > > .Sh DIAGNOSTICS > > > > Diagnostic messages will only be printed if requested by > > > > .Fl d > > > > > > "Firefox" is a trade mark (type of intellectual property) of Mozilla Foundation. > > > Is it OK for us to use this name such way? > > > > > > Isn't it better using a name of some utility we have in the base system like systat(1) ? > > > > Purley out of simple safety I agree here. Though I doubt a case could > > be made for infringement it is just too easy to do the safe thing. > > I'm not aware of any issues with using a trademark-protected term to refer > to the product named by the mark, Actually since you fail to recognize it as a mark with a TM notice this does have other legal issues.... much as Sony didnt recognize the TM on FreeBSD when used Mozilla could send us a nasty gram. Probably unlikely, but still possible. > and don't see how one could claim that > this usage is an attempt to dilute the mark. I don't currently plan to > make any further changes to this example, myself (though I will not stand > in the way if someone else wants to blandify the example). Good enough. > Thanks, > Ben -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Fri Jun 5 18:37:05 2020 Return-Path: Delivered-To: svn-src-head@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 4DC8D333F2A; Fri, 5 Jun 2020 18:37:05 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49drwK1N1Sz4Wl4; Fri, 5 Jun 2020 18:37:05 +0000 (UTC) (envelope-from emaste@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 2A5081543C; Fri, 5 Jun 2020 18:37:05 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055Ib5Zc097744; Fri, 5 Jun 2020 18:37:05 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055Ib5ro097743; Fri, 5 Jun 2020 18:37:05 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006051837.055Ib5ro097743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 5 Jun 2020 18:37:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361843 - head/sys/crypto/skein/amd64 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/crypto/skein/amd64 X-SVN-Commit-Revision: 361843 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:37:05 -0000 Author: emaste Date: Fri Jun 5 18:37:04 2020 New Revision: 361843 URL: https://svnweb.freebsd.org/changeset/base/361843 Log: skein_block_asm.S: use #ifdef not .ifdef, for Clang IAS Clang IAS does not support the --defsym argument, and .ifndef SKEIN_USE_ASM gets turned into .ifndef 1792 by the preprocessor, which results in error: expected identifier after '.ifdef' .ifndef 1792 ^ Use #ifdef instead, which still works with GNU as. Reviewed by: cem Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25154 Modified: head/sys/crypto/skein/amd64/skein_block_asm.s Modified: head/sys/crypto/skein/amd64/skein_block_asm.s ============================================================================== --- head/sys/crypto/skein/amd64/skein_block_asm.s Fri Jun 5 18:18:27 2020 (r361842) +++ head/sys/crypto/skein/amd64/skein_block_asm.s Fri Jun 5 18:37:04 2020 (r361843) @@ -18,20 +18,21 @@ _MASK_ALL_ = (256+512+1024) #all three _MAX_FRAME_ = 240 # ################# -.ifndef SKEIN_USE_ASM +#ifndef SKEIN_USE_ASM _USE_ASM_ = _MASK_ALL_ -.else +#else _USE_ASM_ = SKEIN_USE_ASM -.endif +#endif ################# -.ifndef SKEIN_LOOP #configure loop unrolling +#configure loop unrolling +#ifndef SKEIN_LOOP _SKEIN_LOOP = 2 #default is fully unrolled for 256/512, twice for 1024 -.else +#else _SKEIN_LOOP = SKEIN_LOOP .irp _NN_,%_SKEIN_LOOP #only display loop unrolling if default changed on command line #.print "+++ SKEIN_LOOP = \_NN_" .endr -.endif +#endif # the unroll counts (0 --> fully unrolled) SKEIN_UNROLL_256 = (_SKEIN_LOOP / 100) % 10 SKEIN_UNROLL_512 = (_SKEIN_LOOP / 10) % 10 From owner-svn-src-head@freebsd.org Fri Jun 5 18:44:14 2020 Return-Path: Delivered-To: svn-src-head@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 E4F4D3342F1; Fri, 5 Jun 2020 18:44:14 +0000 (UTC) (envelope-from markj@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ds4Z5JzZz4XZJ; Fri, 5 Jun 2020 18:44:14 +0000 (UTC) (envelope-from markj@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 B1C9F15458; Fri, 5 Jun 2020 18:44:14 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055IiEMx003860; Fri, 5 Jun 2020 18:44:14 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055IiE7i003859; Fri, 5 Jun 2020 18:44:14 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202006051844.055IiE7i003859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 5 Jun 2020 18:44:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361844 - head/lib/librtld_db X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/lib/librtld_db X-SVN-Commit-Revision: 361844 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:44:15 -0000 Author: markj Date: Fri Jun 5 18:44:14 2020 New Revision: 361844 URL: https://svnweb.freebsd.org/changeset/base/361844 Log: librtld_db: Handle anonymous mappings below the first file mapping. r360979 erroneously assumed that the lowest mapping in an address space would be a file mapping, but of course this is not true in general. Reported and tested by: Frederic Chardon MFC after: 3 days Modified: head/lib/librtld_db/rtld_db.c Modified: head/lib/librtld_db/rtld_db.c ============================================================================== --- head/lib/librtld_db/rtld_db.c Fri Jun 5 18:37:04 2020 (r361843) +++ head/lib/librtld_db/rtld_db.c Fri Jun 5 18:44:14 2020 (r361844) @@ -186,11 +186,15 @@ rd_loadobj_iter(rd_agent_t *rdap, rl_iter_f *cb, void * file, but we want the mapping offset relative to the base * mapping. */ - if (kve->kve_type == KVME_TYPE_VNODE && - kve->kve_vn_fileid != fileid) { - base = kve->kve_start; - fileid = kve->kve_vn_fileid; - path = kve->kve_path; + if (kve->kve_type == KVME_TYPE_VNODE) { + if (kve->kve_vn_fileid != fileid) { + base = kve->kve_start; + fileid = kve->kve_vn_fileid; + path = kve->kve_path; + } + } else { + base = 0; + path = NULL; } memset(&rdl, 0, sizeof(rdl)); /* @@ -205,7 +209,8 @@ rd_loadobj_iter(rd_agent_t *rdap, rl_iter_f *cb, void rdl.rdl_prot |= RD_RDL_W; if (kve->kve_protection & KVME_PROT_EXEC) rdl.rdl_prot |= RD_RDL_X; - strlcpy(rdl.rdl_path, path, sizeof(rdl.rdl_path)); + if (path != NULL) + strlcpy(rdl.rdl_path, path, sizeof(rdl.rdl_path)); if ((*cb)(&rdl, clnt_data) != 0) { ret = RD_ERR; break; From owner-svn-src-head@freebsd.org Fri Jun 5 18:56:44 2020 Return-Path: Delivered-To: svn-src-head@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 6B7BC334665; Fri, 5 Jun 2020 18:56:44 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dsM02GY8z4Z4n; Fri, 5 Jun 2020 18:56:44 +0000 (UTC) (envelope-from emaste@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 4921315B6B; Fri, 5 Jun 2020 18:56:44 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055IuiVG010992; Fri, 5 Jun 2020 18:56:44 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055IuhAW010990; Fri, 5 Jun 2020 18:56:43 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006051856.055IuhAW010990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 5 Jun 2020 18:56:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361845 - in head: lib/libmd sys/modules/crypto X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: lib/libmd sys/modules/crypto X-SVN-Commit-Revision: 361845 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:56:44 -0000 Author: emaste Date: Fri Jun 5 18:56:43 2020 New Revision: 361845 URL: https://svnweb.freebsd.org/changeset/base/361845 Log: Also pass SKEIN_USE_ASM to the assembler, via AFLAGS Modified: head/lib/libmd/Makefile head/sys/modules/crypto/Makefile Modified: head/lib/libmd/Makefile ============================================================================== --- head/lib/libmd/Makefile Fri Jun 5 18:44:14 2020 (r361844) +++ head/lib/libmd/Makefile Fri Jun 5 18:56:43 2020 (r361845) @@ -120,7 +120,7 @@ CFLAGS+= -DRMD160_ASM .if defined(XAS) || ${MK_BINUTILS_BOOTSTRAP} != "no" AFLAGS += --strip-local-absolute # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 +AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 SRCS+= skein_block_asm.s CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 .else Modified: head/sys/modules/crypto/Makefile ============================================================================== --- head/sys/modules/crypto/Makefile Fri Jun 5 18:44:14 2020 (r361844) +++ head/sys/modules/crypto/Makefile Fri Jun 5 18:56:43 2020 (r361845) @@ -34,7 +34,7 @@ SRCS += skein_block_asm.s CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 ACFLAGS += -DELF -Wa,--noexecstack # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 +AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 .endif SRCS += siphash.c SRCS += gmac.c gfmult.c From owner-svn-src-head@freebsd.org Fri Jun 5 20:09:19 2020 Return-Path: Delivered-To: svn-src-head@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 6ECE6336A0C; Fri, 5 Jun 2020 20:09:19 +0000 (UTC) (envelope-from manu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dtyl1b6Yz3TjY; Fri, 5 Jun 2020 20:09:19 +0000 (UTC) (envelope-from manu@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 313551673D; Fri, 5 Jun 2020 20:09:19 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055K9JR5054991; Fri, 5 Jun 2020 20:09:19 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055K9D8l054963; Fri, 5 Jun 2020 20:09:13 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006052009.055K9D8l054963@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 5 Jun 2020 20:09:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361848 - in head/sys/gnu/dts: arm arm64/allwinner arm64/altera arm64/amlogic arm64/arm arm64/freescale arm64/intel arm64/marvell arm64/mediatek arm64/nvidia arm64/qcom arm64/renesas ar... X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sys/gnu/dts: arm arm64/allwinner arm64/altera arm64/amlogic arm64/arm arm64/freescale arm64/intel arm64/marvell arm64/mediatek arm64/nvidia arm64/qcom arm64/renesas arm64/rockchip arm64/socion... X-SVN-Commit-Revision: 361848 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 20:09:19 -0000 Author: manu Date: Fri Jun 5 20:09:13 2020 New Revision: 361848 URL: https://svnweb.freebsd.org/changeset/base/361848 Log: dts: Update our copy to be in sync with Linux 5.7 MFC after: 2 months Added: - copied unchanged from r361846, vendor/device-tree/dist/src/arm/am57-pruss.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6dl-pico-dwarf.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6dl-pico-hobbit.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6dl-pico-nymph.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6dl-pico-pi.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6q-pico-dwarf.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6q-pico-hobbit.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6q-pico-nymph.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6q-pico-pi.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6qdl-pico-dwarf.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6qdl-pico-hobbit.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6qdl-pico-nymph.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6qdl-pico-pi.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6qdl-pico.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx6ul-pico-dwarf.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx7-colibri-aster.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx7d-colibri-aster.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx7d-colibri-emmc-aster.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx7d-pico-dwarf.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx7d-pico-nymph.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/imx7s-colibri-aster.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/ste-ux500-samsung-skomer.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/stm32mp157c-dhcom-pdk2.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/stm32mp157c-dhcom-som.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm/sun5i-a13-pocketbook-touch-lux-3.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm/sun7i-a20-linutronix-testbox-v2.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/allwinner/sun50i-a64-pinephone-1.0.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/allwinner/sun50i-a64-pinephone-1.1.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/allwinner/sun50i-a64-pinephone.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/allwinner/sun50i-a64-pinetab.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-kontron-sl28-var2.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-kontron-sl28-var4.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-kontron-sl28.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/imx8mp-evk.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/imx8mp-pinfunc.h - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/freescale/imx8mp.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/mediatek/mt8516-pinfunc.h - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/mediatek/mt8516-pumpkin.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/mediatek/mt8516.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/mediatek/pumpkin-common.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/qcom/ipq6018-cp01-c1.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/qcom/ipq6018.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/qcom/sm8250-mtp.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/qcom/sm8250.dtsi - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/renesas/r8a77961-ulcb.dts - copied unchanged from r361846, vendor/device-tree/dist/src/arm64/rockchip/rk3399-pinebook-pro.dts - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/arm/coresight-cti-dt.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/clock/k210-clk.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/clock/qcom,gcc-sm8250.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/clock/qcom,mss-sc7180.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/clock/sprd,sc9863a-clk.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/display/sdtv-standards.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/interconnect/qcom,osm-l3.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/interconnect/qcom,sc7180.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/power/meson-a1-power.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/soc/tegra-pmc.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/sound/meson-aiu.h - copied unchanged from r361846, vendor/device-tree/dist/include/dt-bindings/sound/meson-g12a-toacodec.h head/sys/gnu/dts/riscv/kendryte/ - copied from r361846, vendor/device-tree/dist/src/riscv/kendryte/ Directory Properties: head/sys/gnu/dts/arm/am57-pruss.dtsi (props changed) head/sys/gnu/dts/arm/imx6dl-pico-dwarf.dts (props changed) head/sys/gnu/dts/arm/imx6dl-pico-hobbit.dts (props changed) head/sys/gnu/dts/arm/imx6dl-pico-nymph.dts (props changed) head/sys/gnu/dts/arm/imx6dl-pico-pi.dts (props changed) head/sys/gnu/dts/arm/imx6q-pico-dwarf.dts (props changed) head/sys/gnu/dts/arm/imx6q-pico-hobbit.dts (props changed) head/sys/gnu/dts/arm/imx6q-pico-nymph.dts (props changed) head/sys/gnu/dts/arm/imx6q-pico-pi.dts (props changed) head/sys/gnu/dts/arm/imx6qdl-pico-dwarf.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-pico-hobbit.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-pico-nymph.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-pico-pi.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-pico.dtsi (props changed) head/sys/gnu/dts/arm/imx6ul-pico-dwarf.dts (props changed) head/sys/gnu/dts/arm/imx7-colibri-aster.dtsi (props changed) head/sys/gnu/dts/arm/imx7d-colibri-aster.dts (props changed) head/sys/gnu/dts/arm/imx7d-colibri-emmc-aster.dts (props changed) head/sys/gnu/dts/arm/imx7d-pico-dwarf.dts (props changed) head/sys/gnu/dts/arm/imx7d-pico-nymph.dts (props changed) head/sys/gnu/dts/arm/imx7s-colibri-aster.dts (props changed) head/sys/gnu/dts/arm/ste-ux500-samsung-skomer.dts (props changed) head/sys/gnu/dts/arm/stm32mp157c-dhcom-pdk2.dts (props changed) head/sys/gnu/dts/arm/stm32mp157c-dhcom-som.dtsi (props changed) head/sys/gnu/dts/arm/sun5i-a13-pocketbook-touch-lux-3.dts (props changed) head/sys/gnu/dts/arm/sun7i-a20-linutronix-testbox-v2.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinephone-1.0.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinephone-1.1.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinephone.dtsi (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinetab.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-sl28-var2.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-sl28-var4.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-sl28.dts (props changed) head/sys/gnu/dts/arm64/freescale/imx8mp-evk.dts (props changed) head/sys/gnu/dts/arm64/freescale/imx8mp-pinfunc.h (props changed) head/sys/gnu/dts/arm64/freescale/imx8mp.dtsi (props changed) head/sys/gnu/dts/arm64/mediatek/mt8516-pinfunc.h (props changed) head/sys/gnu/dts/arm64/mediatek/mt8516-pumpkin.dts (props changed) head/sys/gnu/dts/arm64/mediatek/mt8516.dtsi (props changed) head/sys/gnu/dts/arm64/mediatek/pumpkin-common.dtsi (props changed) head/sys/gnu/dts/arm64/qcom/ipq6018-cp01-c1.dts (props changed) head/sys/gnu/dts/arm64/qcom/ipq6018.dtsi (props changed) head/sys/gnu/dts/arm64/qcom/sm8250-mtp.dts (props changed) head/sys/gnu/dts/arm64/qcom/sm8250.dtsi (props changed) head/sys/gnu/dts/arm64/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77961-ulcb.dts (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399-pinebook-pro.dts (props changed) head/sys/gnu/dts/include/dt-bindings/arm/coresight-cti-dt.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/k210-clk.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sm8250.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,mss-sc7180.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/sprd,sc9863a-clk.h (props changed) head/sys/gnu/dts/include/dt-bindings/display/sdtv-standards.h (props changed) head/sys/gnu/dts/include/dt-bindings/interconnect/qcom,osm-l3.h (props changed) head/sys/gnu/dts/include/dt-bindings/interconnect/qcom,sc7180.h (props changed) head/sys/gnu/dts/include/dt-bindings/power/meson-a1-power.h (props changed) head/sys/gnu/dts/include/dt-bindings/soc/tegra-pmc.h (props changed) head/sys/gnu/dts/include/dt-bindings/sound/meson-aiu.h (props changed) head/sys/gnu/dts/include/dt-bindings/sound/meson-g12a-toacodec.h (props changed) Modified: head/sys/gnu/dts/arm/am33xx-l4.dtsi head/sys/gnu/dts/arm/am33xx.dtsi head/sys/gnu/dts/arm/am4372.dtsi head/sys/gnu/dts/arm/am437x-gp-evm.dts head/sys/gnu/dts/arm/am437x-idk-evm.dts head/sys/gnu/dts/arm/am437x-l4.dtsi head/sys/gnu/dts/arm/am437x-sk-evm.dts head/sys/gnu/dts/arm/am5718.dtsi head/sys/gnu/dts/arm/am571x-idk.dts head/sys/gnu/dts/arm/am5728.dtsi head/sys/gnu/dts/arm/am5748.dtsi head/sys/gnu/dts/arm/am574x-idk.dts head/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi head/sys/gnu/dts/arm/am57xx-idk-common.dtsi head/sys/gnu/dts/arm/arm-realview-pbx.dtsi head/sys/gnu/dts/arm/aspeed-g4.dtsi head/sys/gnu/dts/arm/aspeed-g5.dtsi head/sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi head/sys/gnu/dts/arm/aspeed-g6.dtsi head/sys/gnu/dts/arm/at91-dvk_su60_somc_lcm.dtsi head/sys/gnu/dts/arm/at91-sam9x60ek.dts (contents, props changed) head/sys/gnu/dts/arm/at91-sama5d27_wlsom1_ek.dts (contents, props changed) head/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts head/sys/gnu/dts/arm/at91-sama5d4_ma5d4evk.dts head/sys/gnu/dts/arm/at91sam9n12ek.dts head/sys/gnu/dts/arm/at91sam9x5dm.dtsi head/sys/gnu/dts/arm/bcm-hr2.dtsi head/sys/gnu/dts/arm/bcm2711-rpi-4-b.dts head/sys/gnu/dts/arm/bcm2711.dtsi head/sys/gnu/dts/arm/bcm2835-rpi-zero-w.dts head/sys/gnu/dts/arm/bcm2835-rpi.dtsi head/sys/gnu/dts/arm/bcm283x.dtsi head/sys/gnu/dts/arm/dm814x-clocks.dtsi head/sys/gnu/dts/arm/dm814x.dtsi head/sys/gnu/dts/arm/dm816x.dtsi head/sys/gnu/dts/arm/dra62x.dtsi head/sys/gnu/dts/arm/dra7.dtsi head/sys/gnu/dts/arm/dra72x.dtsi head/sys/gnu/dts/arm/dra74x.dtsi head/sys/gnu/dts/arm/ecx-2000.dts head/sys/gnu/dts/arm/ecx-common.dtsi head/sys/gnu/dts/arm/exynos3250-artik5.dtsi head/sys/gnu/dts/arm/exynos4210-universal_c210.dts head/sys/gnu/dts/arm/exynos4412-odroid-common.dtsi head/sys/gnu/dts/arm/exynos5250-arndale.dts head/sys/gnu/dts/arm/exynos5420-arndale-octa.dts head/sys/gnu/dts/arm/exynos5422-cpus.dtsi head/sys/gnu/dts/arm/exynos5422-odroid-core.dtsi head/sys/gnu/dts/arm/exynos5422-odroidhc1.dts head/sys/gnu/dts/arm/exynos5422-odroidxu3-common.dtsi head/sys/gnu/dts/arm/gemini-dlink-dir-685.dts head/sys/gnu/dts/arm/gemini-dlink-dns-313.dts head/sys/gnu/dts/arm/gemini-nas4220b.dts head/sys/gnu/dts/arm/gemini-sl93512r.dts head/sys/gnu/dts/arm/gemini-sq201.dts head/sys/gnu/dts/arm/gemini.dtsi head/sys/gnu/dts/arm/highbank.dts head/sys/gnu/dts/arm/imx23-olinuxino.dts head/sys/gnu/dts/arm/imx23.dtsi head/sys/gnu/dts/arm/imx25-pinfunc.h head/sys/gnu/dts/arm/imx25.dtsi head/sys/gnu/dts/arm/imx27-phytec-phycard-s-rdk.dts head/sys/gnu/dts/arm/imx27.dtsi head/sys/gnu/dts/arm/imx28-apx4devkit.dts head/sys/gnu/dts/arm/imx28.dtsi head/sys/gnu/dts/arm/imx31.dtsi head/sys/gnu/dts/arm/imx35.dtsi head/sys/gnu/dts/arm/imx50.dtsi head/sys/gnu/dts/arm/imx51-zii-rdu1.dts head/sys/gnu/dts/arm/imx51.dtsi head/sys/gnu/dts/arm/imx53.dtsi head/sys/gnu/dts/arm/imx6dl-colibri-eval-v3.dts head/sys/gnu/dts/arm/imx6dl-riotboard.dts head/sys/gnu/dts/arm/imx6dl-yapp4-common.dtsi head/sys/gnu/dts/arm/imx6dl-yapp4-ursa.dts head/sys/gnu/dts/arm/imx6dl.dtsi head/sys/gnu/dts/arm/imx6q-apalis-eval.dts head/sys/gnu/dts/arm/imx6q-apalis-ixora-v1.1.dts head/sys/gnu/dts/arm/imx6q-apalis-ixora.dts head/sys/gnu/dts/arm/imx6q-b450v3.dts head/sys/gnu/dts/arm/imx6q-b650v3.dts head/sys/gnu/dts/arm/imx6q-b850v3.dts head/sys/gnu/dts/arm/imx6q-bx50v3.dtsi head/sys/gnu/dts/arm/imx6q-marsboard.dts head/sys/gnu/dts/arm/imx6q-novena.dts head/sys/gnu/dts/arm/imx6q.dtsi head/sys/gnu/dts/arm/imx6qdl-apalis.dtsi head/sys/gnu/dts/arm/imx6qdl-colibri.dtsi head/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw553x.dtsi head/sys/gnu/dts/arm/imx6qdl-gw5910.dtsi (contents, props changed) head/sys/gnu/dts/arm/imx6qdl-phytec-phycore-som.dtsi head/sys/gnu/dts/arm/imx6qdl-sr-som-ti.dtsi head/sys/gnu/dts/arm/imx6qdl-zii-rdu2.dtsi head/sys/gnu/dts/arm/imx6qdl.dtsi head/sys/gnu/dts/arm/imx6qp.dtsi head/sys/gnu/dts/arm/imx6sl.dtsi head/sys/gnu/dts/arm/imx6sll.dtsi head/sys/gnu/dts/arm/imx6sx-nitrogen6sx.dts head/sys/gnu/dts/arm/imx6sx-pinfunc.h head/sys/gnu/dts/arm/imx6sx-sabreauto.dts head/sys/gnu/dts/arm/imx6sx-sdb.dtsi head/sys/gnu/dts/arm/imx6sx-softing-vining-2000.dts head/sys/gnu/dts/arm/imx6sx-udoo-neo.dtsi head/sys/gnu/dts/arm/imx6sx.dtsi head/sys/gnu/dts/arm/imx6ul-ccimx6ulsbcpro.dts head/sys/gnu/dts/arm/imx6ul-pico.dtsi head/sys/gnu/dts/arm/imx6ul.dtsi head/sys/gnu/dts/arm/imx6ull.dtsi head/sys/gnu/dts/arm/imx7-colibri-eval-v3.dtsi head/sys/gnu/dts/arm/imx7-colibri.dtsi head/sys/gnu/dts/arm/imx7d-cl-som-imx7.dts head/sys/gnu/dts/arm/imx7d-colibri-emmc.dtsi head/sys/gnu/dts/arm/imx7d-colibri-eval-v3.dts head/sys/gnu/dts/arm/imx7d-colibri.dtsi head/sys/gnu/dts/arm/imx7s-colibri-eval-v3.dts head/sys/gnu/dts/arm/imx7s-colibri.dtsi head/sys/gnu/dts/arm/imx7s.dtsi head/sys/gnu/dts/arm/imx7ulp-evk.dts head/sys/gnu/dts/arm/imx7ulp.dtsi head/sys/gnu/dts/arm/integratorap.dts head/sys/gnu/dts/arm/iwg20d-q7-dbcm-ca.dtsi head/sys/gnu/dts/arm/mmp2-brownstone.dts head/sys/gnu/dts/arm/mmp2.dtsi head/sys/gnu/dts/arm/mmp3-dell-ariel.dts head/sys/gnu/dts/arm/mmp3.dtsi head/sys/gnu/dts/arm/motorola-mapphone-common.dtsi head/sys/gnu/dts/arm/mt2701.dtsi head/sys/gnu/dts/arm/mt7623.dtsi head/sys/gnu/dts/arm/mt7629.dtsi head/sys/gnu/dts/arm/omap3-n950-n9.dtsi head/sys/gnu/dts/arm/omap4-l4.dtsi head/sys/gnu/dts/arm/omap4.dtsi head/sys/gnu/dts/arm/omap5-l4-abe.dtsi head/sys/gnu/dts/arm/omap5.dtsi head/sys/gnu/dts/arm/pxa168-aspenite.dts head/sys/gnu/dts/arm/pxa168.dtsi head/sys/gnu/dts/arm/pxa910-dkb.dts head/sys/gnu/dts/arm/pxa910.dtsi head/sys/gnu/dts/arm/qcom-apq8064.dtsi head/sys/gnu/dts/arm/qcom-apq8084.dtsi head/sys/gnu/dts/arm/qcom-ipq4019.dtsi head/sys/gnu/dts/arm/qcom-ipq8064.dtsi head/sys/gnu/dts/arm/qcom-mdm9615.dtsi head/sys/gnu/dts/arm/qcom-msm8660.dtsi head/sys/gnu/dts/arm/qcom-msm8960.dtsi head/sys/gnu/dts/arm/qcom-msm8974-lge-nexus5-hammerhead.dts head/sys/gnu/dts/arm/qcom-msm8974-sony-xperia-honami.dts head/sys/gnu/dts/arm/qcom-msm8974.dtsi head/sys/gnu/dts/arm/r7s72100-gr-peach.dts head/sys/gnu/dts/arm/r7s72100.dtsi head/sys/gnu/dts/arm/r7s9210.dtsi head/sys/gnu/dts/arm/r8a73a4-ape6evm.dts head/sys/gnu/dts/arm/r8a73a4.dtsi head/sys/gnu/dts/arm/r8a7740.dtsi head/sys/gnu/dts/arm/r8a7743.dtsi head/sys/gnu/dts/arm/r8a7744.dtsi head/sys/gnu/dts/arm/r8a7745-iwg22d-sodimm-dbhd-ca.dts head/sys/gnu/dts/arm/r8a7745-iwg22d-sodimm.dts head/sys/gnu/dts/arm/r8a7745.dtsi head/sys/gnu/dts/arm/r8a77470.dtsi head/sys/gnu/dts/arm/r8a7790-lager.dts head/sys/gnu/dts/arm/r8a7790-stout.dts head/sys/gnu/dts/arm/r8a7790.dtsi head/sys/gnu/dts/arm/r8a7791-koelsch.dts head/sys/gnu/dts/arm/r8a7791-porter.dts head/sys/gnu/dts/arm/r8a7791.dtsi head/sys/gnu/dts/arm/r8a7792-blanche.dts head/sys/gnu/dts/arm/r8a7792-wheat.dts head/sys/gnu/dts/arm/r8a7792.dtsi head/sys/gnu/dts/arm/r8a7793-gose.dts head/sys/gnu/dts/arm/r8a7793.dtsi head/sys/gnu/dts/arm/r8a7794-alt.dts head/sys/gnu/dts/arm/r8a7794-silk.dts head/sys/gnu/dts/arm/r8a7794.dtsi head/sys/gnu/dts/arm/rk3036-kylin.dts head/sys/gnu/dts/arm/rk3036.dtsi head/sys/gnu/dts/arm/rk3066a.dtsi head/sys/gnu/dts/arm/rk3188-bqedison2qc.dts head/sys/gnu/dts/arm/rk3188.dtsi head/sys/gnu/dts/arm/rk3228-evb.dts head/sys/gnu/dts/arm/rk3229-xms6.dts head/sys/gnu/dts/arm/rk322x.dtsi head/sys/gnu/dts/arm/rk3288-evb-act8846.dts head/sys/gnu/dts/arm/rk3288-evb-rk808.dts head/sys/gnu/dts/arm/rk3288-firefly-reload.dts head/sys/gnu/dts/arm/rk3288-r89.dts head/sys/gnu/dts/arm/rk3288-tinker.dtsi head/sys/gnu/dts/arm/rk3288-vyasa.dts head/sys/gnu/dts/arm/rk3288.dtsi head/sys/gnu/dts/arm/rk3xxx.dtsi head/sys/gnu/dts/arm/rv1108.dtsi head/sys/gnu/dts/arm/sam9x60.dtsi (contents, props changed) head/sys/gnu/dts/arm/sama5d2.dtsi head/sys/gnu/dts/arm/sama5d3.dtsi head/sys/gnu/dts/arm/sama5d4.dtsi head/sys/gnu/dts/arm/sh73a0-kzm9g.dts head/sys/gnu/dts/arm/socfpga_arria10.dtsi head/sys/gnu/dts/arm/socfpga_arria10_socdk_nand.dts head/sys/gnu/dts/arm/ste-ab8500.dtsi head/sys/gnu/dts/arm/ste-ab8505.dtsi (contents, props changed) head/sys/gnu/dts/arm/ste-dbx5x0.dtsi head/sys/gnu/dts/arm/ste-href-stuib.dtsi head/sys/gnu/dts/arm/ste-href-tvk1281618-r2.dtsi (contents, props changed) head/sys/gnu/dts/arm/ste-href-tvk1281618-r3.dtsi (contents, props changed) head/sys/gnu/dts/arm/stm32746g-eval.dts head/sys/gnu/dts/arm/stm32mp15-pinctrl.dtsi (contents, props changed) head/sys/gnu/dts/arm/stm32mp151.dtsi (contents, props changed) head/sys/gnu/dts/arm/stm32mp153.dtsi (contents, props changed) head/sys/gnu/dts/arm/stm32mp157a-avenger96.dts head/sys/gnu/dts/arm/stm32mp157c-ed1.dts head/sys/gnu/dts/arm/stm32mp157c-ev1.dts head/sys/gnu/dts/arm/stm32mp15xx-dkx.dtsi (contents, props changed) head/sys/gnu/dts/arm/sun5i.dtsi head/sys/gnu/dts/arm/sun6i-a31.dtsi head/sys/gnu/dts/arm/sun7i-a20.dtsi head/sys/gnu/dts/arm/sun8i-a23-a33.dtsi head/sys/gnu/dts/arm/sun8i-a33.dtsi head/sys/gnu/dts/arm/sun8i-a83t-tbs-a711.dts head/sys/gnu/dts/arm/sun8i-a83t.dtsi head/sys/gnu/dts/arm/sun8i-h3.dtsi head/sys/gnu/dts/arm/sun8i-r40.dtsi head/sys/gnu/dts/arm/sun8i-v3s.dtsi head/sys/gnu/dts/arm/sunxi-h3-h5.dtsi head/sys/gnu/dts/arm/tango4-common.dtsi head/sys/gnu/dts/arm/tegra114-dalmore.dts head/sys/gnu/dts/arm/tegra114.dtsi head/sys/gnu/dts/arm/tegra124-apalis-v1.2.dtsi head/sys/gnu/dts/arm/tegra124-apalis.dtsi head/sys/gnu/dts/arm/tegra124-jetson-tk1.dts head/sys/gnu/dts/arm/tegra124-nyan.dtsi head/sys/gnu/dts/arm/tegra124-venice2.dts head/sys/gnu/dts/arm/tegra124.dtsi head/sys/gnu/dts/arm/tegra20.dtsi head/sys/gnu/dts/arm/tegra30-apalis-v1.1.dtsi head/sys/gnu/dts/arm/tegra30-apalis.dtsi head/sys/gnu/dts/arm/tegra30-beaver.dts head/sys/gnu/dts/arm/tegra30-cardhu.dtsi head/sys/gnu/dts/arm/tegra30-colibri.dtsi head/sys/gnu/dts/arm/tegra30.dtsi head/sys/gnu/dts/arm/uniphier-ld4.dtsi head/sys/gnu/dts/arm/uniphier-pro4.dtsi head/sys/gnu/dts/arm/uniphier-pro5.dtsi head/sys/gnu/dts/arm/uniphier-pxs2.dtsi head/sys/gnu/dts/arm/uniphier-ref-daughter.dtsi head/sys/gnu/dts/arm/uniphier-sld8.dtsi head/sys/gnu/dts/arm/versatile-ab-ib2.dts head/sys/gnu/dts/arm/vexpress-v2m-rs1.dtsi head/sys/gnu/dts/arm/vexpress-v2m.dtsi head/sys/gnu/dts/arm/vexpress-v2p-ca15-tc1.dts head/sys/gnu/dts/arm/vexpress-v2p-ca15_a7.dts head/sys/gnu/dts/arm/vexpress-v2p-ca5s.dts head/sys/gnu/dts/arm/vexpress-v2p-ca9.dts head/sys/gnu/dts/arm/vf-colibri-eval-v3.dtsi head/sys/gnu/dts/arm/vf-colibri.dtsi head/sys/gnu/dts/arm/vf500-colibri-eval-v3.dts head/sys/gnu/dts/arm/vf500-colibri.dtsi head/sys/gnu/dts/arm/vf500.dtsi head/sys/gnu/dts/arm/vf610-colibri-eval-v3.dts head/sys/gnu/dts/arm/vf610-colibri.dtsi head/sys/gnu/dts/arm/vf610-zii-cfu1.dts head/sys/gnu/dts/arm/vf610-zii-dev.dtsi head/sys/gnu/dts/arm/vf610-zii-spb4.dts head/sys/gnu/dts/arm/vf610-zii-ssmb-dtu.dts head/sys/gnu/dts/arm/vf610-zii-ssmb-spu3.dts head/sys/gnu/dts/arm/vf610m4-colibri.dts head/sys/gnu/dts/arm/vfxxx.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-a64-olinuxino.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinebook.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-h5-orangepi-pc2.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h5.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-h6-beelink-gs1.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-3.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-one-plus.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-h6-pine-h64.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h6.dtsi head/sys/gnu/dts/arm64/altera/socfpga_stratix10_socdk.dts head/sys/gnu/dts/arm64/amlogic/meson-a1.dtsi head/sys/gnu/dts/arm64/amlogic/meson-axg-s400.dts head/sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi head/sys/gnu/dts/arm64/amlogic/meson-g12.dtsi head/sys/gnu/dts/arm64/amlogic/meson-g12a-sei510.dts head/sys/gnu/dts/arm64/amlogic/meson-g12a-u200.dts head/sys/gnu/dts/arm64/amlogic/meson-g12a-x96-max.dts head/sys/gnu/dts/arm64/amlogic/meson-g12b-khadas-vim3.dtsi head/sys/gnu/dts/arm64/amlogic/meson-g12b-odroid-n2.dts head/sys/gnu/dts/arm64/amlogic/meson-g12b-ugoos-am6.dts head/sys/gnu/dts/arm64/amlogic/meson-gx.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxbb-kii-pro.dts (contents, props changed) head/sys/gnu/dts/arm64/amlogic/meson-gxbb-odroidc2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxbb-vega-s95.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-p212.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxm-khadas-vim2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxm.dtsi head/sys/gnu/dts/arm64/amlogic/meson-khadas-vim3.dtsi head/sys/gnu/dts/arm64/amlogic/meson-sm1-sei610.dts head/sys/gnu/dts/arm64/amlogic/meson-sm1.dtsi head/sys/gnu/dts/arm64/arm/foundation-v8.dtsi head/sys/gnu/dts/arm64/arm/fvp-base-revc.dts head/sys/gnu/dts/arm64/arm/juno-base.dtsi head/sys/gnu/dts/arm64/arm/juno-motherboard.dtsi head/sys/gnu/dts/arm64/arm/rtsm_ve-aemv8a.dts head/sys/gnu/dts/arm64/arm/rtsm_ve-motherboard-rs2.dtsi head/sys/gnu/dts/arm64/arm/rtsm_ve-motherboard.dtsi head/sys/gnu/dts/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts head/sys/gnu/dts/arm64/arm/vexpress-v2m-rs1.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1028a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1088a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1088a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls208xa.dtsi head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-cex7.dtsi (contents, props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-lx2160a.dtsi head/sys/gnu/dts/arm64/freescale/imx8mm-evk.dts head/sys/gnu/dts/arm64/freescale/imx8mm.dtsi head/sys/gnu/dts/arm64/freescale/imx8mn-evk.dtsi head/sys/gnu/dts/arm64/freescale/imx8mn.dtsi head/sys/gnu/dts/arm64/freescale/imx8mq-evk.dts head/sys/gnu/dts/arm64/freescale/imx8mq-librem5-devkit.dts head/sys/gnu/dts/arm64/freescale/imx8mq-phanbell.dts (contents, props changed) head/sys/gnu/dts/arm64/freescale/imx8mq.dtsi head/sys/gnu/dts/arm64/freescale/imx8qxp.dtsi head/sys/gnu/dts/arm64/freescale/s32v234.dtsi head/sys/gnu/dts/arm64/intel/socfpga_agilex_socdk.dts head/sys/gnu/dts/arm64/marvell/armada-3720-espressobin-emmc.dts head/sys/gnu/dts/arm64/marvell/armada-3720-espressobin-v7-emmc.dts head/sys/gnu/dts/arm64/marvell/armada-3720-espressobin-v7.dts head/sys/gnu/dts/arm64/marvell/armada-3720-espressobin.dtsi head/sys/gnu/dts/arm64/marvell/armada-8040-clearfog-gt-8k.dts head/sys/gnu/dts/arm64/marvell/armada-8040-mcbin.dtsi head/sys/gnu/dts/arm64/marvell/armada-ap806-dual.dtsi head/sys/gnu/dts/arm64/marvell/armada-ap807-quad.dtsi head/sys/gnu/dts/arm64/mediatek/mt2712e.dtsi head/sys/gnu/dts/arm64/mediatek/mt6797.dtsi head/sys/gnu/dts/arm64/mediatek/mt7622.dtsi head/sys/gnu/dts/arm64/mediatek/mt8173.dtsi head/sys/gnu/dts/arm64/mediatek/mt8183.dtsi head/sys/gnu/dts/arm64/nvidia/tegra132.dtsi head/sys/gnu/dts/arm64/nvidia/tegra186-p2771-0000.dts head/sys/gnu/dts/arm64/nvidia/tegra186-p3310.dtsi head/sys/gnu/dts/arm64/nvidia/tegra186.dtsi head/sys/gnu/dts/arm64/nvidia/tegra194-p2888.dtsi head/sys/gnu/dts/arm64/nvidia/tegra194-p2972-0000.dts head/sys/gnu/dts/arm64/nvidia/tegra194.dtsi head/sys/gnu/dts/arm64/nvidia/tegra210-p2180.dtsi head/sys/gnu/dts/arm64/nvidia/tegra210-p2371-2180.dts head/sys/gnu/dts/arm64/nvidia/tegra210-p2597.dtsi head/sys/gnu/dts/arm64/nvidia/tegra210-p3450-0000.dts head/sys/gnu/dts/arm64/nvidia/tegra210-smaug.dts head/sys/gnu/dts/arm64/nvidia/tegra210.dtsi head/sys/gnu/dts/arm64/qcom/apq8016-sbc.dtsi head/sys/gnu/dts/arm64/qcom/apq8096-db820c.dtsi head/sys/gnu/dts/arm64/qcom/ipq8074.dtsi head/sys/gnu/dts/arm64/qcom/msm8916-samsung-a2015-common.dtsi head/sys/gnu/dts/arm64/qcom/msm8916.dtsi head/sys/gnu/dts/arm64/qcom/msm8992.dtsi head/sys/gnu/dts/arm64/qcom/msm8994.dtsi head/sys/gnu/dts/arm64/qcom/msm8996.dtsi head/sys/gnu/dts/arm64/qcom/msm8998-mtp.dtsi head/sys/gnu/dts/arm64/qcom/msm8998.dtsi head/sys/gnu/dts/arm64/qcom/pm6150.dtsi (contents, props changed) head/sys/gnu/dts/arm64/qcom/pm8998.dtsi head/sys/gnu/dts/arm64/qcom/qcs404-evb.dtsi head/sys/gnu/dts/arm64/qcom/qcs404.dtsi head/sys/gnu/dts/arm64/qcom/sc7180-idp.dts (contents, props changed) head/sys/gnu/dts/arm64/qcom/sc7180.dtsi (contents, props changed) head/sys/gnu/dts/arm64/qcom/sdm845-cheza.dtsi head/sys/gnu/dts/arm64/qcom/sdm845-db845c.dts head/sys/gnu/dts/arm64/qcom/sdm845-mtp.dts head/sys/gnu/dts/arm64/qcom/sdm845.dtsi head/sys/gnu/dts/arm64/qcom/sdm850-lenovo-yoga-c630.dts head/sys/gnu/dts/arm64/renesas/r8a774a1.dtsi head/sys/gnu/dts/arm64/renesas/r8a774b1.dtsi head/sys/gnu/dts/arm64/renesas/r8a774c0.dtsi head/sys/gnu/dts/arm64/renesas/r8a77950.dtsi (contents, props changed) head/sys/gnu/dts/arm64/renesas/r8a77951.dtsi (contents, props changed) head/sys/gnu/dts/arm64/renesas/r8a77960.dtsi (contents, props changed) head/sys/gnu/dts/arm64/renesas/r8a77961-salvator-xs.dts head/sys/gnu/dts/arm64/renesas/r8a77961.dtsi head/sys/gnu/dts/arm64/renesas/r8a77965.dtsi head/sys/gnu/dts/arm64/renesas/r8a77970-eagle.dts head/sys/gnu/dts/arm64/renesas/r8a77970-v3msk.dts head/sys/gnu/dts/arm64/renesas/r8a77970.dtsi head/sys/gnu/dts/arm64/renesas/r8a77980-condor.dts head/sys/gnu/dts/arm64/renesas/r8a77980-v3hsk.dts head/sys/gnu/dts/arm64/renesas/r8a77980.dtsi head/sys/gnu/dts/arm64/renesas/r8a77990-ebisu.dts head/sys/gnu/dts/arm64/renesas/r8a77990.dtsi head/sys/gnu/dts/arm64/renesas/r8a77995-draak.dts head/sys/gnu/dts/arm64/renesas/r8a77995.dtsi head/sys/gnu/dts/arm64/rockchip/px30.dtsi head/sys/gnu/dts/arm64/rockchip/rk3308.dtsi head/sys/gnu/dts/arm64/rockchip/rk3328-a1.dts head/sys/gnu/dts/arm64/rockchip/rk3328-evb.dts head/sys/gnu/dts/arm64/rockchip/rk3328-rock64.dts head/sys/gnu/dts/arm64/rockchip/rk3328.dtsi head/sys/gnu/dts/arm64/rockchip/rk3368-px5-evb.dts head/sys/gnu/dts/arm64/rockchip/rk3368.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-evb.dts head/sys/gnu/dts/arm64/rockchip/rk3399-gru-chromebook.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-gru.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-hugsun-x99.dts head/sys/gnu/dts/arm64/rockchip/rk3399-orangepi.dts head/sys/gnu/dts/arm64/rockchip/rk3399-puma.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-rock960.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-sapphire-excavator.dts head/sys/gnu/dts/arm64/rockchip/rk3399.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399pro-rock-pi-n10.dts (contents, props changed) head/sys/gnu/dts/arm64/socionext/uniphier-ld11.dtsi head/sys/gnu/dts/arm64/socionext/uniphier-ld20.dtsi head/sys/gnu/dts/arm64/socionext/uniphier-pxs3-ref.dts head/sys/gnu/dts/arm64/socionext/uniphier-pxs3.dtsi head/sys/gnu/dts/arm64/ti/k3-am65-main.dtsi head/sys/gnu/dts/arm64/ti/k3-am65-mcu.dtsi head/sys/gnu/dts/arm64/ti/k3-am65.dtsi head/sys/gnu/dts/arm64/ti/k3-am654-base-board.dts head/sys/gnu/dts/arm64/ti/k3-j721e-common-proc-board.dts head/sys/gnu/dts/arm64/ti/k3-j721e-mcu-wakeup.dtsi head/sys/gnu/dts/arm64/ti/k3-j721e.dtsi head/sys/gnu/dts/include/dt-bindings/bus/ti-sysc.h head/sys/gnu/dts/include/dt-bindings/clock/dm814.h head/sys/gnu/dts/include/dt-bindings/clock/g12a-clkc.h head/sys/gnu/dts/include/dt-bindings/clock/gxbb-clkc.h head/sys/gnu/dts/include/dt-bindings/clock/imx7d-clock.h head/sys/gnu/dts/include/dt-bindings/clock/imx8mm-clock.h head/sys/gnu/dts/include/dt-bindings/clock/imx8mn-clock.h head/sys/gnu/dts/include/dt-bindings/clock/imx8mp-clock.h (contents, props changed) head/sys/gnu/dts/include/dt-bindings/clock/imx8mq-clock.h head/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sc7180.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sm8150.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,gpucc-sc7180.h (contents, props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,rpmcc.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,rpmh.h head/sys/gnu/dts/include/dt-bindings/clock/sun50i-a64-ccu.h head/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h head/sys/gnu/dts/include/dt-bindings/clock/tegra124-car-common.h head/sys/gnu/dts/include/dt-bindings/clock/tegra210-car.h head/sys/gnu/dts/include/dt-bindings/clock/tegra30-car.h head/sys/gnu/dts/include/dt-bindings/input/linux-event-codes.h head/sys/gnu/dts/include/dt-bindings/interconnect/qcom,sdm845.h head/sys/gnu/dts/include/dt-bindings/leds/common.h head/sys/gnu/dts/include/dt-bindings/media/tvp5150.h Directory Properties: head/sys/gnu/dts/arm/ (props changed) head/sys/gnu/dts/arm/am3703.dtsi (props changed) head/sys/gnu/dts/arm/am3715.dtsi (props changed) head/sys/gnu/dts/arm/armada-385-clearfog-gtr-l8.dts (props changed) head/sys/gnu/dts/arm/armada-385-clearfog-gtr-s4.dts (props changed) head/sys/gnu/dts/arm/armada-385-clearfog-gtr.dtsi (props changed) head/sys/gnu/dts/arm/at91-kizboxmini-base.dts (props changed) head/sys/gnu/dts/arm/at91-kizboxmini-common.dtsi (props changed) head/sys/gnu/dts/arm/at91-kizboxmini-mb.dts (props changed) head/sys/gnu/dts/arm/at91-kizboxmini-rd.dts (props changed) head/sys/gnu/dts/arm/at91-sama5d27_wlsom1.dtsi (props changed) head/sys/gnu/dts/arm/at91-smartkiz.dts (props changed) head/sys/gnu/dts/arm/dm3725.dtsi (props changed) head/sys/gnu/dts/arm/imx6dl-gw5907.dts (props changed) head/sys/gnu/dts/arm/imx6dl-gw5910.dts (props changed) head/sys/gnu/dts/arm/imx6dl-gw5912.dts (props changed) head/sys/gnu/dts/arm/imx6dl-gw5913.dts (props changed) head/sys/gnu/dts/arm/imx6q-gw5907.dts (props changed) head/sys/gnu/dts/arm/imx6q-gw5910.dts (props changed) head/sys/gnu/dts/arm/imx6q-gw5912.dts (props changed) head/sys/gnu/dts/arm/imx6q-gw5913.dts (props changed) head/sys/gnu/dts/arm/imx6qdl-gw5907.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-gw5912.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-gw5913.dtsi (props changed) head/sys/gnu/dts/arm/imx6sl-tolino-shine3.dts (props changed) head/sys/gnu/dts/arm/imx7ulp-com.dts (props changed) head/sys/gnu/dts/arm/omap3-echo.dts (props changed) head/sys/gnu/dts/arm/rk3288-veyron-broadcom-bluetooth.dtsi (props changed) head/sys/gnu/dts/arm/rockchip-radxa-dalang-carrier.dtsi (props changed) head/sys/gnu/dts/arm/ste-db8500.dtsi (props changed) head/sys/gnu/dts/arm/ste-db8520.dtsi (props changed) head/sys/gnu/dts/arm/ste-dbx5x0-pinctrl.dtsi (props changed) head/sys/gnu/dts/arm/ste-href520-tvk.dts (props changed) head/sys/gnu/dts/arm/ste-ux500-samsung-golden.dts (props changed) head/sys/gnu/dts/arm/stm32mp157.dtsi (props changed) head/sys/gnu/dts/arm/stm32mp15xc.dtsi (props changed) head/sys/gnu/dts/arm/stm32mp15xxaa-pinctrl.dtsi (props changed) head/sys/gnu/dts/arm/stm32mp15xxab-pinctrl.dtsi (props changed) head/sys/gnu/dts/arm/stm32mp15xxac-pinctrl.dtsi (props changed) head/sys/gnu/dts/arm/stm32mp15xxad-pinctrl.dtsi (props changed) head/sys/gnu/dts/arm/sun8i-h3-emlid-neutis-n5h3-devboard.dts (props changed) head/sys/gnu/dts/arm/sun8i-h3-emlid-neutis-n5h3.dtsi (props changed) head/sys/gnu/dts/arm/sunxi-h3-h5-emlid-neutis.dtsi (props changed) head/sys/gnu/dts/arm/sunxi-libretech-all-h3-it.dtsi (props changed) head/sys/gnu/dts/arm64/ (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-a64-cpu-opp.dtsi (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h5-libretech-all-h3-it.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h5-libretech-all-h5-cc.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h6-pine-h64-model-b.dts (props changed) head/sys/gnu/dts/arm64/altera/socfpga_stratix10_socdk_nand.dts (props changed) head/sys/gnu/dts/arm64/amlogic/meson-gx-libretech-pc.dtsi (props changed) head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-libretech-pc.dts (props changed) head/sys/gnu/dts/arm64/amlogic/meson-gxm-s912-libretech-pc.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-clearfog-cx.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-clearfog-itx.dtsi (props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-honeycomb.dts (props changed) head/sys/gnu/dts/arm64/freescale/imx8mn-pinfunc.h (props changed) head/sys/gnu/dts/arm64/freescale/imx8mq-thor96.dts (props changed) head/sys/gnu/dts/arm64/intel/socfpga_agilex_socdk_nand.dts (props changed) head/sys/gnu/dts/arm64/qcom/apq8096-ifc6640.dts (props changed) head/sys/gnu/dts/arm64/qcom/pm6150l.dtsi (props changed) head/sys/gnu/dts/arm64/renesas/r8a774c0-ek874-idk-2121wr.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77950-salvator-x.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77950-ulcb-kf.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77950-ulcb.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77951-salvator-x.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77951-salvator-xs.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77951-ulcb-kf.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77951-ulcb.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77960-salvator-x.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77960-salvator-xs.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77960-ulcb-kf.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77960-ulcb.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77965-ulcb-kf.dts (props changed) head/sys/gnu/dts/arm64/renesas/r8a77965-ulcb.dts (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399-rockpro64-v2.dts (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399-rockpro64.dtsi (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399pro-vmarc-som.dtsi (props changed) head/sys/gnu/dts/arm64/sprd/sc9863a.dtsi (props changed) head/sys/gnu/dts/arm64/sprd/sharkl3.dtsi (props changed) head/sys/gnu/dts/arm64/sprd/sp9863a-1h10.dts (props changed) head/sys/gnu/dts/arm64/xilinx/zynqmp-clk-ccf.dtsi (props changed) head/sys/gnu/dts/include/ (props changed) head/sys/gnu/dts/include/dt-bindings/clock/meson8-ddr-clkc.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,dispcc-sc7180.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq6018.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8998.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,videocc-sc7180.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/ti-dra7-atl.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/xlnx-versal-clk.h (props changed) head/sys/gnu/dts/include/dt-bindings/dma/x1830-dma.h (props changed) head/sys/gnu/dts/include/dt-bindings/interconnect/qcom,msm8916.h (props changed) head/sys/gnu/dts/include/dt-bindings/interrupt-controller/aspeed-scu-ic.h (props changed) head/sys/gnu/dts/include/dt-bindings/memory/tegra194-mc.h (props changed) head/sys/gnu/dts/include/dt-bindings/power/mt6765-power.h (props changed) head/sys/gnu/dts/include/dt-bindings/reset-controller/mt2712-resets.h (props changed) head/sys/gnu/dts/include/dt-bindings/reset/nuvoton,npcm7xx-reset.h (props changed) head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq6018.h (props changed) head/sys/gnu/dts/riscv/ (props changed) head/sys/gnu/dts/riscv/kendryte/k210.dts (props changed) head/sys/gnu/dts/riscv/kendryte/k210.dtsi (props changed) Modified: head/sys/gnu/dts/arm/am33xx-l4.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am33xx-l4.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am33xx-l4.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -759,12 +759,27 @@ ranges = <0x0 0x200000 0x80000>; }; - target-module@300000 { /* 0x4a300000, ap 9 04.0 */ - compatible = "ti,sysc"; - status = "disabled"; + pruss_tm: target-module@300000 { /* 0x4a300000, ap 9 04.0 */ + compatible = "ti,sysc-pruss", "ti,sysc"; + reg = <0x326000 0x4>, + <0x326004 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = <(SYSC_PRUSS_STANDBY_INIT | + SYSC_PRUSS_SUB_MWAIT)>; + ti,sysc-midle = , + , + ; + ti,sysc-sidle = , + , + ; + clocks = <&pruss_ocp_clkctrl AM3_PRUSS_OCP_PRUSS_CLKCTRL 0>; + clock-names = "fck"; + resets = <&prm_per 1>; + reset-names = "rstctrl"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x300000 0x80000>; + status = "disabled"; }; }; }; Modified: head/sys/gnu/dts/arm/am33xx.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am33xx.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am33xx.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -47,6 +47,7 @@ #size-cells = <0>; cpu@0 { compatible = "arm,cortex-a8"; + enable-method = "ti,am3352"; device_type = "cpu"; reg = <0>; @@ -56,7 +57,18 @@ clock-names = "cpu"; clock-latency = <300000>; /* From omap-cpufreq driver */ + cpu-idle-states = <&mpu_gate>; }; + + idle-states { + mpu_gate: mpu_gate { + compatible = "arm,idle-state"; + entry-latency-us = <40>; + exit-latency-us = <90>; + min-residency-us = <300>; + ti,idle-wkup-m3; + }; + }; }; cpu0_opp_table: opp-table { @@ -193,45 +205,100 @@ reg = <0x48200000 0x1000>; }; - edma: edma@49000000 { - compatible = "ti,edma3-tpcc"; - ti,hwmods = "tpcc"; - reg = <0x49000000 0x10000>; - reg-names = "edma3_cc"; - interrupts = <12 13 14>; - interrupt-names = "edma3_ccint", "edma3_mperr", - "edma3_ccerrint"; - dma-requests = <64>; - #dma-cells = <2>; + target-module@49000000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49000000 0x4>; + reg-names = "rev"; + clocks = <&l3_clkctrl AM3_L3_TPCC_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49000000 0x10000>; - ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>, - <&edma_tptc2 0>; + edma: dma@0 { + compatible = "ti,edma3-tpcc"; + reg = <0 0x10000>; + reg-names = "edma3_cc"; + interrupts = <12 13 14>; + interrupt-names = "edma3_ccint", "edma3_mperr", + "edma3_ccerrint"; + dma-requests = <64>; + #dma-cells = <2>; - ti,edma-memcpy-channels = <20 21>; + ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>, + <&edma_tptc2 0>; + + ti,edma-memcpy-channels = <20 21>; + }; }; - edma_tptc0: tptc@49800000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc0"; - reg = <0x49800000 0x100000>; - interrupts = <112>; - interrupt-names = "edma3_tcerrint"; + target-module@49800000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49800000 0x4>, + <0x49800010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = ; + ti,sysc-midle = ; + ti,sysc-sidle = , + ; + clocks = <&l3_clkctrl AM3_L3_TPTC0_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49800000 0x100000>; + + edma_tptc0: dma@0 { + compatible = "ti,edma3-tptc"; + reg = <0 0x100000>; + interrupts = <112>; + interrupt-names = "edma3_tcerrint"; + }; }; - edma_tptc1: tptc@49900000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc1"; - reg = <0x49900000 0x100000>; - interrupts = <113>; - interrupt-names = "edma3_tcerrint"; + target-module@49900000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49900000 0x4>, + <0x49900010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = ; + ti,sysc-midle = ; + ti,sysc-sidle = , + ; + clocks = <&l3_clkctrl AM3_L3_TPTC1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49900000 0x100000>; + + edma_tptc1: dma@0 { + compatible = "ti,edma3-tptc"; + reg = <0 0x100000>; + interrupts = <113>; + interrupt-names = "edma3_tcerrint"; + }; }; - edma_tptc2: tptc@49a00000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc2"; - reg = <0x49a00000 0x100000>; - interrupts = <114>; - interrupt-names = "edma3_tcerrint"; + target-module@49a00000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49a00000 0x4>, + <0x49a00010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = ; + ti,sysc-midle = ; + ti,sysc-sidle = , + ; + clocks = <&l3_clkctrl AM3_L3_TPTC2_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49a00000 0x100000>; + + edma_tptc2: dma@0 { + compatible = "ti,edma3-tptc"; + reg = <0 0x100000>; + interrupts = <114>; + interrupt-names = "edma3_tcerrint"; + }; }; target-module@47810000 { Modified: head/sys/gnu/dts/arm/am4372.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am4372.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am4372.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -45,6 +45,7 @@ #size-cells = <0>; cpu: cpu@0 { compatible = "arm,cortex-a9"; + enable-method = "ti,am4372"; device_type = "cpu"; reg = <0>; @@ -54,7 +55,18 @@ operating-points-v2 = <&cpu0_opp_table>; clock-latency = <300000>; /* From omap-cpufreq driver */ + cpu-idle-states = <&mpu_gate>; }; + + idle-states { + mpu_gate: mpu_gate { + compatible = "arm,idle-state"; + entry-latency-us = <40>; + exit-latency-us = <100>; + min-residency-us = <300>; + local-timer-stop; + }; + }; }; cpu0_opp_table: opp-table { @@ -185,47 +197,102 @@ &pm_sram_data>; }; - edma: edma@49000000 { - compatible = "ti,edma3-tpcc"; - ti,hwmods = "tpcc"; - reg = <0x49000000 0x10000>; - reg-names = "edma3_cc"; - interrupts = , - , - ; - interrupt-names = "edma3_ccint", "edma3_mperr", - "edma3_ccerrint"; - dma-requests = <64>; - #dma-cells = <2>; + target-module@49000000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49000000 0x4>; + reg-names = "rev"; + clocks = <&l3_clkctrl AM4_L3_TPCC_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49000000 0x10000>; - ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>, - <&edma_tptc2 0>; + edma: dma@0 { + compatible = "ti,edma3-tpcc"; + reg = <0 0x10000>; + reg-names = "edma3_cc"; + interrupts = , + , + ; + interrupt-names = "edma3_ccint", "edma3_mperr", + "edma3_ccerrint"; + dma-requests = <64>; + #dma-cells = <2>; - ti,edma-memcpy-channels = <58 59>; + ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>, + <&edma_tptc2 0>; + + ti,edma-memcpy-channels = <58 59>; + }; }; - edma_tptc0: tptc@49800000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc0"; - reg = <0x49800000 0x100000>; - interrupts = ; - interrupt-names = "edma3_tcerrint"; + target-module@49800000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49800000 0x4>, + <0x49800010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = ; + ti,sysc-midle = ; + ti,sysc-sidle = , + ; + clocks = <&l3_clkctrl AM4_L3_TPTC0_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49800000 0x100000>; + + edma_tptc0: dma@0 { + compatible = "ti,edma3-tptc"; + reg = <0 0x100000>; + interrupts = ; + interrupt-names = "edma3_tcerrint"; + }; }; - edma_tptc1: tptc@49900000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc1"; - reg = <0x49900000 0x100000>; - interrupts = ; - interrupt-names = "edma3_tcerrint"; + target-module@49900000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49900000 0x4>, + <0x49900010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = ; + ti,sysc-midle = ; + ti,sysc-sidle = , + ; + clocks = <&l3_clkctrl AM4_L3_TPTC1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49900000 0x100000>; + + edma_tptc1: dma@0 { + compatible = "ti,edma3-tptc"; + reg = <0 0x100000>; + interrupts = ; + interrupt-names = "edma3_tcerrint"; + }; }; - edma_tptc2: tptc@49a00000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc2"; - reg = <0x49a00000 0x100000>; - interrupts = ; - interrupt-names = "edma3_tcerrint"; + target-module@49a00000 { + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x49a00000 0x4>, + <0x49a00010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = ; + ti,sysc-midle = ; + ti,sysc-sidle = , + ; + clocks = <&l3_clkctrl AM4_L3_TPTC2_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x49a00000 0x100000>; + + edma_tptc2: dma@0 { + compatible = "ti,edma3-tptc"; + reg = <0 0x100000>; + interrupts = ; + interrupt-names = "edma3_tcerrint"; + }; }; target-module@47810000 { @@ -344,6 +411,28 @@ }; }; + pruss_tm: target-module@54400000 { + compatible = "ti,sysc-pruss", "ti,sysc"; + reg = <0x54426000 0x4>, + <0x54426004 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = <(SYSC_PRUSS_STANDBY_INIT | + SYSC_PRUSS_SUB_MWAIT)>; + ti,sysc-midle = , + , + ; + ti,sysc-sidle = , + , + ; + clocks = <&pruss_ocp_clkctrl AM4_PRUSS_OCP_PRUSS_CLKCTRL 0>; + clock-names = "fck"; + resets = <&prm_per 1>; + reset-names = "rstctrl"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x54400000 0x80000>; + }; + gpmc: gpmc@50000000 { compatible = "ti,am3352-gpmc"; ti,hwmods = "gpmc"; @@ -391,38 +480,6 @@ #size-cells = <0>; interrupts = <0 138 0x4>; num-cs = <4>; - }; - }; - - dss: dss@4832a000 { - compatible = "ti,omap3-dss"; - reg = <0x4832a000 0x200>; - status = "disabled"; - ti,hwmods = "dss_core"; - clocks = <&disp_clk>; - clock-names = "fck"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - - dispc: dispc@4832a400 { - compatible = "ti,omap3-dispc"; - reg = <0x4832a400 0x400>; - interrupts = ; - ti,hwmods = "dss_dispc"; - clocks = <&disp_clk>; - clock-names = "fck"; - - max-memory-bandwidth = <230000000>; - }; - - rfbi: rfbi@4832a800 { - compatible = "ti,omap3-rfbi"; - reg = <0x4832a800 0x100>; - ti,hwmods = "dss_rfbi"; - clocks = <&disp_clk>; - clock-names = "fck"; - status = "disabled"; }; }; Modified: head/sys/gnu/dts/arm/am437x-gp-evm.dts ============================================================================== --- head/sys/gnu/dts/arm/am437x-gp-evm.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am437x-gp-evm.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -943,7 +943,7 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; }; &elm { Modified: head/sys/gnu/dts/arm/am437x-idk-evm.dts ============================================================================== --- head/sys/gnu/dts/arm/am437x-idk-evm.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am437x-idk-evm.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -504,7 +504,7 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; }; &rtc { Modified: head/sys/gnu/dts/arm/am437x-l4.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am437x-l4.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am437x-l4.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -2117,7 +2117,6 @@ target-module@2a000 { /* 0x4832a000, ap 88 3c.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "dss_core"; reg = <0x2a000 0x4>, <0x2a010 0x4>, <0x2a014 0x4>; @@ -2135,6 +2134,82 @@ <0x00000800 0x0002a800 0x00000400>, <0x00000c00 0x0002ac00 0x00000400>, <0x00001000 0x0002b000 0x00001000>; + + dss: dss@0 { + compatible = "ti,omap3-dss"; + reg = <0 0x200>; + status = "disabled"; + clocks = <&disp_clk>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x00000000 0x00000400>, + <0x00000400 0x00000400 0x00000400>, + <0x00000800 0x00000800 0x00000400>, + <0x00000c00 0x00000c00 0x00000400>, + <0x00001000 0x00001000 0x00001000>; + + target-module@400 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x400 0x4>, + <0x410 0x4>, + <0x414 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-sidle = , + , + ; + ti,sysc-midle = , + , + ; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,syss-mask = <1>; + clocks = <&dss_clkctrl AM4_DSS_DSS_CORE_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x400 0x400>; + + dispc: dispc@0 { + compatible = "ti,omap3-dispc"; + reg = <0 0x400>; + interrupts = ; + clocks = <&disp_clk>; + clock-names = "fck"; + + max-memory-bandwidth = <230000000>; + }; + }; + + target-module@800 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x800 0x4>, + <0x810 0x4>, + <0x814 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-sidle = , + , + ; + ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,syss-mask = <1>; + clocks = <&dss_clkctrl AM4_DSS_DSS_CORE_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x800 0x400>; + + rfbi: rfbi@0 { + compatible = "ti,omap3-rfbi"; + reg = <0 0x100>; + clocks = <&dss_clkctrl AM4_DSS_DSS_CORE_CLKCTRL 0>; + clock-names = "fck"; + status = "disabled"; + }; + }; + }; }; target-module@3d000 { /* 0x4833d000, ap 102 6e.0 */ Modified: head/sys/gnu/dts/arm/am437x-sk-evm.dts ============================================================================== --- head/sys/gnu/dts/arm/am437x-sk-evm.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am437x-sk-evm.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -833,13 +833,13 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { phy-handle = <ðphy1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; dual_emac_res_vlan = <2>; }; Copied: head/sys/gnu/dts/arm/am57-pruss.dtsi (from r361846, vendor/device-tree/dist/src/arm/am57-pruss.dtsi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/gnu/dts/arm/am57-pruss.dtsi Fri Jun 5 20:09:13 2020 (r361848, copy of r361846, vendor/device-tree/dist/src/arm/am57-pruss.dtsi) @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ + * + * Common PRUSS data for TI AM57xx platforms + */ + +&ocp { + pruss1_tm: target-module@4b226000 { + compatible = "ti,sysc-pruss", "ti,sysc"; + reg = <0x4b226000 0x4>, + <0x4b226004 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = <(SYSC_PRUSS_STANDBY_INIT | + SYSC_PRUSS_SUB_MWAIT)>; + ti,sysc-midle = , + , + ; + ti,sysc-sidle = , + , + ; + /* Domains (P, C): coreaon_pwrdm, l4per2_clkdm */ + clocks = <&l4per2_clkctrl DRA7_L4PER2_PRUSS1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x4b200000 0x80000>; + }; + + pruss2_tm: target-module@4b2a6000 { + compatible = "ti,sysc-pruss", "ti,sysc"; + reg = <0x4b2a6000 0x4>, + <0x4b2a6004 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-mask = <(SYSC_PRUSS_STANDBY_INIT | + SYSC_PRUSS_SUB_MWAIT)>; + ti,sysc-midle = , + , + ; + ti,sysc-sidle = , + , + ; + /* Domains (P, C): coreaon_pwrdm, l4per2_clkdm */ + clocks = <&l4per2_clkctrl DRA7_L4PER2_PRUSS2_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x4b280000 0x80000>; + }; +}; Modified: head/sys/gnu/dts/arm/am5718.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am5718.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am5718.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -4,6 +4,7 @@ */ #include "dra72x.dtsi" +#include "am57-pruss.dtsi" / { compatible = "ti,am5718", "ti,dra7"; Modified: head/sys/gnu/dts/arm/am571x-idk.dts ============================================================================== --- head/sys/gnu/dts/arm/am571x-idk.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am571x-idk.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -190,13 +190,13 @@ &cpsw_port1 { phy-handle = <ðphy0_sw>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; ti,dual-emac-pvid = <1>; }; &cpsw_port2 { phy-handle = <ðphy1_sw>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; ti,dual-emac-pvid = <2>; }; Modified: head/sys/gnu/dts/arm/am5728.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am5728.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am5728.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -4,6 +4,7 @@ */ #include "dra74x.dtsi" +#include "am57-pruss.dtsi" / { compatible = "ti,am5728", "ti,dra7"; Modified: head/sys/gnu/dts/arm/am5748.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am5748.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am5748.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -4,6 +4,7 @@ */ #include "dra76x.dtsi" +#include "am57-pruss.dtsi" / { compatible = "ti,am5748", "ti,dra762", "ti,dra7"; Modified: head/sys/gnu/dts/arm/am574x-idk.dts ============================================================================== --- head/sys/gnu/dts/arm/am574x-idk.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am574x-idk.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -40,3 +40,7 @@ status = "okay"; dual_emac; }; + +&m_can0 { + status = "disabled"; +}; Modified: head/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -433,13 +433,13 @@ &cpsw_emac0 { phy-handle = <&phy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { phy-handle = <&phy1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; dual_emac_res_vlan = <2>; }; Modified: head/sys/gnu/dts/arm/am57xx-idk-common.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am57xx-idk-common.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/am57xx-idk-common.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -408,13 +408,13 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { phy-handle = <ðphy1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-rxid"; dual_emac_res_vlan = <2>; }; Modified: head/sys/gnu/dts/arm/arm-realview-pbx.dtsi ============================================================================== --- head/sys/gnu/dts/arm/arm-realview-pbx.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/arm-realview-pbx.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -210,7 +210,7 @@ }; }; - soc: soc@0 { + soc: soc { compatible = "arm,realview-pbx-soc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; Modified: head/sys/gnu/dts/arm/aspeed-g4.dtsi ============================================================================== --- head/sys/gnu/dts/arm/aspeed-g4.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/aspeed-g4.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -164,6 +164,8 @@ reg = <0x1e6a0000 0x300>; interrupts = <5>; clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <5>; + aspeed,vhub-generic-endpoints = <15>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb2d_default>; status = "disabled"; Modified: head/sys/gnu/dts/arm/aspeed-g5.dtsi ============================================================================== --- head/sys/gnu/dts/arm/aspeed-g5.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/aspeed-g5.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -195,6 +195,8 @@ reg = <0x1e6a0000 0x300>; interrupts = <5>; clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <5>; + aspeed,vhub-generic-endpoints = <15>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb2ad_default>; status = "disabled"; Modified: head/sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi ============================================================================== --- head/sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -1112,6 +1112,31 @@ groups = "UART9"; }; + pinctrl_usb2ah_default: usb2ah_default { + function = "USB2AH"; + groups = "USBA"; + }; + + pinctrl_usb2ad_default: usb2ad_default { + function = "USB2AD"; + groups = "USBA"; + }; + + pinctrl_usb2bh_default: usb2bh_default { + function = "USB2BH"; + groups = "USBB"; + }; + + pinctrl_usb2bd_default: usb2bd_default { + function = "USB2BD"; + groups = "USBB"; + }; + + pinctrl_usb11bhid_default: usb11bhid_default { + function = "USB11BHID"; + groups = "USBB"; + }; + pinctrl_vb_default: vb_default { function = "VB"; groups = "VB"; Modified: head/sys/gnu/dts/arm/aspeed-g6.dtsi ============================================================================== --- head/sys/gnu/dts/arm/aspeed-g6.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/aspeed-g6.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -245,6 +245,51 @@ status = "disabled"; }; + ehci0: usb@1e6a1000 { + compatible = "aspeed,ast2600-ehci", "generic-ehci"; + reg = <0x1e6a1000 0x100>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ah_default>; + status = "disabled"; + }; + + ehci1: usb@1e6a3000 { + compatible = "aspeed,ast2600-ehci", "generic-ehci"; + reg = <0x1e6a3000 0x100>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2bh_default>; + status = "disabled"; + }; + + uhci: usb@1e6b0000 { + compatible = "aspeed,ast2600-uhci", "generic-uhci"; + reg = <0x1e6b0000 0x100>; + interrupts = ; + #ports = <2>; + clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>; + status = "disabled"; + /* + * No default pinmux, it will follow EHCI, use an + * explicit pinmux override if EHCI is not enabled. + */ + }; + + vhub: usb-vhub@1e6a0000 { + compatible = "aspeed,ast2600-usb-vhub"; + reg = <0x1e6a0000 0x350>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <7>; + aspeed,vhub-generic-endpoints = <21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ad_default>; + status = "disabled"; + }; + apb { compatible = "simple-bus"; #address-cells = <1>; Modified: head/sys/gnu/dts/arm/at91-dvk_su60_somc_lcm.dtsi ============================================================================== --- head/sys/gnu/dts/arm/at91-dvk_su60_somc_lcm.dtsi Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/at91-dvk_su60_somc_lcm.dtsi Fri Jun 5 20:09:13 2020 (r361848) @@ -17,7 +17,7 @@ }; panel: panel { - compatible = "winstar,wf70gtiagdng0", "innolux,at070tn92", "simple-panel"; + compatible = "winstar,wf70gtiagdng0", "innolux,at070tn92"; backlight = <&backlight>; power-supply = <&vcc_lcd_reg>; #address-cells = <1>; Modified: head/sys/gnu/dts/arm/at91-sam9x60ek.dts ============================================================================== --- head/sys/gnu/dts/arm/at91-sam9x60ek.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/at91-sam9x60ek.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -645,3 +645,8 @@ &usb2 { status = "okay"; }; + +&watchdog { + status = "okay"; +}; + Modified: head/sys/gnu/dts/arm/at91-sama5d27_wlsom1_ek.dts ============================================================================== --- head/sys/gnu/dts/arm/at91-sama5d27_wlsom1_ek.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/at91-sama5d27_wlsom1_ek.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -186,6 +186,11 @@ pinmux = ; bias-disable; }; + + pinctrl_usba_vbus: usba_vbus { + pinmux = ; + bias-disable; + }; }; &pwm0 { @@ -245,6 +250,13 @@ pinctrl-0 = <&pinctrl_uart3_default>; atmel,use-dma-rx; atmel,use-dma-tx; + status = "okay"; +}; + +&usb0 { + atmel,vbus-gpio = <&pioA PIN_PA16 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; Modified: head/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts ============================================================================== --- head/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -180,8 +180,11 @@ i2c0: i2c@f8028000 { dmas = <0>, <0>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pioA PIN_PD22 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -198,8 +201,11 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&pmc PMC_TYPE_PERIPHERAL 19>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_flx0_default>; + pinctrl-1 = <&pinctrl_flx0_gpio>; + sda-gpios = <&pioA PIN_PB28 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pioA PIN_PB29 GPIO_ACTIVE_HIGH>; atmel,fifo-size = <16>; status = "okay"; }; @@ -226,8 +232,11 @@ i2c1: i2c@fc028000 { dmas = <0>, <0>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + sda-gpios = <&pioA PIN_PC6 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pioA PIN_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; at24@50 { @@ -244,15 +253,33 @@ bias-disable; }; + pinctrl_flx0_gpio: flx0_gpio { + pinmux = , + ; + bias-disable; + }; + pinctrl_i2c0_default: i2c0_default { pinmux = , ; bias-disable; }; + pinctrl_i2c0_gpio: i2c0_gpio { + pinmux = , + ; + bias-disable; + }; + pinctrl_i2c1_default: i2c1_default { pinmux = , ; + bias-disable; + }; + + pinctrl_i2c1_gpio: i2c1_gpio { + pinmux = , + ; bias-disable; }; Modified: head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts ============================================================================== --- head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts Fri Jun 5 19:29:38 2020 (r361847) +++ head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts Fri Jun 5 20:09:13 2020 (r361848) @@ -129,8 +129,11 @@ i2c0: i2c@f8028000 { dmas = <0>, <0>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pioA PIN_PD22 GPIO_ACTIVE_HIGH>; i2c-sda-hold-time-ns = <350>; status = "okay"; @@ -331,8 +334,11 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&pmc PMC_TYPE_PERIPHERAL 23>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_flx4_default>; + pinctrl-1 = <&pinctrl_flx4_gpio>; + sda-gpios = <&pioA PIN_PD12 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pioA PIN_PD13 GPIO_ACTIVE_HIGH>; atmel,fifo-size = <16>; i2c-analog-filter; i2c-digital-filter; @@ -343,11 +349,14 @@ i2c1: i2c@fc028000 { dmas = <0>, <0>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1_default>; i2c-analog-filter; i2c-digital-filter; i2c-digital-filter-width-ns = <35>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + sda-gpios = <&pioA PIN_PD4 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pioA PIN_PD5 GPIO_ACTIVE_HIGH>; status = "okay"; at24@54 { @@ -441,15 +450,33 @@ bias-disable; }; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Fri Jun 5 20:14:55 2020 Return-Path: Delivered-To: svn-src-head@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 BA664336BBF; Fri, 5 Jun 2020 20:14:55 +0000 (UTC) (envelope-from manu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dv5C4Mk7z3VyR; Fri, 5 Jun 2020 20:14:55 +0000 (UTC) (envelope-from manu@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 8CE3E1654C; Fri, 5 Jun 2020 20:14:55 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055KEtLQ061021; Fri, 5 Jun 2020 20:14:55 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055KEtbZ061019; Fri, 5 Jun 2020 20:14:55 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006052014.055KEtbZ061019@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 5 Jun 2020 20:14:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361849 - head/sys/gnu/dts/arm X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/gnu/dts/arm X-SVN-Commit-Revision: 361849 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 20:14:55 -0000 Author: manu Date: Fri Jun 5 20:14:54 2020 New Revision: 361849 URL: https://svnweb.freebsd.org/changeset/base/361849 Log: dts: patch the am33xx dts for upcoming clock support Some ranges are too small compared to what they really are. Add functional clocks for the timers. Submitted by: Oskar Holmlund (oskar.holmlund@ohdata.se) X-Differential Revision: https://reviews.freebsd.org/D25118 Modified: head/sys/gnu/dts/arm/am33xx-l4.dtsi head/sys/gnu/dts/arm/am33xx.dtsi Modified: head/sys/gnu/dts/arm/am33xx-l4.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am33xx-l4.dtsi Fri Jun 5 20:09:13 2020 (r361848) +++ head/sys/gnu/dts/arm/am33xx-l4.dtsi Fri Jun 5 20:14:54 2020 (r361849) @@ -1167,6 +1167,8 @@ compatible = "ti,am335x-timer"; reg = <0x0 0x400>; interrupts = <69>; + clocks = <&timer3_fck>; + clock-names = "fck"; }; }; @@ -1193,6 +1195,8 @@ reg = <0x0 0x400>; interrupts = <92>; ti,timer-pwm; + clocks = <&timer4_fck>; + clock-names = "fck"; }; }; @@ -1219,6 +1223,8 @@ reg = <0x0 0x400>; interrupts = <93>; ti,timer-pwm; + clocks = <&timer5_fck>; + clock-names = "fck"; }; }; @@ -1245,6 +1251,8 @@ reg = <0x0 0x400>; interrupts = <94>; ti,timer-pwm; + clocks = <&timer6_fck>; + clock-names = "fck"; }; }; @@ -1271,6 +1279,8 @@ reg = <0x0 0x400>; interrupts = <95>; ti,timer-pwm; + clocks = <&timer7_fck>; + clock-names = "fck"; }; }; Modified: head/sys/gnu/dts/arm/am33xx.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am33xx.dtsi Fri Jun 5 20:09:13 2020 (r361848) +++ head/sys/gnu/dts/arm/am33xx.dtsi Fri Jun 5 20:14:54 2020 (r361849) @@ -336,7 +336,7 @@ <0x47400010 0x4>; reg-names = "rev", "sysc"; ti,sysc-mask = <(SYSC_OMAP4_FREEEMU | - SYSC_OMAP2_SOFTRESET)>; + SYSC_OMAP4_SOFTRESET)>; ti,sysc-midle = , , ; @@ -348,7 +348,7 @@ clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x47400000 0x5000>; + ranges = <0x0 0x47400000 0x8000>; usb0_phy: usb-phy@1300 { compatible = "ti,am335x-usb-phy"; From owner-svn-src-head@freebsd.org Fri Jun 5 20:18:55 2020 Return-Path: Delivered-To: svn-src-head@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 F2886336D47; Fri, 5 Jun 2020 20:18:55 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dv9q55T2z3WDP; Fri, 5 Jun 2020 20:18:55 +0000 (UTC) (envelope-from emaste@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 AA17416655; Fri, 5 Jun 2020 20:18:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055KItwR061250; Fri, 5 Jun 2020 20:18:55 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055KIthD061249; Fri, 5 Jun 2020 20:18:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006052018.055KIthD061249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 5 Jun 2020 20:18:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361850 - head X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 361850 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 20:18:56 -0000 Author: emaste Date: Fri Jun 5 20:18:55 2020 New Revision: 361850 URL: https://svnweb.freebsd.org/changeset/base/361850 Log: Makefile.inc1: remove stale dependency cleanup from 2018 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Jun 5 20:14:54 2020 (r361849) +++ head/Makefile.inc1 Fri Jun 5 20:18:55 2020 (r361850) @@ -1559,12 +1559,6 @@ INSTALLKERNEL= ${_kernel} .endfor _cleankernobj_fast_depend_hack: .PHONY -# 20180320 remove stale generated assym.s after renaming to .inc in r331254 - @if [ -e "${OBJTOP}/sys/${KERNCONF}/assym.s" ]; then \ - echo "Removing stale generated assym files"; \ - rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \ - ${OBJTOP}/sys/${KERNCONF}/.depend.assym.*; \ - fi # 20191009 r353340 removal of opensolaris_atomic.S (also r353381) .if ${MACHINE} != i386 .for f in opensolaris_atomic From owner-svn-src-head@freebsd.org Fri Jun 5 20:21:10 2020 Return-Path: Delivered-To: svn-src-head@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 1FC1C336DE9; Fri, 5 Jun 2020 20:21:10 +0000 (UTC) (envelope-from eugen@freebsd.org) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:c2c:26d8::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dvDP6Clzz3WlS; Fri, 5 Jun 2020 20:21:09 +0000 (UTC) (envelope-from eugen@freebsd.org) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id 055KL2Sm072378 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Jun 2020 20:21:03 GMT (envelope-from eugen@freebsd.org) X-Envelope-From: eugen@freebsd.org X-Envelope-To: shawn.webb@hardenedbsd.org Received: from [10.58.0.10] (dadvw [10.58.0.10]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id 055KL2Ac044477 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Sat, 6 Jun 2020 03:21:03 +0700 (+07) (envelope-from eugen@freebsd.org) Subject: Re: svn commit: r361790 - head/sbin/ifconfig To: Shawn Webb References: <202006041444.054EijxB047937@repo.freebsd.org> <20200604214510.4my3xa6d2ce75zba@mutt-hbsd> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Eugene Grosbein Message-ID: Date: Sat, 6 Jun 2020 03:20:57 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20200604214510.4my3xa6d2ce75zba@mutt-hbsd> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_SOFTFAIL autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) * 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 49dvDP6Clzz3WlS X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 20:21:10 -0000 05.06.2020 4:45, Shawn Webb wrote: >> Modified: head/sbin/ifconfig/ifconfig.8 >> ============================================================================== >> --- head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:15:39 2020 (r361789) >> +++ head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:44:44 2020 (r361790) > > Hey Eugene, > > Does the manpage need a date bump? It was already bumped that day with previous commit by avg. Sorry for late reply. From owner-svn-src-head@freebsd.org Fri Jun 5 21:20:03 2020 Return-Path: Delivered-To: svn-src-head@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 68AF9337B5D for ; Fri, 5 Jun 2020 21:20:03 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49dwXL1DCLz3crC for ; Fri, 5 Jun 2020 21:20:01 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x835.google.com with SMTP id w90so9739806qtd.8 for ; Fri, 05 Jun 2020 14:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=SNCSCwRajrv0X9jwgRg45zyK29x7XIVsK+7iBYhw4Es=; b=Oz6Pif9o3q2BgxOBPvxoX+At0WVIAT+ux1yApb1Ga81iuWivcIhfTFzk6TXOk8GJA+ iSYYBKL2wnSl5V19ac9ihUXN4GvDatnWM4xpRH6HcmQJrOzhp709LG/SIYz/vEXsEEj0 /omGLla57NSvwqI/iTb1QxOUWJAJfM8TRHevA1/68yXHgRHrFeSUeNtlmTYZMhXXQuIY baRLaG3H1VVZpaVtFPgwqiJwxnOBsNTt3SFZ6RNgtk+lZc+29F8I9ZKQ8ALfvzrASYgK HvOZqoLwlqjuLN2sVfPr4q+g5cLzqibSHfh/U7paCCpTucTa1aDMzBBjeAouwE0y0K00 nuww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=SNCSCwRajrv0X9jwgRg45zyK29x7XIVsK+7iBYhw4Es=; b=HnoQTr+M5nYbIizrUepcRIDkPO3oGtdR8fHXINP+o1FfueDtWYoX3kyq7fo8A8Ub1q QIyAHuavH7Dx40jJxYM3HTxeJlZ+rVodM4f5HJG6j0lB+vuA/4tGefgI5La0O75/S2Ow tsp0FktNhtDXcSIZNraJuD09dLQDUoBu/Zei4p7AfJFWjjDc3q11qZ3q/b6UEGNH7heP HgVb3e9LNbhzbz0S54v2wGxSCPywfzielScir6dhZIAI0BhDlrN0XpNJByTg+gf9N/mT 9FbzRK6/pw6oCm2lCyO9SrEOShpZWoZxpstJrI4XH4op0vs+PEmJ2pvJJoEjVps8yJrn clBA== X-Gm-Message-State: AOAM531KThdn0r91wm8ja04dAwpXj8Ozun3Fu/jMwkUNGFmz+zq8pQ74 H8Td2Cv4nvWA6kR2ekCJ7uPBCg== X-Google-Smtp-Source: ABdhPJzLQNkuopH2Si6zekrD3kvCxmLazPtuZE/zxTT4SDjrBTBis2at+2JB/nBMOUt4PmVrgz3Zfw== X-Received: by 2002:ac8:7b83:: with SMTP id p3mr10284187qtu.17.1591392001203; Fri, 05 Jun 2020 14:20:01 -0700 (PDT) Received: from mutt-hbsd (75-148-2-186-WashingtonDC.hfc.comcastbusiness.net. [75.148.2.186]) by smtp.gmail.com with ESMTPSA id v144sm816226qka.69.2020.06.05.14.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 14:20:00 -0700 (PDT) Date: Fri, 5 Jun 2020 17:19:46 -0400 From: Shawn Webb To: Eugene Grosbein Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361790 - head/sbin/ifconfig Message-ID: <20200605211946.x6z4xozuxpibozhg@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <202006041444.054EijxB047937@repo.freebsd.org> <20200604214510.4my3xa6d2ce75zba@mutt-hbsd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yp6ontevzddw3e5o" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 49dwXL1DCLz3crC X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=Oz6Pif9o; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::835 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-4.91 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; NEURAL_HAM_MEDIUM(-1.01)[-1.007]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; NEURAL_HAM_SHORT(-0.80)[-0.804]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::835:from]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 21:20:03 -0000 --yp6ontevzddw3e5o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 06, 2020 at 03:20:57AM +0700, Eugene Grosbein wrote: > 05.06.2020 4:45, Shawn Webb wrote: >=20 > >> Modified: head/sbin/ifconfig/ifconfig.8 > >> =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=3D=3D=3D= =3D=3D=3D=3D=3D > >> --- head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:15:39 2020 (r361789) > >> +++ head/sbin/ifconfig/ifconfig.8 Thu Jun 4 14:44:44 2020 (r361790) > >=20 > > Hey Eugene, > >=20 > > Does the manpage need a date bump? >=20 > It was already bumped that day with previous commit by avg. > Sorry for late reply. No worries. I didn't catch the prior date bump. Thanks for the clarification! :) --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --yp6ontevzddw3e5o Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl7atuwACgkQ/y5nonf4 4fpovA//b+EnRn4YJZ2qD5scLN+nnRYwI/gGOMPVdCir28RTVsALcpLUKLM+pYDC njflPnHu8kapS7LGkuWaz+r1u/yiDO5YaACuVhXERt+eCkgRdgk2PmRCSmAtkpoZ EwoumGsO8aECpWjqJe/8n8xvcsVKEc5CBCgbL3QkUSBzutj9zakjBY4pODIlc26d sHAAqQ6BSTYkCs3VXB4pW4rHDir+ZL4W/6dzeLc0xOZGkUX7bympqjX+NHqJnCZL zqXc5twW8cOBgzkq0gzGTfnRgBFnb/cfFGZxI0o56X3BIZgA1ZNgWVdkvHNIX2UZ PqjNrSNynXDrDvEc/uoIPHhff61HzVr7oL+UkU+v29B0HihJ3XbnzR4F2U2yg4/e cvAQjgiM+ndFpdVAkKv7Qj3sU6yJo27nD6qiM98IkvkLaCdc4uIvA4Adby7c4Edj aIAQtJU63ParnDlvPJQ7dF1IZsKnFdnOwaSYhrK98TB9mFshFcSaHY/JC/W+fzVy k4rwYke7Ttx0c9jIOJnc0r25JUmTfoePdZqSQFOcqkfWnVmwcS3GK69+AzeTSOU7 sTfblYTJb71vGT5IvdP0yylYOxz4ofMz5Gsgz3QAke0Pfsndb9Xog7+b3lc2qlj0 IfmKAgPSkMIrOCDau+pO3ZPH4q+pSxbCckNrYmNZKZhjFzrwRKk= =/KnL -----END PGP SIGNATURE----- --yp6ontevzddw3e5o-- From owner-svn-src-head@freebsd.org Sat Jun 6 00:02:50 2020 Return-Path: Delivered-To: svn-src-head@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 C40F033BBBB; Sat, 6 Jun 2020 00:02:50 +0000 (UTC) (envelope-from chs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f08B4YxGz4Cpb; Sat, 6 Jun 2020 00:02:50 +0000 (UTC) (envelope-from chs@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 977CD193A2; Sat, 6 Jun 2020 00:02:50 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05602o2w002385; Sat, 6 Jun 2020 00:02:50 GMT (envelope-from chs@FreeBSD.org) Received: (from chs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05602oJW002384; Sat, 6 Jun 2020 00:02:50 GMT (envelope-from chs@FreeBSD.org) Message-Id: <202006060002.05602oJW002384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: chs set sender to chs@FreeBSD.org using -f From: Chuck Silvers Date: Sat, 6 Jun 2020 00:02:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361852 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: chs X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 361852 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 00:02:50 -0000 Author: chs Date: Sat Jun 6 00:02:50 2020 New Revision: 361852 URL: https://svnweb.freebsd.org/changeset/base/361852 Log: Fix hang due to missing unbusy in sendfile when an async data I/O fails. r359473 removed the page unbusy logic from sendfile_iodone() because when vm_pager_get_pages_async() would return an error after failing to start the async I/O (eg. because VOP_BMAP failed), sendfile_swapin() would also unbusy the pages, and it was wrong to unbusy twice. However this breaks the case where vm_pager_get_pages_async() succeeds in starting an async I/O and the async I/O is what fails. In this case, sendfile_iodone() must unbusy the pages, and because sendfile_iodone() doesn't know which case it is in, sendfile_iodone() must always unbusy pages and relookup pages which have been substituted with bogus_page, which in turn means that sendfile_swapin() must never do unbusy or relookup for pages which have been given to vm_pager_get_pages_async(), even if there is an error. Reviewed by: kib, markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25136 Modified: head/sys/kern/kern_sendfile.c Modified: head/sys/kern/kern_sendfile.c ============================================================================== --- head/sys/kern/kern_sendfile.c Fri Jun 5 22:07:10 2020 (r361851) +++ head/sys/kern/kern_sendfile.c Sat Jun 6 00:02:50 2020 (r361852) @@ -292,36 +292,30 @@ sendfile_iodone(void *arg, vm_page_t *pa, int count, i struct socket *so; int i; - if (error != 0) { + if (error != 0) sfio->error = error; - /* - * Restore of the pg[] elements is done by - * sendfile_swapin(). - */ - } else { - /* - * Restore the valid page pointers. They are already - * unbusied, but still wired. For error != 0 case, - * sendfile_swapin() handles unbusy. - * - * XXXKIB since pages are only wired, and we do not - * own the object lock, other users might have - * invalidated them in meantime. Similarly, after we - * unbusied the swapped-in pages, they can become - * invalid under us. - */ - MPASS(count == 0 || pa[0] != bogus_page); - for (i = 0; i < count; i++) { - if (pa[i] == bogus_page) { - sfio->pa[(pa[0]->pindex - sfio->pindex0) + i] = - pa[i] = vm_page_relookup(sfio->obj, - pa[0]->pindex + i); - KASSERT(pa[i] != NULL, - ("%s: page %p[%d] disappeared", - __func__, pa, i)); - } else { - vm_page_xunbusy_unchecked(pa[i]); - } + + /* + * Restore the valid page pointers. They are already + * unbusied, but still wired. + * + * XXXKIB since pages are only wired, and we do not + * own the object lock, other users might have + * invalidated them in meantime. Similarly, after we + * unbusied the swapped-in pages, they can become + * invalid under us. + */ + MPASS(count == 0 || pa[0] != bogus_page); + for (i = 0; i < count; i++) { + if (pa[i] == bogus_page) { + sfio->pa[(pa[0]->pindex - sfio->pindex0) + i] = + pa[i] = vm_page_relookup(sfio->obj, + pa[0]->pindex + i); + KASSERT(pa[i] != NULL, + ("%s: page %p[%d] disappeared", + __func__, pa, i)); + } else { + vm_page_xunbusy_unchecked(pa[i]); } } @@ -534,22 +528,12 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, i sendfile_iowait(sfio, "sferrio"); /* - * Perform full pages recovery before returning EIO. + * Do remaining pages recovery before returning EIO. * Pages from 0 to npages are wired. - * Pages from (i + 1) to (i + count - 1) may be - * substituted to bogus page, and not busied. - * Pages from (i + count) to (i + count1 - 1) are - * not busied. - * Rest of the pages from i to npages are busied. + * Pages from (i + count1) to npages are busied. */ for (j = 0; j < npages; j++) { - if (j >= i + count && j < i + count1) - ; - else if (j > i && j < i + count - 1 && - pa[j] == bogus_page) - pa[j] = vm_page_relookup(obj, - OFF_TO_IDX(vmoff(j, off))); - else if (j >= i) + if (j >= i + count1) vm_page_xunbusy(pa[j]); KASSERT(pa[j] != NULL && pa[j] != bogus_page, ("%s: page %p[%d] I/O recovery failure", From owner-svn-src-head@freebsd.org Sat Jun 6 00:35:42 2020 Return-Path: Delivered-To: svn-src-head@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 75D4D33C5B1; Sat, 6 Jun 2020 00:35:42 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f0t62pQ8z4HSW; Sat, 6 Jun 2020 00:35:42 +0000 (UTC) (envelope-from emaste@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 5B4D019B86; Sat, 6 Jun 2020 00:35:42 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0560Zg4T021205; Sat, 6 Jun 2020 00:35:42 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0560Zg32021203; Sat, 6 Jun 2020 00:35:42 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006060035.0560Zg32021203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 6 Jun 2020 00:35:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361853 - in head: lib/libmd sys/crypto/skein/amd64 sys/modules/crypto X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: lib/libmd sys/crypto/skein/amd64 sys/modules/crypto X-SVN-Commit-Revision: 361853 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 00:35:42 -0000 Author: emaste Date: Sat Jun 6 00:35:41 2020 New Revision: 361853 URL: https://svnweb.freebsd.org/changeset/base/361853 Log: Rename skein_block_asm.s to .S and assemble using Clang IAS Comparing the object files produced by GNU as 2.17.50 and Clang IAS shows many immaterial changes in strtab etc., and one material change in .text: 1bac: 4c 8b 4f 18 mov 0x18(%rdi),%r9 1bb0: eb 0e jmp 1bc0 - 1bb2: 66 66 2e 0f 1f 84 00 data16 nopw %cs:0x0(%rax,%rax,1) - 1bb9: 00 00 00 00 - 1bbd: 0f 1f 00 nopl (%rax) + 1bb2: 66 2e 0f 1f 84 00 00 nopw %cs:0x0(%rax,%rax,1) + 1bb9: 00 00 00 + 1bbc: 0f 1f 40 00 nopl 0x0(%rax) 0000000000001bc0 : Skein1024_block_loop(): 1bc0: 4c 8b 47 10 mov 0x10(%rdi),%r8 1bc4: 4c 03 85 c0 00 00 00 add 0xc0(%rbp),%r8 That is, GNU as and Clang's integrated assembler use different multi- byte NOPs for alignment (GNU as emits an 11 byte NOP + a 3 byte NOP, while Clang IAS emits a 10 byte NOP + a 4 byte NOP). Dependency cleanup hacks are not required, because we do not create .depend files from GNU as. Reviewed by: allanjude, arichardson, cem, tsoome Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D8434 Added: head/sys/crypto/skein/amd64/skein_block_asm.S - copied unchanged from r361852, head/sys/crypto/skein/amd64/skein_block_asm.s Deleted: head/sys/crypto/skein/amd64/skein_block_asm.s Modified: head/lib/libmd/Makefile head/sys/modules/crypto/Makefile Modified: head/lib/libmd/Makefile ============================================================================== --- head/lib/libmd/Makefile Sat Jun 6 00:02:50 2020 (r361852) +++ head/lib/libmd/Makefile Sat Jun 6 00:35:41 2020 (r361853) @@ -116,18 +116,15 @@ CFLAGS+= -DSHA1_ASM SRCS+= rmd160.S CFLAGS+= -DRMD160_ASM .endif -.if exists(${MACHINE_ARCH}/skein_block_asm.s) -.if defined(XAS) || ${MK_BINUTILS_BOOTSTRAP} != "no" -AFLAGS += --strip-local-absolute +.if exists(${MACHINE_ARCH}/skein_block_asm.S) # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 -SRCS+= skein_block_asm.s +ACFLAGS+= -DSKEIN_LOOP=0 +SRCS+= skein_block_asm.S CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 .else .warning as not available: not using optimized Skein asm .endif -.endif -.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.s) +.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.S) ACFLAGS+= -DELF -Wa,--noexecstack .endif .endif # ${USE_ASM_SOURCES} != 0 Copied: head/sys/crypto/skein/amd64/skein_block_asm.S (from r361852, head/sys/crypto/skein/amd64/skein_block_asm.s) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/crypto/skein/amd64/skein_block_asm.S Sat Jun 6 00:35:41 2020 (r361853, copy of r361852, head/sys/crypto/skein/amd64/skein_block_asm.s) @@ -0,0 +1,1333 @@ +# +#---------------------------------------------------------------- +# 64-bit x86 assembler code (gnu as) for Skein block functions +# +# Author: Doug Whiting, Hifn/Exar +# +# This code is released to the public domain. +#---------------------------------------------------------------- +# $FreeBSD$ +# + .text + .altmacro +#ifndef __clang__ + .psize 0,128 #list file has no page boundaries +#endif +# +_MASK_ALL_ = (256+512+1024) #all three algorithm bits +_MAX_FRAME_ = 240 +# +################# +#ifndef SKEIN_USE_ASM +_USE_ASM_ = _MASK_ALL_ +#else +_USE_ASM_ = SKEIN_USE_ASM +#endif +################# +#configure loop unrolling +#ifndef SKEIN_LOOP +_SKEIN_LOOP = 2 #default is fully unrolled for 256/512, twice for 1024 +#else +_SKEIN_LOOP = SKEIN_LOOP + .irp _NN_,%_SKEIN_LOOP #only display loop unrolling if default changed on command line +#.print "+++ SKEIN_LOOP = \_NN_" + .endr +#endif +# the unroll counts (0 --> fully unrolled) +SKEIN_UNROLL_256 = (_SKEIN_LOOP / 100) % 10 +SKEIN_UNROLL_512 = (_SKEIN_LOOP / 10) % 10 +SKEIN_UNROLL_1024 = (_SKEIN_LOOP ) % 10 +# +SKEIN_ASM_UNROLL = 0 + .irp _NN_,256,512,1024 + .if (SKEIN_UNROLL_\_NN_) == 0 +SKEIN_ASM_UNROLL = SKEIN_ASM_UNROLL + \_NN_ + .endif + .endr +################# +# +.ifndef SKEIN_ROUNDS +ROUNDS_256 = 72 +ROUNDS_512 = 72 +ROUNDS_1024 = 80 +.else +ROUNDS_256 = 8*((((SKEIN_ROUNDS / 100) + 5) % 10) + 5) +ROUNDS_512 = 8*((((SKEIN_ROUNDS / 10) + 5) % 10) + 5) +ROUNDS_1024 = 8*((((SKEIN_ROUNDS ) + 5) % 10) + 5) +# only display rounds if default size is changed on command line +.irp _NN_,256,512,1024 + .if _USE_ASM_ && \_NN_ + .irp _RR_,%(ROUNDS_\_NN_) + .if _NN_ < 1024 +.print "+++ SKEIN_ROUNDS_\_NN_ = \_RR_" + .else +.print "+++ SKEIN_ROUNDS_\_NN_ = \_RR_" + .endif + .endr + .endif +.endr +.endif +################# +# +.ifdef SKEIN_CODE_SIZE +_SKEIN_CODE_SIZE = (1) +.else +.ifdef SKEIN_PERF #use code size if SKEIN_PERF is defined +_SKEIN_CODE_SIZE = (1) +.else +_SKEIN_CODE_SIZE = (0) +.endif +.endif +# +################# +# +.ifndef SKEIN_DEBUG +_SKEIN_DEBUG = 0 +.else +_SKEIN_DEBUG = 1 +.endif +################# +# +# define offsets of fields in hash context structure +# +HASH_BITS = 0 #bits of hash output +BCNT = 8 + HASH_BITS #number of bytes in BUFFER[] +TWEAK = 8 + BCNT #tweak values[0..1] +X_VARS = 16 + TWEAK #chaining vars +# +#(Note: buffer[] in context structure is NOT needed here :-) +# +KW_PARITY = 0x1BD11BDAA9FC1A22 #overall parity of key schedule words +FIRST_MASK = ~ (1 << 6) +FIRST_MASK64= ~ (1 << 62) +# +# rotation constants for Skein +# +RC_256_0_0 = 14 +RC_256_0_1 = 16 + +RC_256_1_0 = 52 +RC_256_1_1 = 57 + +RC_256_2_0 = 23 +RC_256_2_1 = 40 + +RC_256_3_0 = 5 +RC_256_3_1 = 37 + +RC_256_4_0 = 25 +RC_256_4_1 = 33 + +RC_256_5_0 = 46 +RC_256_5_1 = 12 + +RC_256_6_0 = 58 +RC_256_6_1 = 22 + +RC_256_7_0 = 32 +RC_256_7_1 = 32 + +RC_512_0_0 = 46 +RC_512_0_1 = 36 +RC_512_0_2 = 19 +RC_512_0_3 = 37 + +RC_512_1_0 = 33 +RC_512_1_1 = 27 +RC_512_1_2 = 14 +RC_512_1_3 = 42 + +RC_512_2_0 = 17 +RC_512_2_1 = 49 +RC_512_2_2 = 36 +RC_512_2_3 = 39 + +RC_512_3_0 = 44 +RC_512_3_1 = 9 +RC_512_3_2 = 54 +RC_512_3_3 = 56 + +RC_512_4_0 = 39 +RC_512_4_1 = 30 +RC_512_4_2 = 34 +RC_512_4_3 = 24 + +RC_512_5_0 = 13 +RC_512_5_1 = 50 +RC_512_5_2 = 10 +RC_512_5_3 = 17 + +RC_512_6_0 = 25 +RC_512_6_1 = 29 +RC_512_6_2 = 39 +RC_512_6_3 = 43 + +RC_512_7_0 = 8 +RC_512_7_1 = 35 +RC_512_7_2 = 56 +RC_512_7_3 = 22 + +RC_1024_0_0 = 24 +RC_1024_0_1 = 13 +RC_1024_0_2 = 8 +RC_1024_0_3 = 47 +RC_1024_0_4 = 8 +RC_1024_0_5 = 17 +RC_1024_0_6 = 22 +RC_1024_0_7 = 37 + +RC_1024_1_0 = 38 +RC_1024_1_1 = 19 +RC_1024_1_2 = 10 +RC_1024_1_3 = 55 +RC_1024_1_4 = 49 +RC_1024_1_5 = 18 +RC_1024_1_6 = 23 +RC_1024_1_7 = 52 + +RC_1024_2_0 = 33 +RC_1024_2_1 = 4 +RC_1024_2_2 = 51 +RC_1024_2_3 = 13 +RC_1024_2_4 = 34 +RC_1024_2_5 = 41 +RC_1024_2_6 = 59 +RC_1024_2_7 = 17 + +RC_1024_3_0 = 5 +RC_1024_3_1 = 20 +RC_1024_3_2 = 48 +RC_1024_3_3 = 41 +RC_1024_3_4 = 47 +RC_1024_3_5 = 28 +RC_1024_3_6 = 16 +RC_1024_3_7 = 25 + +RC_1024_4_0 = 41 +RC_1024_4_1 = 9 +RC_1024_4_2 = 37 +RC_1024_4_3 = 31 +RC_1024_4_4 = 12 +RC_1024_4_5 = 47 +RC_1024_4_6 = 44 +RC_1024_4_7 = 30 + +RC_1024_5_0 = 16 +RC_1024_5_1 = 34 +RC_1024_5_2 = 56 +RC_1024_5_3 = 51 +RC_1024_5_4 = 4 +RC_1024_5_5 = 53 +RC_1024_5_6 = 42 +RC_1024_5_7 = 41 + +RC_1024_6_0 = 31 +RC_1024_6_1 = 44 +RC_1024_6_2 = 47 +RC_1024_6_3 = 46 +RC_1024_6_4 = 19 +RC_1024_6_5 = 42 +RC_1024_6_6 = 44 +RC_1024_6_7 = 25 + +RC_1024_7_0 = 9 +RC_1024_7_1 = 48 +RC_1024_7_2 = 35 +RC_1024_7_3 = 52 +RC_1024_7_4 = 23 +RC_1024_7_5 = 31 +RC_1024_7_6 = 37 +RC_1024_7_7 = 20 +# +# Input: reg +# Output: <<< RC_BlkSize_roundNum_mixNum, BlkSize=256/512/1024 +# +.macro RotL64 reg,BLK_SIZE,ROUND_NUM,MIX_NUM + .if RC_\BLK_SIZE\()_\ROUND_NUM\()_\MIX_NUM #is there anything to do? + rolq $RC_\BLK_SIZE\()_\ROUND_NUM\()_\MIX_NUM,%\reg + .endif +.endm +# +#---------------------------------------------------------------- +# +# MACROS: define local vars and configure stack +# +#---------------------------------------------------------------- +# declare allocated space on the stack +.macro StackVar localName,localSize +\localName = _STK_OFFS_ +_STK_OFFS_ = _STK_OFFS_+(\localSize) +.endm #StackVar +# +#---------------------------------------------------------------- +# +# MACRO: Configure stack frame, allocate local vars +# +.macro Setup_Stack BLK_BITS,KS_CNT,debugCnt + WCNT = (\BLK_BITS)/64 +# +_PushCnt_ = 0 #save nonvolatile regs on stack + .irp _reg_,rbp,rbx,r12,r13,r14,r15 + pushq %\_reg_ +_PushCnt_ = _PushCnt_ + 1 #track count to keep alignment + .endr +# +_STK_OFFS_ = 0 #starting offset from rsp + #---- local variables #<-- rsp + StackVar X_stk ,8*(WCNT) #local context vars + StackVar ksTwk ,8*3 #key schedule: tweak words + StackVar ksKey ,8*(WCNT)+8 #key schedule: key words + .if (SKEIN_ASM_UNROLL && (\BLK_BITS)) == 0 + StackVar ksRot ,16*(\KS_CNT) #leave space for "rotation" to happen + .endif + StackVar Wcopy ,8*(WCNT) #copy of input block + .if _SKEIN_DEBUG + .if \debugCnt + 0 #temp location for debug X[] info + StackVar xDebug_\BLK_BITS ,8*(\debugCnt) + .endif + .endif + .if ((8*_PushCnt_ + _STK_OFFS_) % 8) == 0 + StackVar align16,8 #keep 16-byte aligned (adjust for retAddr?) +tmpStk_\BLK_BITS = align16 #use this + .endif + #---- saved caller parameters (from regs rdi, rsi, rdx, rcx) + StackVar ctxPtr ,8 #context ptr + StackVar blkPtr ,8 #pointer to block data + StackVar blkCnt ,8 #number of full blocks to process + StackVar bitAdd ,8 #bit count to add to tweak +LOCAL_SIZE = _STK_OFFS_ #size of "local" vars + #---- + StackVar savRegs,8*_PushCnt_ #saved registers + StackVar retAddr,8 #return address + #---- caller's stack frame (aligned mod 16) +# +# set up the stack frame pointer (rbp) +# +FRAME_OFFS = ksTwk + 128 #allow short (negative) offset to ksTwk, kwKey + .if FRAME_OFFS > _STK_OFFS_ #keep rbp in the "locals" range +FRAME_OFFS = _STK_OFFS_ + .endif +F_O = -FRAME_OFFS +# + #put some useful defines in the .lst file (for grep) +__STK_LCL_SIZE_\BLK_BITS = LOCAL_SIZE +__STK_TOT_SIZE_\BLK_BITS = _STK_OFFS_ +__STK_FRM_OFFS_\BLK_BITS = FRAME_OFFS +# +# Notes on stack frame setup: +# * the most frequently used variable is X_stk[], based at [rsp+0] +# * the next most used is the key schedule arrays, ksKey and ksTwk +# so rbp is "centered" there, allowing short offsets to the key +# schedule even in 1024-bit Skein case +# * the Wcopy variables are infrequently accessed, but they have long +# offsets from both rsp and rbp only in the 1024-bit case. +# * all other local vars and calling parameters can be accessed +# with short offsets, except in the 1024-bit case +# + subq $LOCAL_SIZE,%rsp #make room for the locals + leaq FRAME_OFFS(%rsp),%rbp #maximize use of short offsets + movq %rdi, ctxPtr+F_O(%rbp) #save caller's parameters on the stack + movq %rsi, blkPtr+F_O(%rbp) + movq %rdx, blkCnt+F_O(%rbp) + movq %rcx, bitAdd+F_O(%rbp) +# +.endm #Setup_Stack +# +#---------------------------------------------------------------- +# +.macro Reset_Stack + addq $LOCAL_SIZE,%rsp #get rid of locals (wipe?) + .irp _reg_,r15,r14,r13,r12,rbx,rbp + popq %\_reg_ #restore caller's regs +_PushCnt_ = _PushCnt_ - 1 + .endr + .if _PushCnt_ + .error "Mismatched push/pops?" + .endif +.endm # Reset_Stack +# +#---------------------------------------------------------------- +# macros to help debug internals +# +.if _SKEIN_DEBUG + .extern Skein_Show_Block #calls to C routines + .extern Skein_Show_Round +# +SKEIN_RND_SPECIAL = 1000 +SKEIN_RND_KEY_INITIAL = SKEIN_RND_SPECIAL+0 +SKEIN_RND_KEY_INJECT = SKEIN_RND_SPECIAL+1 +SKEIN_RND_FEED_FWD = SKEIN_RND_SPECIAL+2 +# +.macro Skein_Debug_Block BLK_BITS +# +#void Skein_Show_Block(uint_t bits,const Skein_Ctxt_Hdr_t *h,const u64b_t *X, +# const u08b_t *blkPtr, const u64b_t *wPtr, +# const u64b_t *ksPtr,const u64b_t *tsPtr) +# +_NN_ = 0 + .irp _reg_,rax,rcx,rdx,rsi,rdi,r8,r9,r10,r11 + pushq %\_reg_ #save all volatile regs on tack before the call +_NN_ = _NN_ + 1 + .endr + # get and push call parameters + movq $\BLK_BITS ,%rdi #bits + movq ctxPtr+F_O(%rbp),%rsi #h (pointer) + leaq X_VARS (%rsi),%rdx #X (pointer) + movq blkPtr+F_O(%rbp),%rcx #blkPtr + leaq Wcopy +F_O(%rbp),%r8 #wPtr + leaq ksKey +F_O(%rbp),%r9 #key pointer + leaq ksTwk +F_O(%rbp),%rax #tweak pointer + pushq %rax # (pass on the stack) + call Skein_Show_Block #call external debug handler + addq $8*1,%rsp #discard parameters on stack + .if (_NN_ % 2 ) == 0 #check stack alignment + .error "Stack misalignment problem in Skein_Debug_Block_\_BLK_BITS" + .endif + .irp _reg_,r11,r10,r9,r8,rdi,rsi,rdx,rcx,rax + popq %\_reg_ #restore regs +_NN_ = _NN_ - 1 + .endr + .if _NN_ + .error "Push/pop mismatch problem in Skein_Debug_Block_\_BLK_BITS" + .endif +.endm # Skein_Debug_Block +# +# the macro to "call" to debug a round +# +.macro Skein_Debug_Round BLK_BITS,R,RDI_OFFS,afterOp + # call the appropriate (local) debug "function" + pushq %rdx #save rdx, so we can use it for round "number" + .if (SKEIN_ASM_UNROLL && \BLK_BITS) || (\R >= SKEIN_RND_SPECIAL) + movq $\R,%rdx + .else #compute round number using edi +_rOffs_ = \RDI_OFFS + 0 + .if \BLK_BITS == 1024 + movq rIdx_offs+8(%rsp),%rdx #get rIdx off the stack (adjust for pushq rdx above) + leaq 1+(((\R)-1) && 3)+_rOffs_(,%rdx,4),%rdx + .else + leaq 1+(((\R)-1) && 3)+_rOffs_(,%rdi,4),%rdx + .endif + .endif + call Skein_Debug_Round_\BLK_BITS + popq %rdx #restore origianl rdx value +# + afterOp +.endm # Skein_Debug_Round +.else #------- _SKEIN_DEBUG (dummy macros if debug not enabled) +.macro Skein_Debug_Block BLK_BITS +.endm +# +.macro Skein_Debug_Round BLK_BITS,R,RDI_OFFS,afterOp +.endm +# +.endif # _SKEIN_DEBUG +# +#---------------------------------------------------------------- +# +.macro addReg dstReg,srcReg_A,srcReg_B,useAddOp,immOffs + .if \immOffs + 0 + leaq \immOffs(%\srcReg_A\srcReg_B,%\dstReg),%\dstReg + .elseif ((\useAddOp + 0) == 0) + .ifndef ASM_NO_LEA #lea seems to be faster on Core 2 Duo CPUs! + leaq (%\srcReg_A\srcReg_B,%\dstReg),%\dstReg + .else + addq %\srcReg_A\srcReg_B,%\dstReg + .endif + .else + addq %\srcReg_A\srcReg_B,%\dstReg + .endif +.endm + +# keep Intel-style ordering here, to match addReg +.macro xorReg dstReg,srcReg_A,srcReg_B + xorq %\srcReg_A\srcReg_B,%\dstReg +.endm +# +#---------------------------------------------------------------- +# +.macro C_label lName + \lName: #use both "genders" to work across linkage conventions +_\lName: + .global \lName + .global _\lName +.endm +# +#=================================== Skein_256 ============================================= +# +.if _USE_ASM_ & 256 +# +# void Skein_256_Process_Block(Skein_256_Ctxt_t *ctx,const u08b_t *blkPtr,size_t blkCnt,size_t bitcntAdd)# +# +################# +# +# code +# +C_label Skein_256_Process_Block + Setup_Stack 256,((ROUNDS_256/8)+1) + movq TWEAK+8(%rdi),%r14 + jmp Skein_256_block_loop + .p2align 4 + # main hash loop for Skein_256 +Skein_256_block_loop: + # + # general register usage: + # RAX..RDX = X0..X3 + # R08..R12 = ks[0..4] + # R13..R15 = ts[0..2] + # RSP, RBP = stack/frame pointers + # RDI = round counter or context pointer + # RSI = temp + # + movq TWEAK+0(%rdi) ,%r13 + addq bitAdd+F_O(%rbp) ,%r13 #computed updated tweak value T0 + movq %r14 ,%r15 + xorq %r13 ,%r15 #now %r13.%r15 is set as the tweak + + movq $KW_PARITY ,%r12 + movq X_VARS+ 0(%rdi),%r8 + movq X_VARS+ 8(%rdi),%r9 + movq X_VARS+16(%rdi),%r10 + movq X_VARS+24(%rdi),%r11 + movq %r13,TWEAK+0(%rdi) #save updated tweak value ctx->h.T[0] + xorq %r8 ,%r12 #start accumulating overall parity + + movq blkPtr +F_O(%rbp) ,%rsi #esi --> input block + xorq %r9 ,%r12 + movq 0(%rsi) ,%rax #get X[0..3] + xorq %r10 ,%r12 + movq 8(%rsi) ,%rbx + xorq %r11 ,%r12 + movq 16(%rsi) ,%rcx + movq 24(%rsi) ,%rdx + + movq %rax,Wcopy+ 0+F_O(%rbp) #save copy of input block + movq %rbx,Wcopy+ 8+F_O(%rbp) + movq %rcx,Wcopy+16+F_O(%rbp) + movq %rdx,Wcopy+24+F_O(%rbp) + + addq %r8 ,%rax #initial key injection + addq %r9 ,%rbx + addq %r10,%rcx + addq %r11,%rdx + addq %r13,%rbx + addq %r14,%rcx + +.if _SKEIN_DEBUG + movq %r14,TWEAK+ 8(%rdi) #save updated tweak T[1] (start bit cleared?) + movq %r8 ,ksKey+ 0+F_O(%rbp) #save key schedule on stack for Skein_Debug_Block + movq %r9 ,ksKey+ 8+F_O(%rbp) + movq %r10,ksKey+16+F_O(%rbp) + movq %r11,ksKey+24+F_O(%rbp) + movq %r12,ksKey+32+F_O(%rbp) + + movq %r13,ksTwk+ 0+F_O(%rbp) + movq %r14,ksTwk+ 8+F_O(%rbp) + movq %r15,ksTwk+16+F_O(%rbp) + + movq %rax,X_stk + 0(%rsp) #save X[] on stack for Skein_Debug_Block + movq %rbx,X_stk + 8(%rsp) + movq %rcx,X_stk +16(%rsp) + movq %rdx,X_stk +24(%rsp) + + Skein_Debug_Block 256 #debug dump + Skein_Debug_Round 256,SKEIN_RND_KEY_INITIAL +.endif +# +.if ((SKEIN_ASM_UNROLL & 256) == 0) + movq %r8 ,ksKey+40+F_O(%rbp) #save key schedule on stack for looping code + movq %r9 ,ksKey+ 8+F_O(%rbp) + movq %r10,ksKey+16+F_O(%rbp) + movq %r11,ksKey+24+F_O(%rbp) + movq %r12,ksKey+32+F_O(%rbp) + + movq %r13,ksTwk+24+F_O(%rbp) + movq %r14,ksTwk+ 8+F_O(%rbp) + movq %r15,ksTwk+16+F_O(%rbp) +.endif + addq $WCNT*8,%rsi #skip the block + movq %rsi,blkPtr +F_O(%rbp) #update block pointer + # + # now the key schedule is computed. Start the rounds + # +.if SKEIN_ASM_UNROLL & 256 +_UNROLL_CNT = ROUNDS_256/8 +.else +_UNROLL_CNT = SKEIN_UNROLL_256 + .if ((ROUNDS_256/8) % _UNROLL_CNT) + .error "Invalid SKEIN_UNROLL_256" + .endif + xorq %rdi,%rdi #rdi = iteration count +Skein_256_round_loop: +.endif +_Rbase_ = 0 +.rept _UNROLL_CNT*2 + # all X and ks vars in regs # (ops to "rotate" ks vars, via mem, if not unrolled) + # round 4*_RBase_ + 0 + addReg rax, rbx + RotL64 rbx, 256,%((4*_Rbase_+0) % 8),0 + addReg rcx, rdx + .if (SKEIN_ASM_UNROLL & 256) == 0 + movq ksKey+8*1+F_O(%rbp,%rdi,8),%r8 + .endif + xorReg rbx, rax + RotL64 rdx, 256,%((4*_Rbase_+0) % 8),1 + xorReg rdx, rcx + .if SKEIN_ASM_UNROLL & 256 + .irp _r0_,%( 8+(_Rbase_+3) % 5) + .irp _r1_,%(13+(_Rbase_+2) % 3) + leaq (%r\_r0_,%r\_r1_),%rdi #precompute key injection value for %rcx + .endr + .endr + .endif + .if (SKEIN_ASM_UNROLL & 256) == 0 + movq ksTwk+8*1+F_O(%rbp,%rdi,8),%r13 + .endif + Skein_Debug_Round 256,%(4*_Rbase_+1) + + # round 4*_Rbase_ + 1 + addReg rax, rdx + RotL64 rdx, 256,%((4*_Rbase_+1) % 8),0 + xorReg rdx, rax + .if (SKEIN_ASM_UNROLL & 256) == 0 + movq ksKey+8*2+F_O(%rbp,%rdi,8),%r9 + .endif + addReg rcx, rbx + RotL64 rbx, 256,%((4*_Rbase_+1) % 8),1 + xorReg rbx, rcx + .if (SKEIN_ASM_UNROLL & 256) == 0 + movq ksKey+8*4+F_O(%rbp,%rdi,8),%r11 + .endif + Skein_Debug_Round 256,%(4*_Rbase_+2) + .if SKEIN_ASM_UNROLL & 256 + .irp _r0_,%( 8+(_Rbase_+2) % 5) + .irp _r1_,%(13+(_Rbase_+1) % 3) + leaq (%r\_r0_,%r\_r1_),%rsi #precompute key injection value for %rbx + .endr + .endr + .endif + # round 4*_Rbase_ + 2 + addReg rax, rbx + RotL64 rbx, 256,%((4*_Rbase_+2) % 8),0 + addReg rcx, rdx + .if (SKEIN_ASM_UNROLL & 256) == 0 + movq ksKey+8*3+F_O(%rbp,%rdi,8),%r10 + .endif + xorReg rbx, rax + RotL64 rdx, 256,%((4*_Rbase_+2) % 8),1 + xorReg rdx, rcx + .if (SKEIN_ASM_UNROLL & 256) == 0 + movq %r8,ksKey+8*6+F_O(%rbp,%rdi,8) #"rotate" the key + leaq 1(%r11,%rdi),%r11 #precompute key + tweak + .endif + Skein_Debug_Round 256,%(4*_Rbase_+3) + # round 4*_Rbase_ + 3 + addReg rax, rdx + RotL64 rdx, 256,%((4*_Rbase_+3) % 8),0 + addReg rcx, rbx + .if (SKEIN_ASM_UNROLL & 256) == 0 + addq ksTwk+8*2+F_O(%rbp,%rdi,8),%r10 #precompute key + tweak + movq %r13,ksTwk+8*4+F_O(%rbp,%rdi,8) #"rotate" the tweak + .endif + xorReg rdx, rax + RotL64 rbx, 256,%((4*_Rbase_+3) % 8),1 + xorReg rbx, rcx + Skein_Debug_Round 256,%(4*_Rbase_+4) + .if (SKEIN_ASM_UNROLL & 256) == 0 + addReg r9 ,r13 #precompute key+tweak + .endif + #inject key schedule words +_Rbase_ = _Rbase_+1 + .if SKEIN_ASM_UNROLL & 256 + addReg rax,r,%(8+((_Rbase_+0) % 5)) + addReg rbx,rsi + addReg rcx,rdi + addReg rdx,r,%(8+((_Rbase_+3) % 5)),,_Rbase_ + .else + incq %rdi + addReg rax,r8 + addReg rcx,r10 + addReg rbx,r9 + addReg rdx,r11 + .endif + Skein_Debug_Round 256,SKEIN_RND_KEY_INJECT +.endr #rept _UNROLL_CNT +# +.if (SKEIN_ASM_UNROLL & 256) == 0 + cmpq $2*(ROUNDS_256/8),%rdi + jb Skein_256_round_loop +.endif # (SKEIN_ASM_UNROLL & 256) == 0 + movq ctxPtr +F_O(%rbp),%rdi #restore rdi --> context + + #---------------------------- + # feedforward: ctx->X[i] = X[i] ^ w[i], {i=0..3} + movq $FIRST_MASK64 ,%r14 + xorq Wcopy + 0+F_O (%rbp),%rax + xorq Wcopy + 8+F_O (%rbp),%rbx + xorq Wcopy +16+F_O (%rbp),%rcx + xorq Wcopy +24+F_O (%rbp),%rdx + andq TWEAK + 8 (%rdi),%r14 + movq %rax,X_VARS+ 0(%rdi) #store final result + movq %rbx,X_VARS+ 8(%rdi) + movq %rcx,X_VARS+16(%rdi) + movq %rdx,X_VARS+24(%rdi) + + Skein_Debug_Round 256,SKEIN_RND_FEED_FWD + + # go back for more blocks, if needed + decq blkCnt+F_O(%rbp) + jnz Skein_256_block_loop + movq %r14,TWEAK + 8(%rdi) + Reset_Stack + ret +Skein_256_Process_Block_End: + + .if _SKEIN_DEBUG +Skein_Debug_Round_256: #here with rdx == round "number" from macro + pushq %rsi #save two regs for BLK_BITS-specific parms + pushq %rdi + movq 24(%rsp),%rdi #get back original rdx (pushed on stack in macro call) to rdi + movq %rax,X_stk+ 0+F_O(%rbp) #save X[] state on stack so debug routines can access it + movq %rbx,X_stk+ 8+F_O(%rbp) #(use FP_ since rsp has changed!) + movq %rcx,X_stk+16+F_O(%rbp) + movq %rdi,X_stk+24+F_O(%rbp) + + movq ctxPtr+F_O(%rbp),%rsi #ctx_hdr_ptr + movq $256,%rdi #now are set for the call + jmp Skein_Debug_Round_Common + .endif +# +.if _SKEIN_CODE_SIZE +C_label Skein_256_Process_Block_CodeSize + movq $(Skein_256_Process_Block_End-Skein_256_Process_Block),%rax + ret +# +C_label Skein_256_Unroll_Cnt + .if _UNROLL_CNT <> ROUNDS_256/8 + movq $_UNROLL_CNT,%rax + .else + xorq %rax,%rax + .endif + ret +.endif +# +.endif #_USE_ASM_ & 256 +# +#=================================== Skein_512 ============================================= +# +.if _USE_ASM_ & 512 +# +# void Skein_512_Process_Block(Skein_512_Ctxt_t *ctx,const u08b_t *blkPtr,size_t blkCnt,size_t bitcntAdd) +# +# X[i] == %r[8+i] #register assignments for X[] values during rounds (i=0..7) +# +################# +# MACRO: one round for 512-bit blocks +# +.macro R_512_OneRound rn0,rn1,rn2,rn3,rn4,rn5,rn6,rn7,_Rn_,op1,op2,op3,op4 +# + addReg r\rn0, r\rn1 + RotL64 r\rn1, 512,%((\_Rn_) % 8),0 + xorReg r\rn1, r\rn0 + \op1 + addReg r\rn2, r\rn3 + RotL64 r\rn3, 512,%((\_Rn_) % 8),1 + xorReg r\rn3, r\rn2 + \op2 + addReg r\rn4, r\rn5 + RotL64 r\rn5, 512,%((\_Rn_) % 8),2 + xorReg r\rn5, r\rn4 + \op3 + addReg r\rn6, r\rn7 + RotL64 r\rn7, 512,%((\_Rn_) % 8),3 + xorReg r\rn7, r\rn6 + \op4 + Skein_Debug_Round 512,%(\_Rn_+1),-4 +# +.endm #R_512_OneRound +# +################# +# MACRO: eight rounds for 512-bit blocks +# +.macro R_512_FourRounds _RR_ #RR = base round number (0 % 8) + .if (SKEIN_ASM_UNROLL && 512) + # here for fully unrolled case. + _II_ = ((\_RR_)/4) + 1 #key injection counter + R_512_OneRound 8, 9,10,11,12,13,14,15,%((\_RR_)+0),,, + R_512_OneRound 10, 9,12,15,14,13, 8,11,%((\_RR_)+1),,, + R_512_OneRound 12, 9,14,11, 8,13,10,15,%((\_RR_)+2),,, + R_512_OneRound 14, 9, 8,15,10,13,12,11,%((\_RR_)+3),, + # inject the key schedule + addq ksKey+8*(((_II_)+0)%9)+F_O(%rbp),%r8 + addReg r11, rax + addq ksKey+8*(((_II_)+1)%9)+F_O(%rbp),%r9 + addReg r12, rbx + addq ksKey+8*(((_II_)+2)%9)+F_O(%rbp),%r10 + addReg r13, rcx + addReg r14, rdx + addReg r15, rsi,,,(_II_) + .else + # here for looping case #"rotate" key/tweak schedule (move up on stack) + incq %rdi #bump key injection counter + R_512_OneRound 8, 9,10,11,12,13,14,15,%((\_RR_)+0),,, + R_512_OneRound 10, 9,12,15,14,13, 8,11,%((\_RR_)+1),,, + R_512_OneRound 12, 9,14,11, 8,13,10,15,%((\_RR_)+2),,, + R_512_OneRound 14, 9, 8,15,10,13,12,11,%((\_RR_)+3),, + # inject the key schedule + addq ksKey+8*0+F_O(%rbp,%rdi,8),%r8 + addReg r11, rax + addReg r12, rbx + addq ksKey+8*1+F_O(%rbp,%rdi,8),%r9 + addReg r13, rcx + addReg r14, rdx + addq ksKey+8*2+F_O(%rbp,%rdi,8),%r10 + addReg r15, rsi + addReg r15, rdi #inject the round number + .endif + + #show the result of the key injection + Skein_Debug_Round 512,SKEIN_RND_KEY_INJECT +.endm #R_512_EightRounds +# +################# +# instantiated code +# +C_label Skein_512_Process_Block + Setup_Stack 512,ROUNDS_512/8 + movq TWEAK+ 8(%rdi),%rbx + jmp Skein_512_block_loop + .p2align 4 + # main hash loop for Skein_512 +Skein_512_block_loop: + # general register usage: + # RAX..RDX = temps for key schedule pre-loads + # R8 ..R15 = X0..X7 + # RSP, RBP = stack/frame pointers + # RDI = round counter or context pointer + # RSI = temp + # + movq TWEAK + 0(%rdi),%rax + addq bitAdd+F_O(%rbp),%rax #computed updated tweak value T0 + movq %rbx,%rcx + xorq %rax,%rcx #%rax/%rbx/%rcx = tweak schedule + movq %rax,TWEAK+ 0 (%rdi) #save updated tweak value ctx->h.T[0] + movq %rax,ksTwk+ 0+F_O(%rbp) + movq $KW_PARITY,%rdx + movq blkPtr +F_O(%rbp),%rsi #%rsi --> input block + movq %rbx,ksTwk+ 8+F_O(%rbp) + movq %rcx,ksTwk+16+F_O(%rbp) + .irp _Rn_,8,9,10,11,12,13,14,15 + movq X_VARS+8*(\_Rn_-8)(%rdi),%r\_Rn_ + xorq %r\_Rn_,%rdx #compute overall parity + movq %r\_Rn_,ksKey+8*(\_Rn_-8)+F_O(%rbp) + .endr #load state into %r8 ..%r15, compute parity + movq %rdx,ksKey+8*(8)+F_O(%rbp)#save key schedule parity + + addReg r13,rax #precompute key injection for tweak + addReg r14, rbx +.if _SKEIN_DEBUG + movq %rbx,TWEAK+ 8(%rdi) #save updated tweak value ctx->h.T[1] for Skein_Debug_Block below +.endif + movq 0(%rsi),%rax #load input block + movq 8(%rsi),%rbx + movq 16(%rsi),%rcx + movq 24(%rsi),%rdx + addReg r8 , rax #do initial key injection + addReg r9 , rbx + movq %rax,Wcopy+ 0+F_O(%rbp) #keep local copy for feedforward + movq %rbx,Wcopy+ 8+F_O(%rbp) + addReg r10, rcx + addReg r11, rdx + movq %rcx,Wcopy+16+F_O(%rbp) + movq %rdx,Wcopy+24+F_O(%rbp) + + movq 32(%rsi),%rax + movq 40(%rsi),%rbx + movq 48(%rsi),%rcx + movq 56(%rsi),%rdx + addReg r12, rax + addReg r13, rbx + addReg r14, rcx + addReg r15, rdx + movq %rax,Wcopy+32+F_O(%rbp) + movq %rbx,Wcopy+40+F_O(%rbp) + movq %rcx,Wcopy+48+F_O(%rbp) + movq %rdx,Wcopy+56+F_O(%rbp) + +.if _SKEIN_DEBUG + .irp _Rn_,8,9,10,11,12,13,14,15 #save values on stack for debug output + movq %r\_Rn_,X_stk+8*(\_Rn_-8)(%rsp) + .endr + + Skein_Debug_Block 512 #debug dump + Skein_Debug_Round 512,SKEIN_RND_KEY_INITIAL +.endif + addq $8*WCNT,%rsi #skip the block + movq %rsi,blkPtr+F_O(%rbp) #update block pointer + # + ################# + # now the key schedule is computed. Start the rounds + # +.if SKEIN_ASM_UNROLL & 512 +_UNROLL_CNT = ROUNDS_512/8 +.else +_UNROLL_CNT = SKEIN_UNROLL_512 + .if ((ROUNDS_512/8) % _UNROLL_CNT) + .error "Invalid SKEIN_UNROLL_512" + .endif + xorq %rdi,%rdi #rdi = round counter +Skein_512_round_loop: +.endif +# +_Rbase_ = 0 +.rept _UNROLL_CNT*2 + R_512_FourRounds %(4*_Rbase_+00) +_Rbase_ = _Rbase_+1 +.endr #rept _UNROLL_CNT +# +.if (SKEIN_ASM_UNROLL & 512) == 0 + cmpq $2*(ROUNDS_512/8),%rdi + jb Skein_512_round_loop + movq ctxPtr +F_O(%rbp),%rdi #restore rdi --> context +.endif + # end of rounds + ################# + # feedforward: ctx->X[i] = X[i] ^ w[i], {i=0..7} + .irp _Rn_,8,9,10,11,12,13,14,15 + .if (\_Rn_ == 8) + movq $FIRST_MASK64,%rbx + .endif + xorq Wcopy+8*(\_Rn_-8)+F_O(%rbp),%r\_Rn_ #feedforward XOR + movq %r\_Rn_,X_VARS+8*(\_Rn_-8)(%rdi) #and store result + .if (\_Rn_ == 14) + andq TWEAK+ 8(%rdi),%rbx + .endif + .endr + Skein_Debug_Round 512,SKEIN_RND_FEED_FWD + + # go back for more blocks, if needed + decq blkCnt+F_O(%rbp) + jnz Skein_512_block_loop + movq %rbx,TWEAK + 8(%rdi) + + Reset_Stack + ret +Skein_512_Process_Block_End: +# + .if _SKEIN_DEBUG +# call here with rdx = "round number" +Skein_Debug_Round_512: + pushq %rsi #save two regs for BLK_BITS-specific parms + pushq %rdi + .irp _Rn_,8,9,10,11,12,13,14,15 #save X[] state on stack so debug routines can access it + movq %r\_Rn_,X_stk+8*(\_Rn_-8)+F_O(%rbp) + .endr + movq ctxPtr+F_O(%rbp),%rsi #ctx_hdr_ptr + movq $512,%rdi #now are set for the call + jmp Skein_Debug_Round_Common + .endif +# +.if _SKEIN_CODE_SIZE +C_label Skein_512_Process_Block_CodeSize + movq $(Skein_512_Process_Block_End-Skein_512_Process_Block),%rax + ret +# +C_label Skein_512_Unroll_Cnt + .if _UNROLL_CNT <> (ROUNDS_512/8) + movq $_UNROLL_CNT,%rax + .else + xorq %rax,%rax + .endif + ret +.endif +# +.endif # _USE_ASM_ & 512 +# +#=================================== Skein1024 ============================================= +.if _USE_ASM_ & 1024 +# +# void Skein1024_Process_Block(Skein_1024_Ctxt_t *ctx,const u08b_t *blkPtr,size_t blkCnt,size_t bitcntAdd)# +# +################# +# use details of permutation to make register assignments +# +o1K_rdi = 0 #offsets in X[] associated with each register +o1K_rsi = 1 +o1K_rbp = 2 +o1K_rax = 3 +o1K_rcx = 4 #rcx is "shared" with X6, since X4/X6 alternate +o1K_rbx = 5 +o1K_rdx = 7 +o1K_r8 = 8 +o1K_r9 = 9 +o1K_r10 = 10 +o1K_r11 = 11 +o1K_r12 = 12 +o1K_r13 = 13 +o1K_r14 = 14 +o1K_r15 = 15 +# +rIdx_offs = tmpStk_1024 +# +.macro r1024_Mix w0,w1,reg0,reg1,_RN0_,_Rn1_,op1 + addReg \reg0 , \reg1 #perform the MIX *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sat Jun 6 00:40:02 2020 Return-Path: Delivered-To: svn-src-head@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 D791C33C5D0; Sat, 6 Jun 2020 00:40:02 +0000 (UTC) (envelope-from rmacklem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f0z65KmMz4J73; Sat, 6 Jun 2020 00:40:02 +0000 (UTC) (envelope-from rmacklem@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 AD4EB19844; Sat, 6 Jun 2020 00:40:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0560e2Jd021512; Sat, 6 Jun 2020 00:40:02 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0560e263021511; Sat, 6 Jun 2020 00:40:02 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202006060040.0560e263021511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 6 Jun 2020 00:40:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361854 - head/usr.sbin/mountd X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.sbin/mountd X-SVN-Commit-Revision: 361854 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 00:40:02 -0000 Author: rmacklem Date: Sat Jun 6 00:40:02 2020 New Revision: 361854 URL: https://svnweb.freebsd.org/changeset/base/361854 Log: Fix mountd so that it will not lose SIGHUPs that indicate "reload exports". Without this patch, if a SIGHUP is handled while the process is executing get_exportlist(), that SIGHUP is essentially ignored because the got_sighup variable is reset to 0 after get_exportlist(). This results in the exports file(s) not being reloaded until another SIGHUP signal is sent to mountd. This patch fixes this by resetting got_sighup to zero before the get_exportlist() call while SIGHUP is blocked. It also defines a delay time of 250msec before doing another exports reload if there are RPC request(s) to process. This prevents repeated exports reloads from delaying handling of RPC requests significantly. PR: 246597 Reported by: patrykkotlowski@gmail.com Tested by: patrykkotlowski@gmail.com Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D25127 Modified: head/usr.sbin/mountd/mountd.c Modified: head/usr.sbin/mountd/mountd.c ============================================================================== --- head/usr.sbin/mountd/mountd.c Sat Jun 6 00:35:41 2020 (r361853) +++ head/usr.sbin/mountd/mountd.c Sat Jun 6 00:40:02 2020 (r361854) @@ -184,6 +184,12 @@ struct fhreturn { #define GETPORT_MAXTRY 20 /* Max tries to get a port # */ +/* + * How long to delay a reload of exports when there are RPC request(s) + * to process, in usec. Must be less than 1second. + */ +#define RELOADDELAY 250000 + /* Global defs */ static char *add_expdir(struct dirlist **, char *, int); static void add_dlist(struct dirlist **, struct dirlist *, @@ -410,6 +416,10 @@ main(int argc, char **argv) int maxrec = RPC_MAXDATASIZE; int attempt_cnt, port_len, port_pos, ret; char **port_list; + uint64_t curtime, nexttime; + struct timeval tv; + struct timespec tp; + sigset_t sighup_mask; /* Check that another mountd isn't already running. */ pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &otherpid); @@ -665,19 +675,49 @@ main(int argc, char **argv) } /* Expand svc_run() here so that we can call get_exportlist(). */ + curtime = nexttime = 0; + sigemptyset(&sighup_mask); + sigaddset(&sighup_mask, SIGHUP); for (;;) { - if (got_sighup) { - get_exportlist(1); + clock_gettime(CLOCK_MONOTONIC, &tp); + curtime = tp.tv_sec; + curtime = curtime * 1000000 + tp.tv_nsec / 1000; + sigprocmask(SIG_BLOCK, &sighup_mask, NULL); + if (got_sighup && curtime >= nexttime) { got_sighup = 0; - } + sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL); + get_exportlist(1); + clock_gettime(CLOCK_MONOTONIC, &tp); + nexttime = tp.tv_sec; + nexttime = nexttime * 1000000 + tp.tv_nsec / 1000 + + RELOADDELAY; + } else + sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL); + + /* + * If a reload is pending, poll for received request(s), + * otherwise set a RELOADDELAY timeout, since a SIGHUP + * could be processed between the got_sighup test and + * the select() system call. + */ + tv.tv_sec = 0; + if (got_sighup) + tv.tv_usec = 0; + else + tv.tv_usec = RELOADDELAY; readfds = svc_fdset; - switch (select(svc_maxfd + 1, &readfds, NULL, NULL, NULL)) { + switch (select(svc_maxfd + 1, &readfds, NULL, NULL, &tv)) { case -1: - if (errno == EINTR) - continue; + if (errno == EINTR) { + /* Allow a reload now. */ + nexttime = 0; + continue; + } syslog(LOG_ERR, "mountd died: select: %m"); exit(1); case 0: + /* Allow a reload now. */ + nexttime = 0; continue; default: svc_getreqset(&readfds); From owner-svn-src-head@freebsd.org Sat Jun 6 00:48:00 2020 Return-Path: Delivered-To: svn-src-head@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 82AF433CB4E; Sat, 6 Jun 2020 00:48:00 +0000 (UTC) (envelope-from chs@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f18J2zL5z4KGm; Sat, 6 Jun 2020 00:48:00 +0000 (UTC) (envelope-from chs@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 615E41995A; Sat, 6 Jun 2020 00:48:00 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0560m0YU028352; Sat, 6 Jun 2020 00:48:00 GMT (envelope-from chs@FreeBSD.org) Received: (from chs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0560m09x028351; Sat, 6 Jun 2020 00:48:00 GMT (envelope-from chs@FreeBSD.org) Message-Id: <202006060048.0560m09x028351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: chs set sender to chs@FreeBSD.org using -f From: Chuck Silvers Date: Sat, 6 Jun 2020 00:48:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361855 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: chs X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 361855 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 00:48:00 -0000 Author: chs Date: Sat Jun 6 00:47:59 2020 New Revision: 361855 URL: https://svnweb.freebsd.org/changeset/base/361855 Log: Don't mark pages as valid if reading the contents from disk fails. Instead, just skip marking pages valid if the read fails. Future attempts to access such pages will notice that they are not marked valid and try to read them from disk again. Reviewed by: kib, markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25138 Modified: head/sys/vm/vnode_pager.c Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Sat Jun 6 00:40:02 2020 (r361854) +++ head/sys/vm/vnode_pager.c Sat Jun 6 00:47:59 2020 (r361855) @@ -1150,28 +1150,30 @@ vnode_pager_generic_getpages_done(struct buf *bp) if (mt == bogus_page) continue; - if (nextoff <= object->un_pager.vnp.vnp_size) { - /* - * Read filled up entire page. - */ - vm_page_valid(mt); - KASSERT(mt->dirty == 0, - ("%s: page %p is dirty", __func__, mt)); - KASSERT(!pmap_page_is_mapped(mt), - ("%s: page %p is mapped", __func__, mt)); - } else { - /* - * Read did not fill up entire page. - * - * Currently we do not set the entire page valid, - * we just try to clear the piece that we couldn't - * read. - */ - vm_page_set_valid_range(mt, 0, - object->un_pager.vnp.vnp_size - tfoff); - KASSERT((mt->dirty & vm_page_bits(0, - object->un_pager.vnp.vnp_size - tfoff)) == 0, - ("%s: page %p is dirty", __func__, mt)); + if (error == 0) { + if (nextoff <= object->un_pager.vnp.vnp_size) { + /* + * Read filled up entire page. + */ + vm_page_valid(mt); + KASSERT(mt->dirty == 0, + ("%s: page %p is dirty", __func__, mt)); + KASSERT(!pmap_page_is_mapped(mt), + ("%s: page %p is mapped", __func__, mt)); + } else { + /* + * Read did not fill up entire page. + * + * Currently we do not set the entire page + * valid, we just try to clear the piece that + * we couldn't read. + */ + vm_page_set_valid_range(mt, 0, + object->un_pager.vnp.vnp_size - tfoff); + KASSERT((mt->dirty & vm_page_bits(0, + object->un_pager.vnp.vnp_size - tfoff)) == + 0, ("%s: page %p is dirty", __func__, mt)); + } } if (i < bp->b_pgbefore || i >= bp->b_npages - bp->b_pgafter) From owner-svn-src-head@freebsd.org Sat Jun 6 02:27:29 2020 Return-Path: Delivered-To: svn-src-head@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 885CB33F992; Sat, 6 Jun 2020 02:27:29 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f3M535Fmz4WSx; Sat, 6 Jun 2020 02:27:29 +0000 (UTC) (envelope-from emaste@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 6535C1AD3E; Sat, 6 Jun 2020 02:27:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0562RTGA090069; Sat, 6 Jun 2020 02:27:29 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0562RTLn090068; Sat, 6 Jun 2020 02:27:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006060227.0562RTLn090068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 6 Jun 2020 02:27:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361857 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 361857 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 02:27:29 -0000 Author: emaste Date: Sat Jun 6 02:27:28 2020 New Revision: 361857 URL: https://svnweb.freebsd.org/changeset/base/361857 Log: src.opts.mk: disable BINUTILS_BOOTSTRAP universally As of r361853 skein_block_asm.S is assembled using Clang's integrated assembler. PR: 233611 Sponsored by: The FreeBSD Foundation Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sat Jun 6 01:56:30 2020 (r361856) +++ head/share/mk/src.opts.mk Sat Jun 6 02:27:28 2020 (r361857) @@ -201,6 +201,7 @@ __DEFAULT_NO_OPTIONS = \ BEARSSL \ BHYVE_SNAPSHOT \ BINUTILS \ + BINUTILS_BOOTSTRAP \ BSD_GREP \ CLANG_EXTRAS \ DTRACE_TESTS \ @@ -290,12 +291,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF # In-tree binutils/gcc are older versions without modern architecture support. .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB -.endif -# BINUTILS_BOOTSTRAP is needed on amd64 only, for skein_block_asm.s -.if ${__T} == "amd64" -__DEFAULT_YES_OPTIONS+=BINUTILS_BOOTSTRAP -.else -__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP .endif .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=OFED From owner-svn-src-head@freebsd.org Sat Jun 6 02:28:21 2020 Return-Path: Delivered-To: svn-src-head@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 B815133FC01; Sat, 6 Jun 2020 02:28:21 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f3N54XCGz4WlY; Sat, 6 Jun 2020 02:28:21 +0000 (UTC) (envelope-from emaste@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 96AE81AD3F; Sat, 6 Jun 2020 02:28:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0562SL9h090164; Sat, 6 Jun 2020 02:28:21 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0562SL6W090163; Sat, 6 Jun 2020 02:28:21 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006060228.0562SL6W090163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 6 Jun 2020 02:28:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361858 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 361858 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 02:28:21 -0000 Author: emaste Date: Sat Jun 6 02:28:21 2020 New Revision: 361858 URL: https://svnweb.freebsd.org/changeset/base/361858 Log: src.conf.5: regen after r361857, BINUTILS_BOOTSTRAP off by default Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sat Jun 6 02:27:28 2020 (r361857) +++ head/share/man/man5/src.conf.5 Sat Jun 6 02:28:21 2020 (r361858) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd May 30, 2020 +.Dd June 5, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -188,18 +188,9 @@ Build and install GNU as part of the normal system build. This option is not available as of .Fx 13.0 . -.It Va WITHOUT_BINUTILS_BOOTSTRAP -Do not build GNU binutils -as part of the bootstrap process. -.Pp -This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mips, mips/mips64, powerpc/powerpc, powerpc/powerpc64, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_BINUTILS_BOOTSTRAP Build GNU binutils as part of the bootstrap process. -.Pp -This is a default setting on -amd64/amd64. .It Va WITHOUT_BLACKLIST Set this if you do not want to build .Xr blacklistd 8 From owner-svn-src-head@freebsd.org Sat Jun 6 02:40:53 2020 Return-Path: Delivered-To: svn-src-head@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 E67E933FF56; Sat, 6 Jun 2020 02:40:53 +0000 (UTC) (envelope-from jhibbits@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f3fY52rXz4Xtk; Sat, 6 Jun 2020 02:40:53 +0000 (UTC) (envelope-from jhibbits@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 A7AC01AD5F; Sat, 6 Jun 2020 02:40:53 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0562ertN096676; Sat, 6 Jun 2020 02:40:53 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0562eqHg096669; Sat, 6 Jun 2020 02:40:52 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202006060240.0562eqHg096669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 6 Jun 2020 02:40:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361859 - in head/sys/powerpc: aim include powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys/powerpc: aim include powerpc X-SVN-Commit-Revision: 361859 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 02:40:54 -0000 Author: jhibbits Date: Sat Jun 6 02:40:52 2020 New Revision: 361859 URL: https://svnweb.freebsd.org/changeset/base/361859 Log: powerpc: Add a (CPU/runtime features) flags set to pcpu struct Summary: The point of this addition is to cache CPU behavior 'features', to avoid having to recompute based on CPU, etc. The first such use case is to avoid the unnecessary manipulation of the SLBs (Segment Lookaside Buffers) when using the Radix pmap on POWER9. Since we already get the PCPU pointer wherever we swap the SLB entries, we can use a cached flag to check if it's necessary to perform the operation anyway, and skip it when not. Reviewed by: bdragon Differential Revision: https://reviews.freebsd.org/D24908 Modified: head/sys/powerpc/aim/mmu_radix.c head/sys/powerpc/aim/trap_subr64.S head/sys/powerpc/include/pcpu.h head/sys/powerpc/powerpc/db_interface.c head/sys/powerpc/powerpc/genassym.c head/sys/powerpc/powerpc/mp_machdep.c Modified: head/sys/powerpc/aim/mmu_radix.c ============================================================================== --- head/sys/powerpc/aim/mmu_radix.c Sat Jun 6 02:28:21 2020 (r361858) +++ head/sys/powerpc/aim/mmu_radix.c Sat Jun 6 02:40:52 2020 (r361859) @@ -2327,6 +2327,7 @@ mmu_radix_bootstrap(vm_offset_t start, vm_offset_t end printf("%s done\n", __func__); pmap_bootstrapped = 1; dmaplimit = roundup2(powerpc_ptob(Maxmem), L2_PAGE_SIZE); + PCPU_SET(flags, PCPU_GET(flags) | PC_FLAG_NOSRS); } static void Modified: head/sys/powerpc/aim/trap_subr64.S ============================================================================== --- head/sys/powerpc/aim/trap_subr64.S Sat Jun 6 02:28:21 2020 (r361858) +++ head/sys/powerpc/aim/trap_subr64.S Sat Jun 6 02:40:52 2020 (r361859) @@ -87,6 +87,9 @@ restore_usersrs: */ restore_kernsrs: GET_CPUINFO(%r28) + lwz %r29, PC_FLAGS(%r28) + mtcr %r29 + btlr 0 addi %r28,%r28,PC_KERNSLB ld %r29,16(%r28) /* One past USER_SLB_SLOT */ cmpdi %r29,0 @@ -270,9 +273,13 @@ restore_kernsrs: std %r29,(savearea+CPUSAVE_R29)(%r3); \ std %r30,(savearea+CPUSAVE_R30)(%r3); \ std %r31,(savearea+CPUSAVE_R31)(%r3); \ + lwz %r28,PC_FLAGS(%r3); \ + mtcr %r28; \ + bt 0, 0f; /* Check to skip restoring SRs. */ \ mflr %r27; /* preserve LR */ \ bl restore_usersrs; /* uses r28-r31 */ \ mtlr %r27; \ +0: \ ld %r31,(savearea+CPUSAVE_R31)(%r3); \ ld %r30,(savearea+CPUSAVE_R30)(%r3); \ ld %r29,(savearea+CPUSAVE_R29)(%r3); \ Modified: head/sys/powerpc/include/pcpu.h ============================================================================== --- head/sys/powerpc/include/pcpu.h Sat Jun 6 02:28:21 2020 (r361858) +++ head/sys/powerpc/include/pcpu.h Sat Jun 6 02:40:52 2020 (r361859) @@ -50,6 +50,7 @@ struct pvo_entry; int pc_bsp; \ volatile int pc_awake; \ uint32_t pc_ipimask; \ + uint32_t pc_flags; /* cpu feature flags */ \ register_t pc_tempsave[CPUSAVE_LEN]; \ register_t pc_disisave[CPUSAVE_LEN]; \ register_t pc_dbsave[CPUSAVE_LEN]; \ @@ -76,6 +77,9 @@ struct pvo_entry; #else #define PCPU_MD_AIM_FIELDS PCPU_MD_AIM32_FIELDS #endif + +/* CPU feature flags, can be used for cached flow control. */ +#define PC_FLAG_NOSRS 0x80000000 #define BOOKE_CRITSAVE_LEN (CPUSAVE_LEN + 2) #define BOOKE_TLB_MAXNEST 4 Modified: head/sys/powerpc/powerpc/db_interface.c ============================================================================== --- head/sys/powerpc/powerpc/db_interface.c Sat Jun 6 02:28:21 2020 (r361858) +++ head/sys/powerpc/powerpc/db_interface.c Sat Jun 6 02:40:52 2020 (r361859) @@ -91,4 +91,5 @@ db_show_mdpcpu(struct pcpu *pc) db_printf("PPC: hwref = %#zx\n", pc->pc_hwref); db_printf("PPC: ipimask = %#x\n", pc->pc_ipimask); + db_printf("PPC: flags = %#x\n", pc->pc_flags); } Modified: head/sys/powerpc/powerpc/genassym.c ============================================================================== --- head/sys/powerpc/powerpc/genassym.c Sat Jun 6 02:28:21 2020 (r361858) +++ head/sys/powerpc/powerpc/genassym.c Sat Jun 6 02:40:52 2020 (r361859) @@ -64,6 +64,7 @@ ASSYM(PC_TEMPSAVE, offsetof(struct pcpu, pc_tempsave)) ASSYM(PC_DISISAVE, offsetof(struct pcpu, pc_disisave)); ASSYM(PC_DBSAVE, offsetof(struct pcpu, pc_dbsave)); ASSYM(PC_RESTORE, offsetof(struct pcpu, pc_restore)); +ASSYM(PC_FLAGS, offsetof(struct pcpu, pc_flags)); #if defined(BOOKE) ASSYM(PC_BOOKE_CRITSAVE, offsetof(struct pcpu, pc_booke.critsave)); @@ -106,6 +107,7 @@ ASSYM(TLBSAVE_BOOKE_R31, TLBSAVE_BOOKE_R31*sizeof(regi ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); +ASSYM(PC_FLAG_NOSRS, PC_FLAG_NOSRS); #if defined(AIM) ASSYM(USER_ADDR, USER_ADDR); #ifdef __powerpc64__ Modified: head/sys/powerpc/powerpc/mp_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/mp_machdep.c Sat Jun 6 02:28:21 2020 (r361858) +++ head/sys/powerpc/powerpc/mp_machdep.c Sat Jun 6 02:40:52 2020 (r361859) @@ -246,6 +246,7 @@ cpu_mp_unleash(void *dummy) printf("Waking up CPU %d (dev=%x)\n", pc->pc_cpuid, (int)pc->pc_hwref); + pc->pc_flags = PCPU_GET(flags); /* Copy cached CPU flags */ ret = platform_smp_start_cpu(pc); if (ret == 0) { timeout = 2000; /* wait 2sec for the AP */ From owner-svn-src-head@freebsd.org Sat Jun 6 02:45:58 2020 Return-Path: Delivered-To: svn-src-head@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 38A073401A3; Sat, 6 Jun 2020 02:45:58 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f3mQ0qB5z4Yp5; Sat, 6 Jun 2020 02:45:58 +0000 (UTC) (envelope-from emaste@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 EFDA11B221; Sat, 6 Jun 2020 02:45:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0562jvFh002507; Sat, 6 Jun 2020 02:45:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0562jvCg002506; Sat, 6 Jun 2020 02:45:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006060245.0562jvCg002506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 6 Jun 2020 02:45:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361860 - in head/gnu/usr.bin/binutils: objcopy objdump X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/gnu/usr.bin/binutils: objcopy objdump X-SVN-Commit-Revision: 361860 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 02:45:58 -0000 Author: emaste Date: Sat Jun 6 02:45:57 2020 New Revision: 361860 URL: https://svnweb.freebsd.org/changeset/base/361860 Log: Remove GNU objcopy and objdump build infrastructure We haven't used the GNU versions of these tools for some time. Deleted: head/gnu/usr.bin/binutils/objcopy/ head/gnu/usr.bin/binutils/objdump/ From owner-svn-src-head@freebsd.org Sat Jun 6 03:09:14 2020 Return-Path: Delivered-To: svn-src-head@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 5B16D340987; Sat, 6 Jun 2020 03:09:14 +0000 (UTC) (envelope-from jhibbits@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f4HG25Gyz4c2n; Sat, 6 Jun 2020 03:09:14 +0000 (UTC) (envelope-from jhibbits@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 42B251B71E; Sat, 6 Jun 2020 03:09:14 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05639EnT016154; Sat, 6 Jun 2020 03:09:14 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05639Cwd016143; Sat, 6 Jun 2020 03:09:12 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202006060309.05639Cwd016143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 6 Jun 2020 03:09:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361861 - in head/sys: conf powerpc/aim powerpc/booke powerpc/include powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys: conf powerpc/aim powerpc/booke powerpc/include powerpc/powerpc X-SVN-Commit-Revision: 361861 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 03:09:14 -0000 Author: jhibbits Date: Sat Jun 6 03:09:12 2020 New Revision: 361861 URL: https://svnweb.freebsd.org/changeset/base/361861 Log: powerpc: Use IFUNCs for copyin/copyout/etc Summary: Radix on AIM, and all of Book-E (currently), can do direct addressing of user space, instead of needing to map user addresses into kernel space. Take advantage of this to optimize the copy(9) functions for this behavior, and avoid effectively NOP translations. Test Plan: Tested on powerpcspe, powerpc64/booke, powerpc64/AIM Reviewed by: bdragon Differential Revision: https://reviews.freebsd.org/D25129 Added: head/sys/powerpc/powerpc/support.S (contents, props changed) Modified: head/sys/conf/files.powerpc head/sys/powerpc/aim/mmu_radix.c head/sys/powerpc/booke/pmap.c head/sys/powerpc/include/asm.h head/sys/powerpc/include/mmuvar.h head/sys/powerpc/include/param.h head/sys/powerpc/powerpc/copyinout.c head/sys/powerpc/powerpc/pmap_dispatch.c head/sys/powerpc/powerpc/trap.c Modified: head/sys/conf/files.powerpc ============================================================================== --- head/sys/conf/files.powerpc Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/conf/files.powerpc Sat Jun 6 03:09:12 2020 (r361861) @@ -239,7 +239,7 @@ powerpc/powerpc/autoconf.c standard powerpc/powerpc/bus_machdep.c standard powerpc/powerpc/busdma_machdep.c standard powerpc/powerpc/clock.c standard -powerpc/powerpc/copyinout.c standard +powerpc/powerpc/copyinout.c optional aim powerpc/powerpc/cpu.c standard powerpc/powerpc/cpu_subr64.S optional powerpc64 powerpc/powerpc/db_disasm.c optional ddb @@ -274,6 +274,7 @@ powerpc/powerpc/sigcode64.S optional powerpc64 powerpc/powerpc/swtch32.S optional powerpc | powerpcspe powerpc/powerpc/swtch64.S optional powerpc64 powerpc/powerpc/stack_machdep.c optional ddb | stack +powerpc/powerpc/support.S optional powerpc64 | booke powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard powerpc/powerpc/trap.c standard Modified: head/sys/powerpc/aim/mmu_radix.c ============================================================================== --- head/sys/powerpc/aim/mmu_radix.c Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/aim/mmu_radix.c Sat Jun 6 03:09:12 2020 (r361861) @@ -412,8 +412,6 @@ void mmu_radix_align_superpage(vm_object_t, vm_ooffset vm_size_t); void mmu_radix_clear_modify(vm_page_t); void mmu_radix_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t, vm_offset_t); -int mmu_radix_map_user_ptr(pmap_t pm, - volatile const void *uaddr, void **kaddr, size_t ulen, size_t *klen); int mmu_radix_decode_kernel_ptr(vm_offset_t, int *, vm_offset_t *); int mmu_radix_enter(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, u_int, int8_t); void mmu_radix_enter_object(pmap_t, vm_offset_t, vm_offset_t, vm_page_t, @@ -538,7 +536,6 @@ static struct pmap_funcs mmu_radix_methods = { .kextract = mmu_radix_kextract, .kremove = mmu_radix_kremove, .change_attr = mmu_radix_change_attr, - .map_user_ptr = mmu_radix_map_user_ptr, .decode_kernel_ptr = mmu_radix_decode_kernel_ptr, .tlbie_all = mmu_radix_tlbie_all, @@ -5996,20 +5993,6 @@ mmu_radix_kremove(vm_offset_t va) pte = kvtopte(va); pte_clear(pte); -} - -int mmu_radix_map_user_ptr(pmap_t pm, - volatile const void *uaddr, void **kaddr, size_t ulen, size_t *klen) -{ - if ((uintptr_t)uaddr + ulen >= VM_MAXUSER_ADDRESS || - (uintptr_t)uaddr + ulen < (uintptr_t)uaddr) - return (EFAULT); - - *kaddr = (void *)(uintptr_t)uaddr; - if (klen) - *klen = ulen; - - return (0); } int Modified: head/sys/powerpc/booke/pmap.c ============================================================================== --- head/sys/powerpc/booke/pmap.c Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/booke/pmap.c Sat Jun 6 03:09:12 2020 (r361861) @@ -349,8 +349,6 @@ static vm_offset_t mmu_booke_quick_enter_page(vm_page_ static void mmu_booke_quick_remove_page(vm_offset_t addr); static int mmu_booke_change_attr(vm_offset_t addr, vm_size_t sz, vm_memattr_t mode); -static int mmu_booke_map_user_ptr(pmap_t pm, - volatile const void *uaddr, void **kaddr, size_t ulen, size_t *klen); static int mmu_booke_decode_kernel_ptr(vm_offset_t addr, int *is_user, vm_offset_t *decoded_addr); static void mmu_booke_page_array_startup(long); @@ -410,7 +408,6 @@ static struct pmap_funcs mmu_booke_methods = { .kremove = mmu_booke_kremove, .unmapdev = mmu_booke_unmapdev, .change_attr = mmu_booke_change_attr, - .map_user_ptr = mmu_booke_map_user_ptr, .decode_kernel_ptr = mmu_booke_decode_kernel_ptr, /* dumpsys() support */ @@ -1206,26 +1203,6 @@ mmu_booke_kremove(vm_offset_t va) tlb_miss_unlock(); mtx_unlock_spin(&tlbivax_mutex); -} - -/* - * Provide a kernel pointer corresponding to a given userland pointer. - * The returned pointer is valid until the next time this function is - * called in this thread. This is used internally in copyin/copyout. - */ -int -mmu_booke_map_user_ptr(pmap_t pm, volatile const void *uaddr, - void **kaddr, size_t ulen, size_t *klen) -{ - - if (trunc_page((uintptr_t)uaddr + ulen) > VM_MAXUSER_ADDRESS) - return (EFAULT); - - *kaddr = (void *)(uintptr_t)uaddr; - if (klen) - *klen = ulen; - - return (0); } /* Modified: head/sys/powerpc/include/asm.h ============================================================================== --- head/sys/powerpc/include/asm.h Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/include/asm.h Sat Jun 6 03:09:12 2020 (r361861) @@ -114,6 +114,7 @@ .p2align 4; \ TYPE_ENTRY(name) \ DOT_LABEL(name): +#define _NAKED_ENTRY(name) _ENTRY(name) #else #define _ENTRY(name) \ .text; \ @@ -124,6 +125,15 @@ name: \ addis %r2, %r12, (.TOC.-name)@ha; \ addi %r2, %r2, (.TOC.-name)@l; \ .localentry name, .-name; + +/* "Naked" function entry. No TOC prologue for ELFv2. */ +#define _NAKED_ENTRY(name) \ + .text; \ + .p2align 4; \ + .globl name; \ + .type name,@function; \ +name: \ + .localentry name, .-name; #endif #define _END(name) \ @@ -145,6 +155,8 @@ name: \ .type name,@function; \ name: #define _END(name) + +#define _NAKED_ENTRY(name) _ENTRY(name) #define LOAD_ADDR(reg, var) \ lis reg, var@ha; \ Modified: head/sys/powerpc/include/mmuvar.h ============================================================================== --- head/sys/powerpc/include/mmuvar.h Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/include/mmuvar.h Sat Jun 6 03:09:12 2020 (r361861) @@ -182,6 +182,25 @@ struct mmu_kobj { typedef struct mmu_kobj *mmu_t; +/* The currently installed pmap object. */ +extern mmu_t mmu_obj; + +/* + * Resolve a given pmap function. + * 'func' is the function name less the 'pmap_' * prefix. + */ +#define PMAP_RESOLVE_FUNC(func) \ + ({ \ + pmap_##func##_t f; \ + const struct mmu_kobj *mmu = mmu_obj; \ + do { \ + f = mmu->funcs->func; \ + if (f != NULL) break; \ + mmu = mmu->base; \ + } while (mmu != NULL); \ + f;}) + + #define MMU_DEF(name, ident, methods) \ \ const struct mmu_kobj name = { \ Modified: head/sys/powerpc/include/param.h ============================================================================== --- head/sys/powerpc/include/param.h Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/include/param.h Sat Jun 6 03:09:12 2020 (r361861) @@ -134,6 +134,9 @@ #define KSTACK_GUARD_PAGES 1 /* pages of kstack guard; 0 disables */ #define USPACE (kstack_pages * PAGE_SIZE) /* total size of pcb */ +#define COPYFAULT 0x1 +#define FUSUFAULT 0x2 + /* * Mach derived conversion macros */ Modified: head/sys/powerpc/powerpc/copyinout.c ============================================================================== --- head/sys/powerpc/powerpc/copyinout.c Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/powerpc/copyinout.c Sat Jun 6 03:09:12 2020 (r361861) @@ -66,13 +66,102 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include #include #include +#include +/* + * On powerpc64 (AIM only) the copy functions are IFUNcs, selecting the best + * option based on the PMAP in use. + * + * There are two options for copy functions on powerpc64: + * - 'remap' copies, which remap userspace segments into kernel space for + * copying. This is used by the 'oea64' pmap. + * - 'direct' copies, which copy directly from userspace. This does not require + * remapping user segments into kernel. This is used by the 'radix' pmap for + * performance. + * + * Book-E does not use the C functions, opting instead to use the 'direct' + * copies, directly, avoiding the IFUNC overhead. + * + * On 32-bit AIM these functions are direct, not IFUNCs, for performance. + */ +#ifdef __powerpc64__ +int subyte_remap(volatile void *addr, int byte); +int subyte_direct(volatile void *addr, int byte); +int copyinstr_remap(const void *udaddr, void *kaddr, size_t len, size_t *done); +int copyinstr_direct(const void *udaddr, void *kaddr, size_t len, size_t *done); +int copyout_remap(const void *kaddr, void *udaddr, size_t len); +int copyout_direct(const void *kaddr, void *udaddr, size_t len); +int copyin_remap(const void *uaddr, void *kaddr, size_t len); +int copyin_direct(const void *uaddr, void *kaddr, size_t len); +int suword32_remap(volatile void *addr, int word); +int suword32_direct(volatile void *addr, int word); +int suword_remap(volatile void *addr, long word); +int suword_direct(volatile void *addr, long word); +int suword64_remap(volatile void *addr, int64_t word); +int suword64_direct(volatile void *addr, int64_t word); +int fubyte_remap(volatile const void *addr); +int fubyte_direct(volatile const void *addr); +int fuword16_remap(volatile const void *addr); +int fuword16_direct(volatile const void *addr); +int fueword32_remap(volatile const void *addr, int32_t *val); +int fueword32_direct(volatile const void *addr, int32_t *val); +int fueword64_remap(volatile const void *addr, int64_t *val); +int fueword64_direct(volatile const void *addr, int64_t *val); +int fueword_remap(volatile const void *addr, long *val); +int fueword_direct(volatile const void *addr, long *val); +int casueword32_remap(volatile uint32_t *addr, uint32_t old, uint32_t *oldvalp, + uint32_t new); +int casueword32_direct(volatile uint32_t *addr, uint32_t old, uint32_t *oldvalp, + uint32_t new); +int casueword_remap(volatile u_long *addr, u_long old, u_long *oldvalp, + u_long new); +int casueword_direct(volatile u_long *addr, u_long old, u_long *oldvalp, + u_long new); + +/* + * The IFUNC resolver determines the copy based on if the PMAP implementation + * includes a pmap_map_user_ptr function. + */ +#define DEFINE_COPY_FUNC(ret, func, args) \ + DEFINE_IFUNC(, ret, func, args) \ + { \ + return (PMAP_RESOLVE_FUNC(map_user_ptr) ? \ + func##_remap : func##_direct); \ + } +DEFINE_COPY_FUNC(int, subyte, (volatile void *, int)) +DEFINE_COPY_FUNC(int, copyinstr, (const void *, void *, size_t, size_t *)) +DEFINE_COPY_FUNC(int, copyin, (const void *, void *, size_t)) +DEFINE_COPY_FUNC(int, copyout, (const void *, void *, size_t)) +DEFINE_COPY_FUNC(int, suword, (volatile void *, long)) +DEFINE_COPY_FUNC(int, suword32, (volatile void *, int)) +#ifdef __powerpc64__ +DEFINE_COPY_FUNC(int, suword64, (volatile void *, int64_t)) +#endif +DEFINE_COPY_FUNC(int, fubyte, (volatile const void *)) +DEFINE_COPY_FUNC(int, fuword16, (volatile const void *)) +DEFINE_COPY_FUNC(int, fueword32, (volatile const void *, int32_t *)) +#ifdef __powerpc64__ +DEFINE_COPY_FUNC(int, fueword64, (volatile const void *, int64_t *)) +#endif +DEFINE_COPY_FUNC(int, fueword, (volatile const void *, long *)) +DEFINE_COPY_FUNC(int, casueword32, + (volatile uint32_t *, uint32_t, uint32_t *, uint32_t)) +DEFINE_COPY_FUNC(int, casueword, (volatile u_long *, u_long, u_long *, u_long)) + +#define REMAP(x) x##_remap +#else +#define REMAP(x) x +#endif + + int -copyout(const void *kaddr, void *udaddr, size_t len) +REMAP(copyout)(const void *kaddr, void *udaddr, size_t len) { struct thread *td; pmap_t pm; @@ -111,7 +200,7 @@ copyout(const void *kaddr, void *udaddr, size_t len) } int -copyin(const void *udaddr, void *kaddr, size_t len) +REMAP(copyin)(const void *udaddr, void *kaddr, size_t len) { struct thread *td; pmap_t pm; @@ -150,7 +239,7 @@ copyin(const void *udaddr, void *kaddr, size_t len) } int -copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done) +REMAP(copyinstr)(const void *udaddr, void *kaddr, size_t len, size_t *done) { const char *up; char *kp; @@ -183,7 +272,7 @@ copyinstr(const void *udaddr, void *kaddr, size_t len, } int -subyte(volatile void *addr, int byte) +REMAP(subyte)(volatile void *addr, int byte) { struct thread *td; pmap_t pm; @@ -212,7 +301,7 @@ subyte(volatile void *addr, int byte) #ifdef __powerpc64__ int -suword32(volatile void *addr, int word) +REMAP(suword32)(volatile void *addr, int word) { struct thread *td; pmap_t pm; @@ -238,10 +327,16 @@ suword32(volatile void *addr, int word) td->td_pcb->pcb_onfault = NULL; return (0); } +#else +int +REMAP(suword32)(volatile void *addr, int32_t word) +{ +REMAP( return (suword)(addr, (long)word)); +} #endif int -suword(volatile void *addr, long word) +REMAP(suword)(volatile void *addr, long word) { struct thread *td; pmap_t pm; @@ -270,20 +365,14 @@ suword(volatile void *addr, long word) #ifdef __powerpc64__ int -suword64(volatile void *addr, int64_t word) +REMAP(suword64)(volatile void *addr, int64_t word) { - return (suword(addr, (long)word)); + return (REMAP(suword)(addr, (long)word)); } -#else -int -suword32(volatile void *addr, int32_t word) -{ - return (suword(addr, (long)word)); -} #endif int -fubyte(volatile const void *addr) +REMAP(fubyte)(volatile const void *addr) { struct thread *td; pmap_t pm; @@ -312,7 +401,7 @@ fubyte(volatile const void *addr) } int -fuword16(volatile const void *addr) +REMAP(fuword16)(volatile const void *addr) { struct thread *td; pmap_t pm; @@ -340,7 +429,7 @@ fuword16(volatile const void *addr) } int -fueword32(volatile const void *addr, int32_t *val) +REMAP(fueword32)(volatile const void *addr, int32_t *val) { struct thread *td; pmap_t pm; @@ -369,7 +458,7 @@ fueword32(volatile const void *addr, int32_t *val) #ifdef __powerpc64__ int -fueword64(volatile const void *addr, int64_t *val) +REMAP(fueword64)(volatile const void *addr, int64_t *val) { struct thread *td; pmap_t pm; @@ -398,7 +487,7 @@ fueword64(volatile const void *addr, int64_t *val) #endif int -fueword(volatile const void *addr, long *val) +REMAP(fueword)(volatile const void *addr, long *val) { struct thread *td; pmap_t pm; @@ -426,7 +515,7 @@ fueword(volatile const void *addr, long *val) } int -casueword32(volatile uint32_t *addr, uint32_t old, uint32_t *oldvalp, +REMAP(casueword32)(volatile uint32_t *addr, uint32_t old, uint32_t *oldvalp, uint32_t new) { struct thread *td; @@ -474,7 +563,7 @@ casueword32(volatile uint32_t *addr, uint32_t old, uin #ifndef __powerpc64__ int -casueword(volatile u_long *addr, u_long old, u_long *oldvalp, u_long new) +REMAP(casueword)(volatile u_long *addr, u_long old, u_long *oldvalp, u_long new) { return (casueword32((volatile uint32_t *)addr, old, @@ -482,7 +571,7 @@ casueword(volatile u_long *addr, u_long old, u_long *o } #else int -casueword(volatile u_long *addr, u_long old, u_long *oldvalp, u_long new) +REMAP(casueword)(volatile u_long *addr, u_long old, u_long *oldvalp, u_long new) { struct thread *td; pmap_t pm; Modified: head/sys/powerpc/powerpc/pmap_dispatch.c ============================================================================== --- head/sys/powerpc/powerpc/pmap_dispatch.c Sat Jun 6 02:45:57 2020 (r361860) +++ head/sys/powerpc/powerpc/pmap_dispatch.c Sat Jun 6 03:09:12 2020 (r361861) @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include -static mmu_t mmu_obj; +mmu_t mmu_obj; /* * pmap globals @@ -99,24 +99,14 @@ pmap_nomethod(void) #define DEFINE_PMAP_IFUNC(ret, func, args) \ DEFINE_IFUNC(, ret, pmap_##func, args) { \ - const struct mmu_kobj *mmu = mmu_obj; \ pmap_##func##_t f; \ - do { \ - f = mmu->funcs->func; \ - if (f != NULL) break; \ - mmu = mmu->base; \ - } while (mmu != NULL); \ + f = PMAP_RESOLVE_FUNC(func); \ return (f != NULL ? f : (pmap_##func##_t)pmap_nomethod);\ } #define DEFINE_DUMPSYS_IFUNC(ret, func, args) \ DEFINE_IFUNC(, ret, dumpsys_##func, args) { \ - const struct mmu_kobj *mmu = mmu_obj; \ pmap_dumpsys_##func##_t f; \ - do { \ - f = mmu->funcs->dumpsys_##func; \ - if (f != NULL) break; \ - mmu = mmu->base; \ - } while (mmu != NULL); \ + f = PMAP_RESOLVE_FUNC(dumpsys_##func); \ return (f != NULL ? f : (pmap_dumpsys_##func##_t)pmap_nomethod);\ } Added: head/sys/powerpc/powerpc/support.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/powerpc/powerpc/support.S Sat Jun 6 03:09:12 2020 (r361861) @@ -0,0 +1,539 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2018, Matthew Macy + * + * 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$ + */ + +/* + * Assembly variants of various functions, for those that don't need generic C + * implementations. Currently this includes: + * + * - Direct-access versions of copyin/copyout methods. + * - These are used by Radix AIM pmap (ISA 3.0), and Book-E, to avoid + * unnecessary pmap_map_usr_ptr() calls. + */ + +#include "assym.inc" +#include "opt_sched.h" + +#include +#include + +#include +#include +#include +#include +#include + +#ifdef _CALL_ELF +.abiversion _CALL_ELF +#endif + +#ifdef __powerpc64__ +#define LOAD ld +#define STORE std +#define WORD 8 +#define CMPI cmpdi +#define CMPLI cmpldi +/* log_2(8 * WORD) */ +#define LOOP_LOG 6 +#define LOG_WORD 3 +#else +#define LOAD lwz +#define STORE stw +#define WORD 4 +#define CMPI cmpwi +#define CMPLI cmplwi +/* log_2(8 * WORD) */ +#define LOOP_LOG 5 +#define LOG_WORD 2 +#endif + +#ifdef AIM +#define ENTRY_DIRECT(x) ENTRY(x ## _direct) +#else +#define ENTRY_DIRECT(x) ENTRY(x) +#endif + +#ifdef __powerpc64__ +#define PROLOGUE ;\ + mflr %r0 ;\ + std %r0, 16(%r1) ;\ + +#define EPILOGUE ;\ + ld %r0, 16(%r1) ;\ + mtlr %r0 ;\ + blr ;\ + nop + +#define VALIDATE_TRUNCATE_ADDR_COPY VALIDATE_ADDR_COPY +#define VALIDATE_ADDR_COPY(raddr, len) \ + srdi %r0, raddr, 52 ;\ + cmpwi %r0, 1 ;\ + bge- copy_fault ;\ + nop + +#define VALIDATE_ADDR_FUSU(raddr) ;\ + srdi %r0, raddr, 52 ;\ + cmpwi %r0, 1 ;\ + bge- fusufault ;\ + nop + +#else +#define PROLOGUE ;\ + mflr %r0 ;\ + stw %r0, 4(%r1) ;\ + +#define EPILOGUE ;\ + lwz %r0, 4(%r1) ;\ + mtlr %r0 ;\ + blr ;\ + nop + +/* %r0 is temporary */ +/* + * Validate address and length are valid. + * For VALIDATE_ADDR_COPY() have to account for wraparound. + */ +#define VALIDATE_ADDR_COPY(raddr, len) \ + lis %r0, VM_MAXUSER_ADDRESS@h ;\ + ori %r0, %r0, VM_MAXUSER_ADDRESS@l ;\ + cmplw %r0, raddr ;\ + blt- copy_fault ;\ + add %r0, raddr, len ;\ + cmplw 7, %r0, raddr ;\ + blt- 7, copy_fault ;\ + mtcrf 0x80, %r0 ;\ + bt- 0, copy_fault ;\ + nop + +#define VALIDATE_TRUNCATE_ADDR_COPY(raddr, len) \ + lis %r0, VM_MAXUSER_ADDRESS@h ;\ + ori %r0, %r0, VM_MAXUSER_ADDRESS@l ;\ + cmplw %r0, raddr ;\ + blt- copy_fault ;\ + sub %r0, %r0, raddr ;\ + cmplw len, %r0 ;\ + isel len, len, %r0, 0 ;\ + +#define VALIDATE_ADDR_FUSU(raddr) \ + lis %r0, VM_MAXUSER_ADDRESS@h ;\ + ori %r0, %r0, VM_MAXUSER_ADDRESS@l ;\ + cmplw %r0, raddr ;\ + ble- fusufault + +#endif + +#define PCPU(reg) mfsprg reg, 0 + +#define SET_COPYFAULT(raddr, rpcb, len) \ + VALIDATE_ADDR_COPY(raddr, len) ;\ + PCPU(%r9) ;\ + li %r0, COPYFAULT ;\ + LOAD rpcb, PC_CURPCB(%r9) ;\ + STORE %r0, PCB_ONFAULT(rpcb) ;\ + +#define SET_COPYFAULT_TRUNCATE(raddr, rpcb, len)\ + VALIDATE_TRUNCATE_ADDR_COPY(raddr, len) ;\ + PCPU(%r9) ;\ + li %r0, COPYFAULT ;\ + LOAD rpcb, PC_CURPCB(%r9) ;\ + STORE %r0, PCB_ONFAULT(rpcb) + +#define SET_FUSUFAULT(raddr, rpcb) \ + VALIDATE_ADDR_FUSU(raddr) ;\ + PCPU(%r9) ;\ + li %r0, FUSUFAULT ;\ + LOAD rpcb, PC_CURPCB(%r9) ;\ + STORE %r0, PCB_ONFAULT(rpcb) + +#define CLEAR_FAULT_NO_CLOBBER(rpcb) \ + PCPU(%r9) ;\ + LOAD rpcb, PC_CURPCB(%r9) ;\ + li %r0, 0 ;\ + STORE %r0, PCB_ONFAULT(rpcb) + +#define CLEAR_FAULT(rpcb) \ + CLEAR_FAULT_NO_CLOBBER(rpcb) ;\ + li %r3, 0 + +/* + * bcopy(src, dst, len) + * %r3 %r4 %r5 + * + * %r7 is the pcb pointer + * + * %r0 and %r8-%r10 are volatile + * %r11 and %r12 are generally volatile, used in linking and exception + * handling. Can be clobbered here. + * + * Does not allocate or use stack space, but clobbers all volatile registers. + */ + +#define rs %r3 +#define rd %r4 +#define rl %r5 + +#define t1 %r6 +#define t2 %r7 +#define t3 %r8 +#define t4 %r9 +#define t5 %r10 +#define t6 %r11 +#define t7 %r12 +#define t8 %r0 + +#define Thresh WORD * 8 +#define W4 3 +#define W2 2 +#define W1 1 +#define WORDS(n) (32 - LOG_WORD - W##n) +.text +ENTRY(bcopy_generic) + CMPLI 0, %r5, 0 + beq .Lend + dcbtst 0, rd + dcbt 0, rs + CMPLI rl, Thresh + blt .Lsmall + b .Llarge +/* memcpy */ +/* ... */ +.Lsmall: /* < 8 words remaining */ + mtcrf 0x3, rl +.Lsmall_start: + bf WORDS(4), 0f + LOAD t1, 0(rs) + LOAD t2, WORD*1(rs) + LOAD t3, WORD*2(rs) + LOAD t4, WORD*3(rs) + addi rs, rs, WORD*4 + STORE t1, 0(rd) + STORE t2, WORD*1(rd) + STORE t3, WORD*2(rd) + STORE t4, WORD*3(rd) + addi rd, rd, WORD*4 +0: /* < 4 words remaining */ + bf WORDS(2), 1f + LOAD t1, 0(rs) + LOAD t2, WORD*1(rs) + addi rs, rs, WORD*2 + STORE t1, 0(rd) + STORE t2, WORD*1(rd) + addi rd, rd, WORD*2 +1: /* < 2 words remaining */ + bf WORDS(1), 2f + LOAD t1, 0(rs) + addi rs, rs, WORD + STORE t1, 0(rd) + addi rd, rd, WORD +2: /* < 1 word remaining */ +#ifdef __powerpc64__ + bf 29, 3f + lwz t1, 0(rs) + addi rs, rs, 4 + stw t1, 0(rd) + addi rd, rd, 4 +3: /* < 4 bytes remaining */ +#endif + bf 30, 4f + lhz t1, 0(rs) + addi rs, rs, 2 + sth t1, 0(rd) + addi rd, rd, 2 +4: /* < 2 bytes remaining */ + bf 31, .Lout + lbz t1, 0(rs) + addi rs, rs, 1 + stb t1, 0(rd) + addi rd, rd, 1 + b .Lout + + .align 4 +.Llarge: + neg t3, rd + andi. t6, t3, WORD-1 /* Align rd to word size */ + mtctr t6 + sub rl, rl, t6 + beq+ .Llargealigned +1: + lbz t1, 0(rs) + addi rs, rs, 1 + stb t1, 0(rd) + addi rd, rd, 1 + bdnz 1b + +.Llargealigned: + srwi. t2, rl, LOOP_LOG /* length >> log_2(loop_size) => 8W iterations */ + mtcrf 0x3, rl + beq .Lsmall_start + mtctr t2 + b 1f + + .align 5 +1: + LOAD t1, 0(rs) + LOAD t2, WORD(rs) + LOAD t3, WORD*2(rs) + LOAD t4, WORD*3(rs) + LOAD t5, WORD*4(rs) + LOAD t6, WORD*5(rs) + LOAD t7, WORD*6(rs) + LOAD t8, WORD*7(rs) + addi rs, rs, WORD*8 + STORE t1, 0(rd) + STORE t2, WORD*1(rd) + STORE t3, WORD*2(rd) + STORE t4, WORD*3(rd) + STORE t5, WORD*4(rd) + STORE t6, WORD*5(rd) + STORE t7, WORD*6(rd) + STORE t8, WORD*7(rd) + addi rd, rd, WORD*8 + bdnz 1b + + b .Lsmall_start +.Lout: +/* done */ +.Lend: + blr + +/* + * copyout(from_kernel, to_user, len) + * %r3, %r4, %r5 + */ +ENTRY_DIRECT(copyout) + PROLOGUE + SET_COPYFAULT(%r4, %r7, %r5) + bl bcopy_generic + nop + CLEAR_FAULT(%r7) + EPILOGUE + +/* + * copyin(from_user, to_kernel, len) + * %r3, %r4, %r5 + */ +ENTRY_DIRECT(copyin) + PROLOGUE + SET_COPYFAULT(%r3, %r7, %r5) + bl bcopy_generic + nop + CLEAR_FAULT(%r7) + EPILOGUE +/* + * copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done) + * %r3 %r4 %r5 %r6 + */ + +ENTRY_DIRECT(copyinstr) + PROLOGUE + SET_COPYFAULT_TRUNCATE(%r3, %r7, %r5) + addi %r9, %r5, 1 + mtctr %r9 + mr %r8, %r3 + addi %r8, %r8, -1 + addi %r4, %r4, -1 + li %r3, ENAMETOOLONG +0: + bdz- 2f + lbzu %r0, 1(%r8) + stbu %r0, 1(%r4) + + // NULL byte reached ? + CMPI %r0, 0 + beq- 1f + b 0b +1: + li %r3, 0 +2: + /* skip storing length if done is NULL */ + CMPI %r6, 0 + beq- 3f + mfctr %r0 + sub %r0, %r9, %r0 + STORE %r0, 0(%r6) +3: + CLEAR_FAULT_NO_CLOBBER(%r7) + EPILOGUE + +ENTRY_DIRECT(subyte) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + stb %r4, 0(%r3) + CLEAR_FAULT(%r7) + EPILOGUE + +#ifndef __powerpc64__ +ENTRY_DIRECT(suword) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + stw %r4, 0(%r3) + CLEAR_FAULT(%r7) + EPILOGUE +#endif + +ENTRY_DIRECT(suword32) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + stw %r4, 0(%r3) + CLEAR_FAULT(%r7) + EPILOGUE + +#ifdef __powerpc64__ +ENTRY_DIRECT(suword64) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + std %r4, 0(%r3) + CLEAR_FAULT(%r7) + EPILOGUE +ENTRY_DIRECT(suword) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + std %r4, 0(%r3) + CLEAR_FAULT(%r7) + EPILOGUE +#endif + +ENTRY_DIRECT(fubyte) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + lbz %r3, 0(%r3) + CLEAR_FAULT_NO_CLOBBER(%r7) + EPILOGUE + +ENTRY_DIRECT(fuword16) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + lhz %r3, 0(%r3) + CLEAR_FAULT_NO_CLOBBER(%r7) + EPILOGUE + +#ifndef __powerpc64__ +ENTRY_DIRECT(fueword) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + lwz %r0, 0(%r3) + stw %r0, 0(%r4) + CLEAR_FAULT(%r7) + EPILOGUE +#endif +ENTRY_DIRECT(fueword32) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + lwz %r0, 0(%r3) + stw %r0, 0(%r4) + CLEAR_FAULT(%r7) + EPILOGUE + +#ifdef __powerpc64__ +ENTRY_DIRECT(fueword) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + ld %r0, 0(%r3) + std %r0, 0(%r4) + CLEAR_FAULT(%r7) + EPILOGUE + +ENTRY_DIRECT(fueword64) + PROLOGUE + SET_FUSUFAULT(%r3, %r7) + ld %r0, 0(%r3) + std %r0, 0(%r4) + CLEAR_FAULT(%r7) + EPILOGUE +#endif + +/* + * casueword(volatile u_long *base, u_long old, u_long *oldp, u_long new) + * %r3 %r4 %r5 %r6 + */ + +#define CASUEWORD32(raddr, rpcb) ;\ + PROLOGUE ;\ + SET_FUSUFAULT(raddr, rpcb) ;\ + li %r8, 0 ;\ +1: ;\ + lwarx %r0, 0, %r3 ;\ + cmplw %r4, %r0 ;\ + bne 2f ;\ + stwcx. %r6, 0, %r3 ;\ + bne- 3f ;\ + b 4f ;\ +2: ;\ + stwcx. %r0, 0, %r3 /* clear reservation (74xx) */ ;\ +3: ;\ + li %r8, 1 ;\ +4: ;\ + stw %r0, 0(%r5) ;\ + CLEAR_FAULT_NO_CLOBBER(rpcb) ;\ + mr %r3, %r8 ;\ + EPILOGUE + +ENTRY_DIRECT(casueword32) + CASUEWORD32(%r3, %r7) + +#ifdef __powerpc64__ +#define CASUEWORD64(raddr, rpcb) ;\ + PROLOGUE ;\ + SET_FUSUFAULT(raddr, rpcb) ;\ + li %r8, 0 ;\ +1: ;\ + ldarx %r0, 0, %r3 ;\ + cmpld %r4, %r0 ;\ + bne 2f ;\ + stdcx. %r6, 0, %r3 ;\ + bne- 3f ;\ + b 4f ;\ +2: ;\ + stdcx. %r0, 0, %r3 /* clear reservation (74xx) */ ;\ +3: ;\ + li %r8, 1 ;\ +4: ;\ + std %r0, 0(%r5) ;\ + CLEAR_FAULT_NO_CLOBBER(rpcb) ;\ + mr %r3, %r8 ;\ + EPILOGUE + +ENTRY_DIRECT(casueword) + CASUEWORD64(%r3, %r7) + +ENTRY_DIRECT(casueword64) + CASUEWORD64(%r3, %r7) +#else +ENTRY_DIRECT(casueword) + CASUEWORD32(%r3, %r7) +#endif + +_NAKED_ENTRY(fusufault) + CLEAR_FAULT_NO_CLOBBER(%r7) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sat Jun 6 05:46:13 2020 Return-Path: Delivered-To: svn-src-head@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 3D03B34788C; Sat, 6 Jun 2020 05:46:13 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f7mP0k1wz3gMG; Sat, 6 Jun 2020 05:46:13 +0000 (UTC) (envelope-from adrian@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 13CD81D4A5; Sat, 6 Jun 2020 05:46:13 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0565kCs6014892; Sat, 6 Jun 2020 05:46:12 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0565kC9x014891; Sat, 6 Jun 2020 05:46:12 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006060546.0565kC9x014891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 6 Jun 2020 05:46:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361863 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361863 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 05:46:13 -0000 Author: adrian Date: Sat Jun 6 05:46:12 2020 New Revision: 361863 URL: https://svnweb.freebsd.org/changeset/base/361863 Log: [net80211] Fix typo. Oops! Modified: head/sys/net80211/ieee80211_node.c Modified: head/sys/net80211/ieee80211_node.c ============================================================================== --- head/sys/net80211/ieee80211_node.c Sat Jun 6 03:54:06 2020 (r361862) +++ head/sys/net80211/ieee80211_node.c Sat Jun 6 05:46:12 2020 (r361863) @@ -2764,7 +2764,7 @@ ieee80211_node_join(struct ieee80211_node *ni, int res ni->ni_flags & IEEE80211_NODE_HT ? (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", - ni->ni_flags & IEEE80211_NODE_AMSDU ? " (+ASPDU)" : "", + ni->ni_flags & IEEE80211_NODE_AMSDU ? " (+AMSDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "", From owner-svn-src-head@freebsd.org Sat Jun 6 06:17:54 2020 Return-Path: Delivered-To: svn-src-head@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 4FCC4347D58; Sat, 6 Jun 2020 06:17:54 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f8Sx6n58z41tj; Sat, 6 Jun 2020 06:17:52 +0000 (UTC) (envelope-from adrian@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 D9D981DA50; Sat, 6 Jun 2020 06:17:51 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0566HpOX033528; Sat, 6 Jun 2020 06:17:51 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0566HpjP033527; Sat, 6 Jun 2020 06:17:51 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006060617.0566HpjP033527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 6 Jun 2020 06:17:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361864 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361864 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:17:54 -0000 Author: adrian Date: Sat Jun 6 06:17:51 2020 New Revision: 361864 URL: https://svnweb.freebsd.org/changeset/base/361864 Log: [net80211] Fix this typo! I've just started using this macro in upcoming amsdu/ampdu/ff rework and yes, too many parens. Oops! Modified: head/sys/net80211/ieee80211_ht.h Modified: head/sys/net80211/ieee80211_ht.h ============================================================================== --- head/sys/net80211/ieee80211_ht.h Sat Jun 6 05:46:12 2020 (r361863) +++ head/sys/net80211/ieee80211_ht.h Sat Jun 6 06:17:51 2020 (r361864) @@ -74,7 +74,7 @@ struct ieee80211_tx_ampdu { * A-MSDU in A-MPDU */ #define IEEE80211_AMPDU_RUNNING_AMSDU(tap) \ - ((((tap)->txa_flags & (IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_AMSDU)) \ + (((tap)->txa_flags & (IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_AMSDU)) \ == (IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_AMSDU)) /* return non-zero if AMPDU tx for the TID was NACKed */ From owner-svn-src-head@freebsd.org Sat Jun 6 06:20:05 2020 Return-Path: Delivered-To: svn-src-head@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 185C6347FA7; Sat, 6 Jun 2020 06:20:05 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f8WS6wV6z4226; Sat, 6 Jun 2020 06:20:04 +0000 (UTC) (envelope-from imp@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 E46501DBB6; Sat, 6 Jun 2020 06:20:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0566K46V033959; Sat, 6 Jun 2020 06:20:04 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0566K4Zk033958; Sat, 6 Jun 2020 06:20:04 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006060620.0566K4Zk033958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 6 Jun 2020 06:20:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361865 - head/sys/cam/nvme X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/nvme X-SVN-Commit-Revision: 361865 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:20:05 -0000 Author: imp Date: Sat Jun 6 06:20:04 2020 New Revision: 361865 URL: https://svnweb.freebsd.org/changeset/base/361865 Log: Ensure that we send at least LBA range per TRIM. Modified: head/sys/cam/nvme/nvme_da.c Modified: head/sys/cam/nvme/nvme_da.c ============================================================================== --- head/sys/cam/nvme/nvme_da.c Sat Jun 6 06:17:51 2020 (r361864) +++ head/sys/cam/nvme/nvme_da.c Sat Jun 6 06:20:04 2020 (r361865) @@ -1082,6 +1082,7 @@ ndastart(struct cam_periph *periph, union ccb *start_c TAILQ_INIT(&trim->bps); bp1 = bp; ents = min(nitems(trim->dsm), nda_max_trim_entries); + ents = max(ents, 1); dsm_range = trim->dsm; dsm_end = dsm_range + ents; do { From owner-svn-src-head@freebsd.org Sat Jun 6 06:21:16 2020 Return-Path: Delivered-To: svn-src-head@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 7462C3282F1; Sat, 6 Jun 2020 06:21:16 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f8Xr2SKSz42Lj; Sat, 6 Jun 2020 06:21:16 +0000 (UTC) (envelope-from imp@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 4FA591DC10; Sat, 6 Jun 2020 06:21:16 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0566LGr0037159; Sat, 6 Jun 2020 06:21:16 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0566LGxY037158; Sat, 6 Jun 2020 06:21:16 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006060621.0566LGxY037158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 6 Jun 2020 06:21:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361866 - head/sys/cam/nvme X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/nvme X-SVN-Commit-Revision: 361866 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:21:16 -0000 Author: imp Date: Sat Jun 6 06:21:15 2020 New Revision: 361866 URL: https://svnweb.freebsd.org/changeset/base/361866 Log: Add a tunable for the nvd symlink creation. Some automation tries to detect if nvd or nda is in used, and the presence of both confuses it. Provide a knob to turn off nvd alias creation (kern.cam.nda.nvd_compat=0) for these situations. The default is the same: create the nvd compat link. Modified: head/sys/cam/nvme/nvme_da.c Modified: head/sys/cam/nvme/nvme_da.c ============================================================================== --- head/sys/cam/nvme/nvme_da.c Sat Jun 6 06:20:04 2020 (r361865) +++ head/sys/cam/nvme/nvme_da.c Sat Jun 6 06:21:15 2020 (r361866) @@ -185,11 +185,14 @@ static int nda_send_ordered = NDA_DEFAULT_SEND_ORDERED static int nda_default_timeout = NDA_DEFAULT_TIMEOUT; static int nda_max_trim_entries = NDA_MAX_TRIM_ENTRIES; static int nda_enable_biospeedup = 1; +static int nda_nvd_compat = 1; SYSCTL_INT(_kern_cam_nda, OID_AUTO, max_trim, CTLFLAG_RDTUN, &nda_max_trim_entries, NDA_MAX_TRIM_ENTRIES, "Maximum number of BIO_DELETE to send down as a DSM TRIM."); SYSCTL_INT(_kern_cam_nda, OID_AUTO, enable_biospeedup, CTLFLAG_RDTUN, - &nda_enable_biospeedup, 0, "Enable BIO_SPEEDUP processing"); + &nda_enable_biospeedup, 0, "Enable BIO_SPEEDUP processing."); +SYSCTL_INT(_kern_cam_nda, OID_AUTO, nvd_compat, CTLFLAG_RDTUN, + &nda_nvd_compat, 1, "Enable creation of nvd aliases."); /* * All NVMe media is non-rotational, so all nvme device instances @@ -950,7 +953,8 @@ ndaregister(struct cam_periph *periph, void *arg) /* * Add alias for older nvd drives to ease transition. */ - disk_add_alias(disk, "nvd"); + if (nda_nvd_compat) + disk_add_alias(disk, "nvd"); /* * Acquire a reference to the periph before we register with GEOM. From owner-svn-src-head@freebsd.org Sat Jun 6 06:21:22 2020 Return-Path: Delivered-To: svn-src-head@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 4B500347CFD; Sat, 6 Jun 2020 06:21:22 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f8Xx20DMz42Wp; Sat, 6 Jun 2020 06:21:21 +0000 (UTC) (envelope-from imp@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 E47D71DE81; Sat, 6 Jun 2020 06:21:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0566LKGM037214; Sat, 6 Jun 2020 06:21:20 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0566LKGZ037213; Sat, 6 Jun 2020 06:21:20 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006060621.0566LKGZ037213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 6 Jun 2020 06:21:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361867 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 361867 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:21:22 -0000 Author: imp Date: Sat Jun 6 06:21:20 2020 New Revision: 361867 URL: https://svnweb.freebsd.org/changeset/base/361867 Log: Document all the sysctl values for the nda devices. Include some minimal documentation on namespace support for nda devices. Fix a few typos and formatting nits to apease igor. Modified: head/share/man/man4/nda.4 Modified: head/share/man/man4/nda.4 ============================================================================== --- head/share/man/man4/nda.4 Sat Jun 6 06:21:15 2020 (r361866) +++ head/share/man/man4/nda.4 Sat Jun 6 06:21:20 2020 (r361867) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2017 +.Dd June 6, 2020 .Dt NDA 4 .Os .Sh NAME @@ -48,37 +48,156 @@ variables and .Xr loader 8 tunables: .Bl -tag -width 12 +.It Va hw.nvme.use_nvd +The +.Xr nvme 4 +driver will create +.Nm +device nodes for block storage when set to 0. +Create +.Xr nvd 4 +device nodes for block storage when set to 1. +See +.Xr nvd 4 +when set to 1. +.It Va kern.cam.nda.nvd_compat +When set to 1, +.Xr nvd 4 +aliases will be created for all +.Nm +devices, including partitions and other +.Xr goem 4 +providers that take their names from the disk's name. +.Xr nvd +devices will not, however, be reported in the +.Va kern.disks +.Xr sysctl 8 . .It Va kern.cam.nda.sort_io_queue -.Pp This variable determines whether the software queued entries are sorted in LBA order or not. Sorting is almost always a waste of time. The default is to not sort. +.It Va kern.cam.nda.enable_biospeedup +This variable determines if the +.Nm +devices participate in the speedup protocol. +When the device participates in the speedup, then when the upper layers +send a +.Va BIO_SPEEDUP , +all current +.Va BIO_DELETE +requests not yet sent to the hardware are completed successfully immediate +without sending them to the hardware. +Used in low disk space scenarios when the filesystem encounters +a critical shortage and needs blocks immediately. +Since trims have maximum benefit when the LBA is unused for a long time, +skipping the trim when space is needed for immediate writes results in little to +no excess wear. +When participation is disabled, +.Va BIO_SPEEDUP +requests are ignored. +.It Va kern.cam.nda.max_trim +The maximum number of LBA ranges to be collected together for each DSM trims +send to the hardware. +Defaults to 256, which is the maximum number of ranges the protocol supports. +Sometimes poor trim performance can be mitigated by limiting the number of +ranges sent to the device. +This value must be between 1 and 256 inclusive. .El .Pp The following report per-device settings, and are read-only unless -otherwise indicated. Replace +otherwise indicated. +Replace .Va N with the device unit number. .Bl -tag -width 12 .It Va kern.cam.nda.N.rotating -.Pp This variable reports whether the storage volume is spinning or flash. -It's value is hard coded to 0 indicating flash. +Its value is hard coded to 0 indicating flash. .It Va kern.cam.nda.N.unmapped_io This variable reports whether the .Nm driver accepts unmapped I/O for this unit. +.It Va kern.cam.nda.N.flags +This variable reports the current flags. +.Bl -tag -width 12 +.It Va OPEN +The device is open. +.It Va DIRTY +Set when a write to the drive is scheduled. +Cleared after flush commands. +.It Va SCTX_INIT +Internal flag set after +.Xr sysctl 8 +nodes have been created. .El +.It Va kern.cam.nda.N.sort_io_queue +Same as the +.Va kern.cam.nda.sort_io_queue +tunable. +.It Va kern.cam.nda.N.trim_ticks +Writable. +When greater than zero, hold trims for up to this many ticks before sending +to the drive. +Sometimes waiting a little bit to collect more trims to send at one time +improves trim performance. +When 0, no delaying of trims are done. +.It Va kern.cam.nda.N.trim_goal +Writable. +When delaying a bit to collect multiple trims, send the accumulated DSM TRIM to +the drive. +.It Va kern.cam.nda.N.trim_lbas +Total number of LBAs that have been trimmed. +.It Va kern.cam.nda.N.trim_ranges +Total number of LBA ranges that have been trimmed. +.It Va kern.cam.nda.N.trim_count +Total number of trims sent to the hardware. +.It Va kern.cam.nda.N.deletes +Total number of +.Va BIO_DELETE +requests queued to the device. +.El +.Sh NAMESPACE MAPPING +Each +.Xr nvme 4 +drive has one or more namespaces associated with it. +One instance of the +.Nm +driver will be created for each of the namespaces on +the drive. +All the +.Nm +nodes for a +.Xr nvme 4 +device are at target 0. +However, the namespace ID maps to the CAM lun, as reported +in kernel messages and in the +.Va devlist +sub command of +.Xr camcontrol 8 . +.Pp +Namespaces are managed with the +.Va ns +sub command of +.Xr nvmecontrol 8 . +Not all drives support namespace management, +but all drives support at least one namespace. +Device nodes for +.Nm +will be created and destroyed dynamically as +namespaces are activated or detached. .Sh FILES .Bl -tag -width ".Pa /dev/nda*" -compact .It Pa /dev/nda* NVMe storage device nodes .El .Sh SEE ALSO +.Xr cam 4 , +.Xr geom 4 , .Xr nvd 4 , -.Xr nvme 4 +.Xr nvme 4 , +.Xr gpart 8 .Sh HISTORY The .Nm From owner-svn-src-head@freebsd.org Sat Jun 6 06:22:34 2020 Return-Path: Delivered-To: svn-src-head@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 70A0D32813C; Sat, 6 Jun 2020 06:22:34 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [18.222.6.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.soaustin.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49f8ZL2RvNz42hQ; Sat, 6 Jun 2020 06:22:34 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from lonesome.com (unknown [18.188.142.31]) by mail.soaustin.net (Postfix) with ESMTPSA id 8102E13E42; Sat, 6 Jun 2020 06:22:33 +0000 (UTC) Date: Sat, 6 Jun 2020 06:22:32 +0000 From: Mark Linimon To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361867 - head/share/man/man4 Message-ID: <20200606062231.GA11228@lonesome.com> References: <202006060621.0566LKGZ037213@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006060621.0566LKGZ037213@repo.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Rspamd-Queue-Id: 49f8ZL2RvNz42hQ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:18.220.0.0/14, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:22:34 -0000 On Sat, Jun 06, 2020 at 06:21:20AM +0000, Warner Losh wrote: > Document all the sysctl values for the nda devices. Thank you. mcl From owner-svn-src-head@freebsd.org Sat Jun 6 06:24:32 2020 Return-Path: Delivered-To: svn-src-head@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 075E3328361 for ; Sat, 6 Jun 2020 06:24:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f8cb1wqjz43Kj for ; Sat, 6 Jun 2020 06:24:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf34.google.com with SMTP id p15so5856319qvr.9 for ; Fri, 05 Jun 2020 23:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eRX6NDt97y0v/YkQYwxNtEF0OilO3QKOrb4pTEAFCRU=; b=z+6z8bTSg0QuInjMXYv2bk8YtTftj2Ds1AHXMvqnnGUA8Z/rcSHa1HuJl9QVcghLdN YiBuOunKGYj7j4locpzd7e+UbE6gRO8qc5qjFi0NPzHvqoOC2isrwyJ4+b/rgzxOd+uq LXa+x9DfmKgkq41sNpoFPx8D8QmQOAGhFCN93mxqJYCqO4BVSGn5VtvMs0TRyXux6drL vwuBLlnwxcQgzQS37239+wOKWCWtEn9Ib+wMKzCxiokCQ8dwO4zxX63Cat3DywUF/TLe hPeLA3NiAojgRivx9u9QEVcYNcQU03PZWnvg6kEVHWElA8RP7XiqzzSfO1KiPyZt+5RM ymQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eRX6NDt97y0v/YkQYwxNtEF0OilO3QKOrb4pTEAFCRU=; b=rHIzvsi6CF1Rp9HucET/MV/372Un2Acu5n3H1AEpdooDYkBN5b0OadBEcNqJbseONd LApzBwYN6Wsubs2yhdUyydeotBncxePpiO5+C3waeW2oOlZZmHgzllh0CZ5RsWQPVrhu cKVKeLCC08Y7ZqM9FWPM+X60x6UEZPicN+T80EFExYVkOqC+vLODS1/gxNuicmdtLjOV euMLdsc7+vOxZuC7Ap40E6OsJ1lYgu0vf2a5JeKXQr2CQr/y5MnZcx2E3B8XOzih5hsy 1va27SrIzGZCgKCrXdSUQH2EcCB2WGsau1XYzxqzmG+uUmVOBgN5unaMx6sHnzbxMQ9H AP/w== X-Gm-Message-State: AOAM532m6/lsrupud7YSSoAPSKVhigQV+8GaeREVE1ThuP4YMMGfDe92 sHqcgU7IzjDQ99xexhOX9Xy/yxTFI8/Xjk4D6dw5kw== X-Google-Smtp-Source: ABdhPJw4/eQiHBUUKl0AuVDn18Iy9X7D7Oho7PFBuSdNAvp9qVI1zoapLjKhtf1j0BIX4lCIKeoJAVZJZv92Stq1+E0= X-Received: by 2002:a0c:910c:: with SMTP id q12mr12699388qvq.22.1591424670189; Fri, 05 Jun 2020 23:24:30 -0700 (PDT) MIME-Version: 1.0 References: <202006060621.0566LKGZ037213@repo.freebsd.org> <20200606062231.GA11228@lonesome.com> In-Reply-To: <20200606062231.GA11228@lonesome.com> From: Warner Losh Date: Sat, 6 Jun 2020 00:24:19 -0600 Message-ID: Subject: Re: svn commit: r361867 - head/share/man/man4 To: Mark Linimon Cc: Warner Losh , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49f8cb1wqjz43Kj X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=z+6z8bTS; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f34) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.56 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.97)[-0.974]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.96)[-0.964]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.62)[-0.618]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f34:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:24:32 -0000 On Sat, Jun 6, 2020 at 12:22 AM Mark Linimon wrote: > On Sat, Jun 06, 2020 at 06:21:20AM +0000, Warner Losh wrote: > > Document all the sysctl values for the nda devices. > > Thank you. > You are welcome. This is overdue. And is likely missing a MFC After line. And if you read developers, you know why I did it. :) Warner From owner-svn-src-head@freebsd.org Sat Jun 6 06:46:41 2020 Return-Path: Delivered-To: svn-src-head@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 20FEB3293A7; Sat, 6 Jun 2020 06:46:41 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (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 49f9685MtSz45b5; Sat, 6 Jun 2020 06:46:40 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 13B3C499; Sat, 6 Jun 2020 02:46:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 06 Jun 2020 02:46:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuripv.dev; h= subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s=fm1; bh=f 3IKlqS6i4BMnKnJXUYfuROVeStsJ8aIsQOoWHdqn2Y=; b=EYAFqsEtG+Vi9x7Zg P6n6csVdwUManyHi3MzrJNuRcVFx9k5n3yyKYc2Sc524FF/cvG1b0OwSKP9d4iNx 6wmJdItx185X01vcV+bpeemgiu+2kvh0AJKR5crBRe2hqqa9+HZfY8FLVAcGA5RM RFjrddQLEZ6VRNPA5pUQgIoRxVlxRiVSWrGA/au0/hTsBL645F1LkTYAfoy81mNw gANM8Ie/m1o4F1QlqFdL2ICqpSrhQowGxOjgd6JJyZBAWM4tn/7BTmrvQaNvYoLI qGJo4+rSx9c/6V7IhWQxCapmnsfINIYPmy5yil0dvUjllzKVVSgUvCUBGPOyUnlW 5oRCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=f3IKlqS6i4BMnKnJXUYfuROVeStsJ8aIsQOoWHdqn 2Y=; b=B/0xmG+oJzwtbyT7hTIEgg6iTKXLeAwNnPPTIMCNsYhMKikMPqs7DO+lQ 798vfYK29CNZCArjaoNMr9N5oM14RGLGTxCcQ5dzRV3jNjjpq1est0K+CiQDeclC XiwJ39jzkRwsjvwthCgT0OLpf88Ok+6eyt4aHYyIjeSFhA2DVna2klQ41iZ8g3mP Q56VZ1u/Hv0uY5Lm68+fHXKkNcl97/lsgacmq2e4SOyWBSoeEwd6X1M002A8Jjo8 K55gy4Uzg7wdveBa2dvqP1021e8QS5fLlaEv8e0oDToNMt13sETckYxi+kxIAntv +j9oHeRKXyX4M60p6rAzGuRHCV0JA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudeggedguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepuffvfhfhkffffgggjggtgfesth ejredttdefjeenucfhrhhomhepjghurhhiucfrrghnkhhovhcuoeihuhhrihhpvheshihu rhhiphhvrdguvghvqeenucggtffrrghtthgvrhhnpeeikeetfedtfedtkefhffeuleejfe ffgfffffeuhfehgfehjedvgeefheeivedugfenucffohhmrghinhepfhhrvggvsghsugdr ohhrghenucfkphepledurddvgedtrdduvdegrddufeeknecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhephihurhhiphhvseihuhhrihhpvhdruggv vh X-ME-Proxy: Received: from [192.168.1.6] (unknown [91.240.124.138]) by mail.messagingengine.com (Postfix) with ESMTPA id A3043328005D; Sat, 6 Jun 2020 02:46:36 -0400 (EDT) Subject: Re: svn commit: r361867 - head/share/man/man4 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006060621.0566LKGZ037213@repo.freebsd.org> From: Yuri Pankov Message-ID: <3c6dcb5e-3579-8dfc-3ade-b399eca6aa79@yuripv.dev> Date: Sat, 6 Jun 2020 09:46:35 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <202006060621.0566LKGZ037213@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49f9685MtSz45b5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:46:41 -0000 Warner Losh wrote: > Author: imp > Date: Sat Jun 6 06:21:20 2020 > New Revision: 361867 > URL: https://svnweb.freebsd.org/changeset/base/361867 > > Log: > Document all the sysctl values for the nda devices. Include some minimal > documentation on namespace support for nda devices. Fix a few typos > and formatting nits to apease igor. > > Modified: > head/share/man/man4/nda.4 > > Modified: head/share/man/man4/nda.4 > ============================================================================== > --- head/share/man/man4/nda.4 Sat Jun 6 06:21:15 2020 (r361866) > +++ head/share/man/man4/nda.4 Sat Jun 6 06:21:20 2020 (r361867) > @@ -25,7 +25,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd December 20, 2017 > +.Dd June 6, 2020 > .Dt NDA 4 > .Os > .Sh NAME > @@ -48,37 +48,156 @@ variables and > .Xr loader 8 > tunables: > .Bl -tag -width 12 > +.It Va hw.nvme.use_nvd > +The > +.Xr nvme 4 > +driver will create > +.Nm > +device nodes for block storage when set to 0. > +Create > +.Xr nvd 4 > +device nodes for block storage when set to 1. > +See > +.Xr nvd 4 > +when set to 1. > +.It Va kern.cam.nda.nvd_compat > +When set to 1, > +.Xr nvd 4 > +aliases will be created for all > +.Nm > +devices, including partitions and other > +.Xr goem 4 A typo in the link. > +providers that take their names from the disk's name. > +.Xr nvd > +devices will not, however, be reported in the > +.Va kern.disks > +.Xr sysctl 8 . > .It Va kern.cam.nda.sort_io_queue > -.Pp > This variable determines whether the software queued entries are > sorted in LBA order or not. > Sorting is almost always a waste of time. > The default is to not sort. > +.It Va kern.cam.nda.enable_biospeedup > +This variable determines if the > +.Nm > +devices participate in the speedup protocol. > +When the device participates in the speedup, then when the upper layers > +send a > +.Va BIO_SPEEDUP , > +all current > +.Va BIO_DELETE > +requests not yet sent to the hardware are completed successfully immediate > +without sending them to the hardware. > +Used in low disk space scenarios when the filesystem encounters > +a critical shortage and needs blocks immediately. > +Since trims have maximum benefit when the LBA is unused for a long time, > +skipping the trim when space is needed for immediate writes results in little to > +no excess wear. > +When participation is disabled, > +.Va BIO_SPEEDUP > +requests are ignored. > +.It Va kern.cam.nda.max_trim > +The maximum number of LBA ranges to be collected together for each DSM trims > +send to the hardware. > +Defaults to 256, which is the maximum number of ranges the protocol supports. > +Sometimes poor trim performance can be mitigated by limiting the number of > +ranges sent to the device. > +This value must be between 1 and 256 inclusive. > .El > .Pp > The following report per-device settings, and are read-only unless > -otherwise indicated. Replace > +otherwise indicated. > +Replace > .Va N > with the device unit number. > .Bl -tag -width 12 > .It Va kern.cam.nda.N.rotating > -.Pp > This variable reports whether the storage volume is spinning or > flash. > -It's value is hard coded to 0 indicating flash. > +Its value is hard coded to 0 indicating flash. > .It Va kern.cam.nda.N.unmapped_io > This variable reports whether the > .Nm > driver accepts unmapped I/O for this unit. > +.It Va kern.cam.nda.N.flags > +This variable reports the current flags. > +.Bl -tag -width 12 > +.It Va OPEN > +The device is open. > +.It Va DIRTY > +Set when a write to the drive is scheduled. > +Cleared after flush commands. > +.It Va SCTX_INIT > +Internal flag set after > +.Xr sysctl 8 > +nodes have been created. > .El > +.It Va kern.cam.nda.N.sort_io_queue > +Same as the > +.Va kern.cam.nda.sort_io_queue > +tunable. > +.It Va kern.cam.nda.N.trim_ticks > +Writable. > +When greater than zero, hold trims for up to this many ticks before sending > +to the drive. > +Sometimes waiting a little bit to collect more trims to send at one time > +improves trim performance. > +When 0, no delaying of trims are done. > +.It Va kern.cam.nda.N.trim_goal > +Writable. > +When delaying a bit to collect multiple trims, send the accumulated DSM TRIM to > +the drive. > +.It Va kern.cam.nda.N.trim_lbas > +Total number of LBAs that have been trimmed. > +.It Va kern.cam.nda.N.trim_ranges > +Total number of LBA ranges that have been trimmed. > +.It Va kern.cam.nda.N.trim_count > +Total number of trims sent to the hardware. > +.It Va kern.cam.nda.N.deletes > +Total number of > +.Va BIO_DELETE > +requests queued to the device. > +.El > +.Sh NAMESPACE MAPPING > +Each > +.Xr nvme 4 > +drive has one or more namespaces associated with it. > +One instance of the > +.Nm > +driver will be created for each of the namespaces on > +the drive. > +All the > +.Nm > +nodes for a > +.Xr nvme 4 > +device are at target 0. > +However, the namespace ID maps to the CAM lun, as reported > +in kernel messages and in the > +.Va devlist > +sub command of > +.Xr camcontrol 8 . > +.Pp > +Namespaces are managed with the > +.Va ns > +sub command of > +.Xr nvmecontrol 8 . > +Not all drives support namespace management, > +but all drives support at least one namespace. > +Device nodes for > +.Nm > +will be created and destroyed dynamically as > +namespaces are activated or detached. > .Sh FILES > .Bl -tag -width ".Pa /dev/nda*" -compact > .It Pa /dev/nda* > NVMe storage device nodes > .El > .Sh SEE ALSO > +.Xr cam 4 , > +.Xr geom 4 , > .Xr nvd 4 , > -.Xr nvme 4 > +.Xr nvme 4 , > +.Xr gpart 8 > .Sh HISTORY > The > .Nm > From owner-svn-src-head@freebsd.org Sat Jun 6 06:49:06 2020 Return-Path: Delivered-To: svn-src-head@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 C3DF43293BF; Sat, 6 Jun 2020 06:49:06 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f98y4w1jz45jD; Sat, 6 Jun 2020 06:49:06 +0000 (UTC) (envelope-from imp@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 A3C951DDEB; Sat, 6 Jun 2020 06:49:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0566n6YK052503; Sat, 6 Jun 2020 06:49:06 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0566n6BW052502; Sat, 6 Jun 2020 06:49:06 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006060649.0566n6BW052502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 6 Jun 2020 06:49:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361868 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 361868 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 06:49:06 -0000 Author: imp Date: Sat Jun 6 06:49:06 2020 New Revision: 361868 URL: https://svnweb.freebsd.org/changeset/base/361868 Log: Fix typo Submitted by: Yuri Pankov Modified: head/share/man/man4/nda.4 Modified: head/share/man/man4/nda.4 ============================================================================== --- head/share/man/man4/nda.4 Sat Jun 6 06:21:20 2020 (r361867) +++ head/share/man/man4/nda.4 Sat Jun 6 06:49:06 2020 (r361868) @@ -66,7 +66,7 @@ When set to 1, aliases will be created for all .Nm devices, including partitions and other -.Xr goem 4 +.Xr geom 4 providers that take their names from the disk's name. .Xr nvd devices will not, however, be reported in the From owner-svn-src-head@freebsd.org Sat Jun 6 07:13:07 2020 Return-Path: Delivered-To: svn-src-head@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 6D546329BB5; Sat, 6 Jun 2020 07:13:07 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49f9hg2Ky7z4810; Sat, 6 Jun 2020 07:13:07 +0000 (UTC) (envelope-from imp@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 4B6B51E1D3; Sat, 6 Jun 2020 07:13:07 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0567D7P4070124; Sat, 6 Jun 2020 07:13:07 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0567D7Ui070123; Sat, 6 Jun 2020 07:13:07 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006060713.0567D7Ui070123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 6 Jun 2020 07:13:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361869 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 361869 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 07:13:07 -0000 Author: imp Date: Sat Jun 6 07:13:06 2020 New Revision: 361869 URL: https://svnweb.freebsd.org/changeset/base/361869 Log: Sort alphabetically. Modified: head/share/man/man4/Makefile Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Sat Jun 6 06:49:06 2020 (r361868) +++ head/share/man/man4/Makefile Sat Jun 6 07:13:06 2020 (r361869) @@ -87,7 +87,6 @@ MAN= aac.4 \ bwi.4 \ bwn.4 \ ${_bytgpio.4} \ - ${_chvgpio.4} \ capsicum.4 \ cardbus.4 \ carp.4 \ @@ -109,6 +108,7 @@ MAN= aac.4 \ cfumass.4 \ ch.4 \ chromebook_platform.4 \ + ${_chvgpio.4} \ ciss.4 \ cloudabi.4 \ cmx.4 \ From owner-svn-src-head@freebsd.org Sat Jun 6 14:19:17 2020 Return-Path: Delivered-To: svn-src-head@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 48158335147; Sat, 6 Jun 2020 14:19:17 +0000 (UTC) (envelope-from cem@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fM8P1FbMz423w; Sat, 6 Jun 2020 14:19:17 +0000 (UTC) (envelope-from cem@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 25EDD2352F; Sat, 6 Jun 2020 14:19:17 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056EJHsE029932; Sat, 6 Jun 2020 14:19:17 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056EJGKf029931; Sat, 6 Jun 2020 14:19:16 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202006061419.056EJGKf029931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 6 Jun 2020 14:19:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361870 - in head/sys/geom: . label X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/sys/geom: . label X-SVN-Commit-Revision: 361870 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 14:19:17 -0000 Author: cem Date: Sat Jun 6 14:19:16 2020 New Revision: 361870 URL: https://svnweb.freebsd.org/changeset/base/361870 Log: Revert r361838 Reported by: delphij Modified: head/sys/geom/geom_dev.c head/sys/geom/label/g_label.c Modified: head/sys/geom/geom_dev.c ============================================================================== --- head/sys/geom/geom_dev.c Sat Jun 6 07:13:06 2020 (r361869) +++ head/sys/geom/geom_dev.c Sat Jun 6 14:19:16 2020 (r361870) @@ -336,20 +336,9 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, struct cdev *dev, *adev; char buf[SPECNAMELEN + 6]; struct make_dev_args args; - bool retaste; g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); - /* Only one geom_dev per provider. */ - LIST_FOREACH(cp, &pp->consumers, consumers) { - if (cp->geom->class != mp || (cp->flags & G_CF_SPOILED)) - continue; - gp = cp->geom; - sc = cp->private; - dev = sc->sc_dev; - retaste = true; - goto aliases; - } gp = g_new_geomf(mp, "%s", pp->name); sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO); mtx_init(&sc->sc_mtx, "g_dev", NULL, MTX_DEF); @@ -391,8 +380,6 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, g_dev_attrchanged(cp, "GEOM::physpath"); snprintf(buf, sizeof(buf), "cdev=%s", gp->name); devctl_notify_f("GEOM", "DEV", "CREATE", buf, M_WAITOK); - retaste = false; -aliases: /* * Now add all the aliases for this drive */ @@ -400,16 +387,8 @@ aliases: error = make_dev_alias_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK, &adev, dev, "%s", gap->ga_alias); if (error) { - /* - * With aliases added after initial taste, we don't - * know which aliases are new in this retaste, so we - * try to create all of them. EEXIST is expected and - * silently ignored or else this becomes really spammy. - */ - if (error != EEXIST || !retaste) - printf("%s: make_dev_alias_p() failed (name=%s," - " error=%d)\n", __func__, gap->ga_alias, - error); + printf("%s: make_dev_alias_p() failed (name=%s, error=%d)\n", + __func__, gap->ga_alias, error); continue; } snprintf(buf, sizeof(buf), "cdev=%s", gap->ga_alias); Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Sat Jun 6 07:13:06 2020 (r361869) +++ head/sys/geom/label/g_label.c Sat Jun 6 14:19:16 2020 (r361870) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -345,16 +344,18 @@ g_label_taste(struct g_class *mp, struct g_provider *p { struct g_label_metadata md; struct g_consumer *cp; - struct g_class *clsp; struct g_geom *gp; int i; - bool changed; g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, pp->name); g_topology_assert(); G_LABEL_DEBUG(2, "Tasting %s.", pp->name); + /* Skip providers that are already open for writing. */ + if (pp->acw > 0) + return (NULL); + if (strcmp(pp->geom->class->name, mp->name) == 0) return (NULL); @@ -390,16 +391,9 @@ g_label_taste(struct g_class *mp, struct g_provider *p if (md.md_provsize != pp->mediasize) break; - /* Skip providers that are already open for writing. */ - if (pp->acw > 0) { - g_access(cp, -1, 0, 0); - goto end; - } - g_label_create(NULL, mp, pp, md.md_label, G_LABEL_DIR, pp->mediasize - pp->sectorsize); } while (0); - changed = false; for (i = 0; g_labels[i] != NULL; i++) { char label[128]; @@ -411,28 +405,8 @@ g_label_taste(struct g_class *mp, struct g_provider *p g_topology_lock(); if (label[0] == '\0') continue; - if (!g_label_is_name_ok(label)) { - G_LABEL_DEBUG(0, - "%s contains suspicious label, skipping.", - pp->name); - G_LABEL_DEBUG(1, "%s suspicious label is: %s", - pp->name, label); - continue; - } - g_provider_add_alias(pp, "%s/%s", g_labels[i]->ld_dir, label); - changed = true; - } - /* - * Force devfs interface to retaste the provider, to catch the new - * alias(es). - */ - if (changed) { - LIST_FOREACH(clsp, &g_classes, class) { - if (strcmp(clsp->name, "DEV") != 0) - continue; - clsp->taste(clsp, pp, 0); - break; - } + g_label_create(NULL, mp, pp, label, g_labels[i]->ld_dir, + pp->mediasize); } g_access(cp, -1, 0, 0); end: From owner-svn-src-head@freebsd.org Sat Jun 6 14:55:24 2020 Return-Path: Delivered-To: svn-src-head@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 78310336241 for ; Sat, 6 Jun 2020 14:55:24 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fMy347zHz45bg for ; Sat, 6 Jun 2020 14:55:23 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qv1-xf35.google.com with SMTP id dp10so6219753qvb.10 for ; Sat, 06 Jun 2020 07:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fL2ixSykCeCmzyk+P6KQ9i1JiFOpAhIcLxMXK8/YqCA=; b=blsW12COtAAakqsU4/dKRKdL3YuTjBaaOFR9kWZqJuM/vP2ZwZ6UC6E7hznW3xlSEk rqxCWvyl1zibBFILhYlrZAOPc+oIbDREt/AwPii4BzfVqwcCw05kGbt7rsv71s+yxezU le9g9qrET5XDE6+OV7eRK0lwh5CPkQXWWCzhgT7BZaHDKps4a/akgRs5eVEOaPfoAJXb QfLkbOQ9WfhT8cVFyOHBCtheGrblxijtAqFnOIjmIg7VYDG+ht+kPVEgHDv+XegK09SX XkYkncnLuCb9Lc1aqiTQx1MCvpY1bm/xCMg00OaSkIBvgpzai3Q3kNl2gohNKv5ReX0P 6Eeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fL2ixSykCeCmzyk+P6KQ9i1JiFOpAhIcLxMXK8/YqCA=; b=EXktO9nEJFyRsSZGEDFFBrgEo1Rg2xDaEwC3xMQtv39PiacPdpUoV4DxyZgXbLbz3M qVoYvH8NotPHmjMSSPXe9Uo+Gdxz2Ijq2s3tupddQwO5mpzIEkQU/54zJCFfXsiJlUFA HALgDS8lu1E/rACZpsO/bENtlGf4Ii1/TbXZazFJ8A9SkWrhCKUF2m5fedk8kwYb23XT 61ja2IotUrwhMFwNqjEU/T4JjiIPs9E4QVmRV3Qizwdat62sMGp6Ubs8oAI6BWWAd/OQ FD16vJx6WNOB6N8ewLdvAim915+tz38843EcXHYJ8ilOihgAiEU3Yoh/M2Ifg+Y+VIqQ RQhA== X-Gm-Message-State: AOAM531sMUgoxLeH7IgyspDHD06BJGmWVyNe1oEHrzgTP9DTrSGOVabY qWE6MzMHkjXHxyuOt7nnDnU/TA== X-Google-Smtp-Source: ABdhPJzaa3Lsv4MVpC/Pjo5IFVOWwGf/Un7nUcsjuzl+xuvqsCTvPh+BP0mudQn0BKEwG+4gzbeKog== X-Received: by 2002:a05:6214:922:: with SMTP id dk2mr15029103qvb.87.1591455322555; Sat, 06 Jun 2020 07:55:22 -0700 (PDT) Received: from mutt-hbsd (75-148-2-186-WashingtonDC.hfc.comcastbusiness.net. [75.148.2.186]) by smtp.gmail.com with ESMTPSA id 207sm2232862qki.134.2020.06.06.07.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jun 2020 07:55:21 -0700 (PDT) Date: Sat, 6 Jun 2020 10:55:08 -0400 From: Shawn Webb To: Conrad Meyer Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361870 - in head/sys/geom: . label Message-ID: <20200606145508.bk3u7x3mpvn63hp5@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <202006061419.056EJGKf029931@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="46dlvitfhrshpply" Content-Disposition: inline In-Reply-To: <202006061419.056EJGKf029931@repo.freebsd.org> X-Rspamd-Queue-Id: 49fMy347zHz45bg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=blsW12CO; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::f35 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-4.64 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; NEURAL_HAM_MEDIUM(-1.02)[-1.016]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; NEURAL_HAM_LONG(-1.01)[-1.009]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; NEURAL_HAM_SHORT(-0.52)[-0.519]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f35:from]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 14:55:24 -0000 --46dlvitfhrshpply Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 06, 2020 at 02:19:16PM +0000, Conrad Meyer wrote: > Author: cem > Date: Sat Jun 6 14:19:16 2020 > New Revision: 361870 > URL: https://svnweb.freebsd.org/changeset/base/361870 >=20 > Log: > Revert r361838 Why? --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --46dlvitfhrshpply Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl7brkYACgkQ/y5nonf4 4foTzw/+Ml4creqmDyAfz9zTdKR5bQpEKpvgS8ihdiNH+soSQlLT4KoliiIigZtB +yikZg5hKMaYEnN+6VMHrOznpxsqQKXEMNuw2XHyuI4yfhW5sf9mowcT7IedCg0N 7D9rLf/Pp0sIy+cZOVxxfVfuRXeeDneG2E3esfH9xtwwXxGevdq11fNW4woPbE/W OJMs/UhBVLBPS4fTvC7TRBe4j/f5k0sPEpO5CaZbKXsGdGiMV8TE0ZAbpViGv+gi p9ce81fM755zreafV46/ddAknPUTgJ9b6H6WCjNndeOOTEnkZaseUk8h0tHR89no KgXhbwSInArN+chZJ+wXSEIaydHmmoE4xZGPfZkf5lhqIyFN5FtcuNGqQ9cb/Kxb pfdYpSB0LyhNlhURPaLQczTCuFQTmijJfRKsCbO2iEoC+/ML4isdRKru1UbMU5+0 PDsQaBLAVO8PED1Qr3T+9Cok3T5CqlC6i13qYvnvNTu0dq2rwLqxh9bAcWXx+Y8d gIJPJjHZI5+eYASnZwB0qcQ0J/F5uB/iThZhE2k6ouf93Ma2W/TF/LiaLueLs4l6 EMh0CfDVVDzfiVG3uvYM9Dbi7CTKSOC33d/CpKrVG39mp4smdOwVuiT8F+w5jqAu K5zj+iCsfSoippX2zXpQe4FdGTMOH2YFDY51QIyctUSkzuzuE4c= =wKR2 -----END PGP SIGNATURE----- --46dlvitfhrshpply-- From owner-svn-src-head@freebsd.org Sat Jun 6 15:01:46 2020 Return-Path: Delivered-To: svn-src-head@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 23CD7336907; Sat, 6 Jun 2020 15:01:46 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from tor1-11.mx.scaleengine.net (tor1-11.mx.scaleengine.net [IPv6:2001:470:1:474::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49fN5P5Lqrz46Bt; Sat, 6 Jun 2020 15:01:45 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from [10.1.1.2] (Seawolf.HML3.ScaleEngine.net [209.51.186.28]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by tor1-11.mx.scaleengine.net (Postfix) with ESMTPSA id 4E372173DD; Sat, 6 Jun 2020 15:01:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.10.3 tor1-11.mx.scaleengine.net 4E372173DD Subject: Re: svn commit: r361870 - in head/sys/geom: . label To: Shawn Webb , Conrad Meyer Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006061419.056EJGKf029931@repo.freebsd.org> <20200606145508.bk3u7x3mpvn63hp5@mutt-hbsd> From: Allan Jude Autocrypt: addr=allanjude@freebsd.org; prefer-encrypt=mutual; keydata= xsFNBFVwZcYBEADwrZDH0xe0ZVjc9ORCc6PcBLwS/RTXA6NkvpD6ea02pZ8lPOVgteuuugFc D34LdDbiWr+479vfrKBh+Y38GL0oZ0/13j10tIlDMHSa5BU0y6ACtnhupFvVlQ57+XaJAb/q 7qkfSiuxVwQ3FY3PL3cl1RrIP5eGHLA9hu4eVbu+FOX/q/XVKz49HaeIaxzo2Q54572VzIo6 C28McX9m65UL5fXMUGJDDLCItLmehZlHsQQ+uBxvODLFpVV2lUgDR/0rDa0B9zHZX8jY8qQ7 ZdCSy7CwClXI054CkXZCaBzgxYh/CotdI8ezmaw7NLs5vWNTxaDEFXaFMQtMVhvqQBpHkfOD 7rjjOmFw00nJL4FuPE5Yut0CPyx8vLjVmNJSt/Y8WxxmhutsqJYFgYfWl/vaWkrFLur/Zcmz IklwLw35HLsCZytCN5A3rGKdRbQjD6QPXOTJu0JPrJF6t2xFkWAT7oxnSV0ELhl2g+JfMMz2 Z1PDmS3NRnyEdqEm7NoRGXJJ7bgxDbN+9SXTyOletqGNXj/bSrBvhvZ0RQrzdHAPwQUfVSU2 qBhQEi2apSZstgVNMan0GUPqCdbE2zpysg+zT7Yhvf9EUQbzPL4LpdK1llT9fZbrdMzEXvEF oSvwJFdV3sqKmZc7b+E3PuxK6GTsKqaukd/3Cj8aLHG1T1im1QARAQABzSJBbGxhbiBKdWRl IDxhbGxhbmp1ZGVAZnJlZWJzZC5vcmc+wsF/BBMBAgApBQJVcGXGAhsjBQkSzAMABwsJCAcD AgEGFQgCCQoLBBYCAwECHgECF4AACgkQGZU1PhKYC34Muw/+JOKpSfhhysWFYiRXynGRDe07 Z6pVsn7DzrPUMRNZfHu8Uujmmy3p2nx9FelIY9yjd2UKHhug+whM54MiIFs90eCRVa4XEsPR 4FFAm0DAWrrb7qhZFcE/GhHdRWpZ341WAElWf6Puj2devtRjfYbikvj5+1V1QmDbju7cEw5D mEET44pTuD2VMRJpu2yZZzkM0i+wKFuPxlhqreufA1VNkZXI/rIfkYWK+nkXd9Efw3YdCyCQ zUgTUCb88ttSqcyhik/li1CDbXBpkzDCKI6I/8fAb7jjOC9LAtrZJrdgONywcVFoyK9ZN7EN AVA+xvYCmuYhR/3zHWH1g4hAm1v1+gIsufhajhfo8/wY1SetlzPaYkSkVQLqD8T6zZyhf+AN bC7ci44UsiKGAplB3phAXrtSPUEqM86kbnHg3fSx37kWKUiYNOnx4AC2VXvEiKsOBlpyt3dw WQbOtOYM+vkfbBwDtoGOOPYAKxc4LOIt9r+J8aD+gTooi9Eo5tvphATf9WkCpl9+aaGbSixB tUpvQMRnSMqTqq4Z7DeiG6VMRQIjsXDSLJEUqcfhnLFo0Ko/RiaHd5xyAQ4DhQ9QpkyQjjNf /3f/dYG7JAtoD30txaQ5V8uHrz210/77DRRX+HJjEj6xCxWUGvQgvEZf5XXyxeePvqZ+zQyT DX61bYw6w6bOwU0EVXBlxgEQAMy7YVnCCLN4oAOBVLZ5nUbVPvpUhsdA94/0/P+uqCIh28Cz ar56OCX0X19N/nAWecxL4H32zFbIRyDB2V/MEh4p9Qvyu/j4i1r3Ex5GhOT2hnit43Ng46z5 29Es4TijrHJP4/l/rB2VOqMKBS7Cq8zk1cWqaI9XZ59imxDNjtLLPPM+zQ1yE3OAMb475QwN UgWxTMw8rkA7CEaqeIn4sqpTSD5C7kT1Bh26+rbgJDZ77D6Uv1LaCZZOaW52okW3bFbdozV8 yM2u+xz2Qs8bHz67p+s+BlygryiOyYytpkiK6Iy4N7FTolyj5EIwCuqzfk0SaRHeOKX2ZRjC qatkgoD/t13PNT38V9tw3qZVOJDS0W6WM8VSg+F+bkM9LgJ8CmKV+Hj0k3pfGfYPOZJ/v18i +SmZmL/Uw2RghnwDWGAsPCKu4uZR777iw7n9Io6Vfxndw2dcS0e9klvFYoaGS6H2F13Asygr WBzFNGFQscN4mUW+ZYBzpTOcHkdT7w8WS55BmXYLna+dYer9/HaAuUrONjujukN4SPS1fMJ2 /CS/idAUKyyVVX5vozoNK2JVC1h1zUAVsdnmhEzNPsvBoqcVNfyqBFROEVLIPwq+lQMGNVjH ekLTKRWf59MEhUC2ztjSKkGmwdg73d6xSXMuq45EgIJV2wPvOgWQonoHH/kxABEBAAHCwWUE GAECAA8FAlVwZcYCGwwFCRLMAwAACgkQGZU1PhKYC34w5A//YViBtZyDV5O+SJT9FFO3lb9x Zdxf0trA3ooCt7gdBkdnBM6T5EmjgVZ3KYYyFfwXZVkteuCCycMF/zVw5eE9FL1+zz9gg663 nY9q2F77TZTKXVWOLlOV2bY+xaK94U4ytogOGhh9b4UnQ/Ct3+6aviCF78Go608BXbmF/GVT 7uhddemk7ItxM1gE5Hscx3saxGKlayaOsdPKeGTVJCDEtHDuOc7/+jGh5Zxpk/Hpi+DUt1ot 8e6hPYLIQa4uVx4f1xxxV858PQ7QysSLr9pTV7FAQ18JclCaMc7JWIa3homZQL/MNKOfST0S 2e+msuRwQo7AnnfFKBUtb02KwpA4GhWryhkjUh/kbVc1wmGxaU3DgXYQ5GV5+Zf4kk/wqr/7 KG0dkTz6NLCVLyDlmAzuFhf66DJ3zzz4yIo3pbDYi3HB/BwJXVSKB3Ko0oUo+6/qMrOIS02L s++QE/z7K12CCcs7WwOjfCYHK7VtE0Sr/PfybBdTbuDncOuAyAIeIKxdI2nmQHzl035hhvQX s4CSghsP319jAOQiIolCeSbTMD4QWMK8RL/Pe1FI1jC3Nw9s+jq8Dudtbcj2UwAP/STUEbJ9 5rznzuuhPjE0e++EU/RpWmcaIMK/z1zZDMN+ce2v1qzgV936ZhJ3iaVzyqbEE81gDxg3P+IM kiYh4ZtPB4Q= Message-ID: <9b4145e4-2a34-549c-b9ce-a31bb5bc00e7@freebsd.org> Date: Sat, 6 Jun 2020 11:01:35 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <20200606145508.bk3u7x3mpvn63hp5@mutt-hbsd> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="99MJUdBYQY22XFEAEyCMCLjAHccv7SRst" X-Rspamd-Queue-Id: 49fN5P5Lqrz46Bt X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 15:01:46 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --99MJUdBYQY22XFEAEyCMCLjAHccv7SRst Content-Type: multipart/mixed; boundary="Waal3CNqTIAC36WHAPFpsODwaNBCbvldl"; protected-headers="v1" From: Allan Jude To: Shawn Webb , Conrad Meyer Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <9b4145e4-2a34-549c-b9ce-a31bb5bc00e7@freebsd.org> Subject: Re: svn commit: r361870 - in head/sys/geom: . label References: <202006061419.056EJGKf029931@repo.freebsd.org> <20200606145508.bk3u7x3mpvn63hp5@mutt-hbsd> In-Reply-To: <20200606145508.bk3u7x3mpvn63hp5@mutt-hbsd> --Waal3CNqTIAC36WHAPFpsODwaNBCbvldl Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 2020-06-06 10:55, Shawn Webb wrote: > On Sat, Jun 06, 2020 at 02:19:16PM +0000, Conrad Meyer wrote: >> Author: cem >> Date: Sat Jun 6 14:19:16 2020 >> New Revision: 361870 >> URL: https://svnweb.freebsd.org/changeset/base/361870 >> >> Log: >> Revert r361838 >=20 > Why? >=20 https://lists.freebsd.org/pipermail/freebsd-current/2020-June/076210.html= --=20 Allan Jude --Waal3CNqTIAC36WHAPFpsODwaNBCbvldl-- --99MJUdBYQY22XFEAEyCMCLjAHccv7SRst Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQIcBAEBAgAGBQJe26/SAAoJEBmVNT4SmAt+igsP/R3FzDxaaiiKyXml97aQpN2N hKnlQkUwzb+aCBcbuf7BBGE7LRF99lTbksQ6t42Wdn7+AccBY511Ju4LqPXs16RN VMR4bpoZK2IMD0h/iC6qS+VYU4LAYc+gSoEQqx1HsAPk5xCN9hKlnOcfxLidLpsz ICRduH/a/btfp7XBf/rB2tFGw8DPfnz6odsbX/F5ErxHiZJlqKLv9Zv4gfjeZX+n ghCfwWzIYW7c2fnfo5ef/a8pufDk/80TtOB1k16gYMajb3snBe2/BX6RUmLak66W aGMJxFuBFkhQpO5W9oAe/ONPax901vjvKcp6VEEGOVtpBjAkB1hmLXmlmFFjn/FT FvPel20HkUeOriRD0gTo/ix5eNt4eUPBwJJ/YdrqeM6Gxsfjx70fqDfn8uTbDcwX rcvH7BQbL3zLJ/Wlo+J86uIe7NUPhl/ChtYAwzZNJofxYeyPHFJOuhJgK5OyF+Sq X97ByiYn/gRcmWciTcA+cYT3JW+4sW++FsKeWQIqFt67gcSYfXjpZjhZfn6u4R1o oIubAn5LdXMz84SUw3xvn6+VOXz3F/PooJWaEhidczKCa3Hwx9egVLengBQqBwaY ngNJNMPD9opytQrDS5tF3edKH/9GSoJj4OE+VNMpI/zj2BqkAx6QY/plMey426yF 3QGqed8COCxI74EgRgsd =Pmod -----END PGP SIGNATURE----- --99MJUdBYQY22XFEAEyCMCLjAHccv7SRst-- From owner-svn-src-head@freebsd.org Sat Jun 6 17:48:56 2020 Return-Path: Delivered-To: svn-src-head@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 8E66333A56D; Sat, 6 Jun 2020 17:48:56 +0000 (UTC) (envelope-from yuripv@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fRpJ3Kz9z4SCm; Sat, 6 Jun 2020 17:48:56 +0000 (UTC) (envelope-from yuripv@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 690D625861; Sat, 6 Jun 2020 17:48:56 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056HmukC061381; Sat, 6 Jun 2020 17:48:56 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056HmuvH061380; Sat, 6 Jun 2020 17:48:56 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <202006061748.056HmuvH061380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Sat, 6 Jun 2020 17:48:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361871 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 361871 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 17:48:56 -0000 Author: yuripv Date: Sat Jun 6 17:48:55 2020 New Revision: 361871 URL: https://svnweb.freebsd.org/changeset/base/361871 Log: stats(7): fix bad Xr references and lint noise Reviewed by: bjk, debdrup Differential Revision: https://reviews.freebsd.org/D25166 Modified: head/share/man/man7/stats.7 Modified: head/share/man/man7/stats.7 ============================================================================== --- head/share/man/man7/stats.7 Sat Jun 6 14:19:16 2020 (r361870) +++ head/share/man/man7/stats.7 Sat Jun 6 17:48:55 2020 (r361871) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 14, 2020 +.Dd June 6, 2020 .Dt STATS 7 .Os .Sh NAME @@ -86,31 +86,32 @@ Display system statistics Report virtual memory statistics .It Nm zpool iostat Report ZFS I/O statistics +.El .Sh SEE ALSO +.Xr btsockstat 1 , +.Xr fstat 1 , .Xr intro 1 , +.Xr lockstat 1 , +.Xr netstat 1 , +.Xr plockstat 1 , +.Xr procstat 1 , +.Xr sockstat 1 , +.Xr stat 1 , +.Xr systat 1 , .Xr intro 7 , -.Xr intro 8 , -.Xr btsockstat 1 , .Xr ctlstat 8 , -.Xr fstat 1 , .Xr gstat 8 , .Xr ibstat 8 , .Xr ifmcstat 8 , +.Xr intro 8 , .Xr iostat 8 , .Xr ipfstat 8 , .Xr kldstat 8 , -.Xr lockstat 1 , .Xr mailstats 8 , -.Xr netstat 1 , -.Xr plockstat 1 , .Xr pmcstat 8 , -.Xr procstat 1 , .Xr pstat 8 , -.Xr sockstat 1, -.Xr stat 1 , -.Xr systat 1 , .Xr vmstat 8 , -.Xr zpool-iostat 8 , +.Xr zpool 8 .Sh HISTORY The .Nm From owner-svn-src-head@freebsd.org Sat Jun 6 18:20:10 2020 Return-Path: Delivered-To: svn-src-head@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 D027933AFA0; Sat, 6 Jun 2020 18:20:10 +0000 (UTC) (envelope-from tuexen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fSVL56jFz4WJ7; Sat, 6 Jun 2020 18:20:10 +0000 (UTC) (envelope-from tuexen@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 A691C26586; Sat, 6 Jun 2020 18:20:10 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056IKA9l079760; Sat, 6 Jun 2020 18:20:10 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056IK9Fa079753; Sat, 6 Jun 2020 18:20:09 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202006061820.056IK9Fa079753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sat, 6 Jun 2020 18:20:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361872 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 361872 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 18:20:10 -0000 Author: tuexen Date: Sat Jun 6 18:20:09 2020 New Revision: 361872 URL: https://svnweb.freebsd.org/changeset/base/361872 Log: Non-functional changes due to cleanup (upstream removing of Panda support) of the code MFC after: 1 week Modified: head/sys/netinet/sctp_constants.h head/sys/netinet/sctp_indata.c head/sys/netinet/sctp_os.h head/sys/netinet/sctp_output.c head/sys/netinet/sctp_pcb.c head/sys/netinet/sctp_usrreq.c Modified: head/sys/netinet/sctp_constants.h ============================================================================== --- head/sys/netinet/sctp_constants.h Sat Jun 6 17:48:55 2020 (r361871) +++ head/sys/netinet/sctp_constants.h Sat Jun 6 18:20:09 2020 (r361872) @@ -576,7 +576,6 @@ __FBSDID("$FreeBSD$"); */ #define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512 - /* * Basically the minimum amount of time before I do a early FR. Making this * value to low will cause duplicate retransmissions. @@ -756,9 +755,8 @@ __FBSDID("$FreeBSD$"); #define SCTP_FROM_SCTP_ASCONF 0x80000000 #define SCTP_FROM_SCTP_OUTPUT 0x90000000 #define SCTP_FROM_SCTP_PEELOFF 0xa0000000 -#define SCTP_FROM_SCTP_PANDA 0xb0000000 -#define SCTP_FROM_SCTP_SYSCTL 0xc0000000 -#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xd0000000 +#define SCTP_FROM_SCTP_SYSCTL 0xb0000000 +#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xc0000000 /* Location ID's */ #define SCTP_LOC_1 0x00000001 Modified: head/sys/netinet/sctp_indata.c ============================================================================== --- head/sys/netinet/sctp_indata.c Sat Jun 6 17:48:55 2020 (r361871) +++ head/sys/netinet/sctp_indata.c Sat Jun 6 18:20:09 2020 (r361872) @@ -2721,8 +2721,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o * cluster... i.e. it is a small packet sent in and yet the driver * underneath allocated a full cluster for it. If so we must copy it * to a smaller mbuf and free up the cluster mbuf. This will help - * with cluster starvation. Note for __Panda__ we don't do this - * since it has clusters all the way down to 64 bytes. + * with cluster starvation. */ if (SCTP_BUF_LEN(m) < (long)MLEN && SCTP_BUF_NEXT(m) == NULL) { /* we only handle mbufs that are singletons.. not chains */ Modified: head/sys/netinet/sctp_os.h ============================================================================== --- head/sys/netinet/sctp_os.h Sat Jun 6 17:48:55 2020 (r361871) +++ head/sys/netinet/sctp_os.h Sat Jun 6 18:20:09 2020 (r361872) @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); - /* All os's must implement this address gatherer. If * no VRF's exist, then vrf 0 is the only one and all * addresses and ifn's live here. Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Sat Jun 6 17:48:55 2020 (r361871) +++ head/sys/netinet/sctp_output.c Sat Jun 6 18:20:09 2020 (r361872) @@ -6475,8 +6475,7 @@ error_out: appendchain = clonechain; } else { if (!copy_by_ref && - (sizeofcpy <= (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN))) - ) { + (sizeofcpy <= (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN)))) { /* Its not in a cluster */ if (*endofchain == NULL) { /* lets get a mbuf cluster */ @@ -13526,12 +13525,6 @@ skip_preblock: error = sctp_msg_append(stcb, net, top, srcv, 0); top = NULL; if (sinfo_flags & SCTP_EOF) { - /* - * This should only happen for Panda for the mbuf - * send case, which does NOT yet support EEOR mode. - * Thus, we can just set this flag to do the proper - * EOF handling. - */ got_all_of_the_send = 1; } } Modified: head/sys/netinet/sctp_pcb.c ============================================================================== --- head/sys/netinet/sctp_pcb.c Sat Jun 6 17:48:55 2020 (r361871) +++ head/sys/netinet/sctp_pcb.c Sat Jun 6 18:20:09 2020 (r361872) @@ -749,8 +749,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockadd /*- * The name has priority over the ifn_index - * if its given. We do this especially for - * panda who might recycle indexes fast. + * if its given. */ if (if_name) { if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { @@ -3157,8 +3156,7 @@ continue_anyway: } else { /* * Note for BSD we hit here always other O/S's will - * pass things in via the sctp_ifap argument - * (Panda). + * pass things in via the sctp_ifap argument. */ ifa = sctp_find_ifa_by_addr(&store.sa, vrf_id, SCTP_ADDR_NOT_LOCKED); @@ -4302,11 +4300,7 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct sockadd * If you have not performed a bind, then we need to do the * ephemeral bind for you. */ - if ((err = sctp_inpcb_bind(inp->sctp_socket, - (struct sockaddr *)NULL, - (struct sctp_ifa *)NULL, - p - ))) { + if ((err = sctp_inpcb_bind(inp->sctp_socket, NULL, NULL, p))) { /* bind error, probably perm */ *error = err; return (NULL); @@ -4674,7 +4668,6 @@ sctp_clean_up_stream(struct sctp_tcb *stcb, struct sct } } } - /*- * Free the association after un-hashing the remote port. This Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Sat Jun 6 17:48:55 2020 (r361871) +++ head/sys/netinet/sctp_usrreq.c Sat Jun 6 18:20:09 2020 (r361872) @@ -71,7 +71,7 @@ sctp_init(void) SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) = (nmbclusters / 8); /* * Allow a user to take no more than 1/2 the number of clusters or - * the SB_MAX whichever is smaller for the send window. + * the SB_MAX, whichever is smaller, for the send window. */ sb_max_adj = (u_long)((u_quad_t)(SB_MAX) * MCLBYTES / (MSIZE + MCLBYTES)); SCTP_BASE_SYSCTL(sctp_sendspace) = min(sb_max_adj, From owner-svn-src-head@freebsd.org Sat Jun 6 18:43:09 2020 Return-Path: Delivered-To: svn-src-head@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 167E733B5FB; Sat, 6 Jun 2020 18:43:09 +0000 (UTC) (envelope-from imp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fT0r6vsXz4Zbd; Sat, 6 Jun 2020 18:43:08 +0000 (UTC) (envelope-from imp@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 E855A267E6; Sat, 6 Jun 2020 18:43:08 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056Ih81t098640; Sat, 6 Jun 2020 18:43:08 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056Ih8Qe098639; Sat, 6 Jun 2020 18:43:08 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006061843.056Ih8Qe098639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 6 Jun 2020 18:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361873 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 361873 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 18:43:09 -0000 Author: imp Date: Sat Jun 6 18:43:08 2020 New Revision: 361873 URL: https://svnweb.freebsd.org/changeset/base/361873 Log: Add a section on CAM architecture. Add xref to all SIM devices we currently have (including a rough indication which ones are likely to fail). Update to include all the CAM options. Fix a few igor nits while I'm here. Modified: head/share/man/man4/scsi.4 Modified: head/share/man/man4/scsi.4 ============================================================================== --- head/share/man/man4/scsi.4 Sat Jun 6 18:20:09 2020 (r361872) +++ head/share/man/man4/scsi.4 Sat Jun 6 18:43:08 2020 (r361873) @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd December 20, 2017 +.Dd June 6, 2020 .Dt CAM 4 .Os .Sh NAME @@ -76,6 +76,17 @@ There are a number of generic kernel configuration opt .Nm subsystem: .Bl -tag -width SCSI_NO_SENSE_STRINGS +.It Dv CAM_BOOT_DELAY +Additional time to wait after the static parts of the kernel have run to allow +for discovery of additional devices which may take time to connect, +such as USB attached storage. +.It Dv CAM_IOSCHED_DYNAMIC +Enable dynamic decisions in the I/O scheduler based on hints and the current +performance of the storage devices. +.It Dv CAM_IO_STATS +Enable collection of statistics for periph devices. +.It Dv CAM_TEST_FAILURE +Enable ability to simulate I/O failures. .It Dv CAMDEBUG This option compiles in all the .Nm @@ -274,6 +285,83 @@ some adapters, but is not yet complete for this versio .Nm .Tn SCSI subsystem. +.Sh ARCHITECTURE +The +.Nm +subsystem glues together the upper layers of the system to the storage devices. +PERIPH devices accept storage requests from GEOM and other upper layers of the +system and translates them into protocol requests. +XPT (transport) dispatches these protocol requests to a SIM driver. +A SIM driver takes protocol requests and translates them into hardware commands +the host adapter understands to transfer the protocol requests, and data (if +any) to the storage device. +The CCB transports these requests around as messages. +.Ss CAM +The Common Access Method was a standard defined in the 1990s to talk to disk +drives. +.Fx +is one of the few operating systems to fully implement this model. +The interface between different parts of CAM is the CCB (or CAM Control Block). +Each CCB has a standard header, which contains the type of request and dispatch +information, and a command specific portion. +A CAM Periph generates requests. +The XPT layer dispatches these requests to the appropriate SIM. +Some CCBs are sent directly to the SIM for immediate processing, while others +are queued and complete when the I/O has finished. +A SIM takes CCBs and translates them into hardware specific commands to push the +SCSI CDB or other protocol control block to the peripheral, along with setting +up the DMA for the associated data. +.Ss Periph Devices +A periph driver knows how to translate standard requests into protocol messages +that a SIM can deliver to hardware. +These requests can come from any upper layer source, but primarily come in via +GEOM as a bio request. +They can also come in directly from character device requests for tapes and pass +through commands. +.Pp +Disk devices, or direct access (da) in CAM, are one type of peripheral. +These devices present themselves to the kernel a device ending in +.Dq da . +Each protocol has a unique device name: +.Bl -tag -width 4 +.It Xr da 4 +SCSI or SAS device, or devices that accept SCSI CDBs for I/O. +.It Xr ada 4 +ATA or SATA device +.It Xr nda 4 +NVME device +.It Xr mda 4 +An SD or MMC block storage device. +.El +.Pp +Tape devices are called serial access +.Po +.Xr sa 4 +.Pc +in CAM. +They interface to the system via a character device and provide +.Xr ioctl 2 +control for tape drives. +.Pp +The +.Xr pass 4 +device will pass through CCB requests from userland to the SIM directly. +The device is used to send commands other than read, write, trim or flush to a +device. +The +.Xr camcontrol 8 +command uses this device. +.Ss XPT drivers +The transport driver connects the periph to the SIM. +It is not configured separately. +It is also responsible for device discovery for those SIM drivers that do not +enumerate themselves. +.Ss SIM driver +SIM used to stand for SCSI Interface Module. +Now it is just SIM because it understands protocols other than SCSI. +There are two types of SIM drivers: virtual and physical. +Physical SIMs are typically called host bus adapters (HBA), but not universally. +Virtual SIM drivers are for communicating with virtual machine hosts. .Sh FILES see other .Nm @@ -319,12 +407,12 @@ This builds into the kernel all possible .Nm debugging. .It Dv CAM_DEBUG_COMPILE -This allows to specify support for which debugging flags described above +This specifies support for which debugging flags described above should be built into the kernel. Flags may be ORed together if the user wishes to see printfs for multiple debugging levels. .It Dv CAM_DEBUG_FLAGS -This allows to set the various debugging flags from a kernel config file. +This sets the various debugging flags from a kernel config file. .It Dv CAM_DEBUG_BUS Specify a bus to debug. To debug all buses, set this to -1. @@ -343,21 +431,65 @@ See .Xr camcontrol 8 for details. .Sh SEE ALSO +.Bl -tag -width 20 +.It Sy Commands: +.Xr camcontrol 8 , +.Xr camdd 8 +.It Sy Libraries: +.Xr cam 3 +.It Sy Periph Drivers: .Xr ada 4 , +.Xr da 4 , +.Xr nda 4 , +.\" .Xr mda 4 , +.Xr pass 4 , +.Xr sa 4 +.Pp +.It Sy SIM Devices: +.Xr aac 4 , +.Xr aacraid 4 , .Xr ahc 4 , .Xr ahci 4 , -.Xr ahd 4 , .Xr ata 4 , -.Xr cd 4 , -.Xr ch 4 , -.Xr da 4 , -.Xr nda 4 , +.Xr aw_mmc 4 , +.Xr ciss 4 , +.Xr hv_storvsc 4 , +.Xr isci 4 , +.Xr iscsi 4 , +.Xr isp 4 , +.\" .Xr mmcnull 4 , +.Xr mpr 4 , +.Xr mps 4 , +.Xr mpt 4 , +.Xr mrsas 4 , +.Xr mvs 4 , .Xr nvme 4 , -.Xr pass 4 , -.Xr pt 4 , -.Xr sa 4 , -.Xr xpt 4 , -.Xr camcontrol 8 +.Xr pms 4 , +.Xr pvscsi 4 , +.Xr sdhci 4 , +.Xr smartpqi 4 , +.Xr sym 4 , +.Xr tws 4 , +.Xr umass 4 , +.Xr virtio_scsi 4 +.It Sy Deprecated or Poorly Supported SIM Devices: +.Xr ahd 4 , +.Xr amr 4 , +.Xr arcmsr 4 , +.Xr esp 4 , +.\" .Xr fslsata 4 , +.Xr hpt27xx 4 , +.Xr hptiop 4 , +.Xr hptmv 4 , +.Xr hptnr 4 , +.\" .Xr htprr 4 , +.Xr iir 4 +.Xr mfi 4 , +.\" .Xr osc 4 , +.\" .Xr ps3cdrom 4 , +.Xr sbp 4 , +.Xr twa 4 +.El .Sh HISTORY The .Nm From owner-svn-src-head@freebsd.org Sat Jun 6 18:56:25 2020 Return-Path: Delivered-To: svn-src-head@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 EF13E33B7D5 for ; Sat, 6 Jun 2020 18:56:25 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fTJ90yCHz4c8r for ; Sat, 6 Jun 2020 18:56:24 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb2f.google.com with SMTP id s1so2241915ybo.7 for ; Sat, 06 Jun 2020 11:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=y+e5zv37cTRalzwk3A13dRwiPgW4T4X3WB1nJjzFBhs=; b=koYLuqhkEmXChVFEtOHw5iAk0C5C4qpQI6/4c3DaUXSQLAN/ZqsH2sD6B+vxMoVQ3f xPt+XLljHggzVIGQxqgb4lrq4ua+s1cBHXbZSCrjDd/5KWjQSFZCUkPut/J7BqRuyjjl JOHvIDBMP3soCPEt0uB5m+lCyXvlMzZkpqjjQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=y+e5zv37cTRalzwk3A13dRwiPgW4T4X3WB1nJjzFBhs=; b=cI1FCJGy8HaZBcK5YRfELbGTVgVtVHe9oq0uWctxySYd6dXxTKJ/q7Z8L8+ZY7z8DJ W+PrQbGnyw/qnrzGKVc1eCYeInTLKVTOUA4DCmE1zeR6ejXLKi1B+3ENzAdFzF5gc/WQ UrRagRtFvdNpm7E0Pu9UpSYDv0Nk21qqh8uODupdrcfGqctBOf3qPxmW7Tk8aoWPu3ng MBAkNHu64JSilU3eXD6EQtt+ld84x6ig5dbs88zgJZHE2ti+46pCHn3bebBkuPGVqzmD OxKfYnmUL2CPPJXm4LzR9vPgMfK6XXfh8A8A97IhuRWeDn8z2w+AXlHjxoi7oQaiUq4T pdHg== X-Gm-Message-State: AOAM5322xVbG1Cw70P7AaQvQW6R/dd8LG4qad7nLlxF9ALpJvXiYZMM4 ss5/0MZhzuWeTEDsFJAKvxI6F7VWrV+wOkx4/JnsHl5W X-Google-Smtp-Source: ABdhPJz+vYW4dO7Wa30gMgHTJwctopr5WFuWw2vFoB6BldCetQaSFl/j0YYHgYBo6sFomHAqVBwGvFjfXHPBSvNSLRU= X-Received: by 2002:a25:ba49:: with SMTP id z9mr23866776ybj.391.1591469783901; Sat, 06 Jun 2020 11:56:23 -0700 (PDT) MIME-Version: 1.0 References: <202006061820.056IK9Fa079753@repo.freebsd.org> In-Reply-To: <202006061820.056IK9Fa079753@repo.freebsd.org> From: Kevin Bowling Date: Sat, 6 Jun 2020 11:56:11 -0700 Message-ID: Subject: Re: svn commit: r361872 - head/sys/netinet To: Michael Tuexen Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49fTJ90yCHz4c8r X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=koYLuqhk; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b2f as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [-2.51 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.04)[-1.039]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-0.99)[-0.993]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[kev009.com]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; NEURAL_HAM_SHORT(-0.18)[-0.180]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b2f:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 18:56:26 -0000 Out of curiosity what is panda? On Sat, Jun 6, 2020 at 11:20 AM Michael Tuexen wrote: > > Author: tuexen > Date: Sat Jun 6 18:20:09 2020 > New Revision: 361872 > URL: https://svnweb.freebsd.org/changeset/base/361872 > > Log: > Non-functional changes due to cleanup (upstream removing of Panda support) > of the code > > MFC after: 1 week > > Modified: > head/sys/netinet/sctp_constants.h > head/sys/netinet/sctp_indata.c > head/sys/netinet/sctp_os.h > head/sys/netinet/sctp_output.c > head/sys/netinet/sctp_pcb.c > head/sys/netinet/sctp_usrreq.c > > Modified: head/sys/netinet/sctp_constants.h > ============================================================================== > --- head/sys/netinet/sctp_constants.h Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_constants.h Sat Jun 6 18:20:09 2020 (r361872) > @@ -576,7 +576,6 @@ __FBSDID("$FreeBSD$"); > */ > #define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512 > > - > /* > * Basically the minimum amount of time before I do a early FR. Making this > * value to low will cause duplicate retransmissions. > @@ -756,9 +755,8 @@ __FBSDID("$FreeBSD$"); > #define SCTP_FROM_SCTP_ASCONF 0x80000000 > #define SCTP_FROM_SCTP_OUTPUT 0x90000000 > #define SCTP_FROM_SCTP_PEELOFF 0xa0000000 > -#define SCTP_FROM_SCTP_PANDA 0xb0000000 > -#define SCTP_FROM_SCTP_SYSCTL 0xc0000000 > -#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xd0000000 > +#define SCTP_FROM_SCTP_SYSCTL 0xb0000000 > +#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xc0000000 > > /* Location ID's */ > #define SCTP_LOC_1 0x00000001 > > Modified: head/sys/netinet/sctp_indata.c > ============================================================================== > --- head/sys/netinet/sctp_indata.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_indata.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -2721,8 +2721,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o > * cluster... i.e. it is a small packet sent in and yet the driver > * underneath allocated a full cluster for it. If so we must copy it > * to a smaller mbuf and free up the cluster mbuf. This will help > - * with cluster starvation. Note for __Panda__ we don't do this > - * since it has clusters all the way down to 64 bytes. > + * with cluster starvation. > */ > if (SCTP_BUF_LEN(m) < (long)MLEN && SCTP_BUF_NEXT(m) == NULL) { > /* we only handle mbufs that are singletons.. not chains */ > > Modified: head/sys/netinet/sctp_os.h > ============================================================================== > --- head/sys/netinet/sctp_os.h Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_os.h Sat Jun 6 18:20:09 2020 (r361872) > @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); > > > > - > /* All os's must implement this address gatherer. If > * no VRF's exist, then vrf 0 is the only one and all > * addresses and ifn's live here. > > Modified: head/sys/netinet/sctp_output.c > ============================================================================== > --- head/sys/netinet/sctp_output.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_output.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -6475,8 +6475,7 @@ error_out: > appendchain = clonechain; > } else { > if (!copy_by_ref && > - (sizeofcpy <= (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN))) > - ) { > + (sizeofcpy <= (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN)))) { > /* Its not in a cluster */ > if (*endofchain == NULL) { > /* lets get a mbuf cluster */ > @@ -13526,12 +13525,6 @@ skip_preblock: > error = sctp_msg_append(stcb, net, top, srcv, 0); > top = NULL; > if (sinfo_flags & SCTP_EOF) { > - /* > - * This should only happen for Panda for the mbuf > - * send case, which does NOT yet support EEOR mode. > - * Thus, we can just set this flag to do the proper > - * EOF handling. > - */ > got_all_of_the_send = 1; > } > } > > Modified: head/sys/netinet/sctp_pcb.c > ============================================================================== > --- head/sys/netinet/sctp_pcb.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_pcb.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -749,8 +749,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockadd > > /*- > * The name has priority over the ifn_index > - * if its given. We do this especially for > - * panda who might recycle indexes fast. > + * if its given. > */ > if (if_name) { > if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { > @@ -3157,8 +3156,7 @@ continue_anyway: > } else { > /* > * Note for BSD we hit here always other O/S's will > - * pass things in via the sctp_ifap argument > - * (Panda). > + * pass things in via the sctp_ifap argument. > */ > ifa = sctp_find_ifa_by_addr(&store.sa, > vrf_id, SCTP_ADDR_NOT_LOCKED); > @@ -4302,11 +4300,7 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct sockadd > * If you have not performed a bind, then we need to do the > * ephemeral bind for you. > */ > - if ((err = sctp_inpcb_bind(inp->sctp_socket, > - (struct sockaddr *)NULL, > - (struct sctp_ifa *)NULL, > - p > - ))) { > + if ((err = sctp_inpcb_bind(inp->sctp_socket, NULL, NULL, p))) { > /* bind error, probably perm */ > *error = err; > return (NULL); > @@ -4674,7 +4668,6 @@ sctp_clean_up_stream(struct sctp_tcb *stcb, struct sct > } > } > } > - > > /*- > * Free the association after un-hashing the remote port. This > > Modified: head/sys/netinet/sctp_usrreq.c > ============================================================================== > --- head/sys/netinet/sctp_usrreq.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_usrreq.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -71,7 +71,7 @@ sctp_init(void) > SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) = (nmbclusters / 8); > /* > * Allow a user to take no more than 1/2 the number of clusters or > - * the SB_MAX whichever is smaller for the send window. > + * the SB_MAX, whichever is smaller, for the send window. > */ > sb_max_adj = (u_long)((u_quad_t)(SB_MAX) * MCLBYTES / (MSIZE + MCLBYTES)); > SCTP_BASE_SYSCTL(sctp_sendspace) = min(sb_max_adj, > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" From owner-svn-src-head@freebsd.org Sat Jun 6 18:56:41 2020 Return-Path: Delivered-To: svn-src-head@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 179F233BA98; Sat, 6 Jun 2020 18:56:41 +0000 (UTC) (envelope-from jhibbits@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fTJS6sb8z4c0s; Sat, 6 Jun 2020 18:56:40 +0000 (UTC) (envelope-from jhibbits@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 E106626A4E; Sat, 6 Jun 2020 18:56:40 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056Iuel0005592; Sat, 6 Jun 2020 18:56:40 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056IueKG005591; Sat, 6 Jun 2020 18:56:40 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202006061856.056IueKG005591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 6 Jun 2020 18:56:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361874 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 361874 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 18:56:41 -0000 Author: jhibbits Date: Sat Jun 6 18:56:40 2020 New Revision: 361874 URL: https://svnweb.freebsd.org/changeset/base/361874 Log: powerpc: Fix nits in copyinout comments from r361861 Also, remove useless nested #ifdefs in the IFUNC block. Reported by: bdragon@ Modified: head/sys/powerpc/powerpc/copyinout.c Modified: head/sys/powerpc/powerpc/copyinout.c ============================================================================== --- head/sys/powerpc/powerpc/copyinout.c Sat Jun 6 18:43:08 2020 (r361873) +++ head/sys/powerpc/powerpc/copyinout.c Sat Jun 6 18:56:40 2020 (r361874) @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); #include /* - * On powerpc64 (AIM only) the copy functions are IFUNcs, selecting the best + * On powerpc64 (AIM only) the copy functions are IFUNCs, selecting the best * option based on the PMAP in use. * * There are two options for copy functions on powerpc64: @@ -85,10 +85,10 @@ __FBSDID("$FreeBSD$"); * remapping user segments into kernel. This is used by the 'radix' pmap for * performance. * - * Book-E does not use the C functions, opting instead to use the 'direct' - * copies, directly, avoiding the IFUNC overhead. + * Book-E does not use the C 'remap' functions, opting instead to use the + * 'direct' copies, directly, avoiding the IFUNC overhead. * - * On 32-bit AIM these functions are direct, not IFUNCs, for performance. + * On 32-bit AIM these functions bypass the IFUNC machinery for performance. */ #ifdef __powerpc64__ int subyte_remap(volatile void *addr, int byte); @@ -125,8 +125,8 @@ int casueword_direct(volatile u_long *addr, u_long old u_long new); /* - * The IFUNC resolver determines the copy based on if the PMAP implementation - * includes a pmap_map_user_ptr function. + * The IFUNC resolver determines the copy based on whether the PMAP + * implementation includes a pmap_map_user_ptr function. */ #define DEFINE_COPY_FUNC(ret, func, args) \ DEFINE_IFUNC(, ret, func, args) \ @@ -140,15 +140,11 @@ DEFINE_COPY_FUNC(int, copyin, (const void *, void *, s DEFINE_COPY_FUNC(int, copyout, (const void *, void *, size_t)) DEFINE_COPY_FUNC(int, suword, (volatile void *, long)) DEFINE_COPY_FUNC(int, suword32, (volatile void *, int)) -#ifdef __powerpc64__ DEFINE_COPY_FUNC(int, suword64, (volatile void *, int64_t)) -#endif DEFINE_COPY_FUNC(int, fubyte, (volatile const void *)) DEFINE_COPY_FUNC(int, fuword16, (volatile const void *)) DEFINE_COPY_FUNC(int, fueword32, (volatile const void *, int32_t *)) -#ifdef __powerpc64__ DEFINE_COPY_FUNC(int, fueword64, (volatile const void *, int64_t *)) -#endif DEFINE_COPY_FUNC(int, fueword, (volatile const void *, long *)) DEFINE_COPY_FUNC(int, casueword32, (volatile uint32_t *, uint32_t, uint32_t *, uint32_t)) From owner-svn-src-head@freebsd.org Sat Jun 6 20:17:57 2020 Return-Path: Delivered-To: svn-src-head@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 3337933D555; Sat, 6 Jun 2020 20:17:57 +0000 (UTC) (envelope-from mckusick@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fW6F0cwmz3XF0; Sat, 6 Jun 2020 20:17:57 +0000 (UTC) (envelope-from mckusick@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 E655027370; Sat, 6 Jun 2020 20:17:56 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056KHu2m055560; Sat, 6 Jun 2020 20:17:56 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056KHuJC055559; Sat, 6 Jun 2020 20:17:56 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <202006062017.056KHuJC055559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Sat, 6 Jun 2020 20:17:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361875 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 361875 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 20:17:57 -0000 Author: mckusick Date: Sat Jun 6 20:17:56 2020 New Revision: 361875 URL: https://svnweb.freebsd.org/changeset/base/361875 Log: Clear the IN_SIZEMOD and IN_IBLKDATA flags only when doing a synchronous inode update. The IN_SIZEMOD and IN_IBLKDATA flags indicate changes to the file size and block pointer fields in the inode. When these fields have been changed, the fsync() and fsyncdata() system calls must write the inode to ensure their semantics that the file is on stable store. The IN_SIZEMOD and IN_IBLKDATA flags cannot be cleared until a synchronous write of the inode is done. If they are cleared on an asynchronous write, then the inode may not yet have been written to the disk when an fsync() or fsyncdata() call is done. Absent these flags, these calls would not know that they needed to write the inode. Thus, these flags only can be cleared on synchronous writes of the inode. Since the inode will be locked for the duration of the I/O that writes it to disk, no fsync() or fsyncdata() will be able to run before the on-disk inode is complete. Reviewed by: kib MFC with: -r361785 Differential revision: https://reviews.freebsd.org/D25072 Modified: head/sys/ufs/ffs/ffs_inode.c Modified: head/sys/ufs/ffs/ffs_inode.c ============================================================================== --- head/sys/ufs/ffs/ffs_inode.c Sat Jun 6 18:56:40 2020 (r361874) +++ head/sys/ufs/ffs/ffs_inode.c Sat Jun 6 20:17:56 2020 (r361875) @@ -94,7 +94,27 @@ ffs_update(vp, waitfor) ip = VTOI(vp); if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor == 0) return (0); - ip->i_flag &= ~(IN_LAZYACCESS | IN_LAZYMOD | IN_MODIFIED | IN_IBLKDATA); + ip->i_flag &= ~(IN_LAZYACCESS | IN_LAZYMOD | IN_MODIFIED); + /* + * The IN_SIZEMOD and IN_IBLKDATA flags indicate changes to the + * file size and block pointer fields in the inode. When these + * fields have been changed, the fsync() and fsyncdata() system + * calls must write the inode to ensure their semantics that the + * file is on stable store. + * + * The IN_SIZEMOD and IN_IBLKDATA flags cannot be cleared until + * a synchronous write of the inode is done. If they are cleared + * on an asynchronous write, then the inode may not yet have been + * written to the disk when an fsync() or fsyncdata() call is done. + * Absent these flags, these calls would not know that they needed + * to write the inode. Thus, these flags only can be cleared on + * synchronous writes of the inode. Since the inode will be locked + * for the duration of the I/O that writes it to disk, no fsync() + * or fsyncdata() will be able to run before the on-disk inode + * is complete. + */ + if (waitfor) + ip->i_flag &= ~(IN_SIZEMOD | IN_IBLKDATA); fs = ITOFS(ip); if (fs->fs_ronly && ITOUMP(ip)->um_fsckpid == 0) return (0); From owner-svn-src-head@freebsd.org Sat Jun 6 20:28:27 2020 Return-Path: Delivered-To: svn-src-head@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 0442433D4F2; Sat, 6 Jun 2020 20:28:27 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49fWLL4QSZz3Y5n; Sat, 6 Jun 2020 20:28:26 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from [IPv6:2a02:8109:1140:c3d:89fd:b31a:4c43:a91d] (unknown [IPv6:2a02:8109:1140:c3d:89fd:b31a:4c43:a91d]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id E3F407220B80B; Sat, 6 Jun 2020 22:28:21 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn commit: r361872 - head/sys/netinet From: Michael Tuexen In-Reply-To: Date: Sat, 6 Jun 2020 22:28:21 +0200 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202006061820.056IK9Fa079753@repo.freebsd.org> To: Kevin Bowling X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 49fWLL4QSZz3Y5n X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:680, ipnet:2001:638::/32, country:DE]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 20:28:27 -0000 > On 6. Jun 2020, at 20:56, Kevin Bowling = wrote: >=20 > Out of curiosity what is panda? Hi Kevin, it was the name used (#ifdef __Panda__) in the upstream SCTP code for using it in an Cisco proprietary product. Since I don't know if that code is still used, but they haven't contributed anything back, I think it is OK to reduce the #ifdef = complexity upstream and remove it.=20 Best regards Michael >=20 > On Sat, Jun 6, 2020 at 11:20 AM Michael Tuexen = wrote: >>=20 >> Author: tuexen >> Date: Sat Jun 6 18:20:09 2020 >> New Revision: 361872 >> URL: https://svnweb.freebsd.org/changeset/base/361872 >>=20 >> Log: >> Non-functional changes due to cleanup (upstream removing of Panda = support) >> of the code >>=20 >> MFC after: 1 week >>=20 >> Modified: >> head/sys/netinet/sctp_constants.h >> head/sys/netinet/sctp_indata.c >> head/sys/netinet/sctp_os.h >> head/sys/netinet/sctp_output.c >> head/sys/netinet/sctp_pcb.c >> head/sys/netinet/sctp_usrreq.c >>=20 >> Modified: head/sys/netinet/sctp_constants.h >> = =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=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/netinet/sctp_constants.h Sat Jun 6 17:48:55 2020 = (r361871) >> +++ head/sys/netinet/sctp_constants.h Sat Jun 6 18:20:09 2020 = (r361872) >> @@ -576,7 +576,6 @@ __FBSDID("$FreeBSD$"); >> */ >> #define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512 >>=20 >> - >> /* >> * Basically the minimum amount of time before I do a early FR. = Making this >> * value to low will cause duplicate retransmissions. >> @@ -756,9 +755,8 @@ __FBSDID("$FreeBSD$"); >> #define SCTP_FROM_SCTP_ASCONF 0x80000000 >> #define SCTP_FROM_SCTP_OUTPUT 0x90000000 >> #define SCTP_FROM_SCTP_PEELOFF 0xa0000000 >> -#define SCTP_FROM_SCTP_PANDA 0xb0000000 >> -#define SCTP_FROM_SCTP_SYSCTL 0xc0000000 >> -#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xd0000000 >> +#define SCTP_FROM_SCTP_SYSCTL 0xb0000000 >> +#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xc0000000 >>=20 >> /* Location ID's */ >> #define SCTP_LOC_1 0x00000001 >>=20 >> Modified: head/sys/netinet/sctp_indata.c >> = =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=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/netinet/sctp_indata.c Sat Jun 6 17:48:55 2020 = (r361871) >> +++ head/sys/netinet/sctp_indata.c Sat Jun 6 18:20:09 2020 = (r361872) >> @@ -2721,8 +2721,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, = int *o >> * cluster... i.e. it is a small packet sent in and yet the = driver >> * underneath allocated a full cluster for it. If so we must = copy it >> * to a smaller mbuf and free up the cluster mbuf. This will = help >> - * with cluster starvation. Note for __Panda__ we don't do = this >> - * since it has clusters all the way down to 64 bytes. >> + * with cluster starvation. >> */ >> if (SCTP_BUF_LEN(m) < (long)MLEN && SCTP_BUF_NEXT(m) =3D=3D = NULL) { >> /* we only handle mbufs that are singletons.. not = chains */ >>=20 >> Modified: head/sys/netinet/sctp_os.h >> = =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=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/netinet/sctp_os.h Sat Jun 6 17:48:55 2020 = (r361871) >> +++ head/sys/netinet/sctp_os.h Sat Jun 6 18:20:09 2020 = (r361872) >> @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); >>=20 >>=20 >>=20 >> - >> /* All os's must implement this address gatherer. If >> * no VRF's exist, then vrf 0 is the only one and all >> * addresses and ifn's live here. >>=20 >> Modified: head/sys/netinet/sctp_output.c >> = =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=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/netinet/sctp_output.c Sat Jun 6 17:48:55 2020 = (r361871) >> +++ head/sys/netinet/sctp_output.c Sat Jun 6 18:20:09 2020 = (r361872) >> @@ -6475,8 +6475,7 @@ error_out: >> appendchain =3D clonechain; >> } else { >> if (!copy_by_ref && >> - (sizeofcpy <=3D = (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + = MHLEN))) >> - ) { >> + (sizeofcpy <=3D = (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + = MHLEN)))) { >> /* Its not in a cluster */ >> if (*endofchain =3D=3D NULL) { >> /* lets get a mbuf cluster */ >> @@ -13526,12 +13525,6 @@ skip_preblock: >> error =3D sctp_msg_append(stcb, net, top, srcv, 0); >> top =3D NULL; >> if (sinfo_flags & SCTP_EOF) { >> - /* >> - * This should only happen for Panda for the = mbuf >> - * send case, which does NOT yet support EEOR = mode. >> - * Thus, we can just set this flag to do the = proper >> - * EOF handling. >> - */ >> got_all_of_the_send =3D 1; >> } >> } >>=20 >> Modified: head/sys/netinet/sctp_pcb.c >> = =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=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/netinet/sctp_pcb.c Sat Jun 6 17:48:55 2020 = (r361871) >> +++ head/sys/netinet/sctp_pcb.c Sat Jun 6 18:20:09 2020 = (r361872) >> @@ -749,8 +749,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct = sockadd >>=20 >> /*- >> * The name has priority over the ifn_index >> - * if its given. We do this especially for >> - * panda who might recycle indexes fast. >> + * if its given. >> */ >> if (if_name) { >> if (strncmp(if_name, = sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) =3D=3D 0) { >> @@ -3157,8 +3156,7 @@ continue_anyway: >> } else { >> /* >> * Note for BSD we hit here always other O/S's = will >> - * pass things in via the sctp_ifap argument >> - * (Panda). >> + * pass things in via the sctp_ifap argument. >> */ >> ifa =3D sctp_find_ifa_by_addr(&store.sa, >> vrf_id, SCTP_ADDR_NOT_LOCKED); >> @@ -4302,11 +4300,7 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct = sockadd >> * If you have not performed a bind, then we need to = do the >> * ephemeral bind for you. >> */ >> - if ((err =3D sctp_inpcb_bind(inp->sctp_socket, >> - (struct sockaddr *)NULL, >> - (struct sctp_ifa *)NULL, >> - p >> - ))) { >> + if ((err =3D sctp_inpcb_bind(inp->sctp_socket, NULL, = NULL, p))) { >> /* bind error, probably perm */ >> *error =3D err; >> return (NULL); >> @@ -4674,7 +4668,6 @@ sctp_clean_up_stream(struct sctp_tcb *stcb, = struct sct >> } >> } >> } >> - >>=20 >> /*- >> * Free the association after un-hashing the remote port. This >>=20 >> Modified: head/sys/netinet/sctp_usrreq.c >> = =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=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/netinet/sctp_usrreq.c Sat Jun 6 17:48:55 2020 = (r361871) >> +++ head/sys/netinet/sctp_usrreq.c Sat Jun 6 18:20:09 2020 = (r361872) >> @@ -71,7 +71,7 @@ sctp_init(void) >> SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) =3D = (nmbclusters / 8); >> /* >> * Allow a user to take no more than 1/2 the number of = clusters or >> - * the SB_MAX whichever is smaller for the send window. >> + * the SB_MAX, whichever is smaller, for the send window. >> */ >> sb_max_adj =3D (u_long)((u_quad_t)(SB_MAX) * MCLBYTES / (MSIZE = + MCLBYTES)); >> SCTP_BASE_SYSCTL(sctp_sendspace) =3D min(sb_max_adj, >> _______________________________________________ >> svn-src-head@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to = "svn-src-head-unsubscribe@freebsd.org" From owner-svn-src-head@freebsd.org Sat Jun 6 21:07:51 2020 Return-Path: Delivered-To: svn-src-head@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 6C2B433E981; Sat, 6 Jun 2020 21:07:51 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fXCq27pRz3dS0; Sat, 6 Jun 2020 21:07:51 +0000 (UTC) (envelope-from emaste@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 4015B8496; Sat, 6 Jun 2020 21:07:51 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056L7pIW086107; Sat, 6 Jun 2020 21:07:51 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056L7oiR086105; Sat, 6 Jun 2020 21:07:50 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006062107.056L7oiR086105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 6 Jun 2020 21:07:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361876 - head/tools/build/options X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/tools/build/options X-SVN-Commit-Revision: 361876 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 21:07:51 -0000 Author: emaste Date: Sat Jun 6 21:07:50 2020 New Revision: 361876 URL: https://svnweb.freebsd.org/changeset/base/361876 Log: Update SYSTEM_LINKER descriptions wrt BINUTILS GNU ld hasn't been built with the BINUTILS option for some time. Modified: head/tools/build/options/WITHOUT_SYSTEM_LINKER head/tools/build/options/WITH_SYSTEM_LINKER Modified: head/tools/build/options/WITHOUT_SYSTEM_LINKER ============================================================================== --- head/tools/build/options/WITHOUT_SYSTEM_LINKER Sat Jun 6 20:17:56 2020 (r361875) +++ head/tools/build/options/WITHOUT_SYSTEM_LINKER Sat Jun 6 21:07:50 2020 (r361876) @@ -7,9 +7,7 @@ This does not prevent a linker from being built for in only for building one for the build itself. The .Va WITHOUT_LLD -and -.Va WITHOUT_BINUTILS -options control those. +option controls that. .Pp This option is only relevant when .Va WITH_LLD_BOOTSTRAP Modified: head/tools/build/options/WITH_SYSTEM_LINKER ============================================================================== --- head/tools/build/options/WITH_SYSTEM_LINKER Sat Jun 6 20:17:56 2020 (r361875) +++ head/tools/build/options/WITH_SYSTEM_LINKER Sat Jun 6 21:07:50 2020 (r361876) @@ -7,9 +7,7 @@ This does not prevent a linker from being built for in only for building one for the build itself. The .Va WITHOUT_LLD -and -.Va WITHOUT_BINUTILS -options control those. +option controls that. .Pp This option is only relevant when .Va WITH_LLD_BOOTSTRAP From owner-svn-src-head@freebsd.org Sat Jun 6 21:26:35 2020 Return-Path: Delivered-To: svn-src-head@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 2D07233EDA9; Sat, 6 Jun 2020 21:26:35 +0000 (UTC) (envelope-from tuexen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fXdR0SfPz3gFB; Sat, 6 Jun 2020 21:26:35 +0000 (UTC) (envelope-from tuexen@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 0ACDC8A1C; Sat, 6 Jun 2020 21:26:35 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056LQYa1098677; Sat, 6 Jun 2020 21:26:34 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056LQYfX098676; Sat, 6 Jun 2020 21:26:34 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202006062126.056LQYfX098676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sat, 6 Jun 2020 21:26:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361877 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 361877 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 21:26:35 -0000 Author: tuexen Date: Sat Jun 6 21:26:34 2020 New Revision: 361877 URL: https://svnweb.freebsd.org/changeset/base/361877 Log: Fix typo in comment. Submitted by Orgad Shaneh for the userland stack. MFC after: 1 week Modified: head/sys/netinet/sctp_pcb.c Modified: head/sys/netinet/sctp_pcb.c ============================================================================== --- head/sys/netinet/sctp_pcb.c Sat Jun 6 21:07:50 2020 (r361876) +++ head/sys/netinet/sctp_pcb.c Sat Jun 6 21:26:34 2020 (r361877) @@ -5881,7 +5881,7 @@ retry: * holding the lock. We won't find it on the list either and * continue and free/destroy it. While holding the lock, spin, to * avoid the race condition as sctp_iterator_worker() will have to - * wait to re-aquire the lock. + * wait to re-acquire the lock. */ if (sctp_it_ctl.iterator_running != 0 || sctp_it_ctl.cur_it != NULL) { SCTP_IPI_ITERATOR_WQ_UNLOCK(); From owner-svn-src-head@freebsd.org Sat Jun 6 22:25:00 2020 Return-Path: Delivered-To: svn-src-head@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 D3555340063; Sat, 6 Jun 2020 22:25:00 +0000 (UTC) (envelope-from adrian@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fYwr5H2Hz438k; Sat, 6 Jun 2020 22:25:00 +0000 (UTC) (envelope-from adrian@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 ABFF58FCA; Sat, 6 Jun 2020 22:25:00 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056MP0qh035525; Sat, 6 Jun 2020 22:25:00 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056MP0sQ035524; Sat, 6 Jun 2020 22:25:00 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202006062225.056MP0sQ035524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 6 Jun 2020 22:25:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361878 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 361878 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 22:25:00 -0000 Author: adrian Date: Sat Jun 6 22:25:00 2020 New Revision: 361878 URL: https://svnweb.freebsd.org/changeset/base/361878 Log: [net80211] Flip on A-MPDU, A-MSDU, A-MPDU+A-MSDU and Fast frames options. This updates the logic to allow: * A-MPDU if available; * A-MSDU if available and A-MPDU is off/NACKed; * A-MPDU+A-MSDU if it's available and negotiated; * Fast frames if the node is 11abg (and not HT/VHT.) This allows for things to fail back to A-MSDU or fast frames if A-MPDU isn't available rather than needing to be non-HT/non-VHT. It also allows A-MPDU+A-MSDU to work if it's negotiated. Tested: * AR9380, STA + AP mode (A-MPDU, A-MSDU, FF, A-MPDU+A-MSDU) * RT5350, STA mode (A-MSDU, FF) * AR9170, STA mode (A-MSDU, FF) Modified: head/sys/net80211/ieee80211_output.c Modified: head/sys/net80211/ieee80211_output.c ============================================================================== --- head/sys/net80211/ieee80211_output.c Sat Jun 6 21:26:34 2020 (r361877) +++ head/sys/net80211/ieee80211_output.c Sat Jun 6 22:25:00 2020 (r361878) @@ -125,6 +125,11 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = vap->iv_ifp; int mcast; + int do_ampdu = 0; + int do_amsdu = 0; + int do_ampdu_amsdu = 0; + int no_ampdu = 1; /* Will be set to 0 if ampdu is active */ + int do_ff = 0; if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) && (m->m_flags & M_PWR_SAV) == 0) { @@ -169,7 +174,28 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, BPF_MTAP(ifp, m); /* 802.3 tx */ + /* + * Figure out if we can do A-MPDU, A-MSDU or FF. + * + * A-MPDU depends upon vap/node config. + * A-MSDU depends upon vap/node config. + * FF depends upon vap config, IE and whether + * it's 11abg (and not 11n/11ac/etc.) + * + * Note that these flags indiciate whether we can do + * it at all, rather than the situation (eg traffic type.) + */ + do_ampdu = ((ni->ni_flags & IEEE80211_NODE_AMPDU_TX) && + (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_TX)); + do_amsdu = ((ni->ni_flags & IEEE80211_NODE_AMSDU_TX) && + (vap->iv_flags_ht & IEEE80211_FHT_AMSDU_TX)); + do_ff = + ((ni->ni_flags & IEEE80211_NODE_HT) == 0) && + ((ni->ni_flags & IEEE80211_NODE_VHT) == 0) && + (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF)); + + /* * Check if A-MPDU tx aggregation is setup or if we * should try to enable it. The sta must be associated * with HT and A-MPDU enabled for use. When the policy @@ -186,8 +212,7 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, * frames will always have sequence numbers allocated from the NON_QOS * TID. */ - if ((ni->ni_flags & IEEE80211_NODE_AMPDU_TX) && - (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_TX)) { + if (do_ampdu) { if ((m->m_flags & M_EAPOL) == 0 && (! mcast)) { int tid = WME_AC_TO_TID(M_WME_GETAC(m)); struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[tid]; @@ -208,6 +233,23 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, ieee80211_ampdu_request(ni, tap); /* XXX hold frame for reply? */ } + /* + * Now update the no-ampdu flag. A-MPDU may have been + * started or administratively disabled above; so now we + * know whether we're running yet or not. + * + * This will let us know whether we should be doing A-MSDU + * at this point. We only do A-MSDU if we're either not + * doing A-MPDU, or A-MPDU is NACKed, or A-MPDU + A-MSDU + * is available. + * + * Whilst here, update the amsdu-ampdu flag. The above may + * have also set or cleared the amsdu-in-ampdu txa_flags + * combination so we can correctly do A-MPDU + A-MSDU. + */ + no_ampdu = (! IEEE80211_AMPDU_RUNNING(tap) + || (IEEE80211_AMPDU_NACKED(tap))); + do_ampdu_amsdu = IEEE80211_AMPDU_RUNNING_AMSDU(tap); } } @@ -222,15 +264,11 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, * to really need to. For A-MSDU we'd have to set the * A-MSDU QoS bit in the wifi header, so we just plain * can't do it. - * - * Strictly speaking, we could actually /do/ A-MSDU / FF - * with A-MPDU together which for certain circumstances - * is beneficial (eg A-MSDU of TCK ACKs.) However, - * I'll ignore that for now so existing behaviour is maintained. - * Later on it would be good to make "amsdu + ampdu" configurable. */ - else if (__predict_true((vap->iv_caps & IEEE80211_C_8023ENCAP) == 0)) { - if ((! mcast) && ieee80211_amsdu_tx_ok(ni)) { + if (__predict_true((vap->iv_caps & IEEE80211_C_8023ENCAP) == 0)) { + if ((! mcast) && + (do_ampdu_amsdu || (no_ampdu && do_amsdu)) && + ieee80211_amsdu_tx_ok(ni)) { m = ieee80211_amsdu_check(ni, m); if (m == NULL) { /* NB: any ni ref held on stageq */ @@ -239,8 +277,7 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, __func__); return (0); } - } else if ((! mcast) && IEEE80211_ATH_CAP(vap, ni, - IEEE80211_NODE_FF)) { + } else if ((! mcast) && do_ff) { m = ieee80211_ff_check(ni, m); if (m == NULL) { /* NB: any ni ref held on stageq */ From owner-svn-src-head@freebsd.org Sat Jun 6 22:26:45 2020 Return-Path: Delivered-To: svn-src-head@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 7908834008C; Sat, 6 Jun 2020 22:26:45 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49fYys2gNsz43Ny; Sat, 6 Jun 2020 22:26:45 +0000 (UTC) (envelope-from emaste@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 525A99476; Sat, 6 Jun 2020 22:26:45 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056MQj4G035638; Sat, 6 Jun 2020 22:26:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056MQjVh035637; Sat, 6 Jun 2020 22:26:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006062226.056MQjVh035637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 6 Jun 2020 22:26:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361879 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 361879 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 22:26:45 -0000 Author: emaste Date: Sat Jun 6 22:26:44 2020 New Revision: 361879 URL: https://svnweb.freebsd.org/changeset/base/361879 Log: src.conf.5: regen after r361876, SYSTEM_LINKER description update Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sat Jun 6 22:25:00 2020 (r361878) +++ head/share/man/man5/src.conf.5 Sat Jun 6 22:26:44 2020 (r361879) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd June 5, 2020 +.Dd June 6, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1556,9 +1556,7 @@ This does not prevent a linker from being built for in only for building one for the build itself. The .Va WITHOUT_LLD -and -.Va WITHOUT_BINUTILS -options control those. +option controls that. .Pp This option is only relevant when .Va WITH_LLD_BOOTSTRAP