From owner-svn-src-stable-12@freebsd.org Sun Mar 8 14:48:22 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B689E26B2CD; Sun, 8 Mar 2020 14:48:22 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b43V1tm3z4ScN; Sun, 8 Mar 2020 14:48:22 +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 31DC72367C; Sun, 8 Mar 2020 14:48:22 +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 028EmMoi073583; Sun, 8 Mar 2020 14:48:22 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028EmMmn073582; Sun, 8 Mar 2020 14:48:22 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202003081448.028EmMmn073582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 8 Mar 2020 14:48:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358739 - stable/12/sys/netinet X-SVN-Group: stable-12 X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: stable/12/sys/netinet X-SVN-Commit-Revision: 358739 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 14:48:22 -0000 Author: tuexen Date: Sun Mar 8 14:48:21 2020 New Revision: 358739 URL: https://svnweb.freebsd.org/changeset/base/358739 Log: MFC r358614: Don't send an uninitialised traffic class in the IPv6 header, when sending a TCP segment from the TCP SYN cache (like a SYN-ACK). This fix initialises it to zero. This is correct for the ECN bits, but is does not honor the DSCP what an application might have set via the IPPROTO_IPV6 level socket options IPV6_TCLASS. That will be fixed separately. Reviewed by: Richard Scheffenegger Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D23900 Modified: stable/12/sys/netinet/tcp_syncache.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/tcp_syncache.c ============================================================================== --- stable/12/sys/netinet/tcp_syncache.c Sun Mar 8 13:24:34 2020 (r358738) +++ stable/12/sys/netinet/tcp_syncache.c Sun Mar 8 14:48:21 2020 (r358739) @@ -1728,7 +1728,8 @@ syncache_respond(struct syncache *sc, struct syncache_ ip6->ip6_dst = sc->sc_inc.inc6_faddr; ip6->ip6_plen = htons(tlen - hlen); /* ip6_hlim is set after checksum */ - ip6->ip6_flow &= ~IPV6_FLOWLABEL_MASK; + /* Zero out traffic class and flow label. */ + ip6->ip6_flow &= ~IPV6_FLOWINFO_MASK; ip6->ip6_flow |= sc->sc_flowlabel; th = (struct tcphdr *)(ip6 + 1); From owner-svn-src-stable-12@freebsd.org Sun Mar 8 16:54:56 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3B6526E507; Sun, 8 Mar 2020 16:54:56 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b6sX4B9vz4ZLq; Sun, 8 Mar 2020 16:54:56 +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 67B7A24EB5; Sun, 8 Mar 2020 16:54:56 +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 028Gsuh2053657; Sun, 8 Mar 2020 16:54:56 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028GsuSl053656; Sun, 8 Mar 2020 16:54:56 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081654.028GsuSl053656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 16:54:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358742 - stable/12/lib/libc/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/lib/libc/sys X-SVN-Commit-Revision: 358742 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 16:54:56 -0000 Author: emaste Date: Sun Mar 8 16:54:55 2020 New Revision: 358742 URL: https://svnweb.freebsd.org/changeset/base/358742 Log: umtx_op.2: correct typo PR: 244611 Modified: stable/12/lib/libc/sys/_umtx_op.2 Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/sys/_umtx_op.2 ============================================================================== --- stable/12/lib/libc/sys/_umtx_op.2 Sun Mar 8 16:53:46 2020 (r358741) +++ stable/12/lib/libc/sys/_umtx_op.2 Sun Mar 8 16:54:55 2020 (r358742) @@ -99,7 +99,7 @@ The constants are defined for special values: .It Dv UMUTEX_UNOWNED Zero, the value stored in the unowned lock. .It Dv UMUTEX_CONTESTED -The contenion indicator. +The contention indicator. .It Dv UMUTEX_RB_OWNERDEAD A thread owning the robust mutex terminated. The mutex is in unlocked state. From owner-svn-src-stable-12@freebsd.org Sun Mar 8 17:56:45 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5DC942703C4; Sun, 8 Mar 2020 17:56: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8Ds0k8Pz429h; Sun, 8 Mar 2020 17:56: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 E9687259F3; Sun, 8 Mar 2020 17: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 028HuiOg092506; Sun, 8 Mar 2020 17:56:44 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028Huin6092505; Sun, 8 Mar 2020 17:56:44 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081756.028Huin6092505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 17:56:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358745 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 358745 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 17:56:45 -0000 Author: emaste Date: Sun Mar 8 17:56:44 2020 New Revision: 358745 URL: https://svnweb.freebsd.org/changeset/base/358745 Log: MFC r357831: Allow fdatasync in capability mode fdatasync is essentially a subset of fsync (and may be exactly fsync, depending on filesystem and development effort) and operates only on a provided fd. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/kern/capabilities.conf Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/capabilities.conf ============================================================================== --- stable/12/sys/kern/capabilities.conf Sun Mar 8 17:42:42 2020 (r358744) +++ stable/12/sys/kern/capabilities.conf Sun Mar 8 17:56:44 2020 (r358745) @@ -218,6 +218,7 @@ fstatfs ## Allow further file descriptor-based I/O operations, subject to capability ## rights. ## +fdatasync fsync ftruncate From owner-svn-src-stable-12@freebsd.org Sun Mar 8 17:58:36 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B0A0D270498; Sun, 8 Mar 2020 17:58:36 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8H03bVHz46MM; Sun, 8 Mar 2020 17:58:36 +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 756A6259FB; Sun, 8 Mar 2020 17:58:36 +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 028HwaGl092642; Sun, 8 Mar 2020 17:58:36 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028HwaxE092641; Sun, 8 Mar 2020 17:58:36 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081758.028HwaxE092641@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 17:58:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358746 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 358746 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 17:58:36 -0000 Author: emaste Date: Sun Mar 8 17:58:36 2020 New Revision: 358746 URL: https://svnweb.freebsd.org/changeset/base/358746 Log: MFC r357838: Allow getloginclass in capability mode As with e.g. getgroups and getlogin it allows querying current process credential state. Reported by: sigsys@gmail.com via kevans Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/kern/capabilities.conf Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/capabilities.conf ============================================================================== --- stable/12/sys/kern/capabilities.conf Sun Mar 8 17:56:44 2020 (r358745) +++ stable/12/sys/kern/capabilities.conf Sun Mar 8 17:58:36 2020 (r358746) @@ -282,6 +282,7 @@ getitimer getgid getgroups getlogin +getloginclass ## ## Allow querying certain trivial global state. From owner-svn-src-stable-12@freebsd.org Sun Mar 8 17:59:47 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C00E9270551; Sun, 8 Mar 2020 17:59:47 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8JM2HQDz48yx; Sun, 8 Mar 2020 17:59:47 +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 02EC6259FC; Sun, 8 Mar 2020 17:59:47 +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 028HxkUJ092733; Sun, 8 Mar 2020 17:59:46 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028Hxko6092731; Sun, 8 Mar 2020 17:59:46 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081759.028Hxko6092731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 17:59:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358747 - in stable/12/sys: compat/freebsd32 kern X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 358747 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 17:59:47 -0000 Author: emaste Date: Sun Mar 8 17:59:46 2020 New Revision: 358747 URL: https://svnweb.freebsd.org/changeset/base/358747 Log: regen sysent after capability mode change MFCs Capability mode changes allowing fdatasync and getloginclass. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/compat/freebsd32/freebsd32_sysent.c stable/12/sys/kern/init_sysent.c Modified: stable/12/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- stable/12/sys/compat/freebsd32/freebsd32_sysent.c Sun Mar 8 17:58:36 2020 (r358746) +++ stable/12/sys/compat/freebsd32/freebsd32_sysent.c Sun Mar 8 17:59:46 2020 (r358747) @@ -592,7 +592,7 @@ struct sysent freebsd32_sysent[] = { { AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 520 = pdgetpid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 521 = pdwait4 */ { AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 522 = freebsd32_pselect */ - { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_GETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 523 = getloginclass */ + { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_GETLOGINCLASS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 523 = getloginclass */ { AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_SETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 524 = setloginclass */ { AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_racct */ { AS(rctl_get_rules_args), (sy_call_t *)sys_rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 526 = rctl_get_rules */ @@ -629,7 +629,7 @@ struct sysent freebsd32_sysent[] = { { AS(freebsd32_utimensat_args), (sy_call_t *)freebsd32_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 547 = freebsd32_utimensat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = obsolete numa_getaffinity */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 549 = obsolete numa_setaffinity */ - { AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 550 = fdatasync */ + { AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 550 = fdatasync */ { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 551 = freebsd32_fstat */ { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 552 = freebsd32_fstatat */ { AS(freebsd32_fhstat_args), (sy_call_t *)freebsd32_fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 553 = freebsd32_fhstat */ Modified: stable/12/sys/kern/init_sysent.c ============================================================================== --- stable/12/sys/kern/init_sysent.c Sun Mar 8 17:58:36 2020 (r358746) +++ stable/12/sys/kern/init_sysent.c Sun Mar 8 17:59:46 2020 (r358747) @@ -572,7 +572,7 @@ struct sysent sysent[] = { { AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 520 = pdgetpid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 521 = pdwait4 */ { AS(pselect_args), (sy_call_t *)sys_pselect, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 522 = pselect */ - { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_GETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 523 = getloginclass */ + { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_GETLOGINCLASS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 523 = getloginclass */ { AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_SETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 524 = setloginclass */ { AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_racct */ { AS(rctl_get_rules_args), (sy_call_t *)sys_rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 526 = rctl_get_rules */ @@ -599,7 +599,7 @@ struct sysent sysent[] = { { AS(utimensat_args), (sy_call_t *)sys_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 547 = utimensat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = obsolete numa_getaffinity */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 549 = obsolete numa_setaffinity */ - { AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 550 = fdatasync */ + { AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 550 = fdatasync */ { AS(fstat_args), (sy_call_t *)sys_fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 551 = fstat */ { AS(fstatat_args), (sy_call_t *)sys_fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 552 = fstatat */ { AS(fhstat_args), (sy_call_t *)sys_fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 553 = fhstat */ From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:05:18 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A535E270834; Sun, 8 Mar 2020 18:05:18 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8Qk05Ytz4D21; Sun, 8 Mar 2020 18:05:18 +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 F257125BCA; Sun, 8 Mar 2020 18:05:17 +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 028I5H3Q098412; Sun, 8 Mar 2020 18:05:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028I5HBR098410; Sun, 8 Mar 2020 18:05:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081805.028I5HBR098410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:05:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358748 - stable/12/tools/build/options X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/tools/build/options X-SVN-Commit-Revision: 358748 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:05:18 -0000 Author: emaste Date: Sun Mar 8 18:05:17 2020 New Revision: 358748 URL: https://svnweb.freebsd.org/changeset/base/358748 Log: MFC r356759, r356890, r357617: BINUTILS option description updates Sponsored by: The FreeBSD Foundation Modified: stable/12/tools/build/options/WITHOUT_BINUTILS stable/12/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP stable/12/tools/build/options/WITH_BINUTILS_BOOTSTRAP Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/build/options/WITHOUT_BINUTILS ============================================================================== --- stable/12/tools/build/options/WITHOUT_BINUTILS Sun Mar 8 17:59:46 2020 (r358747) +++ stable/12/tools/build/options/WITHOUT_BINUTILS Sun Mar 8 18:05:17 2020 (r358748) @@ -1,9 +1,7 @@ .\" $FreeBSD$ -Set to not build or install GNU +Do not build or install GNU .Xr as 1 , -.Xr objdump 1 , -and for some CPU architectures -.Xr ld.bfd 1 +.Xr ld.bfd 1 , and +.Xr objdump 1 as part of the normal system build. -The resulting system cannot build programs from source. Modified: stable/12/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP ============================================================================== --- stable/12/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP Sun Mar 8 17:59:46 2020 (r358747) +++ stable/12/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP Sun Mar 8 18:05:17 2020 (r358748) @@ -1,7 +1,3 @@ .\" $FreeBSD$ -Set to not build binutils (as, ld, and objdump) +Do not build GNU binutils as part of the bootstrap process. -.Bf -symbolic -The option does not work for build targets unless some alternative -toolchain is provided. -.Ef Modified: stable/12/tools/build/options/WITH_BINUTILS_BOOTSTRAP ============================================================================== --- stable/12/tools/build/options/WITH_BINUTILS_BOOTSTRAP Sun Mar 8 17:59:46 2020 (r358747) +++ stable/12/tools/build/options/WITH_BINUTILS_BOOTSTRAP Sun Mar 8 18:05:17 2020 (r358748) @@ -1,3 +1,3 @@ .\" $FreeBSD$ -Set build binutils (as, ld, and objdump) +Build GNU binutils as part of the bootstrap process. From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:07:35 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C19B2708E4; Sun, 8 Mar 2020 18:07:35 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8TL5M9Tz4GP2; Sun, 8 Mar 2020 18:07:34 +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 58DE525BCF; Sun, 8 Mar 2020 18:07:34 +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 028I7YOY098568; Sun, 8 Mar 2020 18:07:34 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028I7Yrk098567; Sun, 8 Mar 2020 18:07:34 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081807.028I7Yrk098567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:07:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358749 - stable/12/share/man/man5 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man5 X-SVN-Commit-Revision: 358749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:07:35 -0000 Author: emaste Date: Sun Mar 8 18:07:33 2020 New Revision: 358749 URL: https://svnweb.freebsd.org/changeset/base/358749 Log: regen src.conf.5 after BINUTILS option description MFCs Sponsored by: The FreeBSD Foundation Modified: stable/12/share/man/man5/src.conf.5 Modified: stable/12/share/man/man5/src.conf.5 ============================================================================== --- stable/12/share/man/man5/src.conf.5 Sun Mar 8 18:05:17 2020 (r358748) +++ stable/12/share/man/man5/src.conf.5 Sun Mar 8 18:07:33 2020 (r358749) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd January 13, 2020 +.Dd March 8, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -176,14 +176,12 @@ Build all binaries with the flag set to indicate that the run-time loader should perform all relocation processing at process startup rather than on demand. .It Va WITHOUT_BINUTILS -Set to not build or install GNU +Do not build or install GNU .Xr as 1 , -.Xr objdump 1 , -and for some CPU architectures -.Xr ld.bfd 1 +.Xr ld.bfd 1 , and +.Xr objdump 1 as part of the normal system build. -The resulting system cannot build programs from source. .Pp This is a default setting on arm64/aarch64 and riscv/riscv64. @@ -205,17 +203,13 @@ of the normal system build. This is a default setting on amd64/amd64, arm/arm, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BINUTILS_BOOTSTRAP -Set to not build binutils (as, ld, and objdump) +Do not build GNU binutils as part of the bootstrap process. -.Bf -symbolic -The option does not work for build targets unless some alternative -toolchain is provided. -.Ef .Pp This is a default setting on arm64/aarch64 and riscv/riscv64. .It Va WITH_BINUTILS_BOOTSTRAP -Set build binutils (as, ld, and objdump) +Build GNU binutils as part of the bootstrap process. .Pp This is a default setting on @@ -454,6 +448,8 @@ When set, it enforces these options: .Pp .Bl -item -compact .It +.Va WITHOUT_DMAGENT +.It .Va WITHOUT_KERBEROS .It .Va WITHOUT_OPENSSH @@ -1507,6 +1503,8 @@ Set to not build OpenSSL. When set, it enforces these options: .Pp .Bl -item -compact +.It +.Va WITHOUT_DMAGENT .It .Va WITHOUT_KERBEROS .It From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:08:46 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E539C2709A4; Sun, 8 Mar 2020 18:08:46 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8Vk0CLkz4K5X; Sun, 8 Mar 2020 18:08:46 +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 D8DF825BD2; Sun, 8 Mar 2020 18:08: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 028I8jOW098787; Sun, 8 Mar 2020 18:08:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028I8jHX098786; Sun, 8 Mar 2020 18:08:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081808.028I8jHX098786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:08:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358750 - stable/12/lib/libfetch X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/lib/libfetch X-SVN-Commit-Revision: 358750 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:08:47 -0000 Author: emaste Date: Sun Mar 8 18:08:45 2020 New Revision: 358750 URL: https://svnweb.freebsd.org/changeset/base/358750 Log: MFC r357579: libfetch: disallow invalid escape sequences Per RFC1738 escape is "% hex hex"; other sequences do not form a valid URL. Suggested by: Matthew Dillon Reviewed by: Matthew Dillon Sponsored by: The FreeBSD Foundation Modified: stable/12/lib/libfetch/fetch.c Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libfetch/fetch.c ============================================================================== --- stable/12/lib/libfetch/fetch.c Sun Mar 8 18:07:33 2020 (r358749) +++ stable/12/lib/libfetch/fetch.c Sun Mar 8 18:08:45 2020 (r358750) @@ -325,6 +325,9 @@ fetch_pctdecode(char *dst, const char *src, size_t dle (d2 = fetch_hexval(s[2])) >= 0 && (d1 > 0 || d2 > 0)) { c = d1 << 4 | d2; s += 2; + } else if (s[0] == '%') { + /* Invalid escape sequence. */ + return (NULL); } else { c = *s; } From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:09:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A64A270A42; Sun, 8 Mar 2020 18:09: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8Wp19B5z4MGl; Sun, 8 Mar 2020 18:09: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 D990225BD4; Sun, 8 Mar 2020 18:09:41 +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 028I9fFg098884; Sun, 8 Mar 2020 18:09:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028I9foB098883; Sun, 8 Mar 2020 18:09:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081809.028I9foB098883@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:09:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358751 - stable/12/lib/libc/locale X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/lib/libc/locale X-SVN-Commit-Revision: 358751 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:09:42 -0000 Author: emaste Date: Sun Mar 8 18:09:41 2020 New Revision: 358751 URL: https://svnweb.freebsd.org/changeset/base/358751 Log: MFC r355914: localeconv: correct grouping and mon_grouping per C/POSIX grouping and mon_grouping should be "" in the C locale. PR: 172215 Sponsored by: The FreeBSD Foundation Modified: stable/12/lib/libc/locale/fix_grouping.c Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/locale/fix_grouping.c ============================================================================== --- stable/12/lib/libc/locale/fix_grouping.c Sun Mar 8 18:08:45 2020 (r358750) +++ stable/12/lib/libc/locale/fix_grouping.c Sun Mar 8 18:09:41 2020 (r358751) @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include -static const char nogrouping[] = { CHAR_MAX, '\0' }; +static const char nogrouping[] = { '\0' }; /* * Internal helper used to convert grouping sequences from string From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:10:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8F52B270ACC; Sun, 8 Mar 2020 18:10: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8Xy0RBkz4PVX; Sun, 8 Mar 2020 18:10: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 B80F625D0B; Sun, 8 Mar 2020 18:10:41 +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 028IAfl0099627; Sun, 8 Mar 2020 18:10:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IAfSQ099623; Sun, 8 Mar 2020 18:10:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081810.028IAfSQ099623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:10:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358752 - stable/12/sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/sys X-SVN-Commit-Revision: 358752 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:10:42 -0000 Author: emaste Date: Sun Mar 8 18:10:41 2020 New Revision: 358752 URL: https://svnweb.freebsd.org/changeset/base/358752 Log: MFC r357056: add MIPS-specific PT header ELF definitions Submitted by: David Carlier Modified: stable/12/sys/sys/elf_common.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/sys/elf_common.h ============================================================================== --- stable/12/sys/sys/elf_common.h Sun Mar 8 18:09:41 2020 (r358751) +++ stable/12/sys/sys/elf_common.h Sun Mar 8 18:10:41 2020 (r358752) @@ -542,6 +542,10 @@ typedef struct { #define PT_LOPROC 0x70000000 /* First processor-specific type. */ #define PT_ARM_ARCHEXT 0x70000000 /* ARM arch compat information. */ #define PT_ARM_EXIDX 0x70000001 /* ARM exception unwind tables. */ +#define PT_MIPS_REGINFO 0x70000000 /* MIPS register usage info */ +#define PT_MIPS_RTPROC 0x70000001 /* MIPS runtime procedure tbl */ +#define PT_MIPS_OPTIONS 0x70000002 /* MIPS e_flags value*/ +#define PT_MIPS_ABIFLAGS 0x70000003 /* MIPS fp mode */ #define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ #define PT_OPENBSD_RANDOMIZE 0x65A3DBE6 /* OpenBSD random data segment */ From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:12:07 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DD9D1270CE7; Sun, 8 Mar 2020 18:12:07 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8Zb5ftqz4Sv1; Sun, 8 Mar 2020 18:12:07 +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 BD78125D96; Sun, 8 Mar 2020 18:12:07 +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 028IC77A004785; Sun, 8 Mar 2020 18:12:07 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IC7WN004784; Sun, 8 Mar 2020 18:12:07 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081812.028IC7WN004784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:12:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358754 - stable/12/share/mk X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/mk X-SVN-Commit-Revision: 358754 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:12:08 -0000 Author: emaste Date: Sun Mar 8 18:12:07 2020 New Revision: 358754 URL: https://svnweb.freebsd.org/changeset/base/358754 Log: MFC r355943: add LDNS build knob dependency on OPENSSL Sponsored by: The FreeBSD Foundation Modified: stable/12/share/mk/src.opts.mk Directory Properties: stable/12/ (props changed) Modified: stable/12/share/mk/src.opts.mk ============================================================================== --- stable/12/share/mk/src.opts.mk Sun Mar 8 18:11:15 2020 (r358753) +++ stable/12/share/mk/src.opts.mk Sun Mar 8 18:12:07 2020 (r358754) @@ -456,11 +456,6 @@ MK_CASPER:= no MK_LIBTHR:= no .endif -.if ${MK_LDNS} == "no" -MK_LDNS_UTILS:= no -MK_UNBOUND:= no -.endif - .if ${MK_SOURCELESS} == "no" MK_SOURCELESS_HOST:= no MK_SOURCELESS_UCODE:= no @@ -507,6 +502,12 @@ MK_NLS_CATALOGS:= no MK_DMAGENT:= no MK_OPENSSH:= no MK_KERBEROS:= no +MK_LDNS:= no +.endif + +.if ${MK_LDNS} == "no" +MK_LDNS_UTILS:= no +MK_UNBOUND:= no .endif .if ${MK_PF} == "no" From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:13:17 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 808D3270D73; Sun, 8 Mar 2020 18:13:17 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8bx2Bhrz4WW5; Sun, 8 Mar 2020 18:13:17 +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 1E26A25DBD; Sun, 8 Mar 2020 18:13:17 +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 028IDG2C004944; Sun, 8 Mar 2020 18:13:16 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IDGg6004943; Sun, 8 Mar 2020 18:13:16 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081813.028IDGg6004943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:13:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358756 - stable/12/usr.sbin/kbdmap X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/usr.sbin/kbdmap X-SVN-Commit-Revision: 358756 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:13:17 -0000 Author: emaste Date: Sun Mar 8 18:13:16 2020 New Revision: 358756 URL: https://svnweb.freebsd.org/changeset/base/358756 Log: MFC r355614: kbdmap: allow INDEX.keymaps to provide the dialog title Previously kbdmap had a localized menu heading ("Choose your keyboard layout") but not the dialog title ("Keyboard Menu"). Sponsored by: The FreeBSD Foundation Modified: stable/12/usr.sbin/kbdmap/kbdmap.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/kbdmap/kbdmap.c ============================================================================== --- stable/12/usr.sbin/kbdmap/kbdmap.c Sun Mar 8 18:12:54 2020 (r358755) +++ stable/12/usr.sbin/kbdmap/kbdmap.c Sun Mar 8 18:13:16 2020 (r358756) @@ -57,6 +57,7 @@ static const char *sysconfig = DEFAULT_SYSCONFIG; static const char *font_current; static const char *dir; static const char *menu = ""; +static const char *title = "Keyboard Menu"; static int x11; static int using_vt; @@ -360,8 +361,8 @@ show_dialog(struct keymap **km_sorted, int num_keymaps tmp_name); exit(1); } - asprintf(&dialog, "/usr/bin/dialog --clear --title \"Keyboard Menu\" " - "--menu \"%s\" 0 0 0", menu); + asprintf(&dialog, "/usr/bin/dialog --clear --title \"%s\" " + "--menu \"%s\" 0 0 0", title, menu); /* start right font, assume that current font is equal * to default font in /etc/rc.conf @@ -627,8 +628,9 @@ menu_read(void) matches = sscanf(p, "%64[^:]:%64[^:]:%256[^:\n]", keym, lng, desc); if (matches == 3) { - if (strcmp(keym, "FONT") - && strcmp(keym, "MENU")) { + if (strcmp(keym, "FONT") != 0 && + strcmp(keym, "MENU") != 0 && + strcmp(keym, "TITLE") != 0) { /* Check file exists & is readable */ if (check_file(keym) == -1) continue; @@ -705,6 +707,10 @@ menu_read(void) exit(0); } + km = get_keymap("TITLE"); + if (km) + /* Take note of dialog title */ + title = strdup(km->desc); km = get_keymap("MENU"); if (km) /* Take note of menu title */ @@ -715,8 +721,9 @@ menu_read(void) font = strdup(km->desc); /* Remove unwanted items from list */ - remove_keymap("MENU"); remove_keymap("FONT"); + remove_keymap("MENU"); + remove_keymap("TITLE"); /* Look for keymaps not in database */ dirp = opendir(dir); From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:14:46 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76690270EB8; Sun, 8 Mar 2020 18:14:46 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8dd5F1Vz4ZqV; Sun, 8 Mar 2020 18:14: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 A0C9325DC4; Sun, 8 Mar 2020 18:14: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 028IEjqq005116; Sun, 8 Mar 2020 18:14:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IEjGT005115; Sun, 8 Mar 2020 18:14:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081814.028IEjGT005115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:14:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358758 - stable/12/share/vt/keymaps X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/vt/keymaps X-SVN-Commit-Revision: 358758 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:14:46 -0000 Author: emaste Date: Sun Mar 8 18:14:45 2020 New Revision: 358758 URL: https://svnweb.freebsd.org/changeset/base/358758 Log: MFC r355585: remove nonexistent from-* entries from vt INDEX.keymaps A number of entries of the form "de.kbd.from-cp850" existed in vt's INDEX.keymaps, added in r270114, but these files do not exist. PR: 235564 Submitted by: scootergrisen gmail com Modified: stable/12/share/vt/keymaps/INDEX.keymaps Directory Properties: stable/12/ (props changed) Modified: stable/12/share/vt/keymaps/INDEX.keymaps ============================================================================== --- stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 18:13:40 2020 (r358757) +++ stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 18:14:45 2020 (r358758) @@ -91,16 +91,6 @@ cz.kbd:de:Tschechisch (QWERTZ, mit Akzenten) cz.kbd:fr:Tchèque (QWERTZ, avec accents) cz.kbd:es:Checo (QWERTZ, con acentos) -cz.kbd.from-ce:en:Czech -cz.kbd.from-ce:de:Tschechisch -cz.kbd.from-ce:fr:Tchèque -cz.kbd.from-ce:es:Checo - -cz.qwerty.kbd.from-ce:en:Czech (QWERTY) -cz.qwerty.kbd.from-ce:de:Tschechisch (QWERTY) -cz.qwerty.kbd.from-ce:fr:Tchèquey (QWERTY) -cz.qwerty.kbd.from-ce:es:Checo (QWERTY) - dk.kbd:en:Danish dk.kbd:da:Dansk dk.kbd:de:Dänisch @@ -115,13 +105,6 @@ dk.acc.kbd:fr:Danois (avec accents) dk.acc.kbd:pt:Dinamarquês (com acentos) dk.acc.kbd:es:Danés (con acentos) -dk.kbd.from-cp865:en:Danish -dk.kbd.from-cp865:da:Dansk -dk.kbd.from-cp865:de:Dänisch -dk.kbd.from-cp865:fr:Danois -dk.kbd.from-cp865:pt:Dinamarquês -dk.kbd.from-cp865:es:Danés - dk.macbook.kbd:en:Danish (macbook) dk.macbook.kbd:da:Dansk (macbook) dk.macbook.kbd:de:Dänisch (Macbook) @@ -139,31 +122,16 @@ gr.kbd:en:Greek (104 keys) gr.kbd:fr:Grec (104 touches) gr.kbd:el:Ελληνικό (104 πλήκτρων) -ee.kbd.from-iso1:en:Estonian -ee.kbd.from-iso1:de:Estnisch -ee.kbd.from-iso1:fr:Estonien -ee.kbd.from-iso1:es:Estonio - ee.kbd:en:Estonian ee.kbd:de:Estnisch ee.kbd:fr:Estonien ee.kbd:es:Estonio -ee.kbd.from-cp850:en:Estonian -ee.kbd.from-cp850:de:Estnisch -ee.kbd.from-cp850:fr:Estonien -ee.kbd.from-cp850:es:Estonio - fi.kbd:en:Finnish fi.kbd:de:Finnisch fi.kbd:fr:Finlandais fi.kbd:es:Finlandés -fi.kbd.from-cp850:en:Finnish -fi.kbd.from-cp850:de:Finnisch -fi.kbd.from-cp850:fr:Finlandais -fi.kbd.from-cp850:es:Finlandés - fr.kbd:en:French fr.kbd:de:Französisch fr.kbd:fr:Français @@ -228,13 +196,6 @@ de.noacc.kbd:pt:Alemão (no accent keys) de.noacc.kbd:es:Alemán (no accent keys) de.noacc.kbd:uk:Німецька (no accent keys) -de.kbd.from-cp850:en:German -de.kbd.from-cp850:de:Deutsch -de.kbd.from-cp850:fr:Allemand -de.kbd.from-cp850:pt:Alemão -de.kbd.from-cp850:es:Alemán -de.kbd.from-cp850:uk:Німецька - gr.elot.acc.kbd:en:Greek ELOT gr.elot.acc.kbd:de:Grieschisch ELOT gr.elot.acc.kbd:fr:Grec ELOT @@ -366,22 +327,6 @@ pt.acc.kbd:fr:Portugais (avec accents) pt.acc.kbd:pt:Português (com acentos) pt.acc.kbd:es:Portugués (con acentos) -ru.kbd.from-cp866:en:Russian (alternative) -ru.kbd.from-cp866:de:Russisch (alternativ) -ru.kbd.from-cp866:ru:Русский (alternative) -ru.kbd.from-cp866:fr:Russe (alternative) -ru.kbd.from-cp866:pt:Russo (alternativo) -ru.kbd.from-cp866:es:Ruso (alternativo) -ru.kbd.from-cp866:uk:Російська (альтернативна) - -ru.kbd.from-iso5:en:Russian -ru.kbd.from-iso5:de:Russisch -ru.kbd.from-iso5:fr:Russe -ru.kbd.from-iso5:ru:Русский -ru.kbd.from-iso5:pt:Russo -ru.kbd.from-iso5:es:Ruso -ru.kbd.from-iso5:uk:Російський - ru.kbd:en:Russian ru.kbd:de:Russisch ru.kbd:ru:Русский @@ -412,12 +357,6 @@ es.dvorak.kbd:fr:Espagnol Dvorak es.dvorak.kbd:pt:Espanhol Dvorak es.dvorak.kbd:es:Español Dvorak -es.kbd.from-iso1:en:Spanish -es.kbd.from-iso1:de:Spanisch -es.kbd.from-iso1:fr:Espagnol -es.kbd.from-iso1:pt:Espanhol -es.kbd.from-iso1:es:Español - es.acc.kbd:en:Spanish (accent keys) es.acc.kbd:de:Spanisch (accent keys) es.acc.kbd:fr:Espagnol (avec accents) @@ -446,11 +385,6 @@ se.kbd:de:Schwedisch se.kbd:fr:Suédois se.kbd:pt,es:Sueco -se.kbd.from-cp850:en:Swedish -se.kbd.from-cp850:de:Schwedisch -se.kbd.from-cp850:fr:Suédois -se.kbd.from-cp850:pt,es:Sueco - ch-fr.kbd:en:Swiss-French ch-fr.kbd:de:Schweiz-Französisch ch-fr.kbd:fr:Suisse-Français @@ -461,11 +395,6 @@ ch-fr.acc.kbd:de:Schweiz-Französisch (mit Akzenten) ch-fr.acc.kbd:fr:Suisse-Français (avec accents) ch-fr.acc.kbd:es:Francosuizo (con acentos) -ch-fr.kbd.from-cp850:en:Swiss-French -ch-fr.kbd.from-cp850:de:Schweiz-Französisch -ch-fr.kbd.from-cp850:fr:Suisse-Français -ch-fr.kbd.from-cp850:es:Francosuizo - ch.kbd:en:Swiss-German ch.kbd:de:Schweiz-Deutsch ch.kbd:fr:Suisse-Allemand @@ -478,12 +407,6 @@ ch.acc.kbd:fr:Suisse-Allemand (avec accents) ch.acc.kbd:pt:Suiço-Alemão (com acentos) ch.acc.kbd:es:Germanosuizo (con acentos) -ch.kbd.from-cp850:en:Swiss-German -ch.kbd.from-cp850:de:Schweiz-Deutsch -ch.kbd.from-cp850:fr:Suisse-Allemand -ch.kbd.from-cp850:pt:Suiço-Alemão -ch.kbd.from-cp850:es:Germanosuizo - ch.macbook.acc.kbd:en:Swiss-German Macbook/Macbook Pro (accent keys) ch.macbook.acc.kbd:de:Schweiz-Deutsch Macbook/Macbook Pro (mit Akzenten) ch.macbook.acc.kbd:fr:Suisse-Allemand Macbook/Macbook Pro (avec accents) @@ -587,12 +510,6 @@ us.macbook.kbd:de:US-amerikanisch Macbook/Macbook Pro us.macbook.kbd:fr:États Unis d'Amérique Macbook / Macbook Pro ISO-8859-1 us.macbook.kbd:pt:Estados Unidos da América Macbook/Macbook Pro ISO-8859-1 us.macbook.kbd:es:Estadounidense Macbook/Macbook Pro ISO-8859-1 - -ua.kbd.from-iso5:en:Ukrainian -ua.kbd.from-iso5:de:Ukrainisch -ua.kbd.from-iso5:fr:Ukrainien -ua.kbd.from-iso5:ru:Украинский -ua.kbd.from-iso5:uk:Українська ua.kbd:en:Ukrainian ua.kbd:de:Ukrainisch From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:15:36 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4DE4270F66; Sun, 8 Mar 2020 18:15:36 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8fb59QFz4ccQ; Sun, 8 Mar 2020 18:15:35 +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 60A0725DCD; Sun, 8 Mar 2020 18:15:35 +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 028IFZuc005239; Sun, 8 Mar 2020 18:15:35 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IFYT4005236; Sun, 8 Mar 2020 18:15:34 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081815.028IFYT4005236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358759 - in stable/12/share: syscons/fonts syscons/keymaps vt/keymaps X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12/share: syscons/fonts syscons/keymaps vt/keymaps X-SVN-Commit-Revision: 358759 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:15:36 -0000 Author: emaste Date: Sun Mar 8 18:15:34 2020 New Revision: 358759 URL: https://svnweb.freebsd.org/changeset/base/358759 Log: MFC r355583: strip trailing whitespace from font and keymap INDEX files PR: 235853 Submitted by: scootergrisen gmail com Modified: stable/12/share/syscons/fonts/INDEX.fonts stable/12/share/syscons/keymaps/INDEX.keymaps stable/12/share/vt/keymaps/INDEX.keymaps Directory Properties: stable/12/ (props changed) Modified: stable/12/share/syscons/fonts/INDEX.fonts ============================================================================== --- stable/12/share/syscons/fonts/INDEX.fonts Sun Mar 8 18:14:45 2020 (r358758) +++ stable/12/share/syscons/fonts/INDEX.fonts Sun Mar 8 18:15:34 2020 (r358759) @@ -1,7 +1,7 @@ # # $FreeBSD$ # -# database for vidfont(8) +# database for vidfont(8) # # Format :: # @@ -25,21 +25,21 @@ # ISO 8859-1 supports the following languages: # Afrikaans, Catalan, Danish, Dutch, English, Faroese, Finnish, French, # German, Galician, Irish, Icelandic, Italian, Norwegian, Portuguese, -# Spanish and Swedish. -# +# Spanish and Swedish. +# # (It has been called to my attention that Albanian can be written with # ISO 8859-1 also. However, from a standards point of view, ISO 8859-2 # is the appropriate character set for Balkan countries.) -# +# # ISO 8859-1 is just one part of the ISO-8859 standard, which specifies # several character sets, e.g.: # 8859-1 Europe, Latin America # 8859-2 Eastern Europe -# 8859-3 SE Europe/miscellaneous (Esperanto, Maltese, etc.) +# 8859-3 SE Europe/miscellaneous (Esperanto, Maltese, etc.) # 8859-4 Scandinavia/Baltic (mostly covered by 8859-1 also) # 8859-5 Cyrillic # 8859-6 Arabic -# 8859-7 Greek +# 8859-7 Greek # 8859-8 Hebrew # 8859-9 Latin5, same as 8859-1 except for Turkish instead of Icelandic # 8859-10 Latin6, for Eskimo/Scandinavian languages @@ -70,17 +70,17 @@ FONT:hy:armscii8-8x16.fnt # armscii8-8x16.fnt:hy:ARMSCII-8 ṳٳ ۳, 8x16 armscii8-8x16.fnt:ru: ARMSCII-8, 8x16 -armscii8-8x16.fnt:en:ARMSCII-8 Character set, 8x16 -armscii8-8x16.fnt:de:ARMSCII-8 Zeichensatz, 8x16 +armscii8-8x16.fnt:en:ARMSCII-8 Character set, 8x16 +armscii8-8x16.fnt:de:ARMSCII-8 Zeichensatz, 8x16 armscii8-8x14.fnt:hy:ARMSCII-8 ṳٳ ۳, 8x14 armscii8-8x14.fnt:ru: ARMSCII-8, 8x14 -armscii8-8x14.fnt:en:ARMSCII-8 Character set, 8x14 +armscii8-8x14.fnt:en:ARMSCII-8 Character set, 8x14 armscii8-8x14.fnt:de:ARMSCII-8 Zeichensatz, 8x14 armscii8-8x8.fnt:hy:ARMSCII-8 ṳٳ ۳, 8x8 armscii8-8x8.fnt:ru: ARMSCII-8, 8x8 -armscii8-8x8.fnt:en:ARMSCII-8 Character set, 8x8 +armscii8-8x8.fnt:en:ARMSCII-8 Character set, 8x8 armscii8-8x8.fnt:de:ARMSCII-8 Zeichensatz, 8x8 cp437-8x14.fnt:en:Codepage 437 English, 8x14 Modified: stable/12/share/syscons/keymaps/INDEX.keymaps ============================================================================== --- stable/12/share/syscons/keymaps/INDEX.keymaps Sun Mar 8 18:14:45 2020 (r358758) +++ stable/12/share/syscons/keymaps/INDEX.keymaps Sun Mar 8 18:15:34 2020 (r358759) @@ -1,6 +1,6 @@ # $FreeBSD$ # -# database for kbdmap(8) +# database for kbdmap(8) # # Format :: # @@ -9,7 +9,7 @@ # lang: lang,lang # # If lang empty use 'en' (us-english) as default. -# +# # Example: # german.iso.kbd:de:deutsch ISO-8859-1 # german.iso.kbd:en:german ISO-8859-1 @@ -40,7 +40,7 @@ FONT:he:iso08-8x16.fnt FONT:uk:koi8-u-8x16.fnt FONT:el:iso07-8x16.fnt FONT:hy:haik8-8x16.fnt -# +# be.iso.kbd:en:Belgian ISO-8859-1 be.iso.kbd:de:Belgisch ISO-8859-1 be.iso.kbd:fr:Belge ISO-8859-1 @@ -546,7 +546,7 @@ us.dvorakr.kbd:pt:Estados Unidos da Amrica dvorakr us.dvorakr.kbd:es:Estadounidense dvorak diestro us.dvorakl.kbd:en:United States of America lefthand dvorak -us.dvorakl.kbd:de:US-amerikanisch dvorak linke Hand +us.dvorakl.kbd:de:US-amerikanisch dvorak linke Hand us.dvorakl.kbd:fr:tats Unis d'Amrique dvorakl us.dvorakl.kbd:pt:Estados Unidos da Amrica dvorakl us.dvorakl.kbd:es:Estadounidense dvorak zurdo Modified: stable/12/share/vt/keymaps/INDEX.keymaps ============================================================================== --- stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 18:14:45 2020 (r358758) +++ stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 18:15:34 2020 (r358759) @@ -1,6 +1,6 @@ # $FreeBSD$ # -# database for kbdmap(8) +# database for kbdmap(8) # # Format :: # @@ -9,7 +9,7 @@ # lang: lang,lang # # If lang empty use 'en' (us-english) as default. -# +# # Example: # german.iso.kbd:de:deutsch # german.iso.kbd:en:german @@ -474,7 +474,7 @@ us.dvorakr.kbd:pt:Estados Unidos da América dvorakr us.dvorakr.kbd:es:Estadounidense dvorak diestro us.dvorakl.kbd:en:United States of America lefthand dvorak -us.dvorakl.kbd:de:US-amerikanisch dvorak linke Hand +us.dvorakl.kbd:de:US-amerikanisch dvorak linke Hand us.dvorakl.kbd:fr:États Unis d'Amérique dvorakl us.dvorakl.kbd:pt:Estados Unidos da América dvorakl us.dvorakl.kbd:es:Estadounidense dvorak zurdo From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:21:06 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 269C7271198; Sun, 8 Mar 2020 18:21:06 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8mx4zwvz4rlV; Sun, 8 Mar 2020 18:21: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 5361F25E1B; Sun, 8 Mar 2020 18:21: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 028IL5EH007261; Sun, 8 Mar 2020 18:21:05 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IL5T5007260; Sun, 8 Mar 2020 18:21:05 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081821.028IL5T5007260@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:21:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358761 - stable/12/sys/compat/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/compat/linux X-SVN-Commit-Revision: 358761 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:21:06 -0000 Author: emaste Date: Sun Mar 8 18:21:04 2020 New Revision: 358761 URL: https://svnweb.freebsd.org/changeset/base/358761 Log: MFC r349751: Update Linux compat version to 2.6.36 New system calls between 2.6.32 and 2.6.26 are already implemented. This should be mostly NFC as far as contemporary Linux applications are concerned though, as Linux kernel 3.2 is the oldest supported by a number of popular distros today; work is in progress by others to enable support for those applications. Modified: stable/12/sys/compat/linux/linux_mib.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linux/linux_mib.h ============================================================================== --- stable/12/sys/compat/linux/linux_mib.h Sun Mar 8 18:19:08 2020 (r358760) +++ stable/12/sys/compat/linux/linux_mib.h Sun Mar 8 18:21:04 2020 (r358761) @@ -48,7 +48,7 @@ int linux_kernver(struct thread *td); #define LINUX_KVERSION 2 #define LINUX_KPATCHLEVEL 6 -#define LINUX_KSUBLEVEL 32 +#define LINUX_KSUBLEVEL 36 #define LINUX_KERNVER(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #define LINUX_VERSION_CODE LINUX_KERNVER(LINUX_KVERSION, \ From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:22:38 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB6FA2714B3; Sun, 8 Mar 2020 18:22:38 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8pj6nl7z3Bnq; Sun, 8 Mar 2020 18:22:37 +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 733D525FA3; Sun, 8 Mar 2020 18:22:37 +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 028IMbDF011417; Sun, 8 Mar 2020 18:22:37 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028IMb86011416; Sun, 8 Mar 2020 18:22:37 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081822.028IMb86011416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:22:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358762 - stable/12/sys/dev/usb/net X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/dev/usb/net X-SVN-Commit-Revision: 358762 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:22:39 -0000 Author: emaste Date: Sun Mar 8 18:22:36 2020 New Revision: 358762 URL: https://svnweb.freebsd.org/changeset/base/358762 Log: MFC r349602: if_muge: set IFCAP_VLAN_MTU to maintain 1500 MTU with vlan use PR: 238665 Submitted by: Ralf Modified: stable/12/sys/dev/usb/net/if_muge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/net/if_muge.c ============================================================================== --- stable/12/sys/dev/usb/net/if_muge.c Sun Mar 8 18:21:04 2020 (r358761) +++ stable/12/sys/dev/usb/net/if_muge.c Sun Mar 8 18:22:36 2020 (r358762) @@ -1610,6 +1610,7 @@ muge_attach_post_sub(struct usb_ether *ue) * however currently only RX checksum is supported in the driver * (see top of file). */ + ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_hwassist = 0; if (MUGE_DEFAULT_RX_CSUM_ENABLE) ifp->if_capabilities |= IFCAP_RXCSUM; From owner-svn-src-stable-12@freebsd.org Sun Mar 8 18:23:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A2E13271532; Sun, 8 Mar 2020 18:23: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b8qy3MKBz3F0j; Sun, 8 Mar 2020 18:23: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 2519B25FA8; Sun, 8 Mar 2020 18:23: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 028INfjs011531; Sun, 8 Mar 2020 18:23:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028INfhL011530; Sun, 8 Mar 2020 18:23:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081823.028INfhL011530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 18:23:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358763 - stable/12/lib/libcompiler_rt X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/lib/libcompiler_rt X-SVN-Commit-Revision: 358763 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 18:23:42 -0000 Author: emaste Date: Sun Mar 8 18:23:41 2020 New Revision: 358763 URL: https://svnweb.freebsd.org/changeset/base/358763 Log: MFC r351040: compiler-rt: enable __bswapsi2/__bswapdi2 for RISC-V As with other archs the compiler may emit calls to the byte swap routines under certain conditions. Sponsored by: The FreeBSD Foundation Modified: stable/12/lib/libcompiler_rt/Makefile.inc Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libcompiler_rt/Makefile.inc ============================================================================== --- stable/12/lib/libcompiler_rt/Makefile.inc Sun Mar 8 18:22:36 2020 (r358762) +++ stable/12/lib/libcompiler_rt/Makefile.inc Sun Mar 8 18:23:41 2020 (r358763) @@ -244,7 +244,8 @@ SRCS+= sync_synchronize.S .endif # On some archs GCC-6.3 requires bswap32 built-in. -.if ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "riscv" || \ + ${MACHINE_CPUARCH} == "sparc64" SRCS+= bswapdi2.c SRCS+= bswapsi2.c .endif From owner-svn-src-stable-12@freebsd.org Sun Mar 8 19:49:19 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7CDB273FC4; Sun, 8 Mar 2020 19:49:19 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bBkl10Kyz4HC7; Sun, 8 Mar 2020 19:49:19 +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 8620426F34; Sun, 8 Mar 2020 19:49:18 +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 028JnIga065168; Sun, 8 Mar 2020 19:49:18 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028JnI1W065166; Sun, 8 Mar 2020 19:49:18 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081949.028JnI1W065166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 19:49:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358773 - in stable/12: crypto/openssh secure/usr.bin/ssh X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12: crypto/openssh secure/usr.bin/ssh X-SVN-Commit-Revision: 358773 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 19:49:19 -0000 Author: emaste Date: Sun Mar 8 19:49:17 2020 New Revision: 358773 URL: https://svnweb.freebsd.org/changeset/base/358773 Log: MFC r345579 by des: Add workaround for a QoS-related bug in VMWare Workstation Submitted by: yuripv Modified: stable/12/crypto/openssh/readconf.c stable/12/secure/usr.bin/ssh/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/crypto/openssh/readconf.c ============================================================================== --- stable/12/crypto/openssh/readconf.c Sun Mar 8 19:18:33 2020 (r358772) +++ stable/12/crypto/openssh/readconf.c Sun Mar 8 19:49:17 2020 (r358773) @@ -16,6 +16,9 @@ __RCSID("$FreeBSD$"); #include +#ifdef VMWARE_GUEST_WORKAROUND +#include +#endif #include #include #include @@ -1954,7 +1957,16 @@ fill_default_options(Options * options) { char *all_cipher, *all_mac, *all_kex, *all_key; int r; +#ifdef VMWARE_GUEST_WORKAROUND + char scval[7]; /* "vmware\0" */ + size_t scsiz = sizeof(scval); + int vmwguest = 0; + if (sysctlbyname("kern.vm_guest", scval, &scsiz, NULL, 0) == 0 && + strcmp(scval, "vmware") == 0) + vmwguest = 1; +#endif + if (options->forward_agent == -1) options->forward_agent = 0; if (options->forward_x11 == -1) @@ -2088,8 +2100,18 @@ fill_default_options(Options * options) if (options->visual_host_key == -1) options->visual_host_key = 0; if (options->ip_qos_interactive == -1) +#ifdef VMWARE_GUEST_WORKAROUND + if (vmwguest) + options->ip_qos_interactive = IPTOS_LOWDELAY; + else +#endif options->ip_qos_interactive = IPTOS_DSCP_AF21; if (options->ip_qos_bulk == -1) +#ifdef VMWARE_GUEST_WORKAROUND + if (vmwguest) + options->ip_qos_bulk = IPTOS_THROUGHPUT; + else +#endif options->ip_qos_bulk = IPTOS_DSCP_CS1; if (options->request_tty == -1) options->request_tty = REQUEST_TTY_AUTO; Modified: stable/12/secure/usr.bin/ssh/Makefile ============================================================================== --- stable/12/secure/usr.bin/ssh/Makefile Sun Mar 8 19:18:33 2020 (r358772) +++ stable/12/secure/usr.bin/ssh/Makefile Sun Mar 8 19:49:17 2020 (r358773) @@ -37,6 +37,9 @@ LIBADD+= crypto CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif +# Workaround VMware Workstation NAT bug +CFLAGS+=-DVMWARE_GUEST_WORKAROUND + .include .PATH: ${SSHDIR} From owner-svn-src-stable-12@freebsd.org Sun Mar 8 19:57:02 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C810227426D; Sun, 8 Mar 2020 19:57:02 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bBvf0QN0z4d1Z; Sun, 8 Mar 2020 19:57:02 +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 F0FAD27134; Sun, 8 Mar 2020 19:57:01 +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 028Jv1lG070917; Sun, 8 Mar 2020 19:57:01 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028Jv1xX070916; Sun, 8 Mar 2020 19:57:01 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003081957.028Jv1xX070916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 19:57:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358774 - stable/12/share/man/man7 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man7 X-SVN-Commit-Revision: 358774 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 19:57:03 -0000 Author: emaste Date: Sun Mar 8 19:57:01 2020 New Revision: 358774 URL: https://svnweb.freebsd.org/changeset/base/358774 Log: MFC r341653: hier.7: add /lib/casper directory Reported by: imp Sponsored by: The FreeBSD Foundation Modified: stable/12/share/man/man7/hier.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/hier.7 ============================================================================== --- stable/12/share/man/man7/hier.7 Sun Mar 8 19:49:17 2020 (r358773) +++ stable/12/share/man/man7/hier.7 Sun Mar 8 19:57:01 2020 (r358774) @@ -144,6 +144,10 @@ and .Pa /sbin .Pp .Bl -tag -width "defaults/" -compact +.It Pa casper/ +service-specific +.Xr libcasper 3 +Capsicum support libraries .It Pa geom/ class-specific libraries for the .Xr geom 8 From owner-svn-src-stable-12@freebsd.org Sun Mar 8 20:03:18 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 255082744B6; Sun, 8 Mar 2020 20:03:18 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bC2t0G9Kz3JvL; Sun, 8 Mar 2020 20:03:18 +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 0413D272FE; Sun, 8 Mar 2020 20:03:18 +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 028K3HXA076918; Sun, 8 Mar 2020 20:03:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028K3HSA076917; Sun, 8 Mar 2020 20:03:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082003.028K3HSA076917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 20:03:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358775 - stable/12/contrib/elftoolchain/readelf X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/contrib/elftoolchain/readelf X-SVN-Commit-Revision: 358775 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 20:03:18 -0000 Author: emaste Date: Sun Mar 8 20:03:17 2020 New Revision: 358775 URL: https://svnweb.freebsd.org/changeset/base/358775 Log: MFC r354842 (jhibbits): readelf: add PowerPC VMX and VSX note decode Modified: stable/12/contrib/elftoolchain/readelf/readelf.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- stable/12/contrib/elftoolchain/readelf/readelf.c Sun Mar 8 19:57:01 2020 (r358774) +++ stable/12/contrib/elftoolchain/readelf/readelf.c Sun Mar 8 20:03:17 2020 (r358775) @@ -1162,6 +1162,8 @@ note_type_freebsd_core(unsigned int nt) case 15: return "NT_PROCSTAT_PSSTRINGS"; case 16: return "NT_PROCSTAT_AUXV"; case 17: return "NT_PTLWPINFO"; + case 0x100: return "NT_PPC_VMX (ppc Altivec registers)"; + case 0x102: return "NT_PPC_VSX (ppc VSX registers)"; case 0x202: return "NT_X86_XSTATE (x86 XSAVE extended state)"; case 0x400: return "NT_ARM_VFP (arm VFP registers)"; default: return (note_type_unknown(nt)); From owner-svn-src-stable-12@freebsd.org Sun Mar 8 20:05:34 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A855B274589; Sun, 8 Mar 2020 20:05:34 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bC5V40j1z3Kpv; Sun, 8 Mar 2020 20:05:34 +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 8315F27301; Sun, 8 Mar 2020 20:05:34 +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 028K5YdJ077082; Sun, 8 Mar 2020 20:05:34 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028K5YQP077081; Sun, 8 Mar 2020 20:05:34 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082005.028K5YQP077081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 20:05:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358776 - stable/12/contrib/elftoolchain/libdwarf X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/contrib/elftoolchain/libdwarf X-SVN-Commit-Revision: 358776 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 20:05:34 -0000 Author: emaste Date: Sun Mar 8 20:05:34 2020 New Revision: 358776 URL: https://svnweb.freebsd.org/changeset/base/358776 Log: MFC r348347 (jhibbits): libdwarf: add missing powerpc64 relocation support Due to missing relocation support in libdwarf for powerpc64, handling of dwarf info on unlinked objects was bogus. Examining raw dwarf data on objects compiled on ppc64 with a modern compiler (in-tree gcc tends to hide the issue, since it only rarely generates relocations in .debug_info and uses DW_FORM_str instead of DW_FORM_strp for everything), you will find that the dwarf data appears corrupt, with repeated references to the compiler version where things like types and function names should appear. This happens because the 0 offset of .debug_str contains the compiler version, and without applying the relocations, *all* indirect strings in .dwarf_info will end up pointing to it. This corruption then propogates to the CTF data, as ctfconvert relies on libdwarf to read the dwarf info, for every compiled object (when building a kernel.) However, if you examine the dwarf data on a compiled executable, it will appear correct, because during final link the relocations get applied and baked in by the linker. Submitted by: Brandon Bergren Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sun Mar 8 20:03:17 2020 (r358775) +++ stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sun Mar 8 20:05:34 2020 (r358776) @@ -44,7 +44,7 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64) case DW_ISA_SPARC: return (is64 ? R_SPARC_UA64 : R_SPARC_UA32); case DW_ISA_PPC: - return (R_PPC_ADDR32); + return (is64 ? R_PPC64_ADDR64 : R_PPC_ADDR32); case DW_ISA_ARM: return (R_ARM_ABS32); case DW_ISA_MIPS: @@ -96,6 +96,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, Dwarf_Unsigned case EM_PPC: if (rel_type == R_PPC_ADDR32) return (4); + break; + case EM_PPC64: + if (rel_type == R_PPC_ADDR32) + return (4); + else if (rel_type == R_PPC64_ADDR64) + return (8); break; case EM_MIPS: if (rel_type == R_MIPS_32) From owner-svn-src-stable-12@freebsd.org Sun Mar 8 20:09:21 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2ED81274653; Sun, 8 Mar 2020 20:09: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bC9r2NT0z3ySJ; Sun, 8 Mar 2020 20:09:20 +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 2667927305; Sun, 8 Mar 2020 20:09:20 +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 028K9Jec077357; Sun, 8 Mar 2020 20:09:19 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028K9J9q077356; Sun, 8 Mar 2020 20:09:19 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082009.028K9J9q077356@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 20:09:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358777 - stable/12/contrib/elftoolchain/strings X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/contrib/elftoolchain/strings X-SVN-Commit-Revision: 358777 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 20:09:21 -0000 Author: emaste Date: Sun Mar 8 20:09:19 2020 New Revision: 358777 URL: https://svnweb.freebsd.org/changeset/base/358777 Log: MFC r340746, r340750 (oshogbo): strings: fix style nits Modified: stable/12/contrib/elftoolchain/strings/strings.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/elftoolchain/strings/strings.c ============================================================================== --- stable/12/contrib/elftoolchain/strings/strings.c Sun Mar 8 20:05:34 2020 (r358776) +++ stable/12/contrib/elftoolchain/strings/strings.c Sun Mar 8 20:09:19 2020 (r358777) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#include #include +#include #include #include @@ -64,7 +64,7 @@ enum encoding_style { }; #define PRINTABLE(c) \ - ((c) >= 0 && (c) <= 255 && \ + ((c) >= 0 && (c) <= 255 && \ ((c) == '\t' || isprint((c)) || \ (encoding == ENCODING_8BIT && (c) > 127))) @@ -109,8 +109,8 @@ main(int argc, char **argv) elf_errmsg(-1)); while ((ch = getopt_long(argc, argv, "1234567890ae:fhn:ot:Vv", - strings_longopts, NULL)) != -1) - switch((char)ch) { + strings_longopts, NULL)) != -1) { + switch ((char)ch) { case 'a': entire_file = 1; break; @@ -183,14 +183,15 @@ main(int argc, char **argv) usage(); /* NOTREACHED */ } + } argc -= optind; argv += optind; - if (!min_len) + if (min_len == 0) min_len = 4; - if (!*argv) + if (*argv == NULL) rc = find_strings("{standard input}", 0, 0); - else while (*argv) { + else while (*argv != NULL) { if (handle_file(*argv) != 0) rc = 1; argv++; @@ -226,10 +227,10 @@ handle_binary(const char *name, int fd) { struct stat buf; - memset(&buf, 0, sizeof(struct stat)); - (void) lseek(fd, (off_t)0, SEEK_SET); + memset(&buf, 0, sizeof(buf)); + (void)lseek(fd, 0, SEEK_SET); if (!fstat(fd, &buf)) - return (find_strings(name, (off_t)0, buf.st_size)); + return (find_strings(name, 0, buf.st_size)); return (1); } @@ -253,21 +254,21 @@ handle_elf(const char *name, int fd) if (entire_file) return (handle_binary(name, fd)); - (void) lseek(fd, (off_t)0, SEEK_SET); + (void)lseek(fd, 0, SEEK_SET); elf = elf_begin(fd, ELF_C_READ, NULL); if (elf_kind(elf) != ELF_K_ELF) { - (void) elf_end(elf); + (void)elf_end(elf); return (handle_binary(name, fd)); } if (gelf_getehdr(elf, &elfhdr) == NULL) { - (void) elf_end(elf); + (void)elf_end(elf); warnx("%s: ELF file could not be processed", name); return (1); } if (elfhdr.e_shnum == 0 && elfhdr.e_type == ET_CORE) { - (void) elf_end(elf); + (void)elf_end(elf); return (handle_binary(name, fd)); } else { scn = NULL; @@ -281,7 +282,7 @@ handle_elf(const char *name, int fd) } } } - (void) elf_end(elf); + (void)elf_end(elf); return (rc); } @@ -304,7 +305,7 @@ getcharacter(void) buf[i] = c; } - switch(encoding) { + switch (encoding) { case ENCODING_7BIT: case ENCODING_8BIT: rt = buf[0]; @@ -317,12 +318,12 @@ getcharacter(void) break; case ENCODING_32BIT_BIG: rt = ((long) buf[0] << 24) | ((long) buf[1] << 16) | - ((long) buf[2] << 8) | buf[3]; - break; + ((long) buf[2] << 8) | buf[3]; + break; case ENCODING_32BIT_LITTLE: rt = buf[0] | ((long) buf[1] << 8) | ((long) buf[2] << 16) | - ((long) buf[3] << 24); - break; + ((long) buf[3] << 24); + break; } return (rt); } @@ -341,63 +342,60 @@ find_strings(const char *name, off_t offset, off_t siz int i; if ((obuf = (char*)calloc(1, min_len + 1)) == NULL) { - (void) fprintf(stderr, "Unable to allocate memory: %s\n", - strerror(errno)); + fprintf(stderr, "Unable to allocate memory: %s\n", + strerror(errno)); return (1); } - (void) fseeko(stdin, offset, SEEK_SET); + (void)fseeko(stdin, offset, SEEK_SET); cur_off = offset; start_off = 0; - while(1) { + for (;;) { if ((offset + size) && (cur_off >= offset + size)) break; start_off = cur_off; - memset(obuf, 0, min_len+1); + memset(obuf, 0, min_len + 1); for(i = 0; i < min_len; i++) { c = getcharacter(); if (c == EOF && feof(stdin)) goto _exit1; - if (PRINTABLE(c)) { - obuf[i] = c; - obuf[i+1] = 0; - cur_off += encoding_size; - } else { + if (PRINTABLE(c)) { + obuf[i] = c; + obuf[i + 1] = 0; + cur_off += encoding_size; + } else { if (encoding == ENCODING_8BIT && (uint8_t)c > 127) { - obuf[i] = c; - obuf[i+1] = 0; - cur_off += encoding_size; - continue; - } - cur_off += encoding_size; - break; - } + obuf[i] = c; + obuf[i + 1] = 0; + cur_off += encoding_size; + continue; + } + cur_off += encoding_size; + break; + } } if (i >= min_len && ((cur_off <= offset + size) || !(offset + size))) { if (show_filename) - printf ("%s: ", name); + printf("%s: ", name); if (show_loc) { - switch(radix) { + switch (radix) { case RADIX_DECIMAL: - (void) printf("%7ju ", - (uintmax_t)start_off); + printf("%7ju ", (uintmax_t)start_off); break; case RADIX_HEX: - (void) printf("%7jx ", - (uintmax_t)start_off); + printf("%7jx ", (uintmax_t)start_off); break; case RADIX_OCTAL: - (void) printf("%7jo ", - (uintmax_t)start_off); + printf("%7jo ", (uintmax_t)start_off); break; } } printf("%s", obuf); - while(1) { + for (;;) { if ((offset + size) && (cur_off >= offset + size)) break; @@ -405,9 +403,9 @@ find_strings(const char *name, off_t offset, off_t siz cur_off += encoding_size; if (encoding == ENCODING_8BIT && (uint8_t)c > 127) { - putchar(c); - continue; - } + putchar(c); + continue; + } if (!PRINTABLE(c) || c == EOF) break; putchar(c); @@ -436,13 +434,15 @@ Usage: %s [options] [file...]\n\ void usage(void) { - (void) fprintf(stderr, USAGE_MESSAGE, ELFTC_GETPROGNAME()); + + fprintf(stderr, USAGE_MESSAGE, ELFTC_GETPROGNAME()); exit(EXIT_FAILURE); } void show_version(void) { - (void) printf("%s (%s)\n", ELFTC_GETPROGNAME(), elftc_version()); + + printf("%s (%s)\n", ELFTC_GETPROGNAME(), elftc_version()); exit(EXIT_SUCCESS); } From owner-svn-src-stable-12@freebsd.org Sun Mar 8 20:35:01 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91DE9274D62; Sun, 8 Mar 2020 20:35:01 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bClT1Qrjz49QJ; Sun, 8 Mar 2020 20:35:01 +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 1C46027893; Sun, 8 Mar 2020 20:35:01 +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 028KZ0Ui095232; Sun, 8 Mar 2020 20:35:00 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028KZ09w095231; Sun, 8 Mar 2020 20:35:00 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082035.028KZ09w095231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 20:35:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358778 - stable/12/contrib/elftoolchain/readelf X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/contrib/elftoolchain/readelf X-SVN-Commit-Revision: 358778 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 20:35:01 -0000 Author: emaste Date: Sun Mar 8 20:35:00 2020 New Revision: 358778 URL: https://svnweb.freebsd.org/changeset/base/358778 Log: readelf: hoist file opening out of dump_object Diff reduction with HEAD to facilitate other MFCs. Modified: stable/12/contrib/elftoolchain/readelf/readelf.c Modified: stable/12/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- stable/12/contrib/elftoolchain/readelf/readelf.c Sun Mar 8 20:09:19 2020 (r358777) +++ stable/12/contrib/elftoolchain/readelf/readelf.c Sun Mar 8 20:35:00 2020 (r358778) @@ -7116,15 +7116,8 @@ process_members: } static void -dump_object(struct readelf *re) +dump_object(struct readelf *re, int fd) { - int fd; - - if ((fd = open(re->filename, O_RDONLY)) == -1) { - warn("open %s failed", re->filename); - return; - } - if ((re->flags & DISPLAY_FILENAME) != 0) printf("\nFile: %s\n", re->filename); @@ -7145,13 +7138,10 @@ dump_object(struct readelf *re) break; default: warnx("Internal: libelf returned unknown elf kind."); - goto done; } - elf_end(re->elf); - done: - close(fd); + elf_end(re->elf); } static void @@ -7496,7 +7486,7 @@ main(int argc, char **argv) { struct readelf *re, re_storage; unsigned long si; - int opt, i; + int fd, opt, i; char *ep; re = &re_storage; @@ -7621,7 +7611,13 @@ main(int argc, char **argv) for (i = 0; i < argc; i++) { re->filename = argv[i]; - dump_object(re); + fd = open(re->filename, O_RDONLY); + if (fd < 0) { + warn("open %s failed", re->filename); + } else { + dump_object(re, fd); + close(fd); + } } exit(EXIT_SUCCESS); From owner-svn-src-stable-12@freebsd.org Sun Mar 8 20:40:46 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 587D6274E30; Sun, 8 Mar 2020 20:40:46 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bCt605x7z4QWN; Sun, 8 Mar 2020 20:40:46 +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 A0D9A278B9; Sun, 8 Mar 2020 20:40: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 028Kej9B098771; Sun, 8 Mar 2020 20:40:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028KecO7096261; Sun, 8 Mar 2020 20:40:38 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082040.028KecO7096261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 20:40:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358779 - in stable/12: contrib/elftoolchain contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfcopy contrib/elftoolchain/elfdump contrib/elftoolchain/li... X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12: contrib/elftoolchain contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfcopy contrib/elftoolchain/elfdump contrib/elftoolchain/libdwarf contrib/elftoolcha... X-SVN-Commit-Revision: 358779 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 20:40:46 -0000 Author: emaste Date: Sun Mar 8 20:40:38 2020 New Revision: 358779 URL: https://svnweb.freebsd.org/changeset/base/358779 Log: MFC r355413: Update ELF Tool Chain to upstream r3769 This contains many small bugfixes and documentation improvements. Sponsored by: The FreeBSD Foundation Added: stable/12/contrib/elftoolchain/.cirrus.yml - copied unchanged from r355413, head/contrib/elftoolchain/.cirrus.yml stable/12/contrib/elftoolchain/libelf/os.Linux.mk - copied unchanged from r355413, head/contrib/elftoolchain/libelf/os.Linux.mk Modified: stable/12/contrib/elftoolchain/README.rst stable/12/contrib/elftoolchain/addr2line/addr2line.c stable/12/contrib/elftoolchain/common/elfdefinitions.h stable/12/contrib/elftoolchain/common/native-elf-format stable/12/contrib/elftoolchain/elfcopy/ascii.c stable/12/contrib/elftoolchain/elfcopy/binary.c stable/12/contrib/elftoolchain/elfcopy/elfcopy.h stable/12/contrib/elftoolchain/elfcopy/main.c stable/12/contrib/elftoolchain/elfcopy/sections.c stable/12/contrib/elftoolchain/elfdump/elfdump.c stable/12/contrib/elftoolchain/libdwarf/dwarf.h stable/12/contrib/elftoolchain/libdwarf/dwarf_dump.c stable/12/contrib/elftoolchain/libdwarf/libdwarf_attr.c stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c stable/12/contrib/elftoolchain/libelf/_libelf.h stable/12/contrib/elftoolchain/libelf/_libelf_config.h stable/12/contrib/elftoolchain/libelf/elf.3 stable/12/contrib/elftoolchain/libelf/elf_data.c stable/12/contrib/elftoolchain/libelf/elf_end.c stable/12/contrib/elftoolchain/libelf/elf_flagdata.3 stable/12/contrib/elftoolchain/libelf/elf_getdata.3 stable/12/contrib/elftoolchain/libelf/elf_getident.c stable/12/contrib/elftoolchain/libelf/elf_next.3 stable/12/contrib/elftoolchain/libelf/elf_next.c stable/12/contrib/elftoolchain/libelf/elf_open.3 stable/12/contrib/elftoolchain/libelf/elf_rand.c stable/12/contrib/elftoolchain/libelf/elf_rawfile.c stable/12/contrib/elftoolchain/libelf/elf_scn.c stable/12/contrib/elftoolchain/libelf/elf_update.3 stable/12/contrib/elftoolchain/libelf/elf_update.c stable/12/contrib/elftoolchain/libelf/gelf.3 stable/12/contrib/elftoolchain/libelf/gelf_cap.c stable/12/contrib/elftoolchain/libelf/gelf_dyn.c stable/12/contrib/elftoolchain/libelf/gelf_getcap.3 stable/12/contrib/elftoolchain/libelf/gelf_getdyn.3 stable/12/contrib/elftoolchain/libelf/gelf_getmove.3 stable/12/contrib/elftoolchain/libelf/gelf_getrel.3 stable/12/contrib/elftoolchain/libelf/gelf_getrela.3 stable/12/contrib/elftoolchain/libelf/gelf_getsym.3 stable/12/contrib/elftoolchain/libelf/gelf_getsyminfo.3 stable/12/contrib/elftoolchain/libelf/gelf_getsymshndx.3 stable/12/contrib/elftoolchain/libelf/gelf_move.c stable/12/contrib/elftoolchain/libelf/gelf_newehdr.3 stable/12/contrib/elftoolchain/libelf/gelf_newphdr.3 stable/12/contrib/elftoolchain/libelf/gelf_rel.c stable/12/contrib/elftoolchain/libelf/gelf_rela.c stable/12/contrib/elftoolchain/libelf/gelf_sym.c stable/12/contrib/elftoolchain/libelf/gelf_syminfo.c stable/12/contrib/elftoolchain/libelf/gelf_symshndx.c stable/12/contrib/elftoolchain/libelf/libelf_allocate.c stable/12/contrib/elftoolchain/libelf/libelf_ar.c stable/12/contrib/elftoolchain/libelf/libelf_convert.m4 stable/12/contrib/elftoolchain/libelf/libelf_data.c stable/12/contrib/elftoolchain/libelf/libelf_ehdr.c stable/12/contrib/elftoolchain/libelf/libelf_extended.c stable/12/contrib/elftoolchain/libelf/libelf_memory.c stable/12/contrib/elftoolchain/libelf/libelf_msize.m4 stable/12/contrib/elftoolchain/libelf/libelf_phdr.c stable/12/contrib/elftoolchain/libelf/libelf_xlate.c stable/12/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 stable/12/contrib/elftoolchain/libelftc/elftc_string_table.c stable/12/contrib/elftoolchain/libelftc/elftc_string_table_create.3 stable/12/contrib/elftoolchain/libelftc/libelftc.h stable/12/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c stable/12/contrib/elftoolchain/libelftc/make-toolchain-version stable/12/contrib/elftoolchain/nm/nm.c stable/12/contrib/elftoolchain/readelf/readelf.1 stable/12/contrib/elftoolchain/readelf/readelf.c stable/12/lib/libelftc/elftc_version.c Directory Properties: stable/12/ (props changed) Copied: stable/12/contrib/elftoolchain/.cirrus.yml (from r355413, head/contrib/elftoolchain/.cirrus.yml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/contrib/elftoolchain/.cirrus.yml Sun Mar 8 20:40:38 2020 (r358779, copy of r355413, head/contrib/elftoolchain/.cirrus.yml) @@ -0,0 +1,22 @@ +freebsd_11_task: + freebsd_instance: + image: freebsd-11-2-release-amd64 + install_script: pkg install -y git py27-yaml + script: + - fetch http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz + - tar -x -C test/tet -f tet3.8-src.tar.gz + - make + +debian_stable_task: + container: + image: debian:stable + setup_script: + - apt-get update + - apt-get install -y + binutils bison bmake curl flex g++ gcc git + libarchive-dev libbsd-dev libc6-dev libexpat1-dev lsb-release + m4 perl python-yaml sharutils zlib1g-dev + script: + - curl -O http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz + - tar -x -C test/tet -z -f tet3.8-src.tar.gz + - bmake Modified: stable/12/contrib/elftoolchain/README.rst ============================================================================== --- stable/12/contrib/elftoolchain/README.rst Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/README.rst Sun Mar 8 20:40:38 2020 (r358779) @@ -62,12 +62,12 @@ The project uses subversion_ for its version control s The subversion branch for the current set of sources may be accessed at the following URL:: - https://elftoolchain.svn.sourceforge.net/svnroot/elftoolchain/trunk + https://sourceforge.net/p/elftoolchain/code/HEAD/tree/trunk/ The project's source tree may be checked out from its repository by using the ``svn checkout`` command:: - % svn checkout https://elftoolchain.svn.sourceforge.net/svnroot/elftoolchain/trunk + % svn checkout https://svn.code.sf.net/p/elftoolchain/code/trunk Checked-out sources may be kept upto-date by running ``svn update`` inside the source directory:: @@ -105,10 +105,10 @@ The project's developers may be contacted using the ma Reporting Bugs -------------- -Please use our `Trac instance`_ for viewing existing bug reports and +Please use our `bug tracker`_ for viewing existing bug reports and for submitting new bug reports. -.. _`Trac instance`: http://sourceforge.net/apps/trac/elftoolchain/report +.. _`bug tracker`: https://sourceforge.net/p/elftoolchain/tickets/ Additional Information @@ -119,7 +119,7 @@ website`_. .. _project website: http://elftoolchain.sourceforge.net/ -.. $Id: README.rst 3656 2018-12-26 09:46:24Z jkoshy $ +.. $Id: README.rst 3677 2019-02-11 09:37:09Z jkoshy $ .. Local Variables: .. mode: rst Modified: stable/12/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- stable/12/contrib/elftoolchain/addr2line/addr2line.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/addr2line/addr2line.c Sun Mar 8 20:40:38 2020 (r358779) @@ -42,7 +42,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: addr2line.c 3544 2017-06-05 14:51:44Z emaste $"); +ELFTC_VCSID("$Id: addr2line.c 3499 2016-11-25 16:06:29Z emaste $"); struct Func { char *name; Modified: stable/12/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- stable/12/contrib/elftoolchain/common/elfdefinitions.h Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/common/elfdefinitions.h Sun Mar 8 20:40:38 2020 (r358779) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfdefinitions.h 3515 2017-01-24 22:04:22Z emaste $ + * $Id: elfdefinitions.h 3769 2019-06-29 15:15:02Z emaste $ */ /* @@ -72,7 +72,39 @@ _ELF_DEFINE_DF(DF_TEXTREL, 0x4, \ _ELF_DEFINE_DF(DF_BIND_NOW, 0x8, \ "process relocation entries at load time") \ _ELF_DEFINE_DF(DF_STATIC_TLS, 0x10, \ - "uses static thread-local storage") + "uses static thread-local storage") \ +_ELF_DEFINE_DF(DF_1_BIND_NOW, 0x1, \ + "process relocation entries at load time") \ +_ELF_DEFINE_DF(DF_1_GLOBAL, 0x2, \ + "unused") \ +_ELF_DEFINE_DF(DF_1_GROUP, 0x4, \ + "object is a member of a group") \ +_ELF_DEFINE_DF(DF_1_NODELETE, 0x8, \ + "object cannot be deleted from a process") \ +_ELF_DEFINE_DF(DF_1_LOADFLTR, 0x10, \ + "immediate load filtees") \ +_ELF_DEFINE_DF(DF_1_INITFIRST, 0x20, \ + "initialize object first") \ +_ELF_DEFINE_DF(DF_1_NOOPEN, 0x40, \ + "disallow dlopen()") \ +_ELF_DEFINE_DF(DF_1_ORIGIN, 0x80, \ + "object being loaded may refer to $ORIGIN") \ +_ELF_DEFINE_DF(DF_1_DIRECT, 0x100, \ + "direct bindings enabled") \ +_ELF_DEFINE_DF(DF_1_INTERPOSE, 0x400, \ + "object is interposer") \ +_ELF_DEFINE_DF(DF_1_NODEFLIB, 0x800, \ + "ignore default library search path") \ +_ELF_DEFINE_DF(DF_1_NODUMP, 0x1000, \ + "disallow dldump()") \ +_ELF_DEFINE_DF(DF_1_CONFALT, 0x2000, \ + "object is a configuration alternative") \ +_ELF_DEFINE_DF(DF_1_ENDFILTEE, 0x4000, \ + "filtee terminates filter search") \ +_ELF_DEFINE_DF(DF_1_DISPRELDNE, 0x8000, \ + "displacement relocation done") \ +_ELF_DEFINE_DF(DF_1_DISPRELPND, 0x10000, \ + "displacement relocation pending") #undef _ELF_DEFINE_DF #define _ELF_DEFINE_DF(N, V, DESCR) N = V , enum { @@ -2464,7 +2496,10 @@ _ELF_DEFINE_NT(NT_PSTATUS, 10, "Linux process status") _ELF_DEFINE_NT(NT_FPREGS, 12, "Linux floating point regset") \ _ELF_DEFINE_NT(NT_PSINFO, 13, "Linux process information") \ _ELF_DEFINE_NT(NT_LWPSTATUS, 16, "Linux lwpstatus_t type") \ -_ELF_DEFINE_NT(NT_LWPSINFO, 17, "Linux lwpinfo_t type") +_ELF_DEFINE_NT(NT_LWPSINFO, 17, "Linux lwpinfo_t type") \ +_ELF_DEFINE_NT(NT_FREEBSD_NOINIT_TAG, 2, "FreeBSD no .init tag") \ +_ELF_DEFINE_NT(NT_FREEBSD_ARCH_TAG, 3, "FreeBSD arch tag") \ +_ELF_DEFINE_NT(NT_FREEBSD_FEATURE_CTL, 4, "FreeBSD feature control") #undef _ELF_DEFINE_NT #define _ELF_DEFINE_NT(N, V, DESCR) N = V , @@ -2822,7 +2857,8 @@ typedef struct { #define ELF64_R_SYM(I) ((I) >> 32) #define ELF64_R_TYPE(I) ((I) & 0xFFFFFFFFUL) -#define ELF64_R_INFO(S,T) (((S) << 32) + ((T) & 0xFFFFFFFFUL)) +#define ELF64_R_INFO(S,T) \ + (((Elf64_Xword) (S) << 32) + ((T) & 0xFFFFFFFFUL)) /* * Symbol versioning structures. Modified: stable/12/contrib/elftoolchain/common/native-elf-format ============================================================================== --- stable/12/contrib/elftoolchain/common/native-elf-format Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/common/native-elf-format Sun Mar 8 20:40:38 2020 (r358779) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: native-elf-format 3650 2018-11-25 12:06:28Z jkoshy $ +# $Id: native-elf-format 3735 2019-04-25 19:44:47Z jkoshy $ # # Find the native ELF format for a host platform by compiling a # test object and examining the resulting object. @@ -37,6 +37,8 @@ $1 ~ "Machine:" { elfarch = "EM_MIPS"; } else if (match($0, ".*[xX]86[-_]64")) { elfarch = "EM_X86_64"; + } else if (match($0, "PowerPC64")) { + elfarch = "EM_PPC64"; } else { elfarch = "unknown"; } Modified: stable/12/contrib/elftoolchain/elfcopy/ascii.c ============================================================================== --- stable/12/contrib/elftoolchain/elfcopy/ascii.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/elfcopy/ascii.c Sun Mar 8 20:40:38 2020 (r358779) @@ -36,7 +36,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: ascii.c 3487 2016-08-24 18:12:08Z emaste $"); +ELFTC_VCSID("$Id: ascii.c 3757 2019-06-28 01:15:28Z emaste $"); static void append_data(struct section *s, const void *buf, size_t sz); static char hex_digit(uint8_t n); Modified: stable/12/contrib/elftoolchain/elfcopy/binary.c ============================================================================== --- stable/12/contrib/elftoolchain/elfcopy/binary.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/elfcopy/binary.c Sun Mar 8 20:40:38 2020 (r358779) @@ -36,7 +36,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: binary.c 3611 2018-04-16 21:35:18Z jkoshy $"); +ELFTC_VCSID("$Id: binary.c 3757 2019-06-28 01:15:28Z emaste $"); /* * Convert ELF object to `binary'. Sections with SHF_ALLOC flag set Modified: stable/12/contrib/elftoolchain/elfcopy/elfcopy.h ============================================================================== --- stable/12/contrib/elftoolchain/elfcopy/elfcopy.h Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/elfcopy/elfcopy.h Sun Mar 8 20:40:38 2020 (r358779) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfcopy.h 3615 2018-05-17 04:12:24Z kaiwang27 $ + * $Id: elfcopy.h 3757 2019-06-28 01:15:28Z emaste $ */ #include Modified: stable/12/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- stable/12/contrib/elftoolchain/elfcopy/main.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/elfcopy/main.c Sun Mar 8 20:40:38 2020 (r358779) @@ -39,7 +39,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: main.c 3577 2017-09-14 02:19:42Z emaste $"); +ELFTC_VCSID("$Id: main.c 3757 2019-06-28 01:15:28Z emaste $"); enum options { Modified: stable/12/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- stable/12/contrib/elftoolchain/elfcopy/sections.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/elfcopy/sections.c Sun Mar 8 20:40:38 2020 (r358779) @@ -34,7 +34,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: sections.c 3646 2018-10-27 02:25:39Z emaste $"); +ELFTC_VCSID("$Id: sections.c 3758 2019-06-28 01:16:50Z emaste $"); static void add_gnu_debuglink(struct elfcopy *ecp); static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc); Modified: stable/12/contrib/elftoolchain/elfdump/elfdump.c ============================================================================== --- stable/12/contrib/elftoolchain/elfdump/elfdump.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/elfdump/elfdump.c Sun Mar 8 20:40:38 2020 (r358779) @@ -50,7 +50,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: elfdump.c 3584 2017-11-05 20:51:43Z jkoshy $"); +ELFTC_VCSID("$Id: elfdump.c 3762 2019-06-28 21:06:24Z emaste $"); #if defined(ELFTC_NEED_ELF_NOTE_DEFINITION) #include "native-elf-format.h" Modified: stable/12/contrib/elftoolchain/libdwarf/dwarf.h ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/dwarf.h Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libdwarf/dwarf.h Sun Mar 8 20:40:38 2020 (r358779) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dwarf.h 3494 2016-09-20 17:16:13Z emaste $ + * $Id: dwarf.h 3749 2019-06-28 01:10:44Z emaste $ */ #ifndef _DWARF_H_ Modified: stable/12/contrib/elftoolchain/libdwarf/dwarf_dump.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/dwarf_dump.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libdwarf/dwarf_dump.c Sun Mar 8 20:40:38 2020 (r358779) @@ -27,7 +27,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: dwarf_dump.c 3494 2016-09-20 17:16:13Z emaste $"); +ELFTC_VCSID("$Id: dwarf_dump.c 3749 2019-06-28 01:10:44Z emaste $"); int dwarf_get_ACCESS_name(unsigned access, const char **s) @@ -605,7 +605,7 @@ dwarf_get_DS_name(unsigned ds, const char **s) case DW_DS_leading_separate: *s = "DW_DS_leading_separate"; break; case DW_DS_trailing_separate: - *s = "DW_DS_trailing_separate"; + *s = "DW_DS_trailing_separate"; break; default: return (DW_DLV_NO_ENTRY); } Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_attr.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/libdwarf_attr.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libdwarf/libdwarf_attr.c Sun Mar 8 20:40:38 2020 (r358779) @@ -27,7 +27,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: libdwarf_attr.c 3064 2014-06-06 19:35:55Z kaiwang27 $"); +ELFTC_VCSID("$Id: libdwarf_attr.c 3748 2019-06-28 01:11:13Z emaste $"); int _dwarf_attr_alloc(Dwarf_Die die, Dwarf_Attribute *atp, Dwarf_Error *error) Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sun Mar 8 20:40:38 2020 (r358779) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: libdwarf_reloc.c 3578 2017-09-14 02:21:28Z emaste $"); +ELFTC_VCSID("$Id: libdwarf_reloc.c 3741 2019-06-07 06:32:01Z jkoshy $"); Dwarf_Unsigned _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64) Modified: stable/12/contrib/elftoolchain/libelf/_libelf.h ============================================================================== --- stable/12/contrib/elftoolchain/libelf/_libelf.h Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/_libelf.h Sun Mar 8 20:40:38 2020 (r358779) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _libelf.h 3632 2018-10-10 21:12:43Z jkoshy $ + * $Id: _libelf.h 3738 2019-05-05 21:49:06Z jkoshy $ */ #ifndef __LIBELF_H_ @@ -94,7 +94,7 @@ struct _Elf { Elf_Kind e_kind; /* ELF_K_* */ Elf *e_parent; /* non-NULL for archive members */ unsigned char *e_rawfile; /* uninterpreted bytes */ - size_t e_rawsize; /* size of uninterpreted bytes */ + off_t e_rawsize; /* size of uninterpreted bytes */ unsigned int e_version; /* file version */ /* @@ -233,7 +233,7 @@ Elf *_libelf_open_object(int _fd, Elf_Cmd _c, int _rep Elf64_Xword _libelf_mips64el_r_info_tof(Elf64_Xword r_info); Elf64_Xword _libelf_mips64el_r_info_tom(Elf64_Xword r_info); struct _Libelf_Data *_libelf_release_data(struct _Libelf_Data *_d); -Elf *_libelf_release_elf(Elf *_e); +void _libelf_release_elf(Elf *_e); Elf_Scn *_libelf_release_scn(Elf_Scn *_s); int _libelf_setphnum(Elf *_e, void *_eh, int _elfclass, size_t _phnum); int _libelf_setshnum(Elf *_e, void *_eh, int _elfclass, size_t _shnum); Modified: stable/12/contrib/elftoolchain/libelf/_libelf_config.h ============================================================================== --- stable/12/contrib/elftoolchain/libelf/_libelf_config.h Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/_libelf_config.h Sun Mar 8 20:40:38 2020 (r358779) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _libelf_config.h 3566 2017-08-31 02:28:40Z emaste $ + * $Id: _libelf_config.h 3764 2019-06-28 21:44:46Z emaste $ */ #if defined(__APPLE__) || defined(__DragonFly__) @@ -98,6 +98,12 @@ #define LIBELF_CLASS ELFCLASS32 #elif defined(__riscv) && (__riscv_xlen == 64) + +#define LIBELF_ARCH EM_RISCV +#define LIBELF_BYTEORDER ELFDATA2LSB +#define LIBELF_CLASS ELFCLASS64 + +#elif defined(__riscv64) #define LIBELF_ARCH EM_RISCV #define LIBELF_BYTEORDER ELFDATA2LSB Modified: stable/12/contrib/elftoolchain/libelf/elf.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf.3 Sun Mar 8 20:40:38 2020 (r358779) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006-2008,2011 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006-2008,2011,2019 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf.3 3643 2018-10-14 21:09:24Z jkoshy $ +.\" $Id: elf.3 3743 2019-06-12 19:36:30Z jkoshy $ .\" -.Dd October 10, 2018 +.Dd June 12, 2019 .Dt ELF 3 .Os .Sh NAME @@ -266,36 +266,43 @@ The operating version for the data in this buffer. .El .Pp .Vt Elf_Data -descriptors are usually associated with +descriptors are usually used in conjunction with .Vt Elf_Scn descriptors. -Existing data descriptors associated with an ELF section may be -structures are retrieved using the -.Fn elf_getdata -and -.Fn elf_rawdata -functions. -The -.Fn elf_newdata -function may be used to attach new data descriptors to an ELF section. .It Vt Elf_Scn .Vt Elf_Scn -descriptors represent a section in an ELF object. +descriptors represent sections in an ELF object. +These descriptors are opaque and contain no application modifiable +fields. .Pp -They are retrieved using the +The +.Vt Elf_Scn +descriptor for a specific section in an ELF object can be +retrieved using the .Fn elf_getscn function. -An application may iterate through the existing sections of an ELF -object using the +The sections contained in an ELF object can be traversed using the .Fn elf_nextscn function. -New sections may be allocated using the +New sections are allocated using the .Fn elf_newscn function. .Pp The -.Vt Elf_Scn -descriptor is opaque and contains no application modifiable fields. +.Vt Elf_Data +descriptors associated with a given section can be retrieved +using the +.Fn elf_getdata +function. +New data descriptors can be added to a section +descriptor using the +.Fn elf_newdata +function. +The untranslated +.Dq file +representation of data in a section can be retrieved using the +.Fn elf_rawdata +function. .El .Ss Supported Elf Types The following ELF datatypes are supported by the library. @@ -608,8 +615,11 @@ descriptor itself. .Xr ar 5 , .Xr elf 5 .Sh HISTORY -The original ELF(3) API was developed for Unix System V. -The current implementation of the ELF(3) API appeared in +The original +.Nm +API was developed for +.At V . +The current implementation of the API appeared in .Fx 7.0 . .Sh AUTHORS The ELF library was written by Modified: stable/12/contrib/elftoolchain/libelf/elf_data.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_data.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_data.c Sun Mar 8 20:40:38 2020 (r358779) @@ -32,7 +32,7 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_data.c 3632 2018-10-10 21:12:43Z jkoshy $"); +ELFTC_VCSID("$Id: elf_data.c 3732 2019-04-22 11:08:38Z jkoshy $"); Elf_Data * elf_getdata(Elf_Scn *s, Elf_Data *ed) @@ -42,7 +42,7 @@ elf_getdata(Elf_Scn *s, Elf_Data *ed) int elfclass, elftype; size_t count, fsz, msz; struct _Libelf_Data *d; - uint64_t sh_align, sh_offset, sh_size; + uint64_t sh_align, sh_offset, sh_size, raw_size; _libelf_translator_function *xlate; d = (struct _Libelf_Data *) ed; @@ -59,7 +59,8 @@ elf_getdata(Elf_Scn *s, Elf_Data *ed) return (&d->d_data); if (d != NULL) - return (&STAILQ_NEXT(d, d_next)->d_data); + return (STAILQ_NEXT(d, d_next) ? + &STAILQ_NEXT(d, d_next)->d_data : NULL); if (e->e_rawfile == NULL) { /* @@ -91,9 +92,10 @@ elf_getdata(Elf_Scn *s, Elf_Data *ed) return (NULL); } + raw_size = (uint64_t) e->e_rawsize; if ((elftype = _libelf_xlate_shtype(sh_type)) < ELF_T_FIRST || elftype > ELF_T_LAST || (sh_type != SHT_NOBITS && - (sh_offset > e->e_rawsize || sh_size > e->e_rawsize - sh_offset))) { + (sh_offset > raw_size || sh_size > raw_size - sh_offset))) { LIBELF_SET_ERROR(SECTION, 0); return (NULL); } @@ -116,7 +118,8 @@ elf_getdata(Elf_Scn *s, Elf_Data *ed) count = (size_t) (sh_size / fsz); - msz = _libelf_msize(elftype, elfclass, e->e_version); + if ((msz = _libelf_msize(elftype, elfclass, e->e_version)) == 0) + return (NULL); if (count > 0 && msz > SIZE_MAX / count) { LIBELF_SET_ERROR(RANGE, 0); @@ -215,7 +218,7 @@ elf_rawdata(Elf_Scn *s, Elf_Data *ed) int elf_class; uint32_t sh_type; struct _Libelf_Data *d; - uint64_t sh_align, sh_offset, sh_size; + uint64_t sh_align, sh_offset, sh_size, raw_size; if (s == NULL || (e = s->s_elf) == NULL || e->e_rawfile == NULL) { LIBELF_SET_ERROR(ARGUMENT, 0); @@ -253,8 +256,9 @@ elf_rawdata(Elf_Scn *s, Elf_Data *ed) return (NULL); } + raw_size = (uint64_t) e->e_rawsize; if (sh_type != SHT_NOBITS && - (sh_offset > e->e_rawsize || sh_size > e->e_rawsize - sh_offset)) { + (sh_offset > raw_size || sh_size > raw_size - sh_offset)) { LIBELF_SET_ERROR(SECTION, 0); return (NULL); } Modified: stable/12/contrib/elftoolchain/libelf/elf_end.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_end.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_end.c Sun Mar 8 20:40:38 2020 (r358779) @@ -34,7 +34,7 @@ #include #endif -ELFTC_VCSID("$Id: elf_end.c 3174 2015-03-27 17:13:41Z emaste $"); +ELFTC_VCSID("$Id: elf_end.c 3738 2019-05-05 21:49:06Z jkoshy $"); int elf_end(Elf *e) @@ -80,14 +80,14 @@ elf_end(Elf *e) free(e->e_rawfile); #if ELFTC_HAVE_MMAP else if (e->e_flags & LIBELF_F_RAWFILE_MMAP) - (void) munmap(e->e_rawfile, e->e_rawsize); + (void) munmap(e->e_rawfile, (size_t) e->e_rawsize); #endif } sv = e; if ((e = e->e_parent) != NULL) e->e_u.e_ar.e_nchildren--; - sv = _libelf_release_elf(sv); + _libelf_release_elf(sv); } return (0); Modified: stable/12/contrib/elftoolchain/libelf/elf_flagdata.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_flagdata.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_flagdata.3 Sun Mar 8 20:40:38 2020 (r358779) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf_flagdata.3 3639 2018-10-14 14:07:02Z jkoshy $ +.\" $Id: elf_flagdata.3 3743 2019-06-12 19:36:30Z jkoshy $ .\" -.Dd December 3, 2011 +.Dd June 12, 2019 .Dt ELF_FLAGDATA 3 .Os .Sh NAME @@ -34,7 +34,7 @@ .Nm elf_flagphdr , .Nm elf_flagscn , .Nm elf_flagshdr -.Nd manipulate flags associated with ELF(3) data structures +.Nd manipulate flags associated with ELF data structures .Sh LIBRARY .Lb libelf .Sh SYNOPSIS @@ -65,7 +65,9 @@ and .Ar scn denote the data structures whose flags need to be changed. These values should have been returned by prior calls to -functions in the ELF(3) API set: +functions in the +.Xr elf 3 +API set: .Bl -bullet -compact .It Argument @@ -175,7 +177,9 @@ function and the .Dv ELF_F_ARCHIVE and .Dv ELF_F_ARCHIVE_SYSV -flags are an extension to the ELF(3) API. +flags are an extension to the +.Xr elf 3 +API. .Sh ERRORS These functions may fail with the following errors: .Bl -tag -width "[ELF_E_RESOURCE]" Modified: stable/12/contrib/elftoolchain/libelf/elf_getdata.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_getdata.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_getdata.3 Sun Mar 8 20:40:38 2020 (r358779) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf_getdata.3 3643 2018-10-14 21:09:24Z jkoshy $ +.\" $Id: elf_getdata.3 3734 2019-04-22 14:10:49Z jkoshy $ .\" -.Dd January 26, 2011 +.Dd April 22, 2019 .Dt ELF_GETDATA 3 .Os .Sh NAME @@ -214,7 +214,12 @@ is incorrect. .It Bq Er ELF_E_UNIMPL The section type associated with section .Ar scn -is currently unsupported by the library. +is not supported. +.It Bq Er ELF_E_VERSION +Section +.Ar scn +was associated with an ELF object with an unsupported +version. .El .Sh SEE ALSO .Xr elf 3 , Modified: stable/12/contrib/elftoolchain/libelf/elf_getident.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_getident.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_getident.c Sun Mar 8 20:40:38 2020 (r358779) @@ -30,7 +30,7 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_getident.c 3174 2015-03-27 17:13:41Z emaste $"); +ELFTC_VCSID("$Id: elf_getident.c 3712 2019-03-16 22:23:34Z jkoshy $"); char * elf_getident(Elf *e, size_t *sz) @@ -54,7 +54,7 @@ elf_getident(Elf *e, size_t *sz) else if (e->e_kind == ELF_K_ELF) *sz = EI_NIDENT; else - *sz = e->e_rawsize; + *sz = (size_t) e->e_rawsize; } return ((char *) e->e_rawfile); Modified: stable/12/contrib/elftoolchain/libelf/elf_next.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_next.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_next.3 Sun Mar 8 20:40:38 2020 (r358779) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf_next.3 3639 2018-10-14 14:07:02Z jkoshy $ +.\" $Id: elf_next.3 3698 2019-02-28 06:34:42Z jkoshy $ .\" -.Dd June 17, 2006 +.Dd February 27, 2019 .Dt ELF_NEXT 3 .Os .Sh NAME @@ -88,6 +88,9 @@ Argument was not associated with a containing .Xr ar 1 archive. +.It Bq Er ELF_E_ARGUMENT +An error was encountered while parsing the archive containing argument +.Ar elf . .El .Sh SEE ALSO .Xr elf 3 , Modified: stable/12/contrib/elftoolchain/libelf/elf_next.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_next.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_next.c Sun Mar 8 20:40:38 2020 (r358779) @@ -30,7 +30,7 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_next.c 3174 2015-03-27 17:13:41Z emaste $"); +ELFTC_VCSID("$Id: elf_next.c 3710 2019-03-12 09:42:35Z jkoshy $"); Elf_Cmd elf_next(Elf *e) @@ -59,6 +59,20 @@ elf_next(Elf *e) */ parent->e_u.e_ar.e_next = (next >= (off_t) parent->e_rawsize) ? (off_t) 0 : next; + + /* + * Return an error if the 'e_next' field falls outside the current + * file. + * + * This check is performed after updating the parent descriptor's + * 'e_next' field so that the next call to elf_begin(3) will terminate + * traversal of a too-small archive even if client code forgets to + * check the return value from elf_next(3). + */ + if (next > (off_t) parent->e_rawsize) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (ELF_C_NULL); + } return (ELF_C_READ); } Modified: stable/12/contrib/elftoolchain/libelf/elf_open.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_open.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_open.3 Sun Mar 8 20:40:38 2020 (r358779) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf_open.3 3643 2018-10-14 21:09:24Z jkoshy $ +.\" $Id: elf_open.3 3743 2019-06-12 19:36:30Z jkoshy $ .\" -.Dd May 31, 2012 +.Dd June 12, 2019 .Dt ELF_OPEN 3 .Os .Sh NAME @@ -43,7 +43,9 @@ The functions .Fn elf_open and .Fn elf_openmemory -are extensions to the ELF(3) API, for the internal use of the +are extensions to the +.Xr elf 3 +API, for the internal use of the Elftoolchain project. Portable applications should not use these functions. .Pp @@ -71,7 +73,9 @@ specifies the size of the memory area in bytes. The function returns a pointer to a ELF descriptor if successful, or NULL if an error occurred. .Sh COMPATIBILITY -These functions are non-standard extensions to the ELF(3) API set. +These functions are non-standard extensions to the +.Xr elf 3 +API set. .Pp The behavior of these functions differs from their counterparts .Xr elf_begin 3 Modified: stable/12/contrib/elftoolchain/libelf/elf_rand.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_rand.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_rand.c Sun Mar 8 20:40:38 2020 (r358779) @@ -29,16 +29,25 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_rand.c 3174 2015-03-27 17:13:41Z emaste $"); +ELFTC_VCSID("$Id: elf_rand.c 3716 2019-03-18 22:01:01Z jkoshy $"); off_t elf_rand(Elf *ar, off_t offset) { struct ar_hdr *arh; + off_t offset_of_member; if (ar == NULL || ar->e_kind != ELF_K_AR || (offset & 1) || offset < SARMAG || - (size_t) offset + sizeof(struct ar_hdr) >= ar->e_rawsize) { + offset >= ar->e_rawsize) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return 0; + } + + offset_of_member = offset + (off_t) sizeof(struct ar_hdr); + + if (offset_of_member <= 0 || /* Numeric overflow. */ + offset_of_member >= ar->e_rawsize) { LIBELF_SET_ERROR(ARGUMENT, 0); return 0; } Modified: stable/12/contrib/elftoolchain/libelf/elf_rawfile.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_rawfile.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_rawfile.c Sun Mar 8 20:40:38 2020 (r358779) @@ -28,15 +28,13 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_rawfile.c 3174 2015-03-27 17:13:41Z emaste $"); +ELFTC_VCSID("$Id: elf_rawfile.c 3712 2019-03-16 22:23:34Z jkoshy $"); char * elf_rawfile(Elf *e, size_t *sz) { - size_t size; unsigned char *ptr; - size = e ? e->e_rawsize : 0; ptr = NULL; if (e == NULL) @@ -45,7 +43,7 @@ elf_rawfile(Elf *e, size_t *sz) LIBELF_SET_ERROR(SEQUENCE, 0); if (sz) - *sz = size; + *sz = e ? (size_t) e->e_rawsize : 0; return ((char *) ptr); } Modified: stable/12/contrib/elftoolchain/libelf/elf_scn.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_scn.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_scn.c Sun Mar 8 20:40:38 2020 (r358779) @@ -36,7 +36,7 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_scn.c 3632 2018-10-10 21:12:43Z jkoshy $"); +ELFTC_VCSID("$Id: elf_scn.c 3712 2019-03-16 22:23:34Z jkoshy $"); static int elfscn_cmp(struct _Elf_Scn *s1, struct _Elf_Scn *s2) @@ -71,10 +71,11 @@ _libelf_load_section_headers(Elf *e, void *ehdr) assert((e->e_flags & LIBELF_F_SHDRS_LOADED) == 0); #define CHECK_EHDR(E,EH) do { \ - if (shoff > e->e_rawsize || \ + uintmax_t rawsize = (uintmax_t) e->e_rawsize; \ + if (shoff > (uintmax_t) e->e_rawsize || \ fsz != (EH)->e_shentsize || \ shnum > SIZE_MAX / fsz || \ - fsz * shnum > e->e_rawsize - shoff) { \ + fsz * shnum > rawsize - shoff) { \ LIBELF_SET_ERROR(HEADER, 0); \ return (0); \ } \ Modified: stable/12/contrib/elftoolchain/libelf/elf_update.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_update.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_update.3 Sun Mar 8 20:40:38 2020 (r358779) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf_update.3 3639 2018-10-14 14:07:02Z jkoshy $ +.\" $Id: elf_update.3 3734 2019-04-22 14:10:49Z jkoshy $ .\" -.Dd August 14, 2011 +.Dd April 22, 2019 .Dt ELF_UPDATE 3 .Os .Sh NAME @@ -345,6 +345,10 @@ operation was requested after a prior call to disassociated the ELF descriptor .Ar elf from its underlying file. +.It Bq Er ELF_E_UNIMPL +Argument +.Ar elf +contained a section with an unsupported ELF type. .It Bq Er ELF_E_VERSION Argument .Ar elf Modified: stable/12/contrib/elftoolchain/libelf/elf_update.c ============================================================================== --- stable/12/contrib/elftoolchain/libelf/elf_update.c Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/elf_update.c Sun Mar 8 20:40:38 2020 (r358779) @@ -41,7 +41,7 @@ #include #endif -ELFTC_VCSID("$Id: elf_update.c 3632 2018-10-10 21:12:43Z jkoshy $"); +ELFTC_VCSID("$Id: elf_update.c 3763 2019-06-28 21:43:27Z emaste $"); /* * Layout strategy: @@ -142,7 +142,7 @@ _libelf_compute_section_extents(Elf *e, Elf_Scn *s, of assert(sh_type != SHT_NULL && sh_type != SHT_NOBITS); elftype = _libelf_xlate_shtype(sh_type); - if (elftype > ELF_T_LAST) { + if (elftype < ELF_T_FIRST || elftype > ELF_T_LAST) { LIBELF_SET_ERROR(SECTION, 0); return (0); } @@ -222,10 +222,16 @@ _libelf_compute_section_extents(Elf *e, Elf_Scn *s, of } /* + * The data buffer's ELF type, ELF class and ELF version + * should be supported. + */ + if ((msz = _libelf_msize(d->d_type, ec, e->e_version)) == 0) + return (0); + + /* * The buffer's size should be a multiple of the * memory size of the underlying type. */ - msz = _libelf_msize(d->d_type, ec, e->e_version); if (d->d_size % msz) { LIBELF_SET_ERROR(DATA, 0); return (0); @@ -802,7 +808,8 @@ _libelf_write_scn(Elf *e, unsigned char *nf, struct _E d = &ld->d_data; - msz = _libelf_msize(d->d_type, ec, e->e_version); + if ((msz = _libelf_msize(d->d_type, ec, e->e_version)) == 0) + return ((off_t) -1); if ((uint64_t) rc < sh_off + d->d_off) (void) memset(nf + rc, @@ -813,8 +820,8 @@ _libelf_write_scn(Elf *e, unsigned char *nf, struct _E assert(d->d_buf != NULL); assert(d->d_version == e->e_version); - assert(msz != 0); assert(d->d_size % msz == 0); + assert(msz != 0); nobjects = (size_t) (d->d_size / msz); @@ -854,7 +861,8 @@ _libelf_write_ehdr(Elf *e, unsigned char *nf, struct _ assert(ehdr != NULL); fsz = _libelf_fsize(ELF_T_EHDR, ec, e->e_version, (size_t) 1); - msz = _libelf_msize(ELF_T_EHDR, ec, e->e_version); + if ((msz = _libelf_msize(ELF_T_EHDR, ec, e->e_version)) == 0) + return ((off_t) -1); em = _libelf_elfmachine(e); @@ -888,15 +896,17 @@ _libelf_write_phdr(Elf *e, unsigned char *nf, struct _ Elf32_Ehdr *eh32; Elf64_Ehdr *eh64; Elf_Data dst, src; - size_t fsz, phnum; + size_t fsz, msz, phnum; uint64_t phoff; assert(ex->ex_type == ELF_EXTENT_PHDR); ec = e->e_class; + ehdr = _libelf_ehdr(e, ec, 0); - phnum = e->e_u.e_elf.e_nphdr; + assert(ehdr != NULL); + phnum = e->e_u.e_elf.e_nphdr; assert(phnum > 0); if (ec == ELFCLASS32) { @@ -916,14 +926,15 @@ _libelf_write_phdr(Elf *e, unsigned char *nf, struct _ (void) memset(&dst, 0, sizeof(dst)); (void) memset(&src, 0, sizeof(src)); + if ((msz = _libelf_msize(ELF_T_PHDR, ec, e->e_version)) == 0) + return ((off_t) -1); fsz = _libelf_fsize(ELF_T_PHDR, ec, e->e_version, phnum); assert(fsz > 0); src.d_buf = _libelf_getphdr(e, ec); src.d_version = dst.d_version = e->e_version; src.d_type = ELF_T_PHDR; - src.d_size = phnum * _libelf_msize(ELF_T_PHDR, ec, - e->e_version); + src.d_size = phnum * msz; dst.d_size = fsz; dst.d_buf = nf + ex->ex_start; @@ -948,13 +959,16 @@ _libelf_write_shdr(Elf *e, unsigned char *nf, struct _ uint64_t shoff; Elf32_Ehdr *eh32; Elf64_Ehdr *eh64; - size_t fsz, nscn; + size_t fsz, msz, nscn; Elf_Data dst, src; assert(ex->ex_type == ELF_EXTENT_SHDR); ec = e->e_class; + ehdr = _libelf_ehdr(e, ec, 0); + assert(ehdr != NULL); + nscn = e->e_u.e_elf.e_nscn; if (ec == ELFCLASS32) { @@ -974,8 +988,11 @@ _libelf_write_shdr(Elf *e, unsigned char *nf, struct _ (void) memset(&dst, 0, sizeof(dst)); (void) memset(&src, 0, sizeof(src)); + if ((msz = _libelf_msize(ELF_T_SHDR, ec, e->e_version)) == 0) + return ((off_t) -1); + src.d_type = ELF_T_SHDR; - src.d_size = _libelf_msize(ELF_T_SHDR, ec, e->e_version); + src.d_size = msz; src.d_version = dst.d_version = e->e_version; fsz = _libelf_fsize(ELF_T_SHDR, ec, e->e_version, (size_t) 1); @@ -1087,7 +1104,7 @@ _libelf_write_elf(Elf *e, off_t newsize, struct _Elf_E if (e->e_flags & LIBELF_F_RAWFILE_MMAP) { assert(e->e_rawfile != NULL); assert(e->e_cmd == ELF_C_RDWR); - if (munmap(e->e_rawfile, e->e_rawsize) < 0) { + if (munmap(e->e_rawfile, (size_t) e->e_rawsize) < 0) { LIBELF_SET_ERROR(IO, errno); goto error; } @@ -1112,12 +1129,14 @@ _libelf_write_elf(Elf *e, off_t newsize, struct _Elf_E assert((e->e_flags & LIBELF_F_RAWFILE_MALLOC) || (e->e_flags & LIBELF_F_RAWFILE_MMAP)); if (e->e_flags & LIBELF_F_RAWFILE_MALLOC) { + assert((e->e_flags & LIBELF_F_RAWFILE_MMAP) == 0); free(e->e_rawfile); e->e_rawfile = newfile; newfile = NULL; } #if ELFTC_HAVE_MMAP else if (e->e_flags & LIBELF_F_RAWFILE_MMAP) { + assert((e->e_flags & LIBELF_F_RAWFILE_MALLOC) == 0); if ((e->e_rawfile = mmap(NULL, (size_t) newsize, PROT_READ, MAP_PRIVATE, e->e_fd, (off_t) 0)) == MAP_FAILED) { @@ -1128,7 +1147,7 @@ _libelf_write_elf(Elf *e, off_t newsize, struct _Elf_E #endif /* ELFTC_HAVE_MMAP */ /* Record the new size of the file. */ - e->e_rawsize = (size_t) newsize; + e->e_rawsize = newsize; } else { /* File opened in ELF_C_WRITE mode. */ assert(e->e_rawfile == NULL); Modified: stable/12/contrib/elftoolchain/libelf/gelf.3 ============================================================================== --- stable/12/contrib/elftoolchain/libelf/gelf.3 Sun Mar 8 20:35:00 2020 (r358778) +++ stable/12/contrib/elftoolchain/libelf/gelf.3 Sun Mar 8 20:40:38 2020 (r358779) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:02:36 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8FB35275EB7; Sun, 8 Mar 2020 21:02:36 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDMJ43Wsz4Jw1; Sun, 8 Mar 2020 21:02:36 +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 8647827F47; Sun, 8 Mar 2020 21:02:36 +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 028L2aZI013446; Sun, 8 Mar 2020 21:02:36 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028L2a1w013444; Sun, 8 Mar 2020 21:02:36 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082102.028L2a1w013444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:02:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358780 - stable/12/tools/tools/controlelf X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/tools/tools/controlelf X-SVN-Commit-Revision: 358780 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:02:36 -0000 Author: emaste Date: Sun Mar 8 21:02:35 2020 New Revision: 358780 URL: https://svnweb.freebsd.org/changeset/base/358780 Log: Add tool to modify ELF binary feature control bits MFC r352797: Add tool to modify ELF binary feature control bits This will allow feature control bits (e.g. for ASLR, PROT_MAX) to be inspected or modified. Some clean-up and additional work is likely still required, but we can iterate on this in the tree. Submitted by: Bora Özarslan MFC r352799: controlelf: clean up warnings - use explicit ELF note name when not found - no trailing . on warnings - no \n MFC r352801: controlelf: install standard BSD 2 clause license MFC r352803: controlelf: some style(9) cleanup MFC r352805: controlelf: add protmax control MFC r352806: controlelf: tidy up option parsing MFC r352808: controlelf: simplify feature string parsing Also add error handling on failure to seek/write updated value. MFC r352809: controlelf: exit with error if file endianness does not match host We need to add support for cross-endian operation, but until that's done just exit with an error rather than misbehaving. MFC r352815: controlelf: update man page Some minor corrections, clarifications or rewording. Sponsored by: The FreeBSD Foundation Added: stable/12/tools/tools/controlelf/ - copied from r352797, head/tools/tools/controlelf/ Modified: stable/12/tools/tools/controlelf/controlelf.1 stable/12/tools/tools/controlelf/controlelf.c Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/tools/controlelf/controlelf.1 ============================================================================== --- head/tools/tools/controlelf/controlelf.1 Fri Sep 27 16:27:52 2019 (r352797) +++ stable/12/tools/tools/controlelf/controlelf.1 Sun Mar 8 21:02:35 2020 (r358780) @@ -26,12 +26,12 @@ .\" .\" $FreeBSD$ .\" -.Dd February 21, 2019 +.Dd September 27, 2019 .Dt CONTROLELF 1 .Os .Sh NAME .Nm controlelf -.Nd change an ELF binary's control features +.Nd change an ELF binary's feature control note .Sh SYNOPSIS .Nm .Op Fl h | Fl -help @@ -41,33 +41,33 @@ .Sh DESCRIPTION The .Nm -utility modifies an ELF binary to change it's control features. +utility modifies feature flags in the feature control note in an ELF binary. .Pp The options are as follows: .Bl -tag -width indent .It Fl h | Fl -help Print a usage message and exit. .It Fl l -Writes the list of all known ELF types to standard output. +List known ELF feature flags. .It Fl e Ar featurelist Edit features from the given comma separated list .Ar featurelist . .Ar featurelist -starts with one of the three modes: +starts with one of the three operations: .Dq Li + to turn on the features, .Dq Li - to turn off the features, .Dq Li = to only turn on the given features. -Followed by a comma separated features. +A comma separated list of feature names follows the operation. .El .Pp If -.Fl e , -option wasn't specified, +.Fl e +is not specified .Nm -will display the current control features for the files named by the arguments +displays the status of each feature in the ELF note in each .Ar . .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command @@ -83,10 +83,12 @@ controlelf file controlelf -e +aslr file .Ed .Sh HISTORY -The .Nm -manual page first appeared in +first appeared in .Fx 13.0 . .Sh AUTHORS -This manual page was written by -.An Bora Ozarslan Mt borako.ozarslan@gmail.com . +.Nm +was written by +.An Bora Ozarslan Mt borako.ozarslan@gmail.com +under sponsorship from the +.Fx Foundation. Modified: stable/12/tools/tools/controlelf/controlelf.c ============================================================================== --- head/tools/tools/controlelf/controlelf.c Fri Sep 27 16:27:52 2019 (r352797) +++ stable/12/tools/tools/controlelf/controlelf.c Sun Mar 8 21:02:35 2020 (r358780) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2019 The FreeBSD Foundation. * @@ -10,26 +10,27 @@ * 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 - * in this position and unchanged. + * 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 ``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 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. + * 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. */ #include #include +#include #include #include @@ -47,66 +48,73 @@ __FBSDID("$FreeBSD$"); -static bool convert_to_feature_val(char*, u_int32_t*); -static bool edit_file_features(Elf *, int, int, char*); +static bool convert_to_feature_val(char *, u_int32_t *); +static bool edit_file_features(Elf *, int, int, char *); static bool get_file_features(Elf *, int, int, u_int32_t *, u_int64_t *); static void print_features(void); -static bool print_file_features(Elf *, int, int, char*); +static bool print_file_features(Elf *, int, int, char *); static void usage(void); struct ControlFeatures { const char *alias; - unsigned long featureVal; + unsigned long value; const char *desc; }; static struct ControlFeatures featurelist[] = { - { "aslr", NT_FREEBSD_FCTL_ASLR_DISABLE, "Disable ASLR" } + { "aslr", NT_FREEBSD_FCTL_ASLR_DISABLE, "Disable ASLR" }, + { "protmax", NT_FREEBSD_FCTL_PROTMAX_DISABLE, + "Disable implicit PROT_MAX" }, + { "stackgap", NT_FREEBSD_FCTL_STKGAP_DISABLE, "Disable stack gap" }, }; -static struct option controlelf_longopts[] = { - { "help", no_argument, NULL, 'h' }, - { NULL, 0, NULL, 0 } +static struct option long_opts[] = { + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 } }; +#if BYTE_ORDER == LITTLE_ENDIAN +#define SUPPORTED_ENDIAN ELFDATA2LSB +#else +#define SUPPORTED_ENDIAN ELFDATA2MSB +#endif + int main(int argc, char **argv) { GElf_Ehdr ehdr; Elf *elf; Elf_Kind kind; - int ch, fd, listed, editfeatures, retval; + int ch, fd, editfeatures, retval; char *features; + bool lflag; - listed = 0; + lflag = 0; editfeatures = 0; retval = 0; if (elf_version(EV_CURRENT) == EV_NONE) errx(EXIT_FAILURE, "elf_version error"); - while ((ch = getopt_long(argc, argv, "hle:", controlelf_longopts, - NULL)) != -1) { + while ((ch = getopt_long(argc, argv, "hle:", long_opts, NULL)) != -1) { switch (ch) { case 'l': print_features(); - listed = 1; + lflag = true; break; case 'e': features = optarg; editfeatures = 1; break; case 'h': - usage(); - break; default: usage(); } } argc -= optind; argv += optind; - if (!argc) { - if (listed) + if (argc == 0) { + if (lflag) exit(0); else { warnx("no file(s) specified"); @@ -117,8 +125,8 @@ main(int argc, char **argv) while (argc) { elf = NULL; - if ((fd = open(argv[0], editfeatures ? O_RDWR : - O_RDONLY, 0)) < 0) { + if ((fd = open(argv[0], + editfeatures ? O_RDWR : O_RDONLY, 0)) < 0) { warn("error opening file %s", argv[0]); retval = 1; goto fail; @@ -132,10 +140,9 @@ main(int argc, char **argv) if ((kind = elf_kind(elf)) != ELF_K_ELF) { if (kind == ELF_K_AR) - warnx("file '%s' is an archive.", argv[0]); + warnx("file '%s' is an archive", argv[0]); else - warnx("file '%s' is not an ELF file.", - argv[0]); + warnx("file '%s' is not an ELF file", argv[0]); retval = 1; goto fail; } @@ -145,13 +152,24 @@ main(int argc, char **argv) retval = 1; goto fail; } + /* + * XXX need to support cross-endian operation, but for now + * exit on error rather than misbehaving. + */ + if (ehdr.e_ident[EI_DATA] != SUPPORTED_ENDIAN) { + warnx("file endianness must match host"); + retval = 1; + goto fail; + } if (!editfeatures) { - if (!print_file_features(elf, ehdr.e_phnum, fd, argv[0])) { + if (!print_file_features(elf, ehdr.e_phnum, fd, + argv[0])) { retval = 1; goto fail; } - } else if (!edit_file_features(elf, ehdr.e_phnum, fd, features)) { + } else if (!edit_file_features(elf, ehdr.e_phnum, fd, + features)) { retval = 1; goto fail; } @@ -169,7 +187,8 @@ fail: return (retval); } -#define USAGE_MESSAGE "\ +#define USAGE_MESSAGE \ + "\ Usage: %s [options] file...\n\ Set or display the control features for an ELF object.\n\n\ Supported options are:\n\ @@ -186,47 +205,40 @@ usage(void) } static bool -convert_to_feature_val(char* feature_str, u_int32_t* feature_val) +convert_to_feature_val(char *feature_str, u_int32_t *feature_val) { - char *feature_input, *feature; + char *feature; int i, len; u_int32_t input; - bool add, set; + char operation; - add = set = false; input = 0; - - if (feature_str[0] == '+') - add = true; - else if (feature_str[0] == '=') - set = true; - else if (feature_str[0] != '-') { - warnx("'%c' is not an operator. Use instead '+', '-', '='.", - feature_str[0]); - return (false); - } - - feature_input = feature_str + 1; + operation = *feature_str; + feature_str++; len = nitems(featurelist); - while ((feature = strsep(&feature_input, ",")) != NULL) { + while ((feature = strsep(&feature_str, ",")) != NULL) { for (i = 0; i < len; ++i) { if (strcmp(featurelist[i].alias, feature) == 0) { - input |= featurelist[i].featureVal; + input |= featurelist[i].value; break; } } if (i == len) { - warnx("%s is not a valid feature.", feature); + warnx("%s is not a valid feature", feature); return (false); } } - if (add) { + if (operation == '+') { *feature_val |= input; - } else if (set) { + } else if (operation == '=') { *feature_val = input; + } else if (operation == '-') { + *feature_val &= ~input; } else { - *feature_val -= (*feature_val) & input; + warnx("'%c' not an operator - use '+', '-', '='", + feature_str[0]); + return (false); } return (true); } @@ -238,15 +250,19 @@ edit_file_features(Elf *elf, int phcount, int fd, char u_int64_t off; if (!get_file_features(elf, phcount, fd, &features, &off)) { - warnx("No control features note on the file.\n"); + warnx("NT_FREEBSD_FEATURE_CTL note not found"); return (false); } if (!convert_to_feature_val(val, &features)) return (false); - lseek(fd, off, SEEK_SET); - write(fd, &features, sizeof(u_int32_t)); + if (lseek(fd, off, SEEK_SET) == -1 || + write(fd, &features, sizeof(features)) < + (ssize_t)sizeof(features)) { + warnx("error writing feature value"); + return (false); + } return (true); } @@ -257,12 +273,13 @@ print_features(void) printf("Known features are:\n"); for (i = 0; i < nitems(featurelist); ++i) - printf("%s\t\t %s\n", featurelist[i].alias, + printf("%-16s%s\n", featurelist[i].alias, featurelist[i].desc); } static bool -print_file_features(Elf *elf, int phcount, int fd, char *filename) { +print_file_features(Elf *elf, int phcount, int fd, char *filename) +{ u_int32_t features; unsigned long i; @@ -272,10 +289,10 @@ print_file_features(Elf *elf, int phcount, int fd, cha printf("File '%s' features:\n", filename); for (i = 0; i < nitems(featurelist); ++i) { - printf("%s\t\t'%s' is ", featurelist[i].alias, + printf("%-16s'%s' is ", featurelist[i].alias, featurelist[i].desc); - if ((featurelist[i].featureVal & features) == 0) + if ((featurelist[i].value & features) == 0) printf("un"); printf("set.\n"); @@ -284,7 +301,8 @@ print_file_features(Elf *elf, int phcount, int fd, cha } static bool -get_file_features(Elf *elf, int phcount, int fd, u_int32_t *features, u_int64_t *off) +get_file_features(Elf *elf, int phcount, int fd, u_int32_t *features, + u_int64_t *off) { GElf_Phdr phdr; Elf_Note note; @@ -327,7 +345,7 @@ get_file_features(Elf *elf, int phcount, int fd, u_int namesz = roundup2(note.n_namesz, 4); name = malloc(namesz); if (name == NULL) { - warn("malloc() failed.\n"); + warn("malloc() failed."); return (false); } descsz = roundup2(note.n_descsz, 4); @@ -339,7 +357,7 @@ get_file_features(Elf *elf, int phcount, int fd, u_int note.n_type != NT_FREEBSD_FEATURE_CTL) { /* Not the right note. Skip the description */ if (lseek(fd, descsz, SEEK_CUR) < 0) { - warn("lseek() failed.\n"); + warn("lseek() failed."); free(name); return (false); } @@ -360,7 +378,7 @@ get_file_features(Elf *elf, int phcount, int fd, u_int * descriptor. This should respect descsz. */ if (note.n_descsz > sizeof(u_int32_t)) - warnx("Feature note is bigger than expected."); + warnx("Feature note is bigger than expected"); read(fd, features, sizeof(u_int32_t)); if (off != NULL) *off = phdr.p_offset + read_total; @@ -369,6 +387,6 @@ get_file_features(Elf *elf, int phcount, int fd, u_int } } - warnx("Couldn't find a note header with control feature note."); + warnx("NT_FREEBSD_FEATURE_CTL note not found"); return (false); } From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:07:23 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 296D52760B6; Sun, 8 Mar 2020 21:07:23 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDSp5SxKz4MpG; Sun, 8 Mar 2020 21:07:22 +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 0753027F63; Sun, 8 Mar 2020 21:07:22 +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 028L7LeU013731; Sun, 8 Mar 2020 21:07:21 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028L7LSo013730; Sun, 8 Mar 2020 21:07:21 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082107.028L7LSo013730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:07:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358781 - stable/12/usr.bin/elfdump X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/usr.bin/elfdump X-SVN-Commit-Revision: 358781 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:07:23 -0000 Author: emaste Date: Sun Mar 8 21:07:21 2020 New Revision: 358781 URL: https://svnweb.freebsd.org/changeset/base/358781 Log: MFC r343609: elfdump: whitespace fixup in advance of other changes Modified: stable/12/usr.bin/elfdump/elfdump.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/elfdump/elfdump.c ============================================================================== --- stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:02:35 2020 (r358780) +++ stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:07:21 2020 (r358781) @@ -319,7 +319,7 @@ static const char *p_flags[] = { /* http://www.sco.com/developers/gabi/latest/ch4.sheader.html#sh_type */ static const char * sh_types(uint64_t machine, uint64_t sht) { - static char unknown_buf[64]; + static char unknown_buf[64]; if (sht < 0x60000000) { switch (sht) { @@ -1059,11 +1059,11 @@ elf_print_note(Elf32_Ehdr *e, void *sh) name = elf_get_word(e, sh, SH_NAME); n = (char *)e + offset; fprintf(out, "\nnote (%s):\n", shstrtab + name); - while (n < ((char *)e + offset + size)) { + while (n < ((char *)e + offset + size)) { namesz = elf_get_word(e, n, N_NAMESZ); descsz = elf_get_word(e, n, N_DESCSZ); - s = n + sizeof(Elf_Note); - desc = elf_get_word(e, n + sizeof(Elf_Note) + namesz, 0); + s = n + sizeof(Elf_Note); + desc = elf_get_word(e, n + sizeof(Elf_Note) + namesz, 0); fprintf(out, "\t%s %d\n", s, desc); n += sizeof(Elf_Note) + namesz + descsz; } From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:10:18 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A125276199; Sun, 8 Mar 2020 21:10:18 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDX93m8lz4SJh; Sun, 8 Mar 2020 21:10:17 +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 F1EC627F69; Sun, 8 Mar 2020 21:10:16 +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 028LAGAZ014069; Sun, 8 Mar 2020 21:10:16 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LAGMQ014068; Sun, 8 Mar 2020 21:10:16 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082110.028LAGMQ014068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:10:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358782 - stable/12/usr.bin/elfdump X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/usr.bin/elfdump X-SVN-Commit-Revision: 358782 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:10:18 -0000 Author: emaste Date: Sun Mar 8 21:10:16 2020 New Revision: 358782 URL: https://svnweb.freebsd.org/changeset/base/358782 Log: MFC r343610: elfdump: include note type names Based on a patch submitted by Dan McGregor. - MFC r343611: elfdump: fix build after r343610 - MFC r343613: elfdump: use designated array initialization for note types This ensures the note type name is in the correct slot. Submitted by: kib - PR: 228290 Sponsored by: The FreeBSD Foundation Modified: stable/12/usr.bin/elfdump/elfdump.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/elfdump/elfdump.c ============================================================================== --- stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:07:21 2020 (r358781) +++ stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:10:16 2020 (r358782) @@ -316,6 +316,15 @@ static const char *p_flags[] = { "PF_X|PF_W|PF_R" }; +#define NT_ELEM(x) [x] = #x, +static const char *nt_types[] = { + "", + NT_ELEM(NT_FREEBSD_ABI_TAG) + NT_ELEM(NT_FREEBSD_NOINIT_TAG) + NT_ELEM(NT_FREEBSD_ARCH_TAG) + NT_ELEM(NT_FREEBSD_FEATURE_CTL) +}; + /* http://www.sco.com/developers/gabi/latest/ch4.sheader.html#sh_type */ static const char * sh_types(uint64_t machine, uint64_t sht) { @@ -1052,7 +1061,9 @@ elf_print_note(Elf32_Ehdr *e, void *sh) u_int32_t namesz; u_int32_t descsz; u_int32_t desc; + u_int32_t type; char *n, *s; + const char *nt_type; offset = elf_get_off(e, sh, SH_OFFSET); size = elf_get_size(e, sh, SH_SIZE); @@ -1062,9 +1073,14 @@ elf_print_note(Elf32_Ehdr *e, void *sh) while (n < ((char *)e + offset + size)) { namesz = elf_get_word(e, n, N_NAMESZ); descsz = elf_get_word(e, n, N_DESCSZ); + type = elf_get_word(e, n, N_TYPE); + if (type < nitems(nt_types) && nt_types[type] != NULL) + nt_type = nt_types[type]; + else + nt_type = "Unknown type"; s = n + sizeof(Elf_Note); desc = elf_get_word(e, n + sizeof(Elf_Note) + namesz, 0); - fprintf(out, "\t%s %d\n", s, desc); + fprintf(out, "\t%s %d (%s)\n", s, desc, nt_type); n += sizeof(Elf_Note) + namesz + descsz; } } From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:11:51 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1BFB3276382; Sun, 8 Mar 2020 21:11: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDYy5lJFz4W1C; Sun, 8 Mar 2020 21:11:50 +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 92258142; Sun, 8 Mar 2020 21:11:50 +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 028LBoiv017477; Sun, 8 Mar 2020 21:11:50 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LBohE017475; Sun, 8 Mar 2020 21:11:50 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082111.028LBohE017475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358783 - stable/12/usr.bin/elfdump X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/usr.bin/elfdump X-SVN-Commit-Revision: 358783 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:11:51 -0000 Author: emaste Date: Sun Mar 8 21:11:49 2020 New Revision: 358783 URL: https://svnweb.freebsd.org/changeset/base/358783 Log: MFC r340169 (brooks): elfdump: Add -E to test if a file is an ELF binary. This is intended to replace potentially unreliable checks like: file -b $1 | grep -q '^ELF ..-bit .SB executable' Modified: stable/12/usr.bin/elfdump/elfdump.1 stable/12/usr.bin/elfdump/elfdump.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/elfdump/elfdump.1 ============================================================================== --- stable/12/usr.bin/elfdump/elfdump.1 Sun Mar 8 21:10:16 2020 (r358782) +++ stable/12/usr.bin/elfdump/elfdump.1 Sun Mar 8 21:11:49 2020 (r358783) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 15, 2003 +.Dd November 5, 2018 .Dt ELFDUMP 1 .Os .Sh NAME @@ -34,7 +34,7 @@ files .Sh SYNOPSIS .Nm -.Fl a | cdeGhinprs +.Fl a | E | cdeGhinprs .Op Fl w Ar file .Ar file .Sh DESCRIPTION @@ -55,6 +55,11 @@ Dump section headers. Dump dynamic symbols. .It Fl e Dump ELF header. +.It Fl E +Return success if +.Ar file +is an ELF file and failure if it is not. +This option is exclusive with other options. .It Fl G Dump the GOT. .It Fl h Modified: stable/12/usr.bin/elfdump/elfdump.c ============================================================================== --- stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:10:16 2020 (r358782) +++ stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:11:49 2020 (r358783) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #define ED_SHDR (1<<8) #define ED_SYMTAB (1<<9) #define ED_ALL ((1<<10)-1) +#define ED_IS_ELF (1<<10) /* Exclusive with other flags */ #define elf_get_addr elf_get_quad #define elf_get_off elf_get_quad @@ -527,7 +528,7 @@ main(int ac, char **av) out = stdout; flags = 0; - while ((ch = getopt(ac, av, "acdeiGhnprsw:")) != -1) + while ((ch = getopt(ac, av, "acdEeiGhnprsw:")) != -1) switch (ch) { case 'a': flags = ED_ALL; @@ -538,6 +539,9 @@ main(int ac, char **av) case 'd': flags |= ED_DYN; break; + case 'E': + flags = ED_IS_ELF; + break; case 'e': flags |= ED_EHDR; break; @@ -575,7 +579,8 @@ main(int ac, char **av) } ac -= optind; av += optind; - if (ac == 0 || flags == 0) + if (ac == 0 || flags == 0 || ((flags & ED_IS_ELF) && + (ac != 1 || (flags & ~ED_IS_ELF) || out != stdout))) usage(); if ((fd = open(*av, O_RDONLY)) < 0 || fstat(fd, &sb) < 0) @@ -593,8 +598,12 @@ main(int ac, char **av) e = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); if (e == MAP_FAILED) err(1, NULL); - if (!IS_ELF(*(Elf32_Ehdr *)e)) + if (!IS_ELF(*(Elf32_Ehdr *)e)) { + if (flags & ED_IS_ELF) + exit(1); errx(1, "not an elf file"); + } else if (flags & ED_IS_ELF) + exit (0); phoff = elf_get_off(e, e, E_PHOFF); shoff = elf_get_off(e, e, E_SHOFF); phentsize = elf_get_quarter(e, e, E_PHENTSIZE); @@ -1270,6 +1279,7 @@ elf_get_quad(Elf32_Ehdr *e, void *base, elf_member_t m static void usage(void) { - fprintf(stderr, "usage: elfdump -a | -cdeGhinprs [-w file] file\n"); + fprintf(stderr, + "usage: elfdump -a | -E | -cdeGhinprs [-w file] file\n"); exit(1); } From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:14:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4860C27657E; Sun, 8 Mar 2020 21:14: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDdF710Dz4d35; Sun, 8 Mar 2020 21:14:41 +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 DC0B319B; Sun, 8 Mar 2020 21:14:41 +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 028LEfWT020140; Sun, 8 Mar 2020 21:14:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LEfmM020139; Sun, 8 Mar 2020 21:14:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082114.028LEfmM020139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:14:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358784 - stable/12/share/man/man7 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man7 X-SVN-Commit-Revision: 358784 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:14:42 -0000 Author: emaste Date: Sun Mar 8 21:14:41 2020 New Revision: 358784 URL: https://svnweb.freebsd.org/changeset/base/358784 Log: MFC r351121: arch.7: arm (i.e., v5) removed before 13.0 Modified: stable/12/share/man/man7/arch.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/arch.7 ============================================================================== --- stable/12/share/man/man7/arch.7 Sun Mar 8 21:11:49 2020 (r358783) +++ stable/12/share/man/man7/arch.7 Sun Mar 8 21:14:41 2020 (r358784) @@ -93,7 +93,7 @@ architectures, the final release. .It aarch64 Ta 11.0 .It alpha Ta 3.2 Ta 6.4 .It amd64 Ta 5.1 -.It arm Ta 6.0 +.It arm Ta 6.0 Ta 12.x .It armeb Ta 8.0 Ta 11.x .It armv6 Ta 10.0 .It armv7 Ta 12.0 From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:16:00 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B206227664F; Sun, 8 Mar 2020 21:16:00 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDfm1BQ7z3C4K; Sun, 8 Mar 2020 21:16:00 +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 C9D2519C; Sun, 8 Mar 2020 21:15:59 +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 028LFxte020266; Sun, 8 Mar 2020 21:15:59 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LFxF2020265; Sun, 8 Mar 2020 21:15:59 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082115.028LFxF2020265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:15:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358785 - stable/12/share/man/man7 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man7 X-SVN-Commit-Revision: 358785 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:16:00 -0000 Author: emaste Date: Sun Mar 8 21:15:59 2020 New Revision: 358785 URL: https://svnweb.freebsd.org/changeset/base/358785 Log: MFC r339608: arch.7: first appeared in FreeBSD 11.1 Modified: stable/12/share/man/man7/arch.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/arch.7 ============================================================================== --- stable/12/share/man/man7/arch.7 Sun Mar 8 21:14:41 2020 (r358784) +++ stable/12/share/man/man7/arch.7 Sun Mar 8 21:15:59 2020 (r358785) @@ -506,4 +506,4 @@ it is unused outside of that scope. An .Nm manual page appeared in -.Fx 12 . +.Fx 11.1 . From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:19:47 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E6AE27679D; Sun, 8 Mar 2020 21:19:47 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDl71Kstz3MPR; Sun, 8 Mar 2020 21:19:47 +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 AC33E1A2; Sun, 8 Mar 2020 21:19:46 +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 028LJkF5020600; Sun, 8 Mar 2020 21:19:46 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LJkhx020599; Sun, 8 Mar 2020 21:19:46 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082119.028LJkhx020599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:19:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358786 - stable/12/share/man/man7 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man7 X-SVN-Commit-Revision: 358786 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:19:47 -0000 Author: emaste Date: Sun Mar 8 21:19:46 2020 New Revision: 358786 URL: https://svnweb.freebsd.org/changeset/base/358786 Log: MFC r339647: arch.7: update final ia64 release to 10.4 10.4 is the final release from stable/10. Modified: stable/12/share/man/man7/arch.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/arch.7 ============================================================================== --- stable/12/share/man/man7/arch.7 Sun Mar 8 21:15:59 2020 (r358785) +++ stable/12/share/man/man7/arch.7 Sun Mar 8 21:19:46 2020 (r358786) @@ -97,7 +97,7 @@ architectures, the final release. .It armeb Ta 8.0 Ta 11.x .It armv6 Ta 10.0 .It armv7 Ta 12.0 -.It ia64 Ta 5.0 Ta 10.x +.It ia64 Ta 5.0 Ta 10.4 .It i386 Ta 1.0 .It mips Ta 8.0 .It mipsel Ta 9.0 From owner-svn-src-stable-12@freebsd.org Sun Mar 8 21:21:48 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C011276974; Sun, 8 Mar 2020 21:21: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDnR6WgPz3xFc; Sun, 8 Mar 2020 21:21:47 +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 B9F5F21B; Sun, 8 Mar 2020 21:21:47 +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 028LLl9Y025233; Sun, 8 Mar 2020 21:21:47 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LLl4V025232; Sun, 8 Mar 2020 21:21:47 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082121.028LLl4V025232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:21:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358787 - stable/12/share/man/man7 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man7 X-SVN-Commit-Revision: 358787 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:21:48 -0000 Author: emaste Date: Sun Mar 8 21:21:47 2020 New Revision: 358787 URL: https://svnweb.freebsd.org/changeset/base/358787 Log: MFC r354468: arch.7: claim 12.x as the last architecture with sparc64 support PR: 228919, 233405, 236839, 239851 Modified: stable/12/share/man/man7/arch.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/arch.7 ============================================================================== --- stable/12/share/man/man7/arch.7 Sun Mar 8 21:19:46 2020 (r358786) +++ stable/12/share/man/man7/arch.7 Sun Mar 8 21:21:47 2020 (r358787) @@ -114,7 +114,7 @@ architectures, the final release. .It powerpc64 Ta 6.0 .It riscv64 Ta 12.0 .It riscv64sf Ta 12.0 -.It sparc64 Ta 5.0 +.It sparc64 Ta 5.0 Ta 12.x .El .Ss Type sizes All From owner-svn-src-stable-12@freebsd.org Sun Mar 8 23:19:10 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 199CF251070; Sun, 8 Mar 2020 23:19:10 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bHNs5L9vz4R8V; Sun, 8 Mar 2020 23:19:09 +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 A2D04186A; Sun, 8 Mar 2020 23:19:09 +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 028NJ9Y8093879; Sun, 8 Mar 2020 23:19:09 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028NJ954093878; Sun, 8 Mar 2020 23:19:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082319.028NJ954093878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 23:19:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358790 - stable/12/sys/vm X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/vm X-SVN-Commit-Revision: 358790 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 23:19:10 -0000 Author: emaste Date: Sun Mar 8 23:19:09 2020 New Revision: 358790 URL: https://svnweb.freebsd.org/changeset/base/358790 Log: MFC r349697: correct pmap_ts_referenced return type pmap_ts_referenced returns a count, not a boolean, and is supposed to have int as the return type not boolean_t. This worked previously because boolean_t is an int typedef. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/vm/pmap.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/vm/pmap.h ============================================================================== --- stable/12/sys/vm/pmap.h Sun Mar 8 21:30:55 2020 (r358789) +++ stable/12/sys/vm/pmap.h Sun Mar 8 23:19:09 2020 (r358790) @@ -164,7 +164,7 @@ void pmap_remove_all(vm_page_t m); void pmap_remove_pages(pmap_t); void pmap_remove_write(vm_page_t m); void pmap_sync_icache(pmap_t, vm_offset_t, vm_size_t); -boolean_t pmap_ts_referenced(vm_page_t m); +int pmap_ts_referenced(vm_page_t m); void pmap_unwire(pmap_t pmap, vm_offset_t start, vm_offset_t end); void pmap_zero_page(vm_page_t); void pmap_zero_page_area(vm_page_t, int off, int size); From owner-svn-src-stable-12@freebsd.org Sun Mar 8 23:20:25 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3970251129; Sun, 8 Mar 2020 23:20:25 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bHQK3FwGz4Ty1; Sun, 8 Mar 2020 23:20:25 +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 167821870; Sun, 8 Mar 2020 23:20:25 +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 028NKOSp094027; Sun, 8 Mar 2020 23:20:24 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028NKOjB094026; Sun, 8 Mar 2020 23:20:24 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082320.028NKOjB094026@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 23:20:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358791 - stable/12/sys/netpfil/pf X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/netpfil/pf X-SVN-Commit-Revision: 358791 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 23:20:25 -0000 Author: emaste Date: Sun Mar 8 23:20:24 2020 New Revision: 358791 URL: https://svnweb.freebsd.org/changeset/base/358791 Log: MFC r350294: pf: zero output buffer in pfioctl Avoid potential structure padding leak. Reported by: Vlad Tsyrklevich Security: Potential kernel memory disclosure Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/netpfil/pf/pf_ioctl.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- stable/12/sys/netpfil/pf/pf_ioctl.c Sun Mar 8 23:19:09 2020 (r358790) +++ stable/12/sys/netpfil/pf/pf_ioctl.c Sun Mar 8 23:20:24 2020 (r358791) @@ -2169,7 +2169,7 @@ relock_DIOCKILLSTATES: break; } - p = pstore = malloc(ps->ps_len, M_TEMP, M_WAITOK); + p = pstore = malloc(ps->ps_len, M_TEMP, M_WAITOK | M_ZERO); nr = 0; for (i = 0; i <= pf_hashmask; i++) { From owner-svn-src-stable-12@freebsd.org Sun Mar 8 23:22:19 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8DAF2251350; Sun, 8 Mar 2020 23:22:19 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bHSW2qSQz4ZM2; Sun, 8 Mar 2020 23:22:19 +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 4CDB51A18; Sun, 8 Mar 2020 23:22:19 +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 028NMJcP099413; Sun, 8 Mar 2020 23:22:19 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028NMJtN099412; Sun, 8 Mar 2020 23:22:19 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082322.028NMJtN099412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 23:22:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358793 - stable/12/sys/netpfil/pf X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/netpfil/pf X-SVN-Commit-Revision: 358793 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 23:22:19 -0000 Author: emaste Date: Sun Mar 8 23:22:18 2020 New Revision: 358793 URL: https://svnweb.freebsd.org/changeset/base/358793 Log: MFC r350468: pf: zero (another) output buffer in pfioctl Avoid potential structure padding leak. r350294 identified a leak via static analysis; although there's no report of a leak with the DIOCGETSRCNODES ioctl it's a good practice to zero the memory. Suggested by: kp Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/netpfil/pf/pf_ioctl.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- stable/12/sys/netpfil/pf/pf_ioctl.c Sun Mar 8 23:21:04 2020 (r358792) +++ stable/12/sys/netpfil/pf/pf_ioctl.c Sun Mar 8 23:22:18 2020 (r358793) @@ -3752,7 +3752,7 @@ DIOCCHANGEADDR_error: nr = 0; - p = pstore = malloc(psn->psn_len, M_TEMP, M_WAITOK); + p = pstore = malloc(psn->psn_len, M_TEMP, M_WAITOK | M_ZERO); for (i = 0, sh = V_pf_srchash; i <= pf_srchashmask; i++, sh++) { PF_HASHROW_LOCK(sh); From owner-svn-src-stable-12@freebsd.org Sun Mar 8 23:26:22 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 24B4425164F; Sun, 8 Mar 2020 23:26:22 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bHY96wpgz3HQ7; Sun, 8 Mar 2020 23:26: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 8F7AB1A36; Sun, 8 Mar 2020 23:26: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 028NQLhr099764; Sun, 8 Mar 2020 23:26:21 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028NQLew099761; Sun, 8 Mar 2020 23:26:21 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082326.028NQLew099761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 23:26:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358795 - in stable/12/share/vt: fonts keymaps X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12/share/vt: fonts keymaps X-SVN-Commit-Revision: 358795 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 23:26:22 -0000 Author: emaste Date: Sun Mar 8 23:26:21 2020 New Revision: 358795 URL: https://svnweb.freebsd.org/changeset/base/358795 Log: MFC r355592: Add Danish translation for vt font and keymap INDEX files Also sort some entries into the correct location, correct MacBook capitalization, etc. PR: 235853 Submitted by: scootergrisen gmail com Modified: stable/12/share/vt/fonts/INDEX.fonts stable/12/share/vt/keymaps/INDEX.keymaps Directory Properties: stable/12/ (props changed) Modified: stable/12/share/vt/fonts/INDEX.fonts ============================================================================== --- stable/12/share/vt/fonts/INDEX.fonts Sun Mar 8 23:22:54 2020 (r358794) +++ stable/12/share/vt/fonts/INDEX.fonts Sun Mar 8 23:26:21 2020 (r358795) @@ -22,6 +22,7 @@ # Language support: MENU, FONT # MENU:en:Choose your terminal font +MENU:da:Vælg skrifttypen til din terminal MENU:de:Wählen Sie Ihre Schrift MENU:fr:Choisissez votre fonte écran @@ -34,12 +35,15 @@ FONT:en:vgarom-8x14.fnt # gallant.fnt:en:Gallant Character set, 8x16 +gallant.fnt:da:Gallant-tegnsæt, 8x16 gallant.fnt:de:Gallant Zeichensatz, 8x16 terminus-b32.fnt:en:Terminus BSD Console, size 32 +terminus-b32.fnt:da:Terminus BSD-konsol, størrelse 32 terminus-b32.fnt:de:Terminus BSD Console, Größe 32 tom-thumb.fnt:en:tom-thumb Character set, 4x6 +tom-thumb.fnt:da:tom-thumb-tegnsæt, 4x6 tom-thumb.fnt:de:tom-thumb Zeichensatz, 4x6 vgarom-16x32.fnt:en:VGAROM, 16x32 @@ -51,10 +55,12 @@ vgarom-8x16.fnt:en:VGAROM, 8x16 vgarom-8x8.fnt:en:VGAROM, 8x8 vgarom-thin-8x16.fnt:en:VGAROM, 8x16 (thin) +vgarom-thin-8x16.fnt:da:VGAROM, 8x16 (smal) vgarom-thin-8x16.fnt:de:VGAROM, 8x16 (dünn) vgarom-thin-8x16.fnt:fr:VGAROM, 8x16 (fin) vgarom-thin-8x8.fnt:en:VGAROM, 8x8 (thin) +vgarom-thin-8x8.fnt:da:VGAROM, 8x8 (smal) vgarom-thin-8x8.fnt:de:VGAROM, 8x8 (dünn) vgarom-thin-8x8.fnt:fr:VGAROM, 8x8 (fin) Modified: stable/12/share/vt/keymaps/INDEX.keymaps ============================================================================== --- stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 23:22:54 2020 (r358794) +++ stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 23:26:21 2020 (r358795) @@ -21,9 +21,10 @@ # Language support: MENU, FONT # MENU:en:Choose your keyboard layout -MENU:da,no,sv:Vælg dit keyboard layout +MENU:da:Vælg dit tastaturlayout MENU:de:Wählen Sie Ihre Tastaturbelegung MENU:fr:Choisissez la disposition de votre clavier +MENU:no,sv:Vælg dit keyboard layout MENU:pl:Wybierz układ klawiatury MENU:pt:Escolha o layout do teclado MENU:es:Seleccione la disposición de su teclado @@ -41,56 +42,86 @@ MENU:tr:Klavye düzeninizi seçiniz FONT:en:vgarom-8x16.hex # +am.kbd:en:Armenian phonetic layout +am.kbd:da:Armensk fonetisk layout +am.kbd:de:Armenische phonetische Tastenbelegung +am.kbd:fr:Arménien phonétique +am.kbd:hy:Հայերեն հնչյունային (Phonetic) դասավորություն +am.kbd:ru:Армянская фонетическая раскладка + be.kbd:en:Belgian +be.kbd:da:Belgisk be.kbd:de:Belgisch be.kbd:fr:Belge be.kbd:pt,es:Belga be.acc.kbd:en:Belgian (accent keys) +be.acc.kbd:da:Belgisk (accenttaster) be.acc.kbd:de:Belgisch (mit Akzenten) be.acc.kbd:fr:Belge (avec accents) be.acc.kbd:pt:Belga (com acentos) be.acc.kbd:es:Belga (con acentos) bg.bds.kbd:en:Bulgarian (BDS) +bg.bds.kbd:da:Bulgarsk (BDS) bg.bds.kbd:de:Bulgarisch (BDS) bg.phonetic.kbd:en:Bulgarian (Phonetic) +bg.phonetic.kbd:da:Bulgarsk (fonetisk) bg.phonetic.kbd:de:Bulgarisch (phonetisch) br.kbd:en:Brazilian (accent keys) +br.kbd:da:Brasiliansk (accenttaster) br.kbd:de:Brasilianisch (mit Akzenten) br.kbd:fr:Brésilien (avec accents) br.kbd:pt:Brasileiro (com acentos) br.kbd:es:Brasileño (con acentos) br.noacc.kbd:en:Brazilian (without accent keys) +br.noacc.kbd:da:Brasiliansk (ingen accenttaster) br.noacc.kbd:de:Brasilianisch (ohne Akzente) br.noacc.kbd:fr:Brésilien (sans accents) br.noacc.kbd:pt:Brasileiro (without accent keys) br.noacc.kbd:es:Brasileño (without accent keys) by.kbd:en:Belarusian +by.kbd:da:Hviderussisk by.kbd:de:Weißrussisch by.kbd:fr:Biélorusse centraleuropean.kbd:en:Central European +centraleuropean.kbd:da:Centraleuropæisk centraleuropean.kbd:de:Zentral Europäisch centraleuropean.kbd:fr:Centre européen centraleuropean.kbd:es:Centroeuropeo centraleuropean.qwerty.kbd:en:Central European (QWERTY) +centraleuropean.qwerty.kbd:da:Centraleuropæisk (QWERTY) centraleuropean.qwerty.kbd:de:Zentral Europäisch (QWERTY) centraleuropean.qwerty.kbd:fr:Centre européen (QWERTY) centraleuropean.qwerty.kbd:es:Centroeuropeo (QWERTY) colemak.acc.kbd:en:Colemak ergonomic alternative +colemak.acc.kbd:da:Colemak ergonomisk alternativ cz.kbd:en:Czech (QWERTZ, accent keys) +cz.kbd:da:Tjekkisk (QWERTZ, accenttaster) cz.kbd:de:Tschechisch (QWERTZ, mit Akzenten) cz.kbd:fr:Tchèque (QWERTZ, avec accents) cz.kbd:es:Checo (QWERTZ, con acentos) +cz.kbd.from-ce:en:Czech +cz.kbd.from-ce:da:Tjekkisk +cz.kbd.from-ce:de:Tschechisch +cz.kbd.from-ce:fr:Tchèque +cz.kbd.from-ce:es:Checo + +cz.qwerty.kbd.from-ce:en:Czech (QWERTY) +cz.qwerty.kbd.from-ce:da:Tjekkisk (QWERTY) +cz.qwerty.kbd.from-ce:de:Tschechisch (QWERTY) +cz.qwerty.kbd.from-ce:fr:Tchèquey (QWERTY) +cz.qwerty.kbd.from-ce:es:Checo (QWERTY) + dk.kbd:en:Danish dk.kbd:da:Dansk dk.kbd:de:Dänisch @@ -99,40 +130,66 @@ dk.kbd:pt:Dinamarquês dk.kbd:es:Danés dk.acc.kbd:en:Danish (accent keys) -dk.acc.kbd:da:Dansk (accent taster) +dk.acc.kbd:da:Dansk (accenttaster) dk.acc.kbd:de:Dänisch (mit Akzenten) dk.acc.kbd:fr:Danois (avec accents) dk.acc.kbd:pt:Dinamarquês (com acentos) dk.acc.kbd:es:Danés (con acentos) -dk.macbook.kbd:en:Danish (macbook) -dk.macbook.kbd:da:Dansk (macbook) -dk.macbook.kbd:de:Dänisch (Macbook) -dk.macbook.kbd:fr:Danois (macbook) -dk.macbook.kbd:pt:Dinamarquês (macbook) -dk.macbook.kbd:es:Danés (macbook) +dk.kbd.from-cp865:en:Danish +dk.kbd.from-cp865:da:Dansk +dk.kbd.from-cp865:de:Dänisch +dk.kbd.from-cp865:fr:Danois +dk.kbd.from-cp865:pt:Dinamarquês +dk.kbd.from-cp865:es:Danés +dk.macbook.kbd:en:Danish (MacBook) +dk.macbook.kbd:da:Dansk (MacBook) +dk.macbook.kbd:de:Dänisch (MacBook) +dk.macbook.kbd:fr:Danois (MacBook) +dk.macbook.kbd:pt:Dinamarquês (MacBook) +dk.macbook.kbd:es:Danés (MacBook) + nl.kbd:en:Dutch (accent keys) +nl.kbd:da:Nederlandsk (accenttaster) nl.kbd:de:Holländisch (mit Akzenten) nordic.asus-eee.kbd:en:Nordic layout on Asus eeePC +nordic.asus-eee.kbd:da:Nordisk layout på Asus eeePC nordic.asus-eee.kbd:fr:Norvégien phonétique sur Asus eeePC -gr.kbd:en:Greek (104 keys) -gr.kbd:fr:Grec (104 touches) -gr.kbd:el:Ελληνικό (104 πλήκτρων) +ee.kbd.from-iso1:en:Estonian +ee.kbd.from-iso1:da:Estisk +ee.kbd.from-iso1:de:Estnisch +ee.kbd.from-iso1:fr:Estonien +ee.kbd.from-iso1:es:Estonio ee.kbd:en:Estonian +ee.kbd:da:Estisk ee.kbd:de:Estnisch ee.kbd:fr:Estonien ee.kbd:es:Estonio +ee.kbd.from-cp850:en:Estonian +ee.kbd.from-cp850:da:Estisk +ee.kbd.from-cp850:de:Estnisch +ee.kbd.from-cp850:fr:Estonien +ee.kbd.from-cp850:es:Estonio + fi.kbd:en:Finnish +fi.kbd:da:Finsk fi.kbd:de:Finnisch fi.kbd:fr:Finlandais fi.kbd:es:Finlandés +fi.kbd.from-cp850:en:Finnish +fi.kbd.from-cp850:da:Finsk +fi.kbd.from-cp850:de:Finnisch +fi.kbd.from-cp850:fr:Finlandais +fi.kbd.from-cp850:es:Finlandés + fr.kbd:en:French +fr.kbd:da:Fransk fr.kbd:de:Französisch fr.kbd:fr:Français fr.kbd:pt:Francês @@ -140,19 +197,22 @@ fr.kbd:es:Francés fr.kbd:uk:Французька fr.acc.kbd:en:French (accent keys) +fr.acc.kbd:da:Fransk (accenttaster) fr.acc.kbd:de:Französisch (mit Akzenten) fr.acc.kbd:fr:Français (avec accents) fr.acc.kbd:pt:Francês (com acentos) fr.acc.kbd:es:Francés (con acentos) fr.acc.kbd:uk:Французька (accent keys) -fr.macbook.kbd:en:French Macbook/Macbook Pro (accent keys) -fr.macbook.kbd:de:Französisch Macbook/Macbook Pro (mit Aksenten) -fr.macbook.kbd:fr:Français Macbook/Macbook Pro (accent keys) -fr.macbook.kbd:pt:Francês Macbook/Macbook Pro (com acentos) -fr.macbook.kbd:es:Francés Macbook/Macbook Pro (con acentos) +fr.macbook.kbd:en:French (MacBook/MacBook Pro) (accent keys) +fr.macbook.kbd:da:Fransk (MacBook/MacBook Pro) (accenttaster) +fr.macbook.kbd:de:Französisch (MacBook/MacBook Pro) (mit Aksenten) +fr.macbook.kbd:fr:Français (MacBook/MacBook Pro) (accent keys) +fr.macbook.kbd:pt:Francês (MacBook/MacBook Pro) (com acentos) +fr.macbook.kbd:es:Francés (MacBook/MacBook Pro) (con acentos) fr.dvorak.kbd:en:French Dvorak-like +fr.dvorak.kbd:da:Fransk Dvorak-lignende fr.dvorak.kbd:de:Französisch Dvorak fr.dvorak.kbd:fr:Français Dvorak fr.dvorak.kbd:pt:Francês Dvorak @@ -160,6 +220,7 @@ fr.dvorak.kbd:es:Francés Dvorak fr.dvorak.kbd:uk:French Dvorak-like fr.dvorak.acc.kbd:en:French Dvorak-like (accent keys) +fr.dvorak.acc.kbd:da:Fransk Dvorak-lignende (accenttaster) fr.dvorak.acc.kbd:de:Französisch Dvorak (mit Akzenten) fr.dvorak.acc.kbd:fr:Français Dvorak (accent keys) fr.dvorak.acc.kbd:pt:Francês Dvorak (com acentos) @@ -167,14 +228,17 @@ fr.dvorak.acc.kbd:es:Francés Dvorak (con acentos) fr.dvorak.acc.kbd:uk:French Dvorak-like (accent keys) ca.kbd:en:Canadian Bilingual +ca.kbd:da:Canadisk tosproget ca-fr.kbd:en:French Canadian (accent keys) +ca-fr.kbd:da:Franskcanadisk (accenttaster) ca-fr.kbd:de:Französisch Kanada (mit Akzenten) ca-fr.kbd:fr:Français Canadien (avec accents) ca-fr.kbd:es:Francocanadiense (con acentos) ca-fr.kbd:uk:Французько-канадська (accent keys) de.kbd:en:German +de.kbd:da:Tysk de.kbd:de:Deutsch de.kbd:fr:Allemand de.kbd:pt:Alemão @@ -183,6 +247,7 @@ de.kbd:tr:Almanca de.kbd:uk:Німецька de.acc.kbd:en:German (accent keys) +de.acc.kbd:da:Tysk (accenttaster) de.acc.kbd:de:Deutsch (mit Akzenten) de.acc.kbd:fr:Allemand (avec accents) de.acc.kbd:pt:Alemão (com acentos) @@ -190,67 +255,85 @@ de.acc.kbd:es:Alemán (con acentos) de.acc.kbd:uk:Німецька (accent keys) de.noacc.kbd:en:German (no accent keys) +de.noacc.kbd:da:Tysk (ingen accenttaster) de.noacc.kbd:de:Deutsch (ohne Akzente) de.noacc.kbd:fr:Allemand (sans accents) de.noacc.kbd:pt:Alemão (no accent keys) de.noacc.kbd:es:Alemán (no accent keys) de.noacc.kbd:uk:Німецька (no accent keys) +de.kbd.from-cp850:en:German +de.kbd.from-cp850:da:Tysk +de.kbd.from-cp850:de:Deutsch +de.kbd.from-cp850:fr:Allemand +de.kbd.from-cp850:pt:Alemão +de.kbd.from-cp850:es:Alemán +de.kbd.from-cp850:uk:Німецька + +gr.kbd:en:Greek (104 keys) +gr.kbd:da:Græsk (104 taster) +gr.kbd:fr:Grec (104 touches) +gr.kbd:el:Ελληνικό (104 πλήκτρων) + gr.elot.acc.kbd:en:Greek ELOT +gr.elot.acc.kbd:da:Græsk ELOT gr.elot.acc.kbd:de:Grieschisch ELOT gr.elot.acc.kbd:fr:Grec ELOT gr.elot.acc.kbd:el:Ελληνικό ΕΛΟΤ gr.101.acc.kbd:en:Greek (101 keys) +gr.101.acc.kbd:da:Græsk (101 taster) gr.101.acc.kbd:de:Grieschisch (101 Tasten) gr.101.acc.kbd:fr:Grec (101 touches) gr.101.acc.kbd:el:Ελληνικό (101 πλήκτρων) il.kbd:en:Hebrew +il.kbd:da:Hebraisk il.kbd:de:Hebräisch il.kbd:fr:Hébreu il.kbd:he:תירבע hr.kbd:en:Croatian +hr.kbd:da:Kroatisk hr.kbd:de:Kroatisch hr.kbd:fr:Croate hr.kbd:es:Croata hu.101.kbd:en:Hungarian (101 keys) +hu.101.kbd:da:Ungarsk (101 taster) hu.101.kbd:de:Ungarisch (101 Tasten) hu.101.kbd:fr:Hongrois (101 touches) hu.101.kbd:es:Húngaro (101) hu.102.kbd:en:Hungarian (102 keys) +hu.102.kbd:da:Ungarsk (102 taster) hu.102.kbd:de:Ungarisch (102 Tasten) hu.102.kbd:fr:Hongrois (102 touches) hu.102.kbd:es:Húngaro (102) -am.kbd:hy:Հայերեն հնչյունային (Phonetic) դասավորություն -am.kbd:ru:Армянская фонетическая раскладка -am.kbd:en:Armenian phonetic layout -am.kbd:fr:Arménien phonétique -am.kbd:de:Armenische phonetische Tastenbelegung - is.kbd:en:Icelandic +is.kbd:da:Islandsk is.kbd:de:Isländisch is.kbd:fr:Islandais is.kbd:pt:Islandês is.kbd:es:Islandés is.acc.kbd:en:Icelandic (accent keys) +is.acc.kbd:da:Islandsk (accenttaster) is.acc.kbd:de:Isländisch (mit Akzenten) is.acc.kbd:fr:Islandais (avec accents) is.acc.kbd:pt:Islandês (com acentos) is.acc.kbd:es:Islandés (con acentos) it.kbd:en:Italian +it.kbd:da:Italiensk it.kbd:de:Italienisch it.kbd:fr:Italien it.kbd:pt,es:Italiano it.kbd:uk:Італійська jp.kbd:en:Japanese 106 +jp.kbd:da:Japansk 106 jp.kbd:de:Japanisch 106 jp.kbd:fr:Japonais 106 jp.kbd:pt:Japonês 106 @@ -258,6 +341,7 @@ jp.kbd:es:Japonés 106 jp.kbd:uk:Японська 106 jp.capsctrl.kbd:en:Japanese 106x +jp.capsctrl.kbd:da:Japansk 106x jp.capsctrl.kbd:de:Japanisch 106x jp.capsctrl.kbd:fr:Japonais 106x jp.capsctrl.kbd:pt:Japonês 106x @@ -265,29 +349,35 @@ jp.capsctrl.kbd:es:Japonés 106x jp.capsctrl.kbd:uk:Японська 106x kz.kst.kbd:en:Kazakh +kz.kst.kbd:da:Kasakhisk kz.kst.kbd:de:Kasachisch kz.kst.kbd:fr:Kazakh kz.io.kbd:en:Kazakh +kz.io.kbd:da:Kasakhisk kz.io.kbd:de:Kasachisch kz.io.kbd:fr:Kazakh latinamerican.kbd:en:Latin American +latinamerican.kbd:da:Latinamerikansk latinamerican.kbd:de:Latein Amerikanisch latinamerican.kbd:fr:Amérique latine latinamerican.kbd:pt,es:América Latina latinamerican.acc.kbd:en:Latin American (accent keys) +latinamerican.acc.kbd:da:Latinamerikansk (accenttaster) latinamerican.acc.kbd:de:Latein Amerikanisch (mit Akzenten) latinamerican.acc.kbd:fr:Amérique latine (avec accents) latinamerican.acc.kbd:pt,es:América Latina (com acentos) lt.kbd:en:Lithuanian +lt.kbd:da:Litauisk lt.kbd:de:Litauisch lt.kbd:fr:Lithuanien lt.kbd:es:Lituano no.kbd:en:Norwegian +no.kbd:da:Norsk no.kbd:no:Norsk no.kbd:de:Norwegisch no.kbd:fr:Norvégien @@ -295,6 +385,7 @@ no.kbd:pt:Norueguês no.kbd:es:Noruego no.dvorak.kbd:en:Norwegian dvorak +no.dvorak.kbd:da:Norsk dvorak no.dvorak.kbd:no:Norsk dvorak no.dvorak.kbd:de:Norwegisch dvorak no.dvorak.kbd:fr:Norvégien dvorak @@ -302,6 +393,7 @@ no.dvorak.kbd:pt:Norueguês dvorak no.dvorak.kbd:es:Noruego Idvorak pl.kbd:en:Polish (programmer's) +pl.kbd:da:Polsk (programmør) pl.kbd:de:Polnisch (für Programmierer) pl.kbd:fr:Polonais (pour programmeurs) pl.kbd:pl:Polska (programisty) @@ -309,6 +401,7 @@ pl.kbd:pt:Polonês (para programadores) pl.kbd:es:Polaco (para programadores) pl.dvorak.kbd:en:Polish Dvorak +pl.dvorak.kbd:da:Polsk Dvorak pl.dvorak.kbd:de:Polnisch Dvorak pl.dvorak.kbd:fr:Polonais Dvorak pl.dvorak.kbd:pl:Polska Dvorak @@ -316,18 +409,39 @@ pl.dvorak.kbd:pt:Polonês Dvorak pl.dvorak.kbd:es:Polaco Dvorak pt.kbd:en:Portuguese +pt.kbd:da:Portugisisk pt.kbd:de:Portugisisch pt.kbd:fr:Portugais pt.kbd:pt:Português pt.kbd:es:Portugués pt.acc.kbd:en:Portuguese (accent keys) +pt.acc.kbd:da:Portugisisk (accenttaster) pt.acc.kbd:de:Portugisisch (mit Akzenten) pt.acc.kbd:fr:Portugais (avec accents) pt.acc.kbd:pt:Português (com acentos) pt.acc.kbd:es:Portugués (con acentos) +ru.kbd.from-cp866:en:Russian (alternative) +ru.kbd.from-cp866:da:Russisk (alternativ) +ru.kbd.from-cp866:de:Russisch (alternativ) +ru.kbd.from-cp866:ru:Русский (alternative) +ru.kbd.from-cp866:fr:Russe (alternative) +ru.kbd.from-cp866:pt:Russo (alternativo) +ru.kbd.from-cp866:es:Ruso (alternativo) +ru.kbd.from-cp866:uk:Російська (альтернативна) + +ru.kbd.from-iso5:en:Russian +ru.kbd.from-iso5:da:Russisk +ru.kbd.from-iso5:de:Russisch +ru.kbd.from-iso5:fr:Russe +ru.kbd.from-iso5:ru:Русский +ru.kbd.from-iso5:pt:Russo +ru.kbd.from-iso5:es:Ruso +ru.kbd.from-iso5:uk:Російський + ru.kbd:en:Russian +ru.kbd:da:Russisk ru.kbd:de:Russisch ru.kbd:ru:Русский ru.kbd:fr:Russe @@ -336,6 +450,7 @@ ru.kbd:es:Ruso ru.kbd:uk:Російська ru.shift.kbd:en:Russian (shift) +ru.shift.kbd:da:Russisk (shift) ru.shift.kbd:de:Russisch (shift) ru.shift.kbd:ru:Русский (shift) ru.shift.kbd:fr:Russe (shift) @@ -344,6 +459,7 @@ ru.shift.kbd:es:Ruso (shift) ru.shift.kbd:uk:Російська (shift) ru.win.kbd:en:Russian (winkeys) +ru.win.kbd:da:Russisk (win-taster) ru.win.kbd:de:Russisch (winkeys) ru.win.kbd:ru:Русский (winkeys) ru.win.kbd:fr:Russe (winkeys) @@ -352,171 +468,234 @@ ru.win.kbd:es:Ruso (winkeys) ru.win.kbd:uk:Російська (winkeys) es.dvorak.kbd:en:Spanish Dvorak +es.dvorak.kbd:da:Spansk Dvorak es.dvorak.kbd:de:Spanisch Dvorak es.dvorak.kbd:fr:Espagnol Dvorak es.dvorak.kbd:pt:Espanhol Dvorak es.dvorak.kbd:es:Español Dvorak +es.kbd.from-iso1:en:Spanish +es.kbd.from-iso1:da:Spansk +es.kbd.from-iso1:de:Spanisch +es.kbd.from-iso1:fr:Espagnol +es.kbd.from-iso1:pt:Espanhol +es.kbd.from-iso1:es:Español + es.acc.kbd:en:Spanish (accent keys) +es.acc.kbd:da:Spansk (accenttaster) es.acc.kbd:de:Spanisch (accent keys) es.acc.kbd:fr:Espagnol (avec accents) es.acc.kbd:pt:Espanhol (com acentos) es.acc.kbd:es:Español (con acentos) es.kbd:en:Spanish (accent keys) +es.kbd:da:Spansk (accenttaster) es.kbd:de:Spanisch (accent keys) es.kbd:fr:Espagnol (avec accents) es.kbd:pt:Espanhol (com acentos) es.kbd:es:Español (con acentos) si.kbd:en:Slovenian +si.kbd:da:Slovensk si.kbd:de:Slovenisch si.kbd:fr:Slovène si.kbd:pt:Eslovênio si.kbd:es:Esloveno sk.kbd:en:Slovak +sk.kbd:da:Slovakisk sk.kbd:de:Slovakisch sk.kbd:fr:Slovène sk.kbd:es:Eslovaco se.kbd:en:Swedish +se.kbd:da:Svensk se.kbd:de:Schwedisch se.kbd:fr:Suédois se.kbd:pt,es:Sueco +se.kbd.from-cp850:en:Swedish +se.kbd.from-cp850:da:Svensk +se.kbd.from-cp850:de:Schwedisch +se.kbd.from-cp850:fr:Suédois +se.kbd.from-cp850:pt,es:Sueco + ch-fr.kbd:en:Swiss-French +ch-fr.kbd:da:Schweizerfransk ch-fr.kbd:de:Schweiz-Französisch ch-fr.kbd:fr:Suisse-Français ch-fr.kbd:es:Francosuizo ch-fr.acc.kbd:en:Swiss-French (accent keys) +ch-fr.acc.kbd:da:Schweizerfransk (accenttaster) ch-fr.acc.kbd:de:Schweiz-Französisch (mit Akzenten) ch-fr.acc.kbd:fr:Suisse-Français (avec accents) ch-fr.acc.kbd:es:Francosuizo (con acentos) +ch-fr.kbd.from-cp850:en:Swiss-French +ch-fr.kbd.from-cp850:da:Schweizerfransk +ch-fr.kbd.from-cp850:de:Schweiz-Französisch +ch-fr.kbd.from-cp850:fr:Suisse-Français +ch-fr.kbd.from-cp850:es:Francosuizo + ch.kbd:en:Swiss-German +ch.kbd:da:Schweizertysk ch.kbd:de:Schweiz-Deutsch ch.kbd:fr:Suisse-Allemand ch.kbd:pt:Suiço-Alemão ch.kbd:es:Germanosuizo ch.acc.kbd:en:Swiss-German (accent keys) +ch.acc.kbd:da:Schweizertysk (accenttaster) ch.acc.kbd:de:Schweiz-Deutsch (mit Akzenten) ch.acc.kbd:fr:Suisse-Allemand (avec accents) ch.acc.kbd:pt:Suiço-Alemão (com acentos) ch.acc.kbd:es:Germanosuizo (con acentos) -ch.macbook.acc.kbd:en:Swiss-German Macbook/Macbook Pro (accent keys) -ch.macbook.acc.kbd:de:Schweiz-Deutsch Macbook/Macbook Pro (mit Akzenten) -ch.macbook.acc.kbd:fr:Suisse-Allemand Macbook/Macbook Pro (avec accents) -ch.macbook.acc.kbd:pt:Suiço-Alemão Macbook/Macbook Pro (com acentos) -ch.macbook.acc.kbd:es:Germanosuizo Macbook/Macbook Pro (con acentos) +ch.kbd.from-cp850:en:Swiss-German +ch.kbd.from-cp850:da:Schweizertysk +ch.kbd.from-cp850:de:Schweiz-Deutsch +ch.kbd.from-cp850:fr:Suisse-Allemand +ch.kbd.from-cp850:pt:Suiço-Alemão +ch.kbd.from-cp850:es:Germanosuizo +ch.macbook.acc.kbd:en:Swiss-German (MacBook/MacBook Pro) (accent keys) +ch.macbook.acc.kbd:da:Schweizertysk (MacBook/MacBook Pro) (accenttaster) +ch.macbook.acc.kbd:de:Schweiz-Deutsch (MacBook/MacBook Pro) (mit Akzenten) +ch.macbook.acc.kbd:fr:Suisse-Allemand (MacBook/MacBook Pro) (avec accents) +ch.macbook.acc.kbd:pt:Suiço-Alemão (MacBook/MacBook Pro) (com acentos) +ch.macbook.acc.kbd:es:Germanosuizo (MacBook/MacBook Pro) (con acentos) + tr.kbd:en:Turkish (Q) +tr.kbd:da:Tyrkisk (Q) tr.kbd:de:Türkisch (Q) tr.kbd:fr:Turc (Q) tr.kbd:uk:Турецька (Q) tr.kbd:tr:Türkçe (Q) tr.f.kbd:en:Turkish (F) +tr.f.kbd:da:Tyrkisk (F) tr.f.kbd:de:Türkisch (F) tr.f.kbd:fr:Turc (F) tr.f.kbd:uk:Турецька (F) tr.f.kbd:tr:Türkçe (F) uk.kbd:en:United Kingdom +uk.kbd:da:Storbritannien uk.kbd:de:Vereinigtes Königreich uk.kbd:fr:Royaume Uni uk.kbd:pt:Reino Unido uk.kbd:es:Británico uk.capsctrl.kbd:en:United Kingdom (Caps Lock acts as Left Ctrl) +uk.capsctrl.kbd:da:Storbritannien (Caps Lock fungerer som venstre Ctrl) uk.capsctrl.kbd:de:Vereinigtes Königreich (Caps Lock als linke Strg) #uk.capsctrl.kbd:fr:Royaume Uni (caps lock acts as Left Ctrl) #uk.capsctrl.kbd:pt:Reino Unido (caps lock acts as Left Ctrl) #uk.capsctrl.kbd:es:Británico (caps lock acts as Left Ctrl) uk.dvorak.kbd:en:United Kingdom Dvorak +uk.dvorak.kbd:da:Storbritannien Dvorak uk.dvorak.kbd:de:Vereinigtes Königreich Dvorak uk.dvorak.kbd:fr:Royaume Uni Dvorak uk.dvorak.kbd:pt:Reino Unido Dvorak uk.dvorak.kbd:es:Británico Dvorak -uk.macbook.kbd:en:United Kingdom Macbook -uk.macbook.kbd:de:Vereinigtes Königreich Macbook -uk.macbook.kbd:fr:Royaume Uni Macbook -uk.macbook.kbd:pt:Reino Unido Macbook -uk.macbook.kbd:es:Británico Macbook +uk.macbook.kbd:en:United Kingdom (MacBook) +uk.macbook.kbd:da:Storbritannien (MacBook) +uk.macbook.kbd:de:Vereinigtes Königreich (MacBook) +uk.macbook.kbd:fr:Royaume Uni (MacBook) +uk.macbook.kbd:pt:Reino Unido (MacBook) +uk.macbook.kbd:es:Británico (MacBook) us.kbd:en:United States of America +us.kbd:da:USA us.kbd:de:US-amerikanisch us.kbd:fr:États Unis d'Amérique us.kbd:pt:Estados Unidos da América us.kbd:es:Estadounidense us.acc.kbd:en:United States of America (accent keys) +us.acc.kbd:da:USA (accenttaster) us.acc.kbd:de:US-amerikanisch (mit Akzenten) us.acc.kbd:fr:États Unis d'Amérique (avec accents) us.acc.kbd:pt:Estados Unidos da América (com acentos) us.acc.kbd:es:Estadounidense (con acentos) us.dvorak.kbd:en:United States of America dvorak +us.dvorak.kbd:da:USA dvorak us.dvorak.kbd:de:US-amerikanisch dvorak us.dvorak.kbd:fr:États Unis d'Amérique dvorak us.dvorak.kbd:pt:Estados Unidos da América dvorak us.dvorak.kbd:es:Estadounidense dvorak us.dvorakr.kbd:en:United States of America righthand dvorak +us.dvorakr.kbd:da:USA højrehåndet dvorak us.dvorakr.kbd:de:US-amerikanisch dvorak rechte Hand us.dvorakr.kbd:fr:États Unis d'Amérique dvorakr us.dvorakr.kbd:pt:Estados Unidos da América dvorakr us.dvorakr.kbd:es:Estadounidense dvorak diestro us.dvorakl.kbd:en:United States of America lefthand dvorak +us.dvorakl.kbd:da:USA venstrehåndet dvorak us.dvorakl.kbd:de:US-amerikanisch dvorak linke Hand us.dvorakl.kbd:fr:États Unis d'Amérique dvorakl us.dvorakl.kbd:pt:Estados Unidos da América dvorakl us.dvorakl.kbd:es:Estadounidense dvorak zurdo us.dvorakp.kbd:en:United States of America Programmer Dvorak +us.dvorakp.kbd:da:USA programmør Dvorak us.dvorakp.kbd:de:US-amerikanisch (Dvorak für Programmierer) us.dvorakp.kbd:fr:États Unis d'Amérique dvorakp us.dvorakp.kbd:pt:Estados Unidos da América dvorakp us.dvorakp.kbd:es:Estadounidense dvorakp us.dvorakx.kbd:en:United States of America dvorakx +us.dvorakx.kbd:da:USA dvorakx us.dvorakx.kbd:de:US-amerikanisch dvorakx us.dvorakx.kbd:fr:États Unis d'Amérique dvorakx us.dvorakx.kbd:pt:Estados Unidos da América dvorakx us.dvorakx.kbd:es:Estadounidense dvorakx us.emacs.kbd:en:United States of America Emacs optimized layout +us.emacs.kbd:da:USA Emacs-optimeret layout us.emacs.kbd:de:US-amerikanisch für Emacs optimiert us.emacs.kbd:fr:États Unis d'Amérique emacs us.emacs.kbd:pt:Estados Unidos da América emacs us.emacs.kbd:es:Estadounidense optimizado para Emacs us.ctrl.kbd:en:United States of America (Caps Lock acts as Left Ctrl) +us.ctrl.kbd:da:USA (Caps Lock fungerer som venstre Ctrl) us.unix.kbd:en:United States of America Traditional Unix Workstation +us.unix.kbd:da:USA traditionel Unix-arbejdsstation us.unix.kbd:de:US-amerikanisch traditionelles Unix Layout us.unix.kbd:fr:États Unis d'Amérique unix us.unix.kbd:pt:Estados Unidos da América unix us.unix.kbd:es:Estadounidense Unix tradicional -us.macbook.kbd:en:United States of America Macbook/Macbook Pro ISO-8859-1 -us.macbook.kbd:de:US-amerikanisch Macbook/Macbook Pro ISO-8859-1 -us.macbook.kbd:fr:États Unis d'Amérique Macbook / Macbook Pro ISO-8859-1 -us.macbook.kbd:pt:Estados Unidos da América Macbook/Macbook Pro ISO-8859-1 -us.macbook.kbd:es:Estadounidense Macbook/Macbook Pro ISO-8859-1 +us.macbook.kbd:en:United States of America (MacBook/MacBook Pro) ISO-8859-1 +us.macbook.kbd:da:USA (MacBook/MacBook Pro) ISO-8859-1 +us.macbook.kbd:de:US-amerikanisch (MacBook/MacBook Pro) ISO-8859-1 +us.macbook.kbd:fr:États Unis d'Amérique (MacBook/MacBook Pro) ISO-8859-1 +us.macbook.kbd:pt:Estados Unidos da América (MacBook/MacBook Pro) ISO-8859-1 +us.macbook.kbd:es:Estadounidense (MacBook/MacBook Pro) ISO-8859-1 +ua.kbd.from-iso5:en:Ukrainian +ua.kbd.from-iso5:da:Ukrainsk +ua.kbd.from-iso5:de:Ukrainisch +ua.kbd.from-iso5:fr:Ukrainien +ua.kbd.from-iso5:ru:Украинский +ua.kbd.from-iso5:uk:Українська + ua.kbd:en:Ukrainian +ua.kbd:da:Ukrainsk ua.kbd:de:Ukrainisch ua.kbd:fr:Ukrainien ua.kbd:uk:Українська ua.shift.alt.kbd:en:Ukrainian (with Russian) (shift) +ua.shift.alt.kbd:da:Ukrainsk (med russisk) (shift) ua.shift.alt.kbd:de:Ukrainisch (mit Russisch) (shift) ua.shift.alt.kbd:fr:Ukrainien (koi8-u avec koi8-r) (shift) ua.shift.alt.kbd:uk:Українська (koi8-u з) koi8-r (shift) From owner-svn-src-stable-12@freebsd.org Sun Mar 8 23:31:05 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 325212517C6; Sun, 8 Mar 2020 23:31: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bHfc1630z40DG; Sun, 8 Mar 2020 23:31:04 +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 E582B1B79; Sun, 8 Mar 2020 23:31:03 +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 028NV3lJ001863; Sun, 8 Mar 2020 23:31:03 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028NV3AV001862; Sun, 8 Mar 2020 23:31:03 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082331.028NV3AV001862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 23:31:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358796 - stable/12/share/vt/keymaps X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/vt/keymaps X-SVN-Commit-Revision: 358796 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 23:31:05 -0000 Author: emaste Date: Sun Mar 8 23:31:03 2020 New Revision: 358796 URL: https://svnweb.freebsd.org/changeset/base/358796 Log: MFC r355594: remove again nonexistent from-* entries from vt INDEX.keymaps PR: 235564, 235853 Modified: stable/12/share/vt/keymaps/INDEX.keymaps Directory Properties: stable/12/ (props changed) Modified: stable/12/share/vt/keymaps/INDEX.keymaps ============================================================================== --- stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 23:26:21 2020 (r358795) +++ stable/12/share/vt/keymaps/INDEX.keymaps Sun Mar 8 23:31:03 2020 (r358796) @@ -110,18 +110,6 @@ cz.kbd:de:Tschechisch (QWERTZ, mit Akzenten) cz.kbd:fr:Tchèque (QWERTZ, avec accents) cz.kbd:es:Checo (QWERTZ, con acentos) -cz.kbd.from-ce:en:Czech -cz.kbd.from-ce:da:Tjekkisk -cz.kbd.from-ce:de:Tschechisch -cz.kbd.from-ce:fr:Tchèque -cz.kbd.from-ce:es:Checo - -cz.qwerty.kbd.from-ce:en:Czech (QWERTY) -cz.qwerty.kbd.from-ce:da:Tjekkisk (QWERTY) -cz.qwerty.kbd.from-ce:de:Tschechisch (QWERTY) -cz.qwerty.kbd.from-ce:fr:Tchèquey (QWERTY) -cz.qwerty.kbd.from-ce:es:Checo (QWERTY) - dk.kbd:en:Danish dk.kbd:da:Dansk dk.kbd:de:Dänisch @@ -136,13 +124,6 @@ dk.acc.kbd:fr:Danois (avec accents) dk.acc.kbd:pt:Dinamarquês (com acentos) dk.acc.kbd:es:Danés (con acentos) -dk.kbd.from-cp865:en:Danish -dk.kbd.from-cp865:da:Dansk -dk.kbd.from-cp865:de:Dänisch -dk.kbd.from-cp865:fr:Danois -dk.kbd.from-cp865:pt:Dinamarquês -dk.kbd.from-cp865:es:Danés - dk.macbook.kbd:en:Danish (MacBook) dk.macbook.kbd:da:Dansk (MacBook) dk.macbook.kbd:de:Dänisch (MacBook) @@ -158,36 +139,18 @@ nordic.asus-eee.kbd:en:Nordic layout on Asus eeePC nordic.asus-eee.kbd:da:Nordisk layout på Asus eeePC nordic.asus-eee.kbd:fr:Norvégien phonétique sur Asus eeePC -ee.kbd.from-iso1:en:Estonian -ee.kbd.from-iso1:da:Estisk -ee.kbd.from-iso1:de:Estnisch -ee.kbd.from-iso1:fr:Estonien -ee.kbd.from-iso1:es:Estonio - ee.kbd:en:Estonian ee.kbd:da:Estisk ee.kbd:de:Estnisch ee.kbd:fr:Estonien ee.kbd:es:Estonio -ee.kbd.from-cp850:en:Estonian -ee.kbd.from-cp850:da:Estisk -ee.kbd.from-cp850:de:Estnisch -ee.kbd.from-cp850:fr:Estonien -ee.kbd.from-cp850:es:Estonio - fi.kbd:en:Finnish fi.kbd:da:Finsk fi.kbd:de:Finnisch fi.kbd:fr:Finlandais fi.kbd:es:Finlandés -fi.kbd.from-cp850:en:Finnish -fi.kbd.from-cp850:da:Finsk -fi.kbd.from-cp850:de:Finnisch -fi.kbd.from-cp850:fr:Finlandais -fi.kbd.from-cp850:es:Finlandés - fr.kbd:en:French fr.kbd:da:Fransk fr.kbd:de:Französisch @@ -262,14 +225,6 @@ de.noacc.kbd:pt:Alemão (no accent keys) de.noacc.kbd:es:Alemán (no accent keys) de.noacc.kbd:uk:Німецька (no accent keys) -de.kbd.from-cp850:en:German -de.kbd.from-cp850:da:Tysk -de.kbd.from-cp850:de:Deutsch -de.kbd.from-cp850:fr:Allemand -de.kbd.from-cp850:pt:Alemão -de.kbd.from-cp850:es:Alemán -de.kbd.from-cp850:uk:Німецька - gr.kbd:en:Greek (104 keys) gr.kbd:da:Græsk (104 taster) gr.kbd:fr:Grec (104 touches) @@ -422,24 +377,6 @@ pt.acc.kbd:fr:Portugais (avec accents) pt.acc.kbd:pt:Português (com acentos) pt.acc.kbd:es:Portugués (con acentos) -ru.kbd.from-cp866:en:Russian (alternative) -ru.kbd.from-cp866:da:Russisk (alternativ) -ru.kbd.from-cp866:de:Russisch (alternativ) -ru.kbd.from-cp866:ru:Русский (alternative) -ru.kbd.from-cp866:fr:Russe (alternative) -ru.kbd.from-cp866:pt:Russo (alternativo) -ru.kbd.from-cp866:es:Ruso (alternativo) -ru.kbd.from-cp866:uk:Російська (альтернативна) - -ru.kbd.from-iso5:en:Russian -ru.kbd.from-iso5:da:Russisk -ru.kbd.from-iso5:de:Russisch -ru.kbd.from-iso5:fr:Russe -ru.kbd.from-iso5:ru:Русский -ru.kbd.from-iso5:pt:Russo -ru.kbd.from-iso5:es:Ruso -ru.kbd.from-iso5:uk:Російський - ru.kbd:en:Russian ru.kbd:da:Russisk ru.kbd:de:Russisch @@ -474,13 +411,6 @@ es.dvorak.kbd:fr:Espagnol Dvorak es.dvorak.kbd:pt:Espanhol Dvorak es.dvorak.kbd:es:Español Dvorak -es.kbd.from-iso1:en:Spanish -es.kbd.from-iso1:da:Spansk -es.kbd.from-iso1:de:Spanisch -es.kbd.from-iso1:fr:Espagnol -es.kbd.from-iso1:pt:Espanhol -es.kbd.from-iso1:es:Español - es.acc.kbd:en:Spanish (accent keys) es.acc.kbd:da:Spansk (accenttaster) es.acc.kbd:de:Spanisch (accent keys) @@ -514,12 +444,6 @@ se.kbd:de:Schwedisch se.kbd:fr:Suédois se.kbd:pt,es:Sueco -se.kbd.from-cp850:en:Swedish -se.kbd.from-cp850:da:Svensk -se.kbd.from-cp850:de:Schwedisch -se.kbd.from-cp850:fr:Suédois -se.kbd.from-cp850:pt,es:Sueco - ch-fr.kbd:en:Swiss-French ch-fr.kbd:da:Schweizerfransk ch-fr.kbd:de:Schweiz-Französisch @@ -532,12 +456,6 @@ ch-fr.acc.kbd:de:Schweiz-Französisch (mit Akzenten) ch-fr.acc.kbd:fr:Suisse-Français (avec accents) ch-fr.acc.kbd:es:Francosuizo (con acentos) -ch-fr.kbd.from-cp850:en:Swiss-French -ch-fr.kbd.from-cp850:da:Schweizerfransk -ch-fr.kbd.from-cp850:de:Schweiz-Französisch -ch-fr.kbd.from-cp850:fr:Suisse-Français -ch-fr.kbd.from-cp850:es:Francosuizo - ch.kbd:en:Swiss-German ch.kbd:da:Schweizertysk ch.kbd:de:Schweiz-Deutsch @@ -552,13 +470,6 @@ ch.acc.kbd:fr:Suisse-Allemand (avec accents) ch.acc.kbd:pt:Suiço-Alemão (com acentos) ch.acc.kbd:es:Germanosuizo (con acentos) -ch.kbd.from-cp850:en:Swiss-German -ch.kbd.from-cp850:da:Schweizertysk -ch.kbd.from-cp850:de:Schweiz-Deutsch -ch.kbd.from-cp850:fr:Suisse-Allemand -ch.kbd.from-cp850:pt:Suiço-Alemão -ch.kbd.from-cp850:es:Germanosuizo - ch.macbook.acc.kbd:en:Swiss-German (MacBook/MacBook Pro) (accent keys) ch.macbook.acc.kbd:da:Schweizertysk (MacBook/MacBook Pro) (accenttaster) ch.macbook.acc.kbd:de:Schweiz-Deutsch (MacBook/MacBook Pro) (mit Akzenten) @@ -680,13 +591,6 @@ us.macbook.kbd:de:US-amerikanisch (MacBook/MacBook Pro us.macbook.kbd:fr:États Unis d'Amérique (MacBook/MacBook Pro) ISO-8859-1 us.macbook.kbd:pt:Estados Unidos da América (MacBook/MacBook Pro) ISO-8859-1 us.macbook.kbd:es:Estadounidense (MacBook/MacBook Pro) ISO-8859-1 - -ua.kbd.from-iso5:en:Ukrainian -ua.kbd.from-iso5:da:Ukrainsk -ua.kbd.from-iso5:de:Ukrainisch -ua.kbd.from-iso5:fr:Ukrainien -ua.kbd.from-iso5:ru:Украинский -ua.kbd.from-iso5:uk:Українська ua.kbd:en:Ukrainian ua.kbd:da:Ukrainsk From owner-svn-src-stable-12@freebsd.org Mon Mar 9 07:12:05 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D35625A8C3; Mon, 9 Mar 2020 07:12:05 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bTtX667zz3Gkr; Mon, 9 Mar 2020 07:12:04 +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 A3C807331; Mon, 9 Mar 2020 07:12:04 +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 0297C4ML080197; Mon, 9 Mar 2020 07:12:04 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0297C2bK080189; Mon, 9 Mar 2020 07:12:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202003090712.0297C2bK080189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 9 Mar 2020 07:12:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358802 - in stable/12/contrib/llvm-project/clang: include/clang/Basic lib/CodeGen lib/Sema X-SVN-Group: stable-12 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable/12/contrib/llvm-project/clang: include/clang/Basic lib/CodeGen lib/Sema X-SVN-Commit-Revision: 358802 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 07:12:05 -0000 Author: dim Date: Mon Mar 9 07:12:02 2020 New Revision: 358802 URL: https://svnweb.freebsd.org/changeset/base/358802 Log: MFC r358711: Merge commit f75939599 from llvm git (by Erich Keane): Reland r374450 with Richard Smith's comments and test fixed. The behavior from the original patch has changed, since we're no longer allowing LLVM to just ignore the alignment. Instead, we're just assuming the maximum possible alignment. Differential Revision: https://reviews.llvm.org/D68824 llvm-svn: 374562 This fixes 'Assertion failed: (Alignment != 0 && "Invalid Alignment"), function CreateAlignmentAssumption', when building recent versions of v8, which invoke __builtin_assume_aligned() with its alignment argument set to 4GiB or more. Clang will now report a warning, and show the maximum possible alignment instead, e.g.: huge-align.cpp:1:27: warning: requested alignment must be 536870912 bytes or smaller; maximum alignment assumed [-Wbuiltin-assume-aligned-alignment] void *f(void *g) { return __builtin_assume_aligned(g, 4294967296); } ^ ~~~~~~~~~~ Upstream PR: https://bugs.llvm.org/show_bug.cgi?id=43839 Reported by: cem Modified: stable/12/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td stable/12/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp stable/12/contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp stable/12/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp stable/12/contrib/llvm-project/clang/lib/CodeGen/CGStmtOpenMP.cpp stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.cpp stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.h stable/12/contrib/llvm-project/clang/lib/Sema/SemaChecking.cpp Directory Properties: stable/12/ (props changed) stable/12/contrib/llvm-project/clang/ (props changed) Modified: stable/12/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td ============================================================================== --- stable/12/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td Mon Mar 9 07:12:02 2020 (r358802) @@ -2797,6 +2797,10 @@ def err_alignment_dependent_typedef_name : Error< def err_attribute_aligned_too_great : Error< "requested alignment must be %0 bytes or smaller">; +def warn_assume_aligned_too_great + : Warning<"requested alignment must be %0 bytes or smaller; maximum " + "alignment assumed">, + InGroup>; def warn_redeclaration_without_attribute_prev_attribute_ignored : Warning< "%q0 redeclared without %1 attribute: previous %1 ignored">, InGroup; Modified: stable/12/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp Mon Mar 9 07:12:02 2020 (r358802) @@ -2026,11 +2026,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDe Value *AlignmentValue = EmitScalarExpr(E->getArg(1)); ConstantInt *AlignmentCI = cast(AlignmentValue); - unsigned Alignment = (unsigned)AlignmentCI->getZExtValue(); + if (AlignmentCI->getValue().ugt(llvm::Value::MaximumAlignment)) + AlignmentCI = ConstantInt::get(AlignmentCI->getType(), + llvm::Value::MaximumAlignment); EmitAlignmentAssumption(PtrValue, Ptr, /*The expr loc is sufficient.*/ SourceLocation(), - Alignment, OffsetValue); + AlignmentCI, OffsetValue); return RValue::get(PtrValue); } case Builtin::BI__assume: Modified: stable/12/contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp Mon Mar 9 07:12:02 2020 (r358802) @@ -4548,7 +4548,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo llvm::Value *Alignment = EmitScalarExpr(AA->getAlignment()); llvm::ConstantInt *AlignmentCI = cast(Alignment); EmitAlignmentAssumption(Ret.getScalarVal(), RetTy, Loc, AA->getLocation(), - AlignmentCI->getZExtValue(), OffsetValue); + AlignmentCI, OffsetValue); } else if (const auto *AA = TargetDecl->getAttr()) { llvm::Value *AlignmentVal = CallArgs[AA->getParamIndex().getLLVMIndex()] .getRValue(*this) Modified: stable/12/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp Mon Mar 9 07:12:02 2020 (r358802) @@ -294,8 +294,7 @@ class ScalarExprEmitter (public) Value *AlignmentValue = CGF.EmitScalarExpr(AVAttr->getAlignment()); llvm::ConstantInt *AlignmentCI = cast(AlignmentValue); - CGF.EmitAlignmentAssumption(V, E, AVAttr->getLocation(), - AlignmentCI->getZExtValue()); + CGF.EmitAlignmentAssumption(V, E, AVAttr->getLocation(), AlignmentCI); } /// EmitLoadOfLValue - Given an expression with complex type that represents a Modified: stable/12/contrib/llvm-project/clang/lib/CodeGen/CGStmtOpenMP.cpp ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/CodeGen/CGStmtOpenMP.cpp Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/CodeGen/CGStmtOpenMP.cpp Mon Mar 9 07:12:02 2020 (r358802) @@ -1460,14 +1460,14 @@ static void emitAlignedClause(CodeGenFunction &CGF, if (!CGF.HaveInsertPoint()) return; for (const auto *Clause : D.getClausesOfKind()) { - unsigned ClauseAlignment = 0; + llvm::APInt ClauseAlignment(64, 0); if (const Expr *AlignmentExpr = Clause->getAlignment()) { auto *AlignmentCI = cast(CGF.EmitScalarExpr(AlignmentExpr)); - ClauseAlignment = static_cast(AlignmentCI->getZExtValue()); + ClauseAlignment = AlignmentCI->getValue(); } for (const Expr *E : Clause->varlists()) { - unsigned Alignment = ClauseAlignment; + llvm::APInt Alignment(ClauseAlignment); if (Alignment == 0) { // OpenMP [2.8.1, Description] // If no optional parameter is specified, implementation-defined default @@ -1478,12 +1478,13 @@ static void emitAlignedClause(CodeGenFunction &CGF, E->getType()->getPointeeType())) .getQuantity(); } - assert((Alignment == 0 || llvm::isPowerOf2_32(Alignment)) && + assert((Alignment == 0 || Alignment.isPowerOf2()) && "alignment is not power of 2"); if (Alignment != 0) { llvm::Value *PtrValue = CGF.EmitScalarExpr(E); CGF.EmitAlignmentAssumption( - PtrValue, E, /*No second loc needed*/ SourceLocation(), Alignment); + PtrValue, E, /*No second loc needed*/ SourceLocation(), + llvm::ConstantInt::get(CGF.getLLVMContext(), Alignment)); } } } Modified: stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.cpp ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.cpp Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.cpp Mon Mar 9 07:12:02 2020 (r358802) @@ -2048,24 +2048,9 @@ void CodeGenFunction::EmitAlignmentAssumption(llvm::Va } void CodeGenFunction::EmitAlignmentAssumption(llvm::Value *PtrValue, - QualType Ty, SourceLocation Loc, - SourceLocation AssumptionLoc, - unsigned Alignment, - llvm::Value *OffsetValue) { - llvm::Value *TheCheck; - llvm::Instruction *Assumption = Builder.CreateAlignmentAssumption( - CGM.getDataLayout(), PtrValue, Alignment, OffsetValue, &TheCheck); - if (SanOpts.has(SanitizerKind::Alignment)) { - llvm::Value *AlignmentVal = llvm::ConstantInt::get(IntPtrTy, Alignment); - EmitAlignmentAssumptionCheck(PtrValue, Ty, Loc, AssumptionLoc, AlignmentVal, - OffsetValue, TheCheck, Assumption); - } -} - -void CodeGenFunction::EmitAlignmentAssumption(llvm::Value *PtrValue, const Expr *E, SourceLocation AssumptionLoc, - unsigned Alignment, + llvm::Value *Alignment, llvm::Value *OffsetValue) { if (auto *CE = dyn_cast(E)) E = CE->getSubExprAsWritten(); Modified: stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.h ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.h Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.h Mon Mar 9 07:12:02 2020 (r358802) @@ -2829,13 +2829,8 @@ class CodeGenFunction : public CodeGenTypeCache { (pub llvm::Value *Alignment, llvm::Value *OffsetValue = nullptr); - void EmitAlignmentAssumption(llvm::Value *PtrValue, QualType Ty, - SourceLocation Loc, SourceLocation AssumptionLoc, - unsigned Alignment, - llvm::Value *OffsetValue = nullptr); - void EmitAlignmentAssumption(llvm::Value *PtrValue, const Expr *E, - SourceLocation AssumptionLoc, unsigned Alignment, + SourceLocation AssumptionLoc, llvm::Value *Alignment, llvm::Value *OffsetValue = nullptr); //===--------------------------------------------------------------------===// Modified: stable/12/contrib/llvm-project/clang/lib/Sema/SemaChecking.cpp ============================================================================== --- stable/12/contrib/llvm-project/clang/lib/Sema/SemaChecking.cpp Mon Mar 9 04:09:36 2020 (r358801) +++ stable/12/contrib/llvm-project/clang/lib/Sema/SemaChecking.cpp Mon Mar 9 07:12:02 2020 (r358802) @@ -5961,6 +5961,12 @@ bool Sema::SemaBuiltinAssumeAligned(CallExpr *TheCall) if (!Result.isPowerOf2()) return Diag(TheCall->getBeginLoc(), diag::err_alignment_not_power_of_two) << Arg->getSourceRange(); + + // Alignment calculations can wrap around if it's greater than 2**29. + unsigned MaximumAlignment = 536870912; + if (Result > MaximumAlignment) + Diag(TheCall->getBeginLoc(), diag::warn_assume_aligned_too_great) + << Arg->getSourceRange() << MaximumAlignment; } if (NumArgs > 2) { From owner-svn-src-stable-12@freebsd.org Mon Mar 9 13:04:48 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8BBD262131; Mon, 9 Mar 2020 13:04: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bdjX5TZXz4Qm9; Mon, 9 Mar 2020 13:04: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 9D984B2AD; Mon, 9 Mar 2020 13:04: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 029D4mRU089517; Mon, 9 Mar 2020 13:04:48 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029D4ltL089513; Mon, 9 Mar 2020 13:04:47 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003091304.029D4ltL089513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 9 Mar 2020 13:04:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358803 - in stable/12: share/man/man4/man4.i386 sys/dev/ctau sys/dev/cx X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12: share/man/man4/man4.i386 sys/dev/ctau sys/dev/cx X-SVN-Commit-Revision: 358803 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 13:04:48 -0000 Author: emaste Date: Mon Mar 9 13:04:47 2020 New Revision: 358803 URL: https://svnweb.freebsd.org/changeset/base/358803 Log: MFC r358554: Add deprecation notices to ctau and cx drivers These support outdated or obsolete ISA WAN (T1/E1) sync serial cards, and these drivers haven't really been touched (other than in tree-wide sweeps to keep them building) for 15+ years. Related PCI devices ce and cp are still in the tree. Relnotes: Yes Sponsored by: The FreeBSD Foundation Modified: stable/12/share/man/man4/man4.i386/ctau.4 stable/12/share/man/man4/man4.i386/cx.4 stable/12/sys/dev/ctau/if_ct.c stable/12/sys/dev/cx/if_cx.c Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/man4.i386/ctau.4 ============================================================================== --- stable/12/share/man/man4/man4.i386/ctau.4 Mon Mar 9 07:12:02 2020 (r358802) +++ stable/12/share/man/man4/man4.i386/ctau.4 Mon Mar 9 13:04:47 2020 (r358803) @@ -13,7 +13,7 @@ .\" Cronyx Id: ct.4,v 1.1.2.6 2004/06/21 17:56:40 rik Exp $ .\" $FreeBSD$ .\" -.Dd September 6, 2004 +.Dd March 2, 2020 .Dt CTAU 4 i386 .Os .Sh NAME @@ -33,6 +33,12 @@ In .Cd hint.ctau.0.port="0x240" .Cd hint.ctau.0.irq="15" .Cd hint.ctau.0.drq="7" +.Sh DEPRECATION NOTICE +The +.Nm +driver is not present in +.Fx 13.0 +and later. .Sh DESCRIPTION The .Nm Modified: stable/12/share/man/man4/man4.i386/cx.4 ============================================================================== --- stable/12/share/man/man4/man4.i386/cx.4 Mon Mar 9 07:12:02 2020 (r358802) +++ stable/12/share/man/man4/man4.i386/cx.4 Mon Mar 9 13:04:47 2020 (r358803) @@ -13,7 +13,7 @@ .\" Cronyx Id: cx.4,v 1.1.2.6 2004/06/21 17:56:40 rik Exp $ .\" $FreeBSD$ .\" -.Dd July 16, 2005 +.Dd March 2, 2020 .Dt CX 4 i386 .Os .Sh NAME @@ -45,6 +45,12 @@ In .Cd hint.cx.0.port="0x240" .Cd hint.cx.0.irq="15" .Cd hint.cx.0.drq="7" +.Sh DEPRECATION NOTICE +The +.Nm +driver is not present in +.Fx 13.0 +and later. .Sh DESCRIPTION The .Nm Modified: stable/12/sys/dev/ctau/if_ct.c ============================================================================== --- stable/12/sys/dev/ctau/if_ct.c Mon Mar 9 07:12:02 2020 (r358802) +++ stable/12/sys/dev/ctau/if_ct.c Mon Mar 9 13:04:47 2020 (r358803) @@ -748,6 +748,7 @@ static int ct_attach (device_t dev) } splx (s); + gone_in_dev(dev, 13, "sync serial (T1/E1) ISA card drivers"); return 0; } Modified: stable/12/sys/dev/cx/if_cx.c ============================================================================== --- stable/12/sys/dev/cx/if_cx.c Mon Mar 9 07:12:02 2020 (r358802) +++ stable/12/sys/dev/cx/if_cx.c Mon Mar 9 13:04:47 2020 (r358803) @@ -871,6 +871,7 @@ static int cx_attach (device_t dev) } splx (s); + gone_in_dev(dev, 13, "sync serial (T1/E1) ISA card drivers"); return 0; } From owner-svn-src-stable-12@freebsd.org Mon Mar 9 13:34:00 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D03426299B; Mon, 9 Mar 2020 13:34:00 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bfMC4R11z3FJx; Mon, 9 Mar 2020 13:33:59 +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 2ADC7B7FC; Mon, 9 Mar 2020 13:33:59 +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 029DXxwU009935; Mon, 9 Mar 2020 13:33:59 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029DXwdq009932; Mon, 9 Mar 2020 13:33:58 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003091333.029DXwdq009932@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 9 Mar 2020 13:33:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358805 - in stable/12/sys: compat/freebsd32 kern X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 358805 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 13:34:00 -0000 Author: emaste Date: Mon Mar 9 13:33:58 2020 New Revision: 358805 URL: https://svnweb.freebsd.org/changeset/base/358805 Log: MFC r346273: correct readlinkat(2) return type r176215 corrected readlink(2)'s return type and the type of the last argument. readlink(2) was introduced in r177788 after being developed as part of Google Summer of Code 2007; it appears to have inherited the wrong return type. Man pages and header files were already ssize_t; update syscalls.master to match. PR: 197915 Submitted by: Henning Petersen Modified: stable/12/sys/compat/freebsd32/syscalls.master stable/12/sys/kern/syscalls.master Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/freebsd32/syscalls.master ============================================================================== --- stable/12/sys/compat/freebsd32/syscalls.master Mon Mar 9 13:06:02 2020 (r358804) +++ stable/12/sys/compat/freebsd32/syscalls.master Mon Mar 9 13:33:58 2020 (r358805) @@ -947,7 +947,7 @@ mode_t mode, uint32_t dev); } 499 AUE_OPENAT_RWTC NOPROTO { int openat(int fd, char *path, int flag, \ mode_t mode); } -500 AUE_READLINKAT NOPROTO { int readlinkat(int fd, char *path, char *buf, \ +500 AUE_READLINKAT NOPROTO { ssize_t readlinkat(int fd, char *path, char *buf, \ size_t bufsize); } 501 AUE_RENAMEAT NOPROTO { int renameat(int oldfd, char *old, int newfd, \ const char *new); } Modified: stable/12/sys/kern/syscalls.master ============================================================================== --- stable/12/sys/kern/syscalls.master Mon Mar 9 13:06:02 2020 (r358804) +++ stable/12/sys/kern/syscalls.master Mon Mar 9 13:33:58 2020 (r358805) @@ -1164,7 +1164,7 @@ ; XXX: see the comment for open 499 AUE_OPENAT_RWTC STD { int openat(int fd, _In_z_ char *path, \ int flag, mode_t mode); } -500 AUE_READLINKAT STD { int readlinkat(int fd, \ +500 AUE_READLINKAT STD { ssize_t readlinkat(int fd, \ _In_z_ char *path, \ _Out_writes_bytes_(bufsize) char *buf, \ size_t bufsize); } From owner-svn-src-stable-12@freebsd.org Mon Mar 9 13:35:09 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8AB5C262A17; Mon, 9 Mar 2020 13:35:09 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bfNX3SHsz3J7Q; Mon, 9 Mar 2020 13:35:08 +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 5E1B2B801; Mon, 9 Mar 2020 13:35:08 +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 029DZ8wL010160; Mon, 9 Mar 2020 13:35:08 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029DZ8Rt010158; Mon, 9 Mar 2020 13:35:08 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003091335.029DZ8Rt010158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 9 Mar 2020 13:35:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358806 - in stable/12/sys: compat/freebsd32 kern X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/12/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 358806 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 13:35:09 -0000 Author: emaste Date: Mon Mar 9 13:35:07 2020 New Revision: 358806 URL: https://svnweb.freebsd.org/changeset/base/358806 Log: make sysent after r358805, readlinkat return type MFC Modified: stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c stable/12/sys/kern/systrace_args.c Modified: stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c Mon Mar 9 13:33:58 2020 (r358805) +++ stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c Mon Mar 9 13:35:07 2020 (r358806) @@ -10431,7 +10431,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* readlinkat */ case 500: if (ndx == 0 || ndx == 1) - p = "int"; + p = "ssize_t"; break; /* renameat */ case 501: Modified: stable/12/sys/kern/systrace_args.c ============================================================================== --- stable/12/sys/kern/systrace_args.c Mon Mar 9 13:33:58 2020 (r358805) +++ stable/12/sys/kern/systrace_args.c Mon Mar 9 13:35:07 2020 (r358806) @@ -10392,7 +10392,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* readlinkat */ case 500: if (ndx == 0 || ndx == 1) - p = "int"; + p = "ssize_t"; break; /* renameat */ case 501: From owner-svn-src-stable-12@freebsd.org Mon Mar 9 14:13:41 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8546326375E; Mon, 9 Mar 2020 14:13:41 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bgF11WZ9z43sV; Mon, 9 Mar 2020 14:13:41 +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 11955C13C; Mon, 9 Mar 2020 14:13:41 +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 029EDeXU037544; Mon, 9 Mar 2020 14:13:40 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029EDeC2037543; Mon, 9 Mar 2020 14:13:40 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003091413.029EDeC2037543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 9 Mar 2020 14:13:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358809 - stable/12/sys/dev/usb/net X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sys/dev/usb/net X-SVN-Commit-Revision: 358809 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 14:13:41 -0000 Author: emaste Date: Mon Mar 9 14:13:40 2020 New Revision: 358809 URL: https://svnweb.freebsd.org/changeset/base/358809 Log: MFC r358299: muge: fix rxcsum enable test if_capabilities indicates capabilities supported by the hardware; if_capenable which are enabled. Note that rx checksum is still disabled in the driver at compile time. Submitted by: Johannes Modified: stable/12/sys/dev/usb/net/if_muge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/net/if_muge.c ============================================================================== --- stable/12/sys/dev/usb/net/if_muge.c Mon Mar 9 13:44:51 2020 (r358808) +++ stable/12/sys/dev/usb/net/if_muge.c Mon Mar 9 14:13:40 2020 (r358809) @@ -1259,7 +1259,7 @@ muge_bulk_read_callback(struct usb_xfer *xfer, usb_err * Check if RX checksums are computed, and * offload them */ - if ((ifp->if_capabilities & IFCAP_RXCSUM) && + if ((ifp->if_capenable & IFCAP_RXCSUM) && !(rx_cmd_a & RX_CMD_A_ICSM_)) { struct ether_header *eh; eh = mtod(m, struct ether_header *); @@ -1971,7 +1971,7 @@ static int muge_sethwcsum(struct muge_softc *sc) MUGE_LOCK_ASSERT(sc, MA_OWNED); - if (ifp->if_capabilities & IFCAP_RXCSUM) { + if (ifp->if_capenable & IFCAP_RXCSUM) { sc->sc_rfe_ctl |= ETH_RFE_CTL_IGMP_COE_ | ETH_RFE_CTL_ICMP_COE_; sc->sc_rfe_ctl |= ETH_RFE_CTL_TCPUDP_COE_ | ETH_RFE_CTL_IP_COE_; } else { From owner-svn-src-stable-12@freebsd.org Mon Mar 9 15:28:53 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A7192265BF4; Mon, 9 Mar 2020 15:28: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bhvn1qyPz3JZV; Mon, 9 Mar 2020 15:28: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 E5C71CE41; Mon, 9 Mar 2020 15:28: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 029FSqB5080769; Mon, 9 Mar 2020 15:28:52 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029FSqQl080768; Mon, 9 Mar 2020 15:28:52 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003091528.029FSqQl080768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 9 Mar 2020 15:28:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358810 - stable/12/share/man/man9 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man9 X-SVN-Commit-Revision: 358810 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 15:28:53 -0000 Author: emaste Date: Mon Mar 9 15:28:52 2020 New Revision: 358810 URL: https://svnweb.freebsd.org/changeset/base/358810 Log: MFC r346299: iflibtxrx.9: update function descriptions to match implementation isc_rxd_refill, isc_rxd_flush return nothing, not void *. isc_txd_credits_update, isc_rxd_available return int, not int *. isc_txd_credits_update has a bool as final argument, not a uint32_t. Prior to r315217 it took four arguments; the final two were uint32_t, bool. Reported by: Gerald Aryeetey Sponsored by: The FreeBSD Foundation Modified: stable/12/share/man/man9/iflibtxrx.9 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man9/iflibtxrx.9 ============================================================================== --- stable/12/share/man/man9/iflibtxrx.9 Mon Mar 9 14:13:40 2020 (r358809) +++ stable/12/share/man/man9/iflibtxrx.9 Mon Mar 9 15:28:52 2020 (r358810) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd March 23, 2017 +.Dd April 16, 2019 .Dt IFLIBTXTX 9 .Os .Sh NAME @@ -19,19 +19,19 @@ .Fa "uint16_t qid" .Fa "uint32_t _pidx_or_credits_" .Fc -.Ft int * +.Ft int .Fo isc_txd_credits_update .Fa "void *sc" .Fa "uint16_t qid" -.Fa "uint32_t credits" +.Fa "bool clear" .Fc -.Ft int * +.Ft int .Fo isc_rxd_available .Fa "void *sc" .Fa "uint16_t qsid" .Fa "uint32_t cidx" .Fc -.Ft void * +.Ft void .Fo isc_rxd_refill .Fa "void *sc" .Fa "uint16_t qsid" @@ -41,7 +41,7 @@ .Fa "caddr_t *vaddrs" .Fa "uint16_t count" .Fc -.Ft void * +.Ft void .Fo isc_rxd_flush .Fa "void *sc" .Fa "uint16_t qsid" From owner-svn-src-stable-12@freebsd.org Mon Mar 9 19:55:16 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D2AE26B8E8; Mon, 9 Mar 2020 19:55:16 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bpq72WkJz4SLy; Mon, 9 Mar 2020 19:55:15 +0000 (UTC) (envelope-from carlavilla@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 D56E11800A; Mon, 9 Mar 2020 19:55:14 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 029JtEf7042848; Mon, 9 Mar 2020 19:55:14 GMT (envelope-from carlavilla@FreeBSD.org) Received: (from carlavilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029JtElN042845; Mon, 9 Mar 2020 19:55:14 GMT (envelope-from carlavilla@FreeBSD.org) Message-Id: <202003091955.029JtElN042845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: carlavilla set sender to carlavilla@FreeBSD.org using -f From: Sergio Carlavilla Delgado Date: Mon, 9 Mar 2020 19:55:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358817 - stable/12/share/man/man3 X-SVN-Group: stable-12 X-SVN-Commit-Author: carlavilla X-SVN-Commit-Paths: stable/12/share/man/man3 X-SVN-Commit-Revision: 358817 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 19:55:16 -0000 Author: carlavilla (doc committer) Date: Mon Mar 9 19:55:13 2020 New Revision: 358817 URL: https://svnweb.freebsd.org/changeset/base/358817 Log: MFC r358352: Add HISTORY sections to tree(3), stdarg(3) and sigevent(3) Submitted by: gbergling@gmail.com Approved by: bcr@(mentor) Modified: stable/12/share/man/man3/sigevent.3 stable/12/share/man/man3/stdarg.3 stable/12/share/man/man3/tree.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man3/sigevent.3 ============================================================================== --- stable/12/share/man/man3/sigevent.3 Mon Mar 9 19:46:28 2020 (r358816) +++ stable/12/share/man/man3/sigevent.3 Mon Mar 9 19:55:13 2020 (r358817) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 15, 2016 +.Dd February 25, 2020 .Dt SIGEVENT 3 .Os .Sh NAME @@ -120,6 +120,11 @@ notifications must link against the .Xr mq_notify 2 , .Xr timer_create 2 , .Xr siginfo 3 +.Sh HISTORY +The +.Va sigevent +structure first appeared in +.Fx 3.3 . .Sh STANDARDS The .Vt struct sigevent Modified: stable/12/share/man/man3/stdarg.3 ============================================================================== --- stable/12/share/man/man3/stdarg.3 Mon Mar 9 19:46:28 2020 (r358816) +++ stable/12/share/man/man3/stdarg.3 Mon Mar 9 19:55:13 2020 (r358817) @@ -32,7 +32,7 @@ .\" @(#)stdarg.3 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd October 25, 2002 +.Dd February 25, 2020 .Dt STDARG 3 .Os .Sh NAME @@ -216,6 +216,18 @@ The and .Fn va_end macros conform to +.St -isoC-99 . +.Sh HISTORY +The +.Fn va_start , +.Fn va_arg +and +.Fn va_end +macros were introduced in +.St -ansiC . +The +.Fn va_copy +macro was introduced in .St -isoC-99 . .Sh BUGS Unlike the Modified: stable/12/share/man/man3/tree.3 ============================================================================== --- stable/12/share/man/man3/tree.3 Mon Mar 9 19:46:28 2020 (r358816) +++ stable/12/share/man/man3/tree.3 Mon Mar 9 19:55:13 2020 (r358817) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 24, 2015 +.Dd February 25, 2020 .Dt TREE 3 .Os .Sh NAME @@ -601,6 +601,9 @@ return the pointer to the removed element otherwise th to indicate an error. .Sh SEE ALSO .Xr queue 3 +.Sh HISTORY +The tree macros first appeared in +.Fx 4.6 . .Sh AUTHORS The author of the tree macros is .An Niels Provos . From owner-svn-src-stable-12@freebsd.org Tue Mar 10 15:18:54 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5AAA826701D; Tue, 10 Mar 2020 15:18:54 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48cJdn6npxz4YTr; Tue, 10 Mar 2020 15:18:53 +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 AD50D255C7; Tue, 10 Mar 2020 15:18:53 +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 02AFIr6D044289; Tue, 10 Mar 2020 15:18:53 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02AFIrd3044288; Tue, 10 Mar 2020 15:18:53 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202003101518.02AFIrd3044288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 10 Mar 2020 15:18:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358835 - stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 358835 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2020 15:18:54 -0000 Author: mav Date: Tue Mar 10 15:18:53 2020 New Revision: 358835 URL: https://svnweb.freebsd.org/changeset/base/358835 Log: MFC r358580: Increase number of write completion threads, matching ZoL. Our iSCSI benchmarks on a large 80-core system show that previous limit of 8 threads can be a bottleneck. At some points this change increases write IOPS by as much as 50%. I am still not sure that so many threads is really required, but we tested lower amounts and got no significant benefits, while latencies were a bit worse, so decided to not diverge. Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Tue Mar 10 13:39:05 2020 (r358834) +++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Tue Mar 10 15:18:53 2020 (r358835) @@ -155,7 +155,7 @@ const zio_taskq_info_t zio_taskqs[ZIO_TYPES][ZIO_TASKQ /* ISSUE ISSUE_HIGH INTR INTR_HIGH */ { ZTI_ONE, ZTI_NULL, ZTI_ONE, ZTI_NULL }, /* NULL */ { ZTI_N(8), ZTI_NULL, ZTI_P(12, 8), ZTI_NULL }, /* READ */ - { ZTI_BATCH, ZTI_N(5), ZTI_N(8), ZTI_N(5) }, /* WRITE */ + { ZTI_BATCH, ZTI_N(5), ZTI_P(12, 8), ZTI_N(5) }, /* WRITE */ { ZTI_P(12, 8), ZTI_NULL, ZTI_ONE, ZTI_NULL }, /* FREE */ { ZTI_ONE, ZTI_NULL, ZTI_ONE, ZTI_NULL }, /* CLAIM */ { ZTI_ONE, ZTI_NULL, ZTI_ONE, ZTI_NULL }, /* IOCTL */ From owner-svn-src-stable-12@freebsd.org Wed Mar 11 05:45:34 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 34875253CB5; Wed, 11 Mar 2020 05:45:34 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48cgsp0DKwz4ZS2; Wed, 11 Mar 2020 05:45:33 +0000 (UTC) (envelope-from pfg@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 BFA7A7C7E; Wed, 11 Mar 2020 05:45:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02B5jXYS068255; Wed, 11 Mar 2020 05:45:33 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B5jXvV068254; Wed, 11 Mar 2020 05:45:33 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <202003110545.02B5jXvV068254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 11 Mar 2020 05:45:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358870 - stable/12/usr.sbin/services_mkdb X-SVN-Group: stable-12 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/12/usr.sbin/services_mkdb X-SVN-Commit-Revision: 358870 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 05:45:34 -0000 Author: pfg Date: Wed Mar 11 05:45:33 2020 New Revision: 358870 URL: https://svnweb.freebsd.org/changeset/base/358870 Log: MFC r358154 (by delphij) Bump PROTOMAX: this matches the value on NetBSD and will be necessary for future updates. MFC r r358448; /etc/services: attempt to bring the database to this century. This is the result of splitting r358153 in two, in order to avoid a build system bug and being able to merge the change to previous releases.. Document better this file, updating the URL to the IANA registry and closely match the official services. For system ports (0 to 1023) we now try to follow the registry closely, noting some historical differences where applicable. As a side effect: drop references to unofficial Kerberos IV which was EOL'ed on Oct 2006[1]. While it is conceivable some people may still use it in some very old FreeBSD machines that can't be replaced easily, the use of it is considered a security risk. Also drop the unofficial netatalk, which we supported long ago in the kernel but was dropped long ago. Leave for now smtps, even though it conflicts with IANA's submissions. The change should have very little visibility, if any, but should be a step closer to the current IANA database. [1] https://web.mit.edu/kerberos/krb4-end-of-life.html Modified: stable/12/usr.sbin/services_mkdb/services stable/12/usr.sbin/services_mkdb/services_mkdb.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/services_mkdb/services ============================================================================== --- stable/12/usr.sbin/services_mkdb/services Wed Mar 11 04:55:20 2020 (r358869) +++ stable/12/usr.sbin/services_mkdb/services Wed Mar 11 05:45:33 2020 (r358870) @@ -1,65 +1,62 @@ # # Network services, Internet style # -# Note that it is presently the policy of IANA to assign a single well-known -# port number for both TCP and UDP; hence, most entries here have two entries -# even if the protocol doesn't support UDP operations. +# Service names and port numbers are used to distinguish between different +# services that run over transport protocols such as TCP, UDP, DCCP, and +# SCTP. # # The latest IANA port assignments can be gotten from # -# http://www.iana.org/assignments/port-numbers +# https://www.iana.org/assignments/service-names-port-numbers/ # -# The Well Known Ports are those from 0 through 1023. -# The Registered Ports are those from 1024 through 49151 -# The Dynamic and/or Private Ports are those from 49152 through 65535 +# System Ports are those from 0 through 1023. +# User Ports are those from 1024 through 49151. +# Dynamic and/or Private Ports are those from 49152 through 65535. # -# Kerberos services are for Kerberos v4, and are unofficial. Sites running -# v5 should uncomment v5 entries and comment v4 entries. +# Note that it is presently the policy of IANA to assign a single well-known +# port number for both TCP and UDP; hence, most entries here have two entries +# even if the protocol doesn't support UDP operations. # # $FreeBSD$ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS # -rtmp 1/ddp #Routing Table Maintenance Protocol tcpmux 1/tcp #TCP Port Service Multiplexer tcpmux 1/udp #TCP Port Service Multiplexer -nbp 2/ddp #Name Binding Protocol compressnet 2/tcp #Management Utility compressnet 2/udp #Management Utility compressnet 3/tcp #Compression Process compressnet 3/udp #Compression Process -echo 4/ddp #AppleTalk Echo Protocol rje 5/tcp #Remote Job Entry rje 5/udp #Remote Job Entry -zip 6/ddp #Zone Information Protocol -echo 7/sctp echo 7/tcp echo 7/udp -discard 9/sctp sink null +echo 7/sctp discard 9/tcp sink null discard 9/udp sink null +discard 9/sctp sink null systat 11/tcp users #Active Users systat 11/udp users #Active Users -daytime 13/sctp daytime 13/tcp daytime 13/udp +daytime 13/sctp qotd 17/tcp quote #Quote of the Day qotd 17/udp quote #Quote of the Day msp 18/tcp #Message Send Protocol msp 18/udp #Message Send Protocol -chargen 19/sctp ttytst source #Character Generator chargen 19/tcp ttytst source #Character Generator chargen 19/udp ttytst source #Character Generator -ftp-data 20/sctp #File Transfer [Default Data] +chargen 19/sctp ttytst source #Character Generator ftp-data 20/tcp #File Transfer [Default Data] ftp-data 20/udp #File Transfer [Default Data] -ftp 21/sctp #File Transfer [Control] +ftp-data 20/sctp #File Transfer [Default Data] ftp 21/tcp #File Transfer [Control] ftp 21/udp #File Transfer [Control] -ssh 22/sctp #Secure Shell Login +ftp 21/sctp #File Transfer [Control] ssh 22/tcp #Secure Shell Login ssh 22/udp #Secure Shell Login +ssh 22/sctp #Secure Shell Login telnet 23/tcp telnet 23/udp # 24/tcp any private mail system @@ -114,24 +111,22 @@ isi-gl 55/tcp #ISI Graphics Language isi-gl 55/udp #ISI Graphics Language xns-auth 56/tcp #XNS Authentication xns-auth 56/udp #XNS Authentication -# 57/tcp any private terminal access -# 57/udp any private terminal access +# 57/tcp any private terminal access +# 57/udp any private terminal access xns-mail 58/tcp #XNS Mail xns-mail 58/udp #XNS Mail # 59/tcp any private file service # 59/udp any private file service -ni-mail 61/tcp #NI MAIL -ni-mail 61/udp #NI MAIL acas 62/tcp #ACA Services acas 62/udp #ACA Services -whois++ 63/tcp -whois++ 63/udp +whoispp 63/tcp whois++ +whoispp 63/udp whois++ covia 64/tcp #Communications Integrator (CI) covia 64/udp #Communications Integrator (CI) tacacs-ds 65/tcp #TACACS-Database Service tacacs-ds 65/udp #TACACS-Database Service -sql*net 66/tcp #Oracle SQL*NET -sql*net 66/udp #Oracle SQL*NET +sql-net 66/tcp sql*net #Oracle SQL*NET / replacement +sql-net 66/udp sql*net #Oracle SQL*NET replacement bootps 67/tcp dhcps #Bootstrap Protocol Server bootps 67/udp dhcps #Bootstrap Protocol Server bootpc 68/tcp dhcpc #Bootstrap Protocol Client @@ -158,11 +153,9 @@ vettcp 78/tcp vettcp 78/udp finger 79/tcp finger 79/udp -http 80/sctp www www-http #World Wide Web HTTP http 80/tcp www www-http #World Wide Web HTTP http 80/udp www www-http #World Wide Web HTTP -hosts2-ns 81/tcp #HOSTS2 Name Server -hosts2-ns 81/udp #HOSTS2 Name Server +http 80/sctp www www-http #World Wide Web HTTP xfer 82/tcp #XFER Utility xfer 82/udp #XFER Utility mit-ml-dev 83/tcp #MIT ML Device @@ -195,8 +188,8 @@ dixie 96/tcp #DIXIE Protocol Specification dixie 96/udp #DIXIE Protocol Specification swift-rvf 97/tcp #Swift Remote Virtural File Protocol swift-rvf 97/udp #Swift Remote Virtural File Protocol -tacnews 98/tcp #TAC News, Unofficial: Red Hat linuxconf -tacnews 98/udp #TAC News, Unofficial: Red Hat linuxconf +tacnews 98/tcp #TAC News +tacnews 98/udp #TAC News metagram 99/tcp #Metagram Relay metagram 99/udp #Metagram Relay newacct 100/tcp #[unauthorized use] @@ -248,8 +241,8 @@ ansatrader 124/tcp #ANSA REX Trader ansatrader 124/udp #ANSA REX Trader locus-map 125/tcp #Locus PC-Interface Net Map Ser locus-map 125/udp #Locus PC-Interface Net Map Ser -unitary 126/tcp #Unisys Unitary Login -unitary 126/udp #Unisys Unitary Login +nxedit 126/tcp #NXEdit +nxedit 126/udp #NXEdit locus-con 127/tcp #Locus PC-Interface Conn Server locus-con 127/udp #Locus PC-Interface Conn Server gss-xlicen 128/tcp #GSS X License Verification @@ -266,8 +259,8 @@ statsrv 133/tcp #Statistics Service statsrv 133/udp #Statistics Service ingres-net 134/tcp #INGRES-NET Service ingres-net 134/udp #INGRES-NET Service -loc-srv 135/tcp epmap #Location Service -loc-srv 135/udp epmap #Location Service +epmap 135/tcp #DCE endpoint resolution +epmap 135/udp #DCE endpoint resolution profile 136/tcp #PROFILE Naming System profile 136/udp #PROFILE Naming System netbios-ns 137/tcp #NETBIOS Name Service @@ -284,20 +277,16 @@ bl-idm 142/tcp #Britton-Lee IDM bl-idm 142/udp #Britton-Lee IDM imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 -NeWS 144/tcp # Window System -NeWS 144/udp # Window System -#PROBLEMS!============================================================== -#uma 144/tcp #Universal Management Architecture -#uma 144/udp #Universal Management Architecture -#PROBLEMS!============================================================== +uma 144/tcp #Universal Management Architecture +uma 144/udp #Universal Management Architecture uaac 145/tcp #UAAC Protocol uaac 145/udp #UAAC Protocol iso-tp0 146/tcp iso-tp0 146/udp iso-ip 147/tcp iso-ip 147/udp -cronus 148/tcp jargon #CRONUS-SUPPORT -cronus 148/udp jargon #CRONUS-SUPPORT +jargon 148/tcp #Jargon +jargon 148/udp #Jargon aed-512 149/tcp #AED 512 Emulation Service aed-512 149/udp #AED 512 Emulation Service sql-net 150/tcp @@ -356,11 +345,11 @@ genrad-mux 176/tcp genrad-mux 176/udp xdmcp 177/tcp #X Display Manager Control Protocol xdmcp 177/udp #X Display Manager Control Protocol -NextStep 178/tcp nextstep NeXTStep #NextStep Window Server -NextStep 178/udp nextstep NeXTStep #NextStep Window Server -bgp 179/sctp #Border Gateway Protocol +nextstep 178/tcp #NextStep Window Server +nextstep 178/udp #NextStep Window Server bgp 179/tcp #Border Gateway Protocol bgp 179/udp #Border Gateway Protocol +bgp 179/sctp #Border Gateway Protocol ris 180/tcp #Intergraph ris 180/udp #Intergraph unify 181/tcp @@ -421,14 +410,10 @@ at-8 208/tcp #AppleTalk Unused at-8 208/udp #AppleTalk Unused qmtp 209/tcp #The Quick Mail Transfer Protocol qmtp 209/udp #The Quick Mail Transfer Protocol -#PROBLEMS!============================================================== -#tam 209/tcp #Trivial Authenticated Mail Protocol -#tam 209/udp #Trivial Authenticated Mail Protocol -#PROBLEMS!============================================================== -z39.50 210/tcp wais #ANSI Z39.50 -z39.50 210/udp wais #ANSI Z39.50 -914c/g 211/tcp #Texas Instruments 914C/G Terminal -914c/g 211/udp #Texas Instruments 914C/G Terminal +z39-50 210/tcp z39.50 wais #ANSI Z39.50 +z39-50 210/udp z39.50 wais #ANSI Z39.50 +914c-g 211/tcp 914c/g #Texas Instruments 914C/G Terminal +914c-g 211/udp 914c/g #Texas Instruments 914C/G Terminal anet 212/tcp #ATEXSSTR anet 212/udp #ATEXSSTR ipx 213/tcp @@ -459,14 +444,14 @@ direct 242/tcp direct 242/udp sur-meas 243/tcp #Survey Measurement sur-meas 243/udp #Survey Measurement -dayna 244/tcp -dayna 244/udp +inbusiness 244/tcp +inbusiness 244/udp link 245/tcp link 245/udp dsp3270 246/tcp #Display Systems Protocol dsp3270 246/udp #Display Systems Protocol -subntbcst_tftp 247/tcp #subntbcst_tftp -subntbcst_tftp 247/udp #subntbcst_tftp +subntbcst-tftp 247/tcp subntbcst_tftp #subntbcst_tftp +subntbcst-tftp 247/udp subntbcst_tftp #subntbcst_tftp bhfhs 248/tcp bhfhs 248/udp # 249-255 reserved @@ -494,7 +479,11 @@ td-service 267/tcp #Tobit David Service Layer td-service 267/udp #Tobit David Service Layer td-replica 268/tcp #Tobit David Replica td-replica 268/udp #Tobit David Replica -# 269-279 unassigned +manet 269/tcp #MANET Protocols [RFC5498] +manet 269/ucp #MANET Protocols [RFC5498] +gist 270/ucp #Q-mode encapsulation for [RFC5971] +pt-tls 271/tcp #Assessment (NEA) Posture +# 272-279 unassigned http-mgmt 280/tcp http-mgmt 280/udp personal-link 281/tcp @@ -541,9 +530,11 @@ pip 321/tcp pip 321/udp rtsps 322/tcp rtsps 322/udp -# 323-332 #unassigned -texar 333/tcp #Texar Security Port -texar 333/udp #Texar Security Port +rpki-rtr 323/tcp #Resource PKI to Router Protocol +rpki-rtr-tls 324/tcp #Resource PKI to Router Protocol over TLS +# 325-332 #unassigned +texar 333/tcp #Texar Security Port +texar 333/udp #Texar Security Port # 334-343 #unassigned pdap 344/tcp #Prospero Data Access Protocol pdap 344/udp #Prospero Data Access Protocol @@ -579,8 +570,8 @@ bhevent 357/tcp bhevent 357/udp shrinkwrap 358/tcp shrinkwrap 358/udp -tenebris_nts 359/tcp #Tenebris Network Trace Service -tenebris_nts 359/udp #Tenebris Network Trace Service +nsrmp 359/tcp #Network Security Risk Management Protocol +nsrmp 359/udp #Network Security Risk Management Protocol scoi2odialog 360/tcp scoi2odialog 360/udp semantix 361/tcp @@ -641,14 +632,14 @@ unidata-ldm 388/tcp #Unidata LDM Version 4 unidata-ldm 388/udp #Unidata LDM Version 4 ldap 389/tcp #Lightweight Directory Access Protocol ldap 389/udp #Lightweight Directory Access Protocol -uis 390/tcp -uis 390/udp +uis 390/tcp #UIS +uis 390/udp #UIS synotics-relay 391/tcp #SynOptics SNMP Relay Port synotics-relay 391/udp #SynOptics SNMP Relay Port synotics-broker 392/tcp #SynOptics Port Broker Port synotics-broker 392/udp #SynOptics Port Broker Port -dis 393/tcp #Data Interpretation System -dis 393/udp #Data Interpretation System +meta5 393/tcp #Meta5 +meta5 393/udp #Meta5 embl-ndt 394/tcp #EMBL Nucleic Data Transfer embl-ndt 394/udp #EMBL Nucleic Data Transfer netcp 395/tcp #NETscout Control Protocol @@ -661,8 +652,8 @@ kryptolan 398/tcp kryptolan 398/udp iso-tsap-c2 399/tcp #ISO-TSAP Class 2 iso-tsap-c2 399/udp #ISO-TSAP Class 2 -work-sol 400/tcp #Workstation Solutions -work-sol 400/udp #Workstation Solutions +osb-sd 400/tcp #Oracle Secure Backup +osb-sd 400/udp #Oracle Secure Backup ups 401/tcp #Uninterruptible Power Supply ups 401/udp #Uninterruptible Power Supply genie 402/tcp #Genie Protocol @@ -747,9 +738,9 @@ decvms-sysmgt 441/tcp decvms-sysmgt 441/udp cvc_hostd 442/tcp cvc_hostd 442/udp -https 443/sctp https 443/tcp https 443/udp +https 443/sctp snpp 444/tcp #Simple Network Paging Protocol snpp 444/udp #Simple Network Paging Protocol # [RFC1568] @@ -792,15 +783,16 @@ datasurfsrvsec 462/udp alpes 463/tcp alpes 463/udp # -kpasswd5 464/tcp # Kerberos (v5) -kpasswd5 464/udp # Kerberos (v5) +kpasswd 464/tcp kpasswd5 # Kerberos (v5) +kpasswd 464/udp kpasswd5 # Kerberos (v5) #PROBLEMS!============================================================== -# IANA has officially assigned these two ports as ``kpasswd'' -#kpasswd 464/tcp # Kerberos (v5) -#kpasswd 464/udp # Kerberos (v5) +# IANA has officially assigned these two ports +smtps 465/tcp #smtp protocol over TLS/SSL (was ssmtp) +smtps 465/udp #smtp protocol over TLS/SSL (was ssmtp) #PROBLEMS!============================================================== -smtps 465/tcp #smtp protocol over TLS/SSL (was ssmtp) -smtps 465/udp #smtp protocol over TLS/SSL (was ssmtp) +urd 465/tcp #URL Rendezvous Directory for SSM +submissions 465/tcp #Message Submission over TLS +igmpv3lite 465/udp #IGMP over UDP for SSM digital-vrc 466/tcp digital-vrc 466/udp mylex-mapd 467/tcp @@ -857,14 +849,14 @@ ticf-1 492/tcp #Transport Independent Convergence ticf-1 492/udp #Transport Independent Convergence for FNA ticf-2 493/tcp #Transport Independent Convergence for FNA ticf-2 493/udp #Transport Independent Convergence for FNA -pov-ray 494/tcp -pov-ray 494/udp +pov-ray 494/tcp #POV-Ray +pov-ray 494/udp #POV-Ray intecourier 495/tcp intecourier 495/udp pim-rp-disc 496/tcp pim-rp-disc 496/udp -dantz 497/tcp -dantz 497/udp +retrospect 497/tcp #Retrospect backup and restore service +retrospect 497/udp #Retrospect backup and restore service siam 498/tcp siam 498/udp iso-ill 499/tcp #ISO ILL Protocol @@ -964,8 +956,8 @@ netnews 532/tcp readnews netnews 532/udp readnews netwall 533/tcp #for emergency broadcasts netwall 533/udp #for emergency broadcasts -mm-admin 534/tcp #MegaMedia Admin -mm-admin 534/udp #MegaMedia Admin +windream 534/tcp #windream Admin +windream 534/udp #windream Admin iiop 535/tcp iiop 535/udp opalis-rdv 536/tcp @@ -1000,8 +992,8 @@ new-rwho 550/tcp new-who new-rwho 550/udp new-who cybercash 551/tcp cybercash 551/udp -deviceshare 552/tcp -deviceshare 552/udp +devshr-nts 552/tcp deviceshare +devshr-nts 552/udp deviceshare pirp 553/tcp pirp 553/udp rtsp 554/tcp #Real Time Stream Control Protocol @@ -1066,9 +1058,6 @@ philips-vc 583/tcp #Philips Video-Conferencing philips-vc 583/udp #Philips Video-Conferencing keyserver 584/tcp keyserver 584/udp -#imap4-ssl@585 never should have been allocated. See PR 46294. -#imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, -#imap4-ssl 585/udp # use 993 instead) password-chg 586/tcp password-chg 586/udp submission 587/tcp @@ -1147,8 +1136,8 @@ asf-rmcp 623/tcp #ASF Remote Management and Control asf-rmcp 623/udp #ASF Remote Management and Control Protocol cryptoadmin 624/tcp #Crypto Admin cryptoadmin 624/udp #Crypto Admin -dec_dlm 625/tcp #DEC DLM -dec_dlm 625/udp #DEC DLM +dec-dlm 625/tcp dec_dlm #DEC DLM +dec-dlm 625/udp dec_dlm #DEC DLM asia 626/tcp asia 626/udp passgo-tivoli 627/tcp #PassGo Tivoli @@ -1159,8 +1148,8 @@ qmqp 628/udp 3com-amp3 629/udp #3Com AMP3 rda 630/tcp rda 630/udp -ipp 631/tcp #IPP (Internet Printing Protocol) -ipp 631/udp #IPP (Internet Printing Protocol) +ipp 631/tcp ipps #IPP (Internet Printing Protocol) +ipp 631/udp ipps #IPP (Internet Printing Protocol) bmpp 632/tcp bmpp 632/udp servstat 633/tcp #Service Status update (Sterling Software) @@ -1327,14 +1316,17 @@ iris-xpcs 714/tcp #IRIS over XPCS iris-xpcs 714/udp #IRIS over XPCS iris-lwz 715/tcp iris-lwz 715/udp +pana 716/udp #PANA Messages +# 717-728 #unassigned netviewdm1 729/tcp #IBM NetView DM/6000 Server/Client netviewdm1 729/udp #IBM NetView DM/6000 Server/Client netviewdm2 730/tcp #IBM NetView DM/6000 send/tcp netviewdm2 730/udp #IBM NetView DM/6000 send/tcp netviewdm3 731/tcp #IBM NetView DM/6000 receive/tcp netviewdm3 731/udp #IBM NetView DM/6000 receive/tcp -netgw 741/tcp -netgw 741/udp +# 732-740 #unassigned +netgw 741/tcp #netGW +netgw 741/udp #netGW netrcs 742/tcp #Network based Rev. Cont. Sys. netrcs 742/udp #Network based Rev. Cont. Sys. flexlm 744/tcp #Flexible License Manager @@ -1345,18 +1337,11 @@ ris-cm 748/tcp #Russell Info Sci Calendar Manager ris-cm 748/udp #Russell Info Sci Calendar Manager kerberos-adm 749/tcp #Kerberos administration (v5) kerberos-adm 749/udp #Kerberos administration (v5) +rfile 750/tcp +loadav 750/udp kerberos-iv 750/udp kdc # Kerberos (v4) -kerberos-iv 750/tcp kdc # Kerberos (v4) -#PROBLEMS!======================================================== -#rfile 750/tcp -#loadav 750/udp -#PROBLEMS!======================================================== -kerberos_master 751/tcp # Kerberos `kadmin' (v4) -kerberos_master 751/udp # Kerberos `kadmin' (v4) -#PROBLEMS!======================================================== pump 751/tcp pump 751/udp -#PROBLEMS!======================================================== qrh 752/tcp qrh 752/udp rrh 753/tcp @@ -1366,19 +1351,14 @@ krb_prop 754/tcp krb5_prop # kerberos/v5 server pro tell 754/tcp #send #PROBLEMS!======================================================== tell 754/udp #send +# 755-757 #unassigned nlogin 758/tcp nlogin 758/udp con 759/tcp con 759/udp -krbupdate 760/tcp kreg # Kerberos (v4) registration -#PROBLEMS!======================================================== ns 760/tcp -#PROBLEMS!======================================================== ns 760/udp -kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" -#PROBLEMS!======================================================== rxe 761/tcp -#PROBLEMS!======================================================== rxe 761/udp quotad 762/tcp quotad 762/udp @@ -1401,17 +1381,17 @@ cycleserv2 772/udp submit 773/tcp notify 773/udp rpasswd 774/tcp -acmaint_dbd 774/udp +acmaint-dbd 774/udp acmaint_dbd entomb 775/tcp -acmaint_transd 775/udp +acmaint-transd 775/udp acmaint_transd wpages 776/tcp wpages 776/udp multiling-http 777/tcp #Multiling HTTP multiling-http 777/udp #Multiling HTTP wpgs 780/tcp wpgs 780/udp -mdbs_daemon 800/tcp -mdbs_daemon 800/udp +mdbs-daemon 800/tcp mdbs_daemon +mdbs-daemon 800/udp mdbs_daemon device 801/tcp device 801/udp mbap-s 802/tcp # Modbus Application Protocol Secure @@ -1434,11 +1414,18 @@ dhcp-failover2 847/tcp #dhcp-failover 2 dhcp-failover2 847/udp #dhcp-failover 2 gdoi 848/tcp gdoi 848/udp +# 849-852 #unassigned +domain-s 853/tcp #DNS query-response protocol +domain-s 853/udp #DNS query-response protocol +# 855-859 #unassigned iscsi 860/tcp iscsi 860/udp owamp-control 861/tcp owamp-control 861/udp -supfilesrv 871/tcp # for SUP +twamp-control 862/tcp +twamp-control 862/udp +# 863-872 #unassigned +supfilesrv 871/tcp # for SUP rsync 873/tcp rsync 873/udp iclcnet-locate 886/tcp #ICL coNETion locate server @@ -1491,477 +1478,106 @@ puprouter 999/tcp puprouter 999/udp cadlock2 1000/tcp cadlock2 1000/udp +webpush 1001/tcp #HTTP Web Push surf 1010/tcp surf 1010/udp exp1 1021/tcp #RFC3692-style Experiment 1 (*) [RFC4727] exp1 1021/udp #RFC3692-style Experiment 1 (*) [RFC4727] +exp1 1021/sctp #RFC3692-style Experiment 1 (*) [RFC4727] exp2 1022/tcp #RFC3692-style Experiment 2 (*) [RFC4727] exp2 1022/udp #RFC3692-style Experiment 2 (*) [RFC4727] +exp2 1022/sctp #RFC3692-style Experiment 2 (*) [RFC4727] # # REGISTERED PORT NUMBERS # blackjack 1025/tcp #network blackjack blackjack 1025/udp #network blackjack -iad1 1030/tcp #BBN IAD -iad1 1030/udp #BBN IAD -iad2 1031/tcp #BBN IAD -iad2 1031/udp #BBN IAD -iad3 1032/tcp #BBN IAD -iad3 1032/udp #BBN IAD +cap 1026/tcp #Calendar Access Protocol +cap 1026/udp #Calendar Access Protocol +6a44 1027/udp #IPv6 Behind NAT44 CPEs +boinc-client 1043/tcp #BOINC Client Control +boinc-client 1043/udp #BOINC Client Control nim 1058/tcp nim 1058/udp nimreg 1059/tcp nimreg 1059/udp -instl_boots 1067/tcp #Installation Bootstrap Proto. Serv. -instl_boots 1067/udp #Installation Bootstrap Proto. Serv. -instl_bootc 1068/tcp #Installation Bootstrap Proto. Cli. -instl_bootc 1068/udp #Installation Bootstrap Proto. Cli. +instl-boots 1067/tcp instl_boots #Installation Bootstrap Proto. Serv. +instl-boots 1067/udp instl_boots #Installation Bootstrap Proto. Serv. +instl-bootc 1068/tcp instl_bootc #Installation Bootstrap Proto. Cli. +instl-bootc 1068/udp instl_bootc #Installation Bootstrap Proto. Cli. socks 1080/tcp socks 1080/udp -ansoft-lm-1 1083/tcp #Anasoft License Manager -ansoft-lm-1 1083/udp #Anasoft License Manager -ansoft-lm-2 1084/tcp #Anasoft License Manager -ansoft-lm-2 1084/udp #Anasoft License Manager webobjects 1085/tcp #Web Objects webobjects 1085/udp #Web Objects +ff-annunc 1089/tcp #FF Annunciation +ff-annunc 1089/udp #FF Annunciation +ff-fms 1090/tcp #FF Fieldbus Message Specification +ff-fms 1090/udp #FF Fieldbus Message Specification +ff-sm 1091/tcp #FF System Management +ff-sm 1091/udp #FF System Management +cnrprotocol 1096/tcp #Common Name Resolution Protocol +cnrprotocol 1096/udp #Common Name Resolution Protocol +rmiactivation 1098/tcp #RMI Activation +rmiactivation 1098/udp #RMI Activation +rmiregistry 1099/tcp #RMI Registry +rmiregistry 1099/udp #RMI Registry +mctp 1100/tcp #MCTP +mctp 1100/udp #MCTP kpop 1109/tcp #Unofficial kpop 1109/udp #Unofficial nfsd-status 1110/tcp #Cluster status info nfsd-keepalive 1110/udp #Client status info supfiledbg 1127/tcp # for SUP +c1222-acse 1153/tcp #ANSI C12.22 Port +c1222-acse 1153/udp #ANSI C12.22 Port nfa 1155/tcp #Network File Access nfa 1155/udp #Network File Access -cisco-ipsla 1167/sctp #Cisco IP SLAs Control Protocol cisco-ipsla 1167/tcp #Cisco IP SLAs Control Protocol cisco-ipsla 1167/udp #Cisco IP SLAs Control Protocol +cisco-ipsla 1167/sctp #Cisco IP SLAs Control Protocol +tripwire 1169/tcp #TRIPWIRE +tripwire 1169/udp #TRIPWIRE skkserv 1178/tcp #SKK (kanji input) +mysql-cluster 1186/tcp #MySQL Cluster Manager +mysql-cluster 1186/udp #MySQL Cluster Manager openvpn 1194/tcp #OpenVPN openvpn 1194/udp #OpenVPN -lupa 1212/tcp -lupa 1212/udp -nerv 1222/tcp #SNI R&D network -nerv 1222/udp #SNI R&D network -hermes 1248/tcp -hermes 1248/udp +rsf-1 1195/tcp #RSF-1 clustering +rsf-1 1195/udp #RSF-1 clustering +qt-serveradmin 1220/tcp #QT SERVER ADMIN +qt-serveradmin 1220/udp #QT SERVER ADMIN healthd 1281/tcp #healthd healthd 1281/udp #healthd -alta-ana-lm 1346/tcp #Alta Analytics License Manager -alta-ana-lm 1346/udp #Alta Analytics License Manager -bbn-mmc 1347/tcp #multi media conferencing -bbn-mmc 1347/udp #multi media conferencing -bbn-mmx 1348/tcp #multi media conferencing -bbn-mmx 1348/udp #multi media conferencing -sbook 1349/tcp #Registration Network Protocol -sbook 1349/udp #Registration Network Protocol -editbench 1350/tcp #Registration Network Protocol -editbench 1350/udp #Registration Network Protocol -equationbuilder 1351/tcp #Digital Tool Works (MIT) -equationbuilder 1351/udp #Digital Tool Works (MIT) -lotusnote 1352/tcp #Lotus Note -lotusnote 1352/udp #Lotus Note -relief 1353/tcp #Relief Consulting -relief 1353/udp #Relief Consulting -rightbrain 1354/tcp #RightBrain Software -rightbrain 1354/udp #RightBrain Software -intuitive-edge 1355/tcp #Intuitive Edge -intuitive-edge 1355/udp #Intuitive Edge -cuillamartin 1356/tcp #CuillaMartin Company -cuillamartin 1356/udp #CuillaMartin Company -pegboard 1357/tcp #Electronic PegBoard -pegboard 1357/udp #Electronic PegBoard -connlcli 1358/tcp -connlcli 1358/udp -ftsrv 1359/tcp -ftsrv 1359/udp -mimer 1360/tcp -mimer 1360/udp -linx 1361/tcp -linx 1361/udp -timeflies 1362/tcp -timeflies 1362/udp -ndm-requester 1363/tcp #Network DataMover Requester -ndm-requester 1363/udp #Network DataMover Requester -ndm-server 1364/tcp #Network DataMover Server -ndm-server 1364/udp #Network DataMover Server -adapt-sna 1365/tcp #Network Software Associates -adapt-sna 1365/udp #Network Software Associates -netware-csp 1366/tcp #Novell NetWare Comm Service Platform -netware-csp 1366/udp #Novell NetWare Comm Service Platform -dcs 1367/tcp -dcs 1367/udp -screencast 1368/tcp -screencast 1368/udp -gv-us 1369/tcp #GlobalView to Unix Shell -gv-us 1369/udp #GlobalView to Unix Shell -us-gv 1370/tcp #Unix Shell to GlobalView -us-gv 1370/udp #Unix Shell to GlobalView -fc-cli 1371/tcp #Fujitsu Config Protocol -fc-cli 1371/udp #Fujitsu Config Protocol -fc-ser 1372/tcp #Fujitsu Config Protocol -fc-ser 1372/udp #Fujitsu Config Protocol -chromagrafx 1373/tcp -chromagrafx 1373/udp -molly 1374/tcp #EPI Software Systems -molly 1374/udp #EPI Software Systems -bytex 1375/tcp -bytex 1375/udp -ibm-pps 1376/tcp #IBM Person to Person Software -ibm-pps 1376/udp #IBM Person to Person Software -cichlid 1377/tcp #Cichlid License Manager -cichlid 1377/udp #Cichlid License Manager -elan 1378/tcp #Elan License Manager -elan 1378/udp #Elan License Manager -dbreporter 1379/tcp #Integrity Solutions -dbreporter 1379/udp #Integrity Solutions -telesis-licman 1380/tcp #Telesis Network License Manager -telesis-licman 1380/udp #Telesis Network License Manager -apple-licman 1381/tcp #Apple Network License Manager -apple-licman 1381/udp #Apple Network License Manager -#udt_os 1382/tcp -#udt_os 1382/udp -gwha 1383/tcp #GW Hannaway Network License Manager -gwha 1383/udp #GW Hannaway Network License Manager -os-licman 1384/tcp #Objective Solutions License Manager -os-licman 1384/udp #Objective Solutions License Manager -atex_elmd 1385/tcp #Atex Publishing License Manager -atex_elmd 1385/udp #Atex Publishing License Manager -checksum 1386/tcp #CheckSum License Manager -checksum 1386/udp #CheckSum License Manager -cadsi-lm 1387/tcp #Computer Aided Design Software Inc LM -cadsi-lm 1387/udp #Computer Aided Design Software Inc LM -objective-dbc 1388/tcp #Objective Solutions DataBase Cache -objective-dbc 1388/udp #Objective Solutions DataBase Cache -iclpv-dm 1389/tcp #Document Manager -iclpv-dm 1389/udp #Document Manager -iclpv-sc 1390/tcp #Storage Controller -iclpv-sc 1390/udp #Storage Controller -iclpv-sas 1391/tcp #Storage Access Server -iclpv-sas 1391/udp #Storage Access Server -iclpv-pm 1392/tcp #Print Manager -iclpv-pm 1392/udp #Print Manager -iclpv-nls 1393/tcp #Network Log Server -iclpv-nls 1393/udp #Network Log Server -iclpv-nlc 1394/tcp #Network Log Client -iclpv-nlc 1394/udp #Network Log Client -iclpv-wsm 1395/tcp #PC Workstation Manager software -iclpv-wsm 1395/udp #PC Workstation Manager software -dvl-activemail 1396/tcp #DVL Active Mail -dvl-activemail 1396/udp #DVL Active Mail -audio-activmail 1397/tcp #Audio Active Mail -audio-activmail 1397/udp #Audio Active Mail -video-activmail 1398/tcp #Video Active Mail -video-activmail 1398/udp #Video Active Mail -cadkey-licman 1399/tcp #Cadkey License Manager -cadkey-licman 1399/udp #Cadkey License Manager -cadkey-tablet 1400/tcp #Cadkey Tablet Daemon -cadkey-tablet 1400/udp #Cadkey Tablet Daemon -goldleaf-licman 1401/tcp #Goldleaf License Manager -goldleaf-licman 1401/udp #Goldleaf License Manager -prm-sm-np 1402/tcp #Prospero Resource Manager -prm-sm-np 1402/udp #Prospero Resource Manager -prm-nm-np 1403/tcp #Prospero Resource Manager -prm-nm-np 1403/udp #Prospero Resource Manager -igi-lm 1404/tcp #Infinite Graphics License Manager -igi-lm 1404/udp #Infinite Graphics License Manager -ibm-res 1405/tcp #IBM Remote Execution Starter -ibm-res 1405/udp #IBM Remote Execution Starter -netlabs-lm 1406/tcp #NetLabs License Manager -netlabs-lm 1406/udp #NetLabs License Manager -dbsa-lm 1407/tcp #DBSA License Manager -dbsa-lm 1407/udp #DBSA License Manager -sophia-lm 1408/tcp #Sophia License Manager -sophia-lm 1408/udp #Sophia License Manager -here-lm 1409/tcp #Here License Manager -here-lm 1409/udp #Here License Manager -hiq 1410/tcp #HiQ License Manager -hiq 1410/udp #HiQ License Manager -af 1411/tcp #AudioFile -af 1411/udp #AudioFile -innosys 1412/tcp -innosys 1412/udp -innosys-acl 1413/tcp -innosys-acl 1413/udp -ibm-mqseries 1414/tcp #IBM MQSeries -ibm-mqseries 1414/udp #IBM MQSeries -dbstar 1415/tcp -dbstar 1415/udp -novell-lu6.2 1416/tcp #Novell LU6.2 -novell-lu6.2 1416/udp #Novell LU6.2 -timbuktu-srv1 1417/tcp #Timbuktu Service 1 Port -timbuktu-srv1 1417/udp #Timbuktu Service 1 Port -timbuktu-srv2 1418/tcp #Timbuktu Service 2 Port -timbuktu-srv2 1418/udp #Timbuktu Service 2 Port -timbuktu-srv3 1419/tcp #Timbuktu Service 3 Port -timbuktu-srv3 1419/udp #Timbuktu Service 3 Port -timbuktu-srv4 1420/tcp #Timbuktu Service 4 Port -timbuktu-srv4 1420/udp #Timbuktu Service 4 Port -gandalf-lm 1421/tcp #Gandalf License Manager -gandalf-lm 1421/udp #Gandalf License Manager -autodesk-lm 1422/tcp #Autodesk License Manager -autodesk-lm 1422/udp #Autodesk License Manager -essbase 1423/tcp #Essbase Arbor Software -essbase 1423/udp #Essbase Arbor Software -hybrid 1424/tcp #Hybrid Encryption Protocol -hybrid 1424/udp #Hybrid Encryption Protocol -zion-lm 1425/tcp #Zion Software License Manager -zion-lm 1425/udp #Zion Software License Manager -sas-1 1426/tcp #Satellite-data Acquisition System 1 -sas-1 1426/udp #Satellite-data Acquisition System 1 -mloadd 1427/tcp #mloadd monitoring tool -mloadd 1427/udp #mloadd monitoring tool -informatik-lm 1428/tcp #Informatik License Manager -informatik-lm 1428/udp #Informatik License Manager -nms 1429/tcp #Hypercom NMS -nms 1429/udp #Hypercom NMS -tpdu 1430/tcp #Hypercom TPDU -tpdu 1430/udp #Hypercom TPDU -rgtp 1431/tcp #Reverse Gossip Transport -rgtp 1431/udp #Reverse Gossip Transport -blueberry-lm 1432/tcp #Blueberry Software License Manager -blueberry-lm 1432/udp #Blueberry Software License Manager +pkt-krb-ipsec 1293/tcp #PKT-KRB-IPSec +pkt-krb-ipsec 1293/udp #PKT-KRB-IPSec +h323hostcallsc 1300/tcp #H323 Host Call Secure +h323hostcallsc 1300/udp #H323 Host Call Secure +jtag-server 1309/tcp #JTAG server +jtag-server 1309/udp #JTAG server +hkrb5gatekeeper 1318/tcp #krb5gatekeeper +krb5gatekeeper 1318/udp #krb5gatekeeper +netdb-export 1329/tcp #netdb-export +netdb-export 1329/udp #netdb-export +digital-notary 1335/tcp #Digital Notary Protocol +digital-notary 1335/udp #Digital Notary Protocol +icap 1344/tcp #ICAP +icap 1344/udp #ICAP ms-sql-s 1433/tcp #Microsoft-SQL-Server ms-sql-s 1433/udp #Microsoft-SQL-Server ms-sql-m 1434/tcp #Microsoft-SQL-Monitor ms-sql-m 1434/udp #Microsoft-SQL-Monitor -ibm-cics 1435/tcp -ibm-cics 1435/udp -sas-2 1436/tcp #Satellite-data Acquisition System 2 -sas-2 1436/udp #Satellite-data Acquisition System 2 -tabula 1437/tcp -tabula 1437/udp -eicon-server 1438/tcp #Eicon Security Agent/Server -eicon-server 1438/udp #Eicon Security Agent/Server -eicon-x25 1439/tcp #Eicon X25/SNA Gateway -eicon-x25 1439/udp #Eicon X25/SNA Gateway -eicon-slp 1440/tcp #Eicon Service Location Protocol -eicon-slp 1440/udp #Eicon Service Location Protocol -cadis-1 1441/tcp #Cadis License Management -cadis-1 1441/udp #Cadis License Management -cadis-2 1442/tcp #Cadis License Management -cadis-2 1442/udp #Cadis License Management -ies-lm 1443/tcp #Integrated Engineering Software -ies-lm 1443/udp #Integrated Engineering Software -marcam-lm 1444/tcp #Marcam License Management -marcam-lm 1444/udp #Marcam License Management -proxima-lm 1445/tcp #Proxima License Manager -proxima-lm 1445/udp #Proxima License Manager -ora-lm 1446/tcp #Optical Research Associates License Manager -ora-lm 1446/udp #Optical Research Associates License Manager -apri-lm 1447/tcp #Applied Parallel Research LM -apri-lm 1447/udp #Applied Parallel Research LM -oc-lm 1448/tcp #OpenConnect License Manager -oc-lm 1448/udp #OpenConnect License Manager -peport 1449/tcp -peport 1449/udp -dwf 1450/tcp #Tandem Distributed Workbench Facility -dwf 1450/udp #Tandem Distributed Workbench Facility -infoman 1451/tcp #IBM Information Management -infoman 1451/udp #IBM Information Management -gtegsc-lm 1452/tcp #GTE Government Systems License Man -gtegsc-lm 1452/udp #GTE Government Systems License Man -genie-lm 1453/tcp #Genie License Manager -genie-lm 1453/udp #Genie License Manager -interhdl_elmd 1454/tcp #interHDL License Manager -interhdl_elmd 1454/udp #interHDL License Manager -esl-lm 1455/tcp #ESL License Manager -esl-lm 1455/udp #ESL License Manager -dca 1456/tcp -dca 1456/udp -valisys-lm 1457/tcp #Valisys License Manager -valisys-lm 1457/udp #Valisys License Manager -nrcabq-lm 1458/tcp #Nichols Research Corp. -nrcabq-lm 1458/udp #Nichols Research Corp. -proshare1 1459/tcp #Proshare Notebook Application -proshare1 1459/udp #Proshare Notebook Application -proshare2 1460/tcp #Proshare Notebook Application -proshare2 1460/udp #Proshare Notebook Application -ibm_wrless_lan 1461/tcp #IBM Wireless LAN -ibm_wrless_lan 1461/udp #IBM Wireless LAN -world-lm 1462/tcp #World License Manager -world-lm 1462/udp #World License Manager -nucleus 1463/tcp -nucleus 1463/udp -msl_lmd 1464/tcp #MSL License Manager -msl_lmd 1464/udp #MSL License Manager -pipes 1465/tcp #Pipes Platform -pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com -oceansoft-lm 1466/tcp #Ocean Software License Manager -oceansoft-lm 1466/udp #Ocean Software License Manager -csdmbase 1467/tcp -csdmbase 1467/udp -csdm 1468/tcp -csdm 1468/udp -aal-lm 1469/tcp #Active Analysis Limited License Manager -aal-lm 1469/udp #Active Analysis Limited License Manager -uaiact 1470/tcp #Universal Analytics -uaiact 1470/udp #Universal Analytics -csdmbase 1471/tcp -csdmbase 1471/udp -csdm 1472/tcp -csdm 1472/udp -openmath 1473/tcp -openmath 1473/udp -telefinder 1474/tcp -telefinder 1474/udp -taligent-lm 1475/tcp #Taligent License Manager -taligent-lm 1475/udp #Taligent License Manager -clvm-cfg 1476/tcp -clvm-cfg 1476/udp -ms-sna-server 1477/tcp -ms-sna-server 1477/udp -ms-sna-base 1478/tcp -ms-sna-base 1478/udp -dberegister 1479/tcp -dberegister 1479/udp -pacerforum 1480/tcp -pacerforum 1480/udp -airs 1481/tcp -airs 1481/udp -miteksys-lm 1482/tcp #Miteksys License Manager -miteksys-lm 1482/udp #Miteksys License Manager -afs 1483/tcp #AFS License Manager -afs 1483/udp #AFS License Manager -confluent 1484/tcp #Confluent License Manager -confluent 1484/udp #Confluent License Manager -lansource 1485/tcp -lansource 1485/udp -nms_topo_serv 1486/tcp -nms_topo_serv 1486/udp -localinfosrvr 1487/tcp -localinfosrvr 1487/udp -docstor 1488/tcp -docstor 1488/udp -dmdocbroker 1489/tcp -dmdocbroker 1489/udp -insitu-conf 1490/tcp -insitu-conf 1490/udp -anynetgateway 1491/tcp -anynetgateway 1491/udp -stone-design-1 1492/tcp -stone-design-1 1492/udp -netmap_lm 1493/tcp -netmap_lm 1493/udp -ica 1494/tcp -ica 1494/udp -cvc 1495/tcp -cvc 1495/udp -liberty-lm 1496/tcp -liberty-lm 1496/udp -rfx-lm 1497/tcp -rfx-lm 1497/udp -watcom-sql 1498/tcp -watcom-sql 1498/udp -fhc 1499/tcp #Federico Heinz Consultora -fhc 1499/udp #Federico Heinz Consultora -vlsi-lm 1500/tcp #VLSI License Manager -vlsi-lm 1500/udp #VLSI License Manager -sas-3 1501/tcp #Satellite-data Acquisition System 3 -sas-3 1501/udp #Satellite-data Acquisition System 3 -shivadiscovery 1502/tcp #Shiva -shivadiscovery 1502/udp #Shiva -imtc-mcs 1503/tcp #Databeam -imtc-mcs 1503/udp #Databeam -evb-elm 1504/tcp #EVB Software Engineering License Manager -evb-elm 1504/udp #EVB Software Engineering License Manager -funkproxy 1505/tcp #Funk Software, Inc. -funkproxy 1505/udp #Funk Software, Inc. -utcd 1506/tcp #Universal Time daemon (utcd) -utcd 1506/udp #Universal Time daemon (utcd) -symplex 1507/tcp -symplex 1507/udp -diagmond 1508/tcp -diagmond 1508/udp -robcad-lm 1509/tcp #Robcad, Ltd. License Manager -robcad-lm 1509/udp #Robcad, Ltd. License Manager -mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. -mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. -3l-l1 1511/tcp -3l-l1 1511/udp -wins 1512/tcp #Microsoft's Windows Internet Name Service -wins 1512/udp #Microsoft's Windows Internet Name Service -fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc -ifor-protocol 1515/tcp -ifor-protocol 1515/udp -vpad 1516/tcp #Virtual Places Audio data -vpad 1516/udp #Virtual Places Audio data -vpac 1517/tcp #Virtual Places Audio control -vpac 1517/udp #Virtual Places Audio control -vpvd 1518/tcp #Virtual Places Video data -vpvd 1518/udp #Virtual Places Video data -vpvc 1519/tcp #Virtual Places Video control -vpvc 1519/udp #Virtual Places Video control -atm-zip-office 1520/tcp #atm zip office -atm-zip-office 1520/udp #atm zip office -ncube-lm 1521/tcp #nCube License Manager -ncube-lm 1521/udp #nCube License Manager -rna-lm 1522/tcp #Ricardo North America License Manager -rna-lm 1522/udp #Ricardo North America License Manager -cichild-lm 1523/tcp -cichild-lm 1523/udp ingreslock 1524/tcp #ingres ingreslock 1524/udp #ingres -prospero-np 1525/tcp #Prospero Directory Service non-priv -prospero-np 1525/udp #Prospero Directory Service non-priv #PROBLEMS!======================================================== orasrv 1525/tcp #oracle orasrv 1525/udp #oracle #PROBLEMS!======================================================== +prospero-np 1525/tcp #Prospero Directory Service non-priv +prospero-np 1525/udp #Prospero Directory Service non-priv pdap-np 1526/tcp #Prospero Data Access Prot non-priv pdap-np 1526/udp #Prospero Data Access Prot non-priv tlisrv 1527/tcp #oracle tlisrv 1527/udp #oracle *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-12@freebsd.org Wed Mar 11 08:20:16 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7E51258652; Wed, 11 Mar 2020 08:20:16 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48clJH6VZ7z3G6d; Wed, 11 Mar 2020 08:20:15 +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 AD0389898; Wed, 11 Mar 2020 08:20:15 +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 02B8KFoH058753; Wed, 11 Mar 2020 08:20:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B8KFN0058751; Wed, 11 Mar 2020 08:20:15 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003110820.02B8KFN0058751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 11 Mar 2020 08:20:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358873 - in stable/12/sys/dev/usb: . controller X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/12/sys/dev/usb: . controller X-SVN-Commit-Revision: 358873 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 08:20:16 -0000 Author: hselasky Date: Wed Mar 11 08:20:14 2020 New Revision: 358873 URL: https://svnweb.freebsd.org/changeset/base/358873 Log: MFC r358738: Remove the power bit from the super speed root hub port status register because it clobbers the super speed link status when a device is in super speed mode. Currently the power bit is not needed for anything in the USB hub driver. This fixes USB warm reset for super speed devices. Tested by: Shichun.Ma@dell.com Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/usb/controller/xhci.c stable/12/sys/dev/usb/usb_hub.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/12/sys/dev/usb/controller/xhci.c Wed Mar 11 08:16:13 2020 (r358872) +++ stable/12/sys/dev/usb/controller/xhci.c Wed Mar 11 08:20:14 2020 (r358873) @@ -3590,13 +3590,10 @@ xhci_roothub_exec(struct usb_device *udev, i |= UPS_OVERCURRENT_INDICATOR; if (v & XHCI_PS_PR) i |= UPS_RESET; - if (v & XHCI_PS_PP) { - /* - * The USB 3.0 RH is using the - * USB 2.0's power bit - */ - i |= UPS_PORT_POWER; - } +#if 0 + if (v & XHCI_PS_PP) + /* XXX undefined */ +#endif USETW(sc->sc_hub_desc.ps.wPortStatus, i); i = 0; Modified: stable/12/sys/dev/usb/usb_hub.c ============================================================================== --- stable/12/sys/dev/usb/usb_hub.c Wed Mar 11 08:16:13 2020 (r358872) +++ stable/12/sys/dev/usb/usb_hub.c Wed Mar 11 08:20:14 2020 (r358873) @@ -691,7 +691,7 @@ repeat: break; case USB_SPEED_SUPER: if (udev->parent_hub == NULL) - power_mask = UPS_PORT_POWER; + power_mask = 0; /* XXX undefined */ else power_mask = UPS_PORT_POWER_SS; break; @@ -699,7 +699,7 @@ repeat: power_mask = 0; break; } - if (!(sc->sc_st.port_status & power_mask)) { + if ((sc->sc_st.port_status & power_mask) != power_mask) { DPRINTF("WARNING: strange, connected port %d " "has no power\n", portno); } From owner-svn-src-stable-12@freebsd.org Wed Mar 11 08:24:53 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A5BD6258AE7; Wed, 11 Mar 2020 08:24:53 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48clPc0ZW2z3L1w; Wed, 11 Mar 2020 08:24:51 +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 512BE9A67; Wed, 11 Mar 2020 08:24:51 +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 02B8OpmR064559; Wed, 11 Mar 2020 08:24:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B8OogP064555; Wed, 11 Mar 2020 08:24:50 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003110824.02B8OogP064555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 11 Mar 2020 08:24:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358877 - stable/12/sys/dev/sound/pcm X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/dev/sound/pcm X-SVN-Commit-Revision: 358877 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 08:24:54 -0000 Author: hselasky Date: Wed Mar 11 08:24:50 2020 New Revision: 358877 URL: https://svnweb.freebsd.org/changeset/base/358877 Log: MFC r358629: Implement a detaching flag for the sound(4) subsystem to take appropriate actions when we are trying to detach an audio device, but cannot because someone is using it. This avoids applications having to wait for the DSP read data timeout before they receive any error indication. Tested with virtual_oss(8). Remove some unused definitions while at it. PR: 194727 Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/sound/pcm/dsp.c stable/12/sys/dev/sound/pcm/mixer.c stable/12/sys/dev/sound/pcm/sound.c stable/12/sys/dev/sound/pcm/sound.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/sound/pcm/dsp.c ============================================================================== --- stable/12/sys/dev/sound/pcm/dsp.c Wed Mar 11 08:23:14 2020 (r358876) +++ stable/12/sys/dev/sound/pcm/dsp.c Wed Mar 11 08:24:50 2020 (r358877) @@ -460,7 +460,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, stru return (ENODEV); d = dsp_get_info(i_dev); - if (!PCM_REGISTERED(d)) + if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -830,7 +830,7 @@ dsp_io_ops(struct cdev *i_dev, struct uio *buf) ("%s(): io train wreck!", __func__)); d = dsp_get_info(i_dev); - if (!DSP_REGISTERED(d, i_dev)) + if (PCM_DETACHING(d) || !DSP_REGISTERED(d, i_dev)) return (EBADF); PCM_GIANT_ENTER(d); @@ -1075,7 +1075,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int *arg_i, ret, tmp; d = dsp_get_info(i_dev); - if (!DSP_REGISTERED(d, i_dev)) + if (PCM_DETACHING(d) || !DSP_REGISTERED(d, i_dev)) return (EBADF); PCM_GIANT_ENTER(d); @@ -2170,9 +2170,11 @@ dsp_poll(struct cdev *i_dev, int events, struct thread int ret, e; d = dsp_get_info(i_dev); - if (!DSP_REGISTERED(d, i_dev)) - return (EBADF); - + if (PCM_DETACHING(d) || !DSP_REGISTERED(d, i_dev)) { + /* XXX many clients don't understand POLLNVAL */ + return (events & (POLLHUP | POLLPRI | POLLIN | + POLLRDNORM | POLLOUT | POLLWRNORM)); + } PCM_GIANT_ENTER(d); wrch = NULL; @@ -2246,7 +2248,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offs return (EINVAL); d = dsp_get_info(i_dev); - if (!DSP_REGISTERED(d, i_dev)) + if (PCM_DETACHING(d) || !DSP_REGISTERED(d, i_dev)) return (EINVAL); PCM_GIANT_ENTER(d); Modified: stable/12/sys/dev/sound/pcm/mixer.c ============================================================================== --- stable/12/sys/dev/sound/pcm/mixer.c Wed Mar 11 08:23:14 2020 (r358876) +++ stable/12/sys/dev/sound/pcm/mixer.c Wed Mar 11 08:24:50 2020 (r358877) @@ -153,7 +153,7 @@ mixer_set_softpcmvol(struct snd_mixer *m, struct sndde struct pcm_channel *c; int dropmtx, acquiremtx; - if (!PCM_REGISTERED(d)) + if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) return (EINVAL); if (mtx_owned(m->lock)) @@ -206,7 +206,7 @@ mixer_set_eq(struct snd_mixer *m, struct snddev_info * else return (EINVAL); - if (!PCM_REGISTERED(d)) + if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) return (EINVAL); if (mtx_owned(m->lock)) @@ -1046,7 +1046,7 @@ mixer_open(struct cdev *i_dev, int flags, int mode, st m = i_dev->si_drv1; d = device_get_softc(m->dev); - if (!PCM_REGISTERED(d)) + if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) return (EBADF); /* XXX Need Giant magic entry ??? */ @@ -1202,7 +1202,7 @@ mixer_ioctl(struct cdev *i_dev, u_long cmd, caddr_t ar return (EBADF); d = device_get_softc(((struct snd_mixer *)i_dev->si_drv1)->dev); - if (!PCM_REGISTERED(d)) + if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -1411,7 +1411,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo for (i = 0; pcm_devclass != NULL && i < devclass_get_maxunit(pcm_devclass); i++) { d = devclass_get_softc(pcm_devclass, i); - if (!PCM_REGISTERED(d)) + if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) continue; /* XXX Need Giant magic entry */ Modified: stable/12/sys/dev/sound/pcm/sound.c ============================================================================== --- stable/12/sys/dev/sound/pcm/sound.c Wed Mar 11 08:23:14 2020 (r358876) +++ stable/12/sys/dev/sound/pcm/sound.c Wed Mar 11 08:24:50 2020 (r358877) @@ -1158,6 +1158,8 @@ pcm_unregister(device_t dev) PCM_LOCK(d); PCM_WAIT(d); + d->flags |= SD_F_DETACHING; + if (d->inprog != 0) { device_printf(dev, "unregister: operation in progress\n"); PCM_UNLOCK(d); Modified: stable/12/sys/dev/sound/pcm/sound.h ============================================================================== --- stable/12/sys/dev/sound/pcm/sound.h Wed Mar 11 08:23:14 2020 (r358876) +++ stable/12/sys/dev/sound/pcm/sound.h Wed Mar 11 08:24:50 2020 (r358877) @@ -130,15 +130,8 @@ struct snd_mixer; #define SD_F_SIMPLEX 0x00000001 #define SD_F_AUTOVCHAN 0x00000002 #define SD_F_SOFTPCMVOL 0x00000004 -/* - * Obsolete due to better matrixing - */ -#if 0 -#define SD_F_PSWAPLR 0x00000008 -#define SD_F_RSWAPLR 0x00000010 -#endif #define SD_F_DYING 0x00000008 -#define SD_F_SUICIDE 0x00000010 +#define SD_F_DETACHING 0x00000010 #define SD_F_BUSY 0x00000020 #define SD_F_MPSAFE 0x00000040 #define SD_F_REGISTERED 0x00000080 @@ -164,7 +157,7 @@ struct snd_mixer; "\002AUTOVCHAN" \ "\003SOFTPCMVOL" \ "\004DYING" \ - "\005SUICIDE" \ + "\005DETACHING" \ "\006BUSY" \ "\007MPSAFE" \ "\010REGISTERED" \ @@ -182,6 +175,8 @@ struct snd_mixer; !((x)->flags & SD_F_DYING)) #define PCM_REGISTERED(x) (PCM_ALIVE(x) && \ ((x)->flags & SD_F_REGISTERED)) + +#define PCM_DETACHING(x) ((x)->flags & SD_F_DETACHING) /* many variables should be reduced to a range. Here define a macro */ #define RANGE(var, low, high) (var) = \ From owner-svn-src-stable-12@freebsd.org Wed Mar 11 08:28:14 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B460F259033; Wed, 11 Mar 2020 08:28:14 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48clTT3GBtz3NpR; Wed, 11 Mar 2020 08:28:13 +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 04CF39AAE; Wed, 11 Mar 2020 08:28:13 +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 02B8SCFJ065417; Wed, 11 Mar 2020 08:28:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B8SCMK065416; Wed, 11 Mar 2020 08:28:12 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003110828.02B8SCMK065416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 11 Mar 2020 08:28:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358881 - stable/12/sys/compat/linuxkpi/common/src X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/compat/linuxkpi/common/src X-SVN-Commit-Revision: 358881 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 08:28:14 -0000 Author: hselasky Date: Wed Mar 11 08:28:12 2020 New Revision: 358881 URL: https://svnweb.freebsd.org/changeset/base/358881 Log: MFC r358586: When closing a LinuxKPI file always use the real release function to avoid resource leakage when destroying a LinuxKPI character device. Submitted by: Andrew Boyer Reviewed by: kib@ PR: 244572 Sponsored by: Mellanox Technologies Modified: stable/12/sys/compat/linuxkpi/common/src/linux_compat.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- stable/12/sys/compat/linuxkpi/common/src/linux_compat.c Wed Mar 11 08:26:52 2020 (r358880) +++ stable/12/sys/compat/linuxkpi/common/src/linux_compat.c Wed Mar 11 08:28:12 2020 (r358881) @@ -1493,6 +1493,7 @@ static int linux_file_close(struct file *file, struct thread *td) { struct linux_file *filp; + int (*release)(struct inode *, struct linux_file *); const struct file_operations *fop; struct linux_cdev *ldev; int error; @@ -1510,8 +1511,13 @@ linux_file_close(struct file *file, struct thread *td) linux_set_current(td); linux_poll_wait_dequeue(filp); linux_get_fop(filp, &fop, &ldev); - if (fop->release != NULL) - error = -OPW(file, td, fop->release(filp->f_vnode, filp)); + /* + * Always use the real release function, if any, to avoid + * leaking device resources: + */ + release = filp->f_op->release; + if (release != NULL) + error = -OPW(file, td, release(filp->f_vnode, filp)); funsetown(&filp->f_sigio); if (filp->f_vnode != NULL) vdrop(filp->f_vnode); From owner-svn-src-stable-12@freebsd.org Wed Mar 11 08:32:17 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 642BF25938B; Wed, 11 Mar 2020 08:32: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48clZ85RM6z42L5; Wed, 11 Mar 2020 08:32:16 +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 41BC09C64; Wed, 11 Mar 2020 08:32:16 +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 02B8WGQ6071169; Wed, 11 Mar 2020 08:32:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B8WFXK071168; Wed, 11 Mar 2020 08:32:15 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003110832.02B8WFXK071168@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 11 Mar 2020 08:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358883 - stable/12/sys/dev/acpica X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/dev/acpica X-SVN-Commit-Revision: 358883 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 08:32:17 -0000 Author: hselasky Date: Wed Mar 11 08:32:15 2020 New Revision: 358883 URL: https://svnweb.freebsd.org/changeset/base/358883 Log: MFC r358537: Expose the ACPI power button, sleep button and LID state as evdev's. This allows libinput to disable touchpads when the lid is closed and various desktop environments can show power-off dialogs when the power button is pressed. While the latter is doable with devd a cross-platform solution is nicer. Submitted by: Greg V Differential Revision: https://reviews.freebsd.org/D23863 Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/acpica/acpi_button.c stable/12/sys/dev/acpica/acpi_lid.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/acpica/acpi_button.c ============================================================================== --- stable/12/sys/dev/acpica/acpi_button.c Wed Mar 11 08:28:57 2020 (r358882) +++ stable/12/sys/dev/acpica/acpi_button.c Wed Mar 11 08:32:15 2020 (r358883) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" +#include "opt_evdev.h" #include #include #include @@ -40,6 +41,11 @@ __FBSDID("$FreeBSD$"); #include +#ifdef EVDEV_SUPPORT +#include +#include +#endif + /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_BUTTON ACPI_MODULE_NAME("BUTTON") @@ -51,6 +57,9 @@ struct acpi_button_softc { #define ACPI_POWER_BUTTON 0 #define ACPI_SLEEP_BUTTON 1 boolean_t fixed; +#ifdef EVDEV_SUPPORT + struct evdev_dev *button_evdev; +#endif }; #define ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP 0x80 @@ -139,6 +148,20 @@ acpi_button_attach(device_t dev) event = (sc->button_type == ACPI_SLEEP_BUTTON) ? ACPI_EVENT_SLEEP_BUTTON : ACPI_EVENT_POWER_BUTTON; +#ifdef EVDEV_SUPPORT + sc->button_evdev = evdev_alloc(); + evdev_set_name(sc->button_evdev, device_get_desc(dev)); + evdev_set_phys(sc->button_evdev, device_get_nameunit(dev)); + evdev_set_id(sc->button_evdev, BUS_HOST, 0, 0, 1); + evdev_support_event(sc->button_evdev, EV_SYN); + evdev_support_event(sc->button_evdev, EV_KEY); + evdev_support_key(sc->button_evdev, + (sc->button_type == ACPI_SLEEP_BUTTON) ? KEY_SLEEP : KEY_POWER); + + if (evdev_register(sc->button_evdev)) + return (ENXIO); +#endif + /* * Install the new handler. We could remove any fixed handlers added * from the FADT once we have a duplicate from the AML but some systems @@ -245,6 +268,9 @@ static void acpi_button_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_button_softc *sc; +#ifdef EVDEV_SUPPORT + uint16_t key; +#endif ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); @@ -260,6 +286,14 @@ acpi_button_notify_handler(ACPI_HANDLE h, UINT32 notif device_printf(sc->button_dev, "unknown notify %#x\n", notify); break; } + +#ifdef EVDEV_SUPPORT + key = (sc->button_type == ACPI_SLEEP_BUTTON) ? KEY_SLEEP : KEY_POWER; + evdev_push_key(sc->button_evdev, key, 1); + evdev_sync(sc->button_evdev); + evdev_push_key(sc->button_evdev, key, 0); + evdev_sync(sc->button_evdev); +#endif } static ACPI_STATUS Modified: stable/12/sys/dev/acpica/acpi_lid.c ============================================================================== --- stable/12/sys/dev/acpica/acpi_lid.c Wed Mar 11 08:28:57 2020 (r358882) +++ stable/12/sys/dev/acpica/acpi_lid.c Wed Mar 11 08:32:15 2020 (r358883) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" +#include "opt_evdev.h" #include #include #include @@ -42,6 +43,11 @@ __FBSDID("$FreeBSD$"); #include +#ifdef EVDEV_SUPPORT +#include +#include +#endif + /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_BUTTON ACPI_MODULE_NAME("LID") @@ -50,6 +56,9 @@ struct acpi_lid_softc { device_t lid_dev; ACPI_HANDLE lid_handle; int lid_status; /* open or closed */ +#ifdef EVDEV_SUPPORT + struct evdev_dev *lid_evdev; +#endif }; ACPI_HANDLE acpi_lid_handle; @@ -103,6 +112,12 @@ acpi_lid_status_update(struct acpi_lid_softc *sc) /* range check value */ sc->lid_status = lid_status ? 1 : 0; + +#ifdef EVDEV_SUPPORT + /* Notify evdev about lid status */ + evdev_push_sw(sc->lid_evdev, SW_LID, lid_status ? 0 : 1); + evdev_sync(sc->lid_evdev); +#endif } static int @@ -129,6 +144,20 @@ acpi_lid_attach(device_t dev) sc = device_get_softc(dev); sc->lid_dev = dev; acpi_lid_handle = sc->lid_handle = acpi_get_handle(dev); + +#ifdef EVDEV_SUPPORT + /* Register evdev device before initial status update */ + sc->lid_evdev = evdev_alloc(); + evdev_set_name(sc->lid_evdev, device_get_desc(dev)); + evdev_set_phys(sc->lid_evdev, device_get_nameunit(dev)); + evdev_set_id(sc->lid_evdev, BUS_HOST, 0, 0, 1); + evdev_support_event(sc->lid_evdev, EV_SYN); + evdev_support_event(sc->lid_evdev, EV_SW); + evdev_support_sw(sc->lid_evdev, SW_LID); + + if (evdev_register(sc->lid_evdev)) + return (ENXIO); +#endif /* * If a system does not get lid events, it may make sense to change From owner-svn-src-stable-12@freebsd.org Wed Mar 11 08:51:21 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2B466259841; Wed, 11 Mar 2020 08:51:21 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48cm086G16z3QXG; Wed, 11 Mar 2020 08:51:20 +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 58BC99E88; Wed, 11 Mar 2020 08:51:20 +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 02B8pKPB080964; Wed, 11 Mar 2020 08:51:20 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B8pJD5080710; Wed, 11 Mar 2020 08:51:19 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003110851.02B8pJD5080710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 11 Mar 2020 08:51:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358885 - in stable/12/sys/dev/mlx5: . mlx5_en mlx5_ib X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12/sys/dev/mlx5: . mlx5_en mlx5_ib X-SVN-Commit-Revision: 358885 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 08:51:21 -0000 Author: kib Date: Wed Mar 11 08:51:19 2020 New Revision: 358885 URL: https://svnweb.freebsd.org/changeset/base/358885 Log: MFC r358624: mlx5en: Support 50GBase-KR4 media type in mlx5en driver. Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c stable/12/sys/dev/mlx5/port.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c ============================================================================== --- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Wed Mar 11 08:34:29 2020 (r358884) +++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Wed Mar 11 08:51:19 2020 (r358885) @@ -166,6 +166,10 @@ static const struct media mlx5e_mode_table[MLX5E_LINK_ .subtype = IFM_50G_KR2, .baudrate = IF_Gbps(50ULL), }, + [MLX5E_50GBASE_KR4][MLX5E_KR4] = { + .subtype = IFM_50G_KR4, + .baudrate = IF_Gbps(50ULL), + }, }; static const struct media mlx5e_ext_mode_table[MLX5E_EXT_LINK_SPEEDS_NUMBER][MLX5E_LINK_MODES_NUMBER] = { @@ -312,6 +316,10 @@ static const struct media mlx5e_ext_mode_table[MLX5E_E }, [MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2][MLX5E_KR2] = { .subtype = IFM_50G_KR2, + .baudrate = IF_Gbps(50ULL), + }, + [MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2][MLX5E_KR4] = { + .subtype = IFM_50G_KR4, .baudrate = IF_Gbps(50ULL), }, [MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2][MLX5E_SR2] = { Modified: stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c ============================================================================== --- stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c Wed Mar 11 08:34:29 2020 (r358884) +++ stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c Wed Mar 11 08:51:19 2020 (r358885) @@ -199,6 +199,7 @@ static int translate_eth_proto_oper(u32 eth_proto_oper break; case MLX5E_PROT_MASK(MLX5E_50GBASE_CR2): case MLX5E_PROT_MASK(MLX5E_50GBASE_KR2): + case MLX5E_PROT_MASK(MLX5E_50GBASE_KR4): case MLX5E_PROT_MASK(MLX5E_50GBASE_SR2): *active_width = IB_WIDTH_1X; *active_speed = IB_SPEED_HDR; Modified: stable/12/sys/dev/mlx5/port.h ============================================================================== --- stable/12/sys/dev/mlx5/port.h Wed Mar 11 08:34:29 2020 (r358884) +++ stable/12/sys/dev/mlx5/port.h Wed Mar 11 08:51:19 2020 (r358885) @@ -95,6 +95,7 @@ enum mlx5e_link_speed { MLX5E_40GBASE_SR4 = 15, MLX5E_40GBASE_LR4_ER4 = 16, MLX5E_50GBASE_SR2 = 18, + MLX5E_50GBASE_KR4 = 19, MLX5E_100GBASE_CR4 = 20, MLX5E_100GBASE_SR4 = 21, MLX5E_100GBASE_KR4 = 22, From owner-svn-src-stable-12@freebsd.org Wed Mar 11 12:51:07 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FE212605E1; Wed, 11 Mar 2020 12:51:07 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48csJq00Xbz4PqS; Wed, 11 Mar 2020 12:51:06 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-qk1-f178.google.com with SMTP id p62so1926673qkb.0; Wed, 11 Mar 2020 05:51:06 -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=o0cm8hMc86KoVet1130JOTHFuaWm+cDbkMqXuMRSfLg=; b=Zf9uvXMw2QdEaSt2ck/RMnxjFtyC+D2VwOO4WWToQdXJtkHBNdYG4FtAhAk7NsbhUW 9V18msRC48LGjZ3SdMfNJQb7xwOTo9eigUu5LtfgaGa5kPuI8eEX+fchPSZDEnFrgv2q hLUOddFMDi4jMr96ePtPCcNoZUeBDiEZy+vdhPbOssoWsJZCNwJvYAg3w88zkYDyDEod hoBzr0ZyVPyfpmKy5PtJEmpWbvDvD1SpAjxkDW6c+U2ujw/d6MrRVVGO/R0IdJgsYD4N US7sB3A1+bismcMTaAUd87I2lr+w2UrDj32cDRL1qLVVwMMbjT2ku8cQgTeJq41noLUv aAXQ== X-Gm-Message-State: ANhLgQ09N5zRyNoqwsBaNvvv5OMXrGhQGbWnr3IdYlWVSl7Ev+wfeBFz +KlCd9pwx6YU+drJFJnIYAtpfZjI X-Google-Smtp-Source: ADFU+vtiIo/4lMUVgWKGmazLZeSFS821PscxsKAmyNj7u9QV9YWhs5aRkSWxi2levvW3l598atWDrw== X-Received: by 2002:a05:620a:681:: with SMTP id f1mr2610719qkh.148.1583931065295; Wed, 11 Mar 2020 05:51:05 -0700 (PDT) Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com. [209.85.219.48]) by smtp.gmail.com with ESMTPSA id f22sm4037049qto.79.2020.03.11.05.51.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Mar 2020 05:51:05 -0700 (PDT) Received: by mail-qv1-f48.google.com with SMTP id w5so771542qvp.11; Wed, 11 Mar 2020 05:51:04 -0700 (PDT) X-Received: by 2002:a05:6214:b90:: with SMTP id fe16mr2626424qvb.112.1583931064613; Wed, 11 Mar 2020 05:51:04 -0700 (PDT) MIME-Version: 1.0 References: <202003110545.02B5jXvV068254@repo.freebsd.org> In-Reply-To: <202003110545.02B5jXvV068254@repo.freebsd.org> From: Kyle Evans Date: Wed, 11 Mar 2020 07:50:53 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r358870 - stable/12/usr.sbin/services_mkdb To: "Pedro F. Giffuni" Cc: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org, delphij@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48csJq00Xbz4PqS X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.81 / 15.00]; NEURAL_HAM_MEDIUM(-0.81)[-0.814,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 12:51:07 -0000 On Wed, Mar 11, 2020 at 12:45 AM Pedro F. Giffuni wrote: > > Author: pfg > Date: Wed Mar 11 05:45:33 2020 > New Revision: 358870 > URL: https://svnweb.freebsd.org/changeset/base/358870 > > Log: > MFC r358154 (by delphij) > Bump PROTOMAX: this matches the value on NetBSD and will be necessary for > future updates. > > MFC r r358448; > /etc/services: attempt to bring the database to this century. > > This is the result of splitting r358153 in two, in order to avoid a build > system bug and being able to merge the change to previous releases.. > > Document better this file, updating the URL to the IANA registry and closely > match the official services. > > For system ports (0 to 1023) we now try to follow the registry closely, noting > some historical differences where applicable. > > As a side effect: drop references to unofficial Kerberos IV which was EOL'ed > on Oct 2006[1]. While it is conceivable some people may still use it in some > very old FreeBSD machines that can't be replaced easily, the use of it is > considered a security risk. Also drop the unofficial netatalk, which we > supported long ago in the kernel but was dropped long ago. > > Leave for now smtps, even though it conflicts with IANA's submissions. > The change should have very little visibility, if any, but should be a > step closer to the current IANA database. > > [1] https://web.mit.edu/kerberos/krb4-end-of-life.html > r358154 at the very least should still go back to stable/11 if there's going to be a later change to /etc/services that will still require it. Thanks, Kyle Evans From owner-svn-src-stable-12@freebsd.org Wed Mar 11 13:45:54 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BCED2261756; Wed, 11 Mar 2020 13:45:54 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ctX22x0Cz4gDB; Wed, 11 Mar 2020 13:45:54 +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 234BFD715; Wed, 11 Mar 2020 13:45:54 +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 02BDjrEr056695; Wed, 11 Mar 2020 13:45:53 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BDjrKt056694; Wed, 11 Mar 2020 13:45:53 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202003111345.02BDjrKt056694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Wed, 11 Mar 2020 13:45:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358888 - stable/12/sbin/pfctl/tests/files X-SVN-Group: stable-12 X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: stable/12/sbin/pfctl/tests/files X-SVN-Commit-Revision: 358888 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 13:45:54 -0000 Author: lwhsu Date: Wed Mar 11 13:45:53 2020 New Revision: 358888 URL: https://svnweb.freebsd.org/changeset/base/358888 Log: MFC r358463: Fix test cases after r358448 (r358870 in stable/12) sbin.pfctl.pfctl_test.pf0087 sbin.pfctl.pfctl_test.selfpf0087 Sponsored by: The FreeBSD Foundation Modified: stable/12/sbin/pfctl/tests/files/pf0087.ok Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/pfctl/tests/files/pf0087.ok ============================================================================== --- stable/12/sbin/pfctl/tests/files/pf0087.ok Wed Mar 11 12:43:54 2020 (r358887) +++ stable/12/sbin/pfctl/tests/files/pf0087.ok Wed Mar 11 13:45:53 2020 (r358888) @@ -5,7 +5,7 @@ pass in on lo1000000 inet proto udp from any to 10.0.0 pass in inet proto tcp from any to 10.0.0.1 port = http flags S/SA keep state pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state pass in inet proto tcp from any to 10.0.0.3 port = http flags S/SA keep state -pass out inet proto tcp from any to 10.0.0.1 port = hosts2-ns flags S/SA keep state +pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA keep state pass in inet proto udp from any to 10.0.0.3 port = domain keep state pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 keep state pass out inet proto udp from any to 10.0.0.1 port = domain keep state From owner-svn-src-stable-12@freebsd.org Wed Mar 11 18:28:41 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 81783266EBC; Wed, 11 Mar 2020 18:28:41 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48d0pK1Nvyz4WXn; Wed, 11 Mar 2020 18:28:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.3] (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 4336F2D7AA; Wed, 11 Mar 2020 18:28:40 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: svn commit: r358870 - stable/12/usr.sbin/services_mkdb To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org, delphij@freebsd.org References: <202003110545.02B5jXvV068254@repo.freebsd.org> From: Pedro Giffuni Organization: FreeBSD Message-ID: <3d419683-5690-b316-ac68-1dd02a8582f0@FreeBSD.org> Date: Wed, 11 Mar 2020 13:28:39 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 18:28:41 -0000 On 11/03/2020 07:50, Kyle Evans wrote: > On Wed, Mar 11, 2020 at 12:45 AM Pedro F. Giffuni wrote: >> Author: pfg >> Date: Wed Mar 11 05:45:33 2020 >> New Revision: 358870 >> URL: https://svnweb.freebsd.org/changeset/base/358870 >> >> Log: >> MFC r358154 (by delphij) >> Bump PROTOMAX: this matches the value on NetBSD and will be necessary for >> future updates. >> >> MFC r r358448; >> /etc/services: attempt to bring the database to this century. >> >> This is the result of splitting r358153 in two, in order to avoid a build >> system bug and being able to merge the change to previous releases.. >> >> Document better this file, updating the URL to the IANA registry and closely >> match the official services. >> >> For system ports (0 to 1023) we now try to follow the registry closely, noting >> some historical differences where applicable. >> >> As a side effect: drop references to unofficial Kerberos IV which was EOL'ed >> on Oct 2006[1]. While it is conceivable some people may still use it in some >> very old FreeBSD machines that can't be replaced easily, the use of it is >> considered a security risk. Also drop the unofficial netatalk, which we >> supported long ago in the kernel but was dropped long ago. >> >> Leave for now smtps, even though it conflicts with IANA's submissions. >> The change should have very little visibility, if any, but should be a >> step closer to the current IANA database. >> >> [1] https://web.mit.edu/kerberos/krb4-end-of-life.html >> > > r358154 at the very least should still go back to stable/11 if there's > going to be a later change to /etc/services that will still require > it. Yes (I am just a bit busy ATM), but it goes a bit further, it has to make it into a release before I can commit the update in -current or we'll break some CI builds. Pedro. From owner-svn-src-stable-12@freebsd.org Thu Mar 12 03:59:52 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA960274032; Thu, 12 Mar 2020 03:59:52 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dFTN4NBXz460R; Thu, 12 Mar 2020 03:59:52 +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 4B2E01F4F7; Thu, 12 Mar 2020 03:59:52 +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 02C3xqF3068364; Thu, 12 Mar 2020 03:59:52 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02C3xqgo068363; Thu, 12 Mar 2020 03:59:52 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202003120359.02C3xqgo068363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 12 Mar 2020 03:59:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358905 - stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 358905 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 03:59:52 -0000 Author: mav Date: Thu Mar 12 03:59:51 2020 New Revision: 358905 URL: https://svnweb.freebsd.org/changeset/base/358905 Log: MFC r358683: Remove vfs.zfs.top_maxinflight tunable/sysctl. It is dead since sorted scrub import at r334844. Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c ============================================================================== --- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Thu Mar 12 03:56:54 2020 (r358904) +++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Thu Mar 12 03:59:51 2020 (r358905) @@ -137,12 +137,6 @@ extern int zfs_vdev_async_write_active_min_dirty_perce */ int zfs_scan_strict_mem_lim = B_FALSE; -/* - * Maximum number of parallelly executing I/Os per top-level vdev. - * Tune with care. Very high settings (hundreds) are known to trigger - * some firmware bugs and resets on certain SSDs. - */ -int zfs_top_maxinflight = 32; /* maximum I/Os per top-level */ unsigned int zfs_resilver_delay = 2; /* number of ticks to delay resilver -- 2 is a good number */ unsigned int zfs_scrub_delay = 4; /* number of ticks to delay scrub -- 4 is a good number */ unsigned int zfs_scan_idle = 50; /* idle window in clock ticks */ @@ -186,8 +180,6 @@ boolean_t zfs_no_scrub_io = B_FALSE; /* set to disable boolean_t zfs_no_scrub_prefetch = B_FALSE; /* set to disable scrub prefetch */ SYSCTL_DECL(_vfs_zfs); -SYSCTL_UINT(_vfs_zfs, OID_AUTO, top_maxinflight, CTLFLAG_RWTUN, - &zfs_top_maxinflight, 0, "Maximum I/Os per top-level vdev"); SYSCTL_UINT(_vfs_zfs, OID_AUTO, resilver_delay, CTLFLAG_RWTUN, &zfs_resilver_delay, 0, "Number of ticks to delay resilver"); SYSCTL_UINT(_vfs_zfs, OID_AUTO, scrub_delay, CTLFLAG_RWTUN, @@ -1538,7 +1530,6 @@ dsl_scan_prefetch_thread(void *arg) dsl_scan_t *scn = arg; spa_t *spa = scn->scn_dp->dp_spa; vdev_t *rvd = spa->spa_root_vdev; - uint64_t maxinflight = rvd->vdev_children * zfs_top_maxinflight; scan_prefetch_issue_ctx_t *spic; /* loop until we are told to stop */ From owner-svn-src-stable-12@freebsd.org Thu Mar 12 16:07:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0E8C264E8C; Thu, 12 Mar 2020 16:07:42 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dYdB43BZz4GKm; Thu, 12 Mar 2020 16:07:42 +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 5F1F327BA2; Thu, 12 Mar 2020 16:07:42 +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 02CG7gYM006581; Thu, 12 Mar 2020 16:07:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CG7gBa006580; Thu, 12 Mar 2020 16:07:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003121607.02CG7gBa006580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 12 Mar 2020 16:07:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358913 - stable/12/usr.bin/posixshmcontrol X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/12/usr.bin/posixshmcontrol X-SVN-Commit-Revision: 358913 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 16:07:43 -0000 Author: kib Date: Thu Mar 12 16:07:41 2020 New Revision: 358913 URL: https://svnweb.freebsd.org/changeset/base/358913 Log: MFC r358826: posixshmcontrol: add an undocumented alias 'list' for the 'ls' command. Modified: stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c ============================================================================== --- stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c Thu Mar 12 16:06:26 2020 (r358912) +++ stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c Thu Mar 12 16:07:41 2020 (r358913) @@ -446,6 +446,7 @@ struct opmode { static const struct opmode opmodes[] = { { .cmd = "create", .impl = create_shm}, { .cmd = "rm", .impl = delete_shm, }, + { .cmd = "list", .impl = list_shm }, { .cmd = "ls", .impl = list_shm }, { .cmd = "dump", .impl = read_shm, }, { .cmd = "stat", .impl = stat_shm, }, From owner-svn-src-stable-12@freebsd.org Thu Mar 12 16:09:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B221264F58; Thu, 12 Mar 2020 16:09:42 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dYgV333Yz4L08; Thu, 12 Mar 2020 16:09:42 +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 1E09E27BA3; Thu, 12 Mar 2020 16:09:42 +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 02CG9f7N006724; Thu, 12 Mar 2020 16:09:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CG9fiM006723; Thu, 12 Mar 2020 16:09:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003121609.02CG9fiM006723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 12 Mar 2020 16:09:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358914 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 358914 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 16:09:42 -0000 Author: kib Date: Thu Mar 12 16:09:41 2020 New Revision: 358914 URL: https://svnweb.freebsd.org/changeset/base/358914 Log: MFC r358676: buffer pager: deref ucred immediately after read. Modified: stable/12/sys/kern/vfs_bio.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/vfs_bio.c ============================================================================== --- stable/12/sys/kern/vfs_bio.c Thu Mar 12 16:07:41 2020 (r358913) +++ stable/12/sys/kern/vfs_bio.c Thu Mar 12 16:09:41 2020 (r358914) @@ -5219,6 +5219,10 @@ again: br_flags, &bp); if (error != 0) goto end_pages; + if (bp->b_rcred == curthread->td_ucred) { + crfree(bp->b_rcred); + bp->b_rcred = NOCRED; + } if (LIST_EMPTY(&bp->b_dep)) { /* * Invalidation clears m->valid, but From owner-svn-src-stable-12@freebsd.org Thu Mar 12 19:00:28 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91A892689DF; Thu, 12 Mar 2020 19:00:28 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ddSX3QM6z4XgS; Thu, 12 Mar 2020 19:00:28 +0000 (UTC) (envelope-from 0mp@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 7026529B0E; Thu, 12 Mar 2020 19:00:28 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02CJ0SRl010382; Thu, 12 Mar 2020 19:00:28 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CJ0SnE010381; Thu, 12 Mar 2020 19:00:28 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003121900.02CJ0SnE010381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Thu, 12 Mar 2020 19:00:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358917 - stable/12/contrib/smbfs/mount_smbfs X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/contrib/smbfs/mount_smbfs X-SVN-Commit-Revision: 358917 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 19:00:28 -0000 Author: 0mp (doc,ports committer) Date: Thu Mar 12 19:00:28 2020 New Revision: 358917 URL: https://svnweb.freebsd.org/changeset/base/358917 Log: MFC r339990: mount_smbfs(8): Add the STANDARDS and HISTORY sections - Document that mount_smbfs(8) only supports SMB1 and that SMB2 and SMB3 are not supported at the moment. Suggest users to browse ports for software compatible with newer versions of the protocol. - Copy supported servers list from README. - Add a SEE ALSO section and reference the chapter about Samba in the FreeBSD Handbook. - Add a HISTORY section. - Style changes: - Use Dq instead of Em in the EXAMPLES section. - Mark command modifiers with Cm. Reviewed by: bcr Approved by: bcr (mentor) Approved by: krion (mentor, implicit), mat (mentor, implicit) Sponsored by: Bally Wulff Games & Entertainment GmbH Differential Revision: https://reviews.freebsd.org/D17798 Modified: stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 ============================================================================== --- stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 Thu Mar 12 18:28:23 2020 (r358916) +++ stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 Thu Mar 12 19:00:28 2020 (r358917) @@ -1,6 +1,6 @@ .\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $ .\" $FreeBSD$ -.Dd September 17, 2011 +.Dd November 1, 2018 .Dt MOUNT_SMBFS 8 .Os .Sh NAME @@ -8,12 +8,12 @@ .Nd "mount a shared resource from an SMB file server" .Sh SYNOPSIS .Nm -.Op Fl E Ar cs1 : Ns Ar cs2 +.Op Fl E Ar cs1 Ns Cm \&: Ns Ar cs2 .Op Fl I Ar host .Op Fl L Ar locale -.Op Fl M Ar crights : Ns Ar srights +.Op Fl M Ar crights Ns Cm \&: Ns Ar srights .Op Fl N -.Op Fl O Ar cowner : Ns Ar cgroup Ns / Ns Ar sowner : Ns Ar sgroup +.Op Fl O Ar cowner Ns Cm \&: Ns Ar cgroup Ns Cm \&/ Ns Ar sowner Ns Cm \&: Ns Ar sgroup .Op Fl R Ar retrycount .Op Fl T Ar timeout .Op Fl U Ar username @@ -25,9 +25,9 @@ .Op Fl n Ar opt .Op Fl u Ar uid .Sm off -.No // Ar user No @ Ar server -.Op Ar :port1 Op Ar :port2 -.No / Ar share +.Cm \&// Ns Ar user Cm \&@ Ar server +.Op Cm \&: Ar port1 Op Cm \&: Ar port2 +.Cm \&/ Ar share .Sm on .Ar node .Sh DESCRIPTION @@ -37,7 +37,7 @@ command mounts a share from a remote server using SMB/ .Pp The options are as follows: .Bl -tag -width indent -.It Fl E Ar cs1 : Ns Ar cs2 +.It Fl E Ar cs1 Ns Cm \&: Ns Ar cs2 Specifies local .Pq Ar cs1 and server's @@ -57,7 +57,7 @@ By default, tries to use an environment variable .Ev LC_* to determine it. -.It Fl M Ar crights : Ns Ar srights +.It Fl M Ar crights Ns Cm \&: Ns Ar srights Assign access rights to the newly created connection. .It Fl N Do not ask for a password. @@ -69,7 +69,7 @@ file for additional configuration parameters and a pas If no password is found, .Nm prompts for it. -.It Fl O Ar cowner : Ns Ar cgroup Ns / Ns Ar sowner : Ns Ar sgroup +.It Fl O Ar cowner Ns Cm \&: Ns Ar cgroup Ns Cm \&/ Ns Ar sowner Ns Cm \&: Ns Ar sgroup Assign owner/group attributes to the newly created connection. .It Fl R Ar retrycount How many retries should be done before the SMB requester decides to drop @@ -111,7 +111,7 @@ server. User ID and group ID assigned to files. The default are owner and group IDs from the directory where the volume is mounted. -.It No // Ns Ar user Ns @ Ns Ar server Ns Oo Ar :port1 Ns Oo Ar :port2 Oc Oc Ns No / Ns Ar share +.It Cm \&// Ns Ar user Ns Cm \&@ Ns Ar server Ns Oo Cm \&: Ns Ar port1 Ns Oo Cm \&: Ns Ar port2 Oc Oc Ns Cm \&/ Ns Ar share The .Nm command will use @@ -145,13 +145,13 @@ for details. .El .Sh EXAMPLES The following example illustrates how to connect to SMB server -.Em SAMBA +.Dq SAMBA as user -.Em GUEST , +.Dq GUEST , and mount shares -.Em PUBLIC +.Dq PUBLIC and -.Em TMP : +.Dq TMP : .Bd -literal -offset indent mount_smbfs -I samba.mydomain.com //guest@samba/public /smb/public mount_smbfs -I 192.168.20.3 -E koi8-r:cp866 //guest@samba/tmp /smb/tmp @@ -159,9 +159,39 @@ mount_smbfs -I 192.168.20.3 -E koi8-r:cp866 //guest@sa .Pp It is also possible to use .Xr fstab 5 -for smbfs mounts (the example below doesn't prompt for a password): +for smbfs mounts (the example below does not prompt for a password): .Pp .Dl "//guest@samba/public /smb/public smbfs rw,noauto,-N 0 0" +.Sh SEE ALSO +.Bl -dash +.It +Chapter dedicated to Samba configuration in the +.Fx +Handbook: +.Lk "https://www.freebsd.org/doc/handbook/network-samba.html" +.El +.Sh STANDARDS +.Nm +offers support for SMB/CIFS/SMB1. +It does not support newer versions of the protocol like SMB2 and SMB3. +SMB2 and SMB3 are supported by software available in the +.Xr ports 7 +collection. +.Pp +The list of supported SMB servers includes: +.Bl -dash -compact +.It +Samba +.It +Windows 95/98/ME/2000/NT4.0 (SPs 4, 5, 6) +.It +IBM LanManager +.It +NetApp +.El +.Sh HISTORY +SMB/CIFS protocol and SMB/CIFS file system implementation first appeared in +.Fx 4.5 . .Sh AUTHORS .An Boris Popov Aq bp@butya.kz , .Aq bp@FreeBSD.org From owner-svn-src-stable-12@freebsd.org Thu Mar 12 19:10:54 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5175268F65; Thu, 12 Mar 2020 19:10:54 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ddhZ39dzz3J8c; Thu, 12 Mar 2020 19:10:54 +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 3523329CFB; Thu, 12 Mar 2020 19:10:54 +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 02CJAshh016598; Thu, 12 Mar 2020 19:10:54 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CJAsTM016597; Thu, 12 Mar 2020 19:10:54 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202003121910.02CJAsTM016597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 12 Mar 2020 19:10:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358918 - stable/12/tests/sys/netpfil/pf X-SVN-Group: stable-12 X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: stable/12/tests/sys/netpfil/pf X-SVN-Commit-Revision: 358918 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 19:10:54 -0000 Author: lwhsu Date: Thu Mar 12 19:10:53 2020 New Revision: 358918 URL: https://svnweb.freebsd.org/changeset/base/358918 Log: MFC r358852: Skip sys.netpfil.pf.nat.exhaust on amd64 in CI as it sometimes panics kernel PR: 244703 Sponsored by: The FreeBSD Foundation Modified: stable/12/tests/sys/netpfil/pf/nat.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/tests/sys/netpfil/pf/nat.sh ============================================================================== --- stable/12/tests/sys/netpfil/pf/nat.sh Thu Mar 12 19:00:28 2020 (r358917) +++ stable/12/tests/sys/netpfil/pf/nat.sh Thu Mar 12 19:10:53 2020 (r358918) @@ -11,6 +11,11 @@ exhaust_head() exhaust_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "amd64" ]; then + atf_skip "https://bugs.freebsd.org/244703" + fi + pft_init epair_nat=$(vnet_mkepair) From owner-svn-src-stable-12@freebsd.org Thu Mar 12 20:51:07 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 030DB26B1F3; Thu, 12 Mar 2020 20:51:07 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dgwB3Ry8z4d6d; Thu, 12 Mar 2020 20:51:06 +0000 (UTC) (envelope-from 0mp@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 3A8F02B117; Thu, 12 Mar 2020 20:51:05 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02CKp51F081827; Thu, 12 Mar 2020 20:51:05 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CKp5OQ081826; Thu, 12 Mar 2020 20:51:05 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003122051.02CKp5OQ081826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Thu, 12 Mar 2020 20:51:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358920 - stable/12/lib/libefivar X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/lib/libefivar X-SVN-Commit-Revision: 358920 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 20:51:07 -0000 Author: 0mp (doc,ports committer) Date: Thu Mar 12 20:51:04 2020 New Revision: 358920 URL: https://svnweb.freebsd.org/changeset/base/358920 Log: MFC 339729: efivar(3): Fix some typos and improve style - Fix some typos. - Remove redundant semicolons from the synopsis section. - Stylize variable names and types with Vt and Va respectively. - Use a list to present non-implemented functions. - Sort the order of the sections. - Add a history section. - Use Nm when "libefivar" is mentioned. PR: 232626 Reported by: Tiwei Bie Reviewed by: bcr, imp Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17686 Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24044 Modified: stable/12/lib/libefivar/efivar.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libefivar/efivar.3 ============================================================================== --- stable/12/lib/libefivar/efivar.3 Thu Mar 12 19:55:51 2020 (r358919) +++ stable/12/lib/libefivar/efivar.3 Thu Mar 12 20:51:04 2020 (r358920) @@ -25,12 +25,12 @@ .\" .\" $FreeBSD$ .\" -.Dd September 14, 2016 +.Dd October 25, 2018 .Dt LIBEFIVAR 3 .Os .Sh NAME .Nm libefivar -.Nd EFI Non Volatile Variable Suppoert +.Nd EFI Non Volatile Variable Support .Sh SYNOPSIS .In efivar.h .Ft int @@ -56,15 +56,17 @@ .Ft int .Fn efi_set_variable "efi_guid_t guid" "const char *name" "void *data" "size_t data_size" "uint32_t attributes" .Ft int -.Fn efi_str_to_guid "const char *s" "efi_guid_t *guid"; +.Fn efi_str_to_guid "const char *s" "efi_guid_t *guid" .Ft int -.Fn efi_variables_supported "void"; +.Fn efi_variables_supported "void" .Sh DESCRIPTION The .Nm library implements access to EFI Variables via the EFI Runtime -Serivces. -All char * strings are converted to 16-bit UTF strings before passing +Services. +All +.Vt "char *" +strings are converted to 16-bit UTF strings before passing them to EFI. .Pp .Fn efi_variables_supported @@ -74,28 +76,48 @@ Otherwise zero is returned. .Pp .Fn efi_del_variable deletes the EFI variable selected by -.Dv guid +.Va guid and -.Dv name . +.Va name . .Pp +The following functions have not been implemented yet: +.Bl -dash -offset indent -compact +.It +.Fn efi_append_variable +.It +.Fn efi_get_next_variable_name +.It .Fn efi_get_variable +.It .Fn efi_get_variable_attributes +.It .Fn efi_get_variable_size -.Fn efi_append_variable -.Fn efi_set_variable -.Fn efi_get_next_variable_name -.Fn efi_str_to_guid -.Fn efi_guid_to_str -.Fn efi_name_to_guid +.It .Fn efi_guid_to_name +.It +.Fn efi_guid_to_str +.It .Fn efi_guid_to_symbol -This function is not actually implemented. -.Sh BUGS -No facilities exist to process the strings as native UTF. -This is a limitation in the Linux libefivar library interface. +.It +.Fn efi_name_to_guid +.It +.Fn efi_set_variable +.It +.Fn efi_str_to_guid +.El .Sh SEE ALSO .Xr efidev 4 +.Sh HISTORY +The +.Nm +library first appeared in +.Fx 12.0 . .Sh AUTHORS .An -nosplit This software was originally written by .An Warner Losh . +.Sh BUGS +No facilities exist to process the strings as native UTF. +This is a limitation in the Linux +.Nm +library interface. From owner-svn-src-stable-12@freebsd.org Thu Mar 12 20:59:01 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 88F3026BA2D; Thu, 12 Mar 2020 20:59: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dh5K1xPYz3Qxn; Thu, 12 Mar 2020 20:59: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 2BC582B1D6; Thu, 12 Mar 2020 20:59:01 +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 02CKx1Rc084597; Thu, 12 Mar 2020 20:59:01 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CKx1mM084596; Thu, 12 Mar 2020 20:59:01 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202003122059.02CKx1mM084596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Thu, 12 Mar 2020 20:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358921 - stable/12/sys/dev/hwpmc X-SVN-Group: stable-12 X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: stable/12/sys/dev/hwpmc X-SVN-Commit-Revision: 358921 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 20:59:01 -0000 Author: mmacy Date: Thu Mar 12 20:59:00 2020 New Revision: 358921 URL: https://svnweb.freebsd.org/changeset/base/358921 Log: Fix sample check in hwpmc Don't drop samples with callchain pending Tested by: mjg@ MFC of r353483 Modified: stable/12/sys/dev/hwpmc/hwpmc_mod.c Modified: stable/12/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- stable/12/sys/dev/hwpmc/hwpmc_mod.c Thu Mar 12 20:51:04 2020 (r358920) +++ stable/12/sys/dev/hwpmc/hwpmc_mod.c Thu Mar 12 20:59:00 2020 (r358921) @@ -4828,7 +4828,7 @@ pmc_capture_user_callchain(int cpu, int ring, struct t nfree++; #endif if (ps->ps_td != td || - ps->ps_nsamples == PMC_USER_CALLCHAIN_PENDING || + ps->ps_nsamples != PMC_USER_CALLCHAIN_PENDING || ps->ps_pmc->pm_state != PMC_STATE_RUNNING) continue; From owner-svn-src-stable-12@freebsd.org Fri Mar 13 01:05:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C8D9527053E; Fri, 13 Mar 2020 01:05:42 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dnYy5jK2z4ZWC; Fri, 13 Mar 2020 01:05:42 +0000 (UTC) (envelope-from mm@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 BB0832DFD2; Fri, 13 Mar 2020 01:05:42 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02D15gdo033418; Fri, 13 Mar 2020 01:05:42 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D15eu0033405; Fri, 13 Mar 2020 01:05:40 GMT (envelope-from mm@FreeBSD.org) Message-Id: <202003130105.02D15eu0033405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Fri, 13 Mar 2020 01:05:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358925 - in stable/12/contrib/libarchive: cpio cpio/test libarchive libarchive/test X-SVN-Group: stable-12 X-SVN-Commit-Author: mm X-SVN-Commit-Paths: in stable/12/contrib/libarchive: cpio cpio/test libarchive libarchive/test X-SVN-Commit-Revision: 358925 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 01:05:42 -0000 Author: mm Date: Fri Mar 13 01:05:40 2020 New Revision: 358925 URL: https://svnweb.freebsd.org/changeset/base/358925 Log: MFC r358533: Sync libarchive with vendor. Relevant vendor changes: Issue #1257: Add testcase for ZIPX files with LZMA_STREAM_END marker PR #1331: cpio.5: fix hard link description Issue #1335: archive_read.c: fix UBSan warning about undefined behavior Issue #1338: XAR reader: fix UBSan warning about undefined behavior Issue #1339: bsdcpio_test: fix datatype in from_hex() Issue #1341: Safe writes: delete temporary file if rename fails. Issue #1341: Safe writes: improve error handling Added: stable/12/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu - copied unchanged from r358533, head/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu Modified: stable/12/contrib/libarchive/cpio/cpio.c stable/12/contrib/libarchive/cpio/cpio.h stable/12/contrib/libarchive/cpio/test/test_format_newc.c stable/12/contrib/libarchive/libarchive/archive_read.c stable/12/contrib/libarchive/libarchive/archive_read_open_filename.c stable/12/contrib/libarchive/libarchive/archive_read_support_format_xar.c stable/12/contrib/libarchive/libarchive/archive_util.c stable/12/contrib/libarchive/libarchive/archive_write_disk_posix.c stable/12/contrib/libarchive/libarchive/archive_write_set_format_xar.c stable/12/contrib/libarchive/libarchive/cpio.5 stable/12/contrib/libarchive/libarchive/test/test_read_format_zip.c Modified: stable/12/contrib/libarchive/cpio/cpio.c ============================================================================== --- stable/12/contrib/libarchive/cpio/cpio.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/cpio/cpio.c Fri Mar 13 01:05:40 2020 (r358925) @@ -737,7 +737,7 @@ file_to_archive(struct cpio *cpio, const char *srcpath */ destpath = srcpath; if (cpio->destdir) { - len = strlen(cpio->destdir) + strlen(srcpath) + 8; + len = cpio->destdir_len + strlen(srcpath) + 8; if (len >= cpio->pass_destpath_alloc) { while (len >= cpio->pass_destpath_alloc) { cpio->pass_destpath_alloc += 512; @@ -1228,15 +1228,14 @@ mode_pass(struct cpio *cpio, const char *destdir) struct lafe_line_reader *lr; const char *p; int r; - size_t destdir_len; /* Ensure target dir has a trailing '/' to simplify path surgery. */ - destdir_len = strlen(destdir); - cpio->destdir = malloc(destdir_len + 8); - memcpy(cpio->destdir, destdir, destdir_len); - if (destdir_len == 0 || destdir[destdir_len - 1] != '/') - cpio->destdir[destdir_len++] = '/'; - cpio->destdir[destdir_len++] = '\0'; + cpio->destdir_len = strlen(destdir); + cpio->destdir = malloc(cpio->destdir_len + 8); + memcpy(cpio->destdir, destdir, cpio->destdir_len); + if (cpio->destdir_len == 0 || destdir[cpio->destdir_len - 1] != '/') + cpio->destdir[cpio->destdir_len++] = '/'; + cpio->destdir[cpio->destdir_len] = '\0'; cpio->archive = archive_write_disk_new(); if (cpio->archive == NULL) Modified: stable/12/contrib/libarchive/cpio/cpio.h ============================================================================== --- stable/12/contrib/libarchive/cpio/cpio.h Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/cpio/cpio.h Fri Mar 13 01:05:40 2020 (r358925) @@ -64,6 +64,7 @@ struct cpio { int option_numeric_uid_gid; /* -n */ int option_rename; /* -r */ char *destdir; + size_t destdir_len; size_t pass_destpath_alloc; char *pass_destpath; int uid_override; Modified: stable/12/contrib/libarchive/cpio/test/test_format_newc.c ============================================================================== --- stable/12/contrib/libarchive/cpio/test/test_format_newc.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/cpio/test/test_format_newc.c Fri Mar 13 01:05:40 2020 (r358925) @@ -49,10 +49,11 @@ is_hex(const char *p, size_t l) return (1); } -static int +/* Convert up to 8 hex characters to unsigned 32-bit decimal integer */ +static uint32_t from_hex(const char *p, size_t l) { - int r = 0; + uint32_t r = 0; while (l > 0) { r *= 16; @@ -82,11 +83,11 @@ DEFINE_TEST(test_format_newc) { FILE *list; int r; - int devmajor, devminor, ino, gid; - int uid = -1; + uint32_t devmajor, devminor, ino, gid, uid; time_t t, t2, now; char *p, *e; - size_t s, fs, ns; + size_t s; + uint64_t fs, ns; char result[1024]; assertUmask(0); @@ -199,9 +200,11 @@ DEFINE_TEST(test_format_newc) #else assertEqualInt(0x81a4, from_hex(e + 14, 8)); /* Mode */ #endif - if (uid < 0) - uid = from_hex(e + 22, 8); +#if defined(_WIN32) + uid = from_hex(e + 22, 8); +#else assertEqualInt(from_hex(e + 22, 8), uid); /* uid */ +#endif gid = from_hex(e + 30, 8); /* gid */ assertEqualMem(e + 38, "00000003", 8); /* nlink */ t = from_hex(e + 46, 8); /* mtime */ @@ -215,14 +218,14 @@ DEFINE_TEST(test_format_newc) " first appearance should be empty, so this file size\n" " field should be zero"); assertEqualInt(0, from_hex(e + 54, 8)); /* File size */ - fs = from_hex(e + 54, 8); + fs = (uint64_t)from_hex(e + 54, 8); fs += PAD(fs, 4); devmajor = from_hex(e + 62, 8); /* devmajor */ devminor = from_hex(e + 70, 8); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000006", 8); /* Name size */ - ns = from_hex(e + 94, 8); + ns = (uint64_t)from_hex(e + 94, 8); ns += PAD(ns + 2, 4); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "file1\0", 6); /* Name contents */ @@ -249,14 +252,14 @@ DEFINE_TEST(test_format_newc) " at t2=%#08jx", (intmax_t)t, (intmax_t)t2); assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */ assertEqualMem(e + 54, "00000005", 8); /* File size */ - fs = from_hex(e + 54, 8); + fs = (uint64_t)from_hex(e + 54, 8); fs += PAD(fs, 4); assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */ assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000008", 8); /* Name size */ - ns = from_hex(e + 94, 8); + ns = (uint64_t)from_hex(e + 94, 8); ns += PAD(ns + 2, 4); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "symlink\0\0\0", 10); /* Name contents */ @@ -285,14 +288,14 @@ DEFINE_TEST(test_format_newc) "t2=%#08jx", (intmax_t)t, (intmax_t)t2); assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */ assertEqualMem(e + 54, "00000000", 8); /* File size */ - fs = from_hex(e + 54, 8); + fs = (uint64_t)from_hex(e + 54, 8); fs += PAD(fs, 4); assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */ assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000004", 8); /* Name size */ - ns = from_hex(e + 94, 8); + ns = (uint64_t)from_hex(e + 94, 8); ns += PAD(ns + 2, 4); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "dir\0\0\0", 6); /* Name contents */ @@ -319,14 +322,14 @@ DEFINE_TEST(test_format_newc) "t2=%#08jx", (intmax_t)t, (intmax_t)t2); assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */ assertEqualInt(10, from_hex(e + 54, 8)); /* File size */ - fs = from_hex(e + 54, 8); + fs = (uint64_t)from_hex(e + 54, 8); fs += PAD(fs, 4); assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */ assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000009", 8); /* Name size */ - ns = from_hex(e + 94, 8); + ns = (uint64_t)from_hex(e + 94, 8); ns += PAD(ns + 2, 4); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "hardlink\0\0", 10); /* Name contents */ Modified: stable/12/contrib/libarchive/libarchive/archive_read.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/archive_read.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/archive_read.c Fri Mar 13 01:05:40 2020 (r358925) @@ -892,15 +892,16 @@ archive_read_data(struct archive *_a, void *buff, size len = a->read_data_remaining; if (len > s) len = s; - if (len) + if (len) { memcpy(dest, a->read_data_block, len); - s -= len; - a->read_data_block += len; - a->read_data_remaining -= len; - a->read_data_output_offset += len; - a->read_data_offset += len; - dest += len; - bytes_read += len; + s -= len; + a->read_data_block += len; + a->read_data_remaining -= len; + a->read_data_output_offset += len; + a->read_data_offset += len; + dest += len; + bytes_read += len; + } } } a->read_data_is_posix_read = 0; Modified: stable/12/contrib/libarchive/libarchive/archive_read_open_filename.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/archive_read_open_filename.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/archive_read_open_filename.c Fri Mar 13 01:05:40 2020 (r358925) @@ -221,7 +221,9 @@ file_open(struct archive *a, void *client_data) struct read_file_data *mine = (struct read_file_data *)client_data; void *buffer; const char *filename = NULL; +#if defined(_WIN32) && !defined(__CYGWIN__) const wchar_t *wfilename = NULL; +#endif int fd = -1; int is_disk_like = 0; #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) @@ -281,10 +283,12 @@ file_open(struct archive *a, void *client_data) #endif } if (fstat(fd, &st) != 0) { +#if defined(_WIN32) && !defined(__CYGWIN__) if (mine->filename_type == FNT_WCS) archive_set_error(a, errno, "Can't stat '%S'", wfilename); else +#endif archive_set_error(a, errno, "Can't stat '%s'", filename); goto fail; Modified: stable/12/contrib/libarchive/libarchive/archive_read_support_format_xar.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/archive_read_support_format_xar.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/archive_read_support_format_xar.c Fri Mar 13 01:05:40 2020 (r358925) @@ -458,6 +458,11 @@ archive_read_support_format_xar(struct archive *_a) return (ARCHIVE_FATAL); } + /* initialize xar->file_queue */ + xar->file_queue.allocated = 0; + xar->file_queue.used = 0; + xar->file_queue.files = NULL; + r = __archive_read_register_format(a, xar, "xar", @@ -1221,10 +1226,12 @@ heap_add_entry(struct archive_read *a, /* Expand our pending files list as necessary. */ if (heap->used >= heap->allocated) { struct xar_file **new_pending_files; - int new_size = heap->allocated * 2; + int new_size; if (heap->allocated < 1024) new_size = 1024; + else + new_size = heap->allocated * 2; /* Overflow might keep us from growing the list. */ if (new_size <= heap->allocated) { archive_set_error(&a->archive, @@ -1238,9 +1245,11 @@ heap_add_entry(struct archive_read *a, ENOMEM, "Out of memory"); return (ARCHIVE_FATAL); } - memcpy(new_pending_files, heap->files, - heap->allocated * sizeof(new_pending_files[0])); - free(heap->files); + if (heap->allocated) { + memcpy(new_pending_files, heap->files, + heap->allocated * sizeof(new_pending_files[0])); + free(heap->files); + } heap->files = new_pending_files; heap->allocated = new_size; } Modified: stable/12/contrib/libarchive/libarchive/archive_util.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/archive_util.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/archive_util.c Fri Mar 13 01:05:40 2020 (r358925) @@ -365,6 +365,7 @@ __archive_mktempx(const char *tmpdir, wchar_t *templat } fd = _open_osfhandle((intptr_t)h, _O_BINARY | _O_RDWR); if (fd == -1) { + la_dosmaperr(GetLastError()); CloseHandle(h); goto exit_tmpfile; } else Modified: stable/12/contrib/libarchive/libarchive/archive_write_disk_posix.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/archive_write_disk_posix.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/archive_write_disk_posix.c Fri Mar 13 01:05:40 2020 (r358925) @@ -1856,8 +1856,9 @@ finish_metadata: if (a->tmpname) { if (rename(a->tmpname, a->name) == -1) { archive_set_error(&a->archive, errno, - "rename failed"); - ret = ARCHIVE_FATAL; + "Failed to rename temporary file"); + ret = ARCHIVE_FAILED; + unlink(a->tmpname); } a->tmpname = NULL; } @@ -2144,8 +2145,11 @@ restore_entry(struct archive_write_disk *a) if ((a->flags & ARCHIVE_EXTRACT_SAFE_WRITES) && S_ISREG(a->st.st_mode)) { /* Use a temporary file to extract */ - if ((a->fd = la_mktemp(a)) == -1) + if ((a->fd = la_mktemp(a)) == -1) { + archive_set_error(&a->archive, errno, + "Can't create temporary file"); return ARCHIVE_FAILED; + } a->pst = NULL; en = 0; } else { Modified: stable/12/contrib/libarchive/libarchive/archive_write_set_format_xar.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/archive_write_set_format_xar.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/archive_write_set_format_xar.c Fri Mar 13 01:05:40 2020 (r358925) @@ -681,7 +681,8 @@ xar_write_data(struct archive_write *a, const void *bu { struct xar *xar; enum la_zaction run; - size_t size, rsize; + size_t size = 0; + size_t rsize; int r; xar = (struct xar *)a->format_data; Modified: stable/12/contrib/libarchive/libarchive/cpio.5 ============================================================================== --- stable/12/contrib/libarchive/libarchive/cpio.5 Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/cpio.5 Fri Mar 13 01:05:40 2020 (r358925) @@ -244,7 +244,7 @@ Note that this format supports only 4 gigabyte files ( older ASCII format, which supports 8 gigabyte files). .Pp In this format, hardlinked files are handled by setting the -filesize to zero for each entry except the last one that +filesize to zero for each entry except the first one that appears in the archive. .Ss New CRC Format The CRC format is identical to the new ASCII format described Modified: stable/12/contrib/libarchive/libarchive/test/test_read_format_zip.c ============================================================================== --- stable/12/contrib/libarchive/libarchive/test/test_read_format_zip.c Fri Mar 13 00:12:15 2020 (r358924) +++ stable/12/contrib/libarchive/libarchive/test/test_read_format_zip.c Fri Mar 13 01:05:40 2020 (r358925) @@ -916,3 +916,53 @@ DEFINE_TEST(test_read_format_zip_lzma_alone_leak) * suite under Valgrind or ASan, the test runner won't return with * exit code 0 in case if a memory leak. */ } + +DEFINE_TEST(test_read_format_zip_lzma_stream_end) +{ + const char *refname = "test_read_format_zip_lzma_stream_end.zipx"; + struct archive *a; + struct archive_entry *ae; + + assert((a = archive_read_new()) != NULL); + if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) { + skipping("lzma reading not fully supported on this platform"); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + return; + } + extract_reference_file(refname); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 37)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("ZIP 6.3 (lzma)", archive_format_name(a)); + assertEqualString("vimrc", archive_entry_pathname(ae)); + assertEqualIntA(a, 0, extract_one(a, ae, 0xBA8E3BAA)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); +} + +DEFINE_TEST(test_read_format_zip_lzma_stream_end_blockread) +{ + const char *refname = "test_read_format_zip_lzma_stream_end.zipx"; + struct archive *a; + struct archive_entry *ae; + + assert((a = archive_read_new()) != NULL); + if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) { + skipping("lzma reading not fully supported on this platform"); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + return; + } + extract_reference_file(refname); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 37)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("ZIP 6.3 (lzma)", archive_format_name(a)); + assertEqualString("vimrc", archive_entry_pathname(ae)); + assertEqualIntA(a, 0, extract_one_using_blocks(a, 13, 0xBA8E3BAA)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); +} Copied: stable/12/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu (from r358533, head/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu Fri Mar 13 01:05:40 2020 (r358925, copy of r358533, head/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu) @@ -0,0 +1,19 @@ +begin 664 test_read_format_zip_lzma_stream_end.zipx +M4$L#!#\``@`.`#TQD4VJ.XZZ/@(``)`#```%````=FEM)82Q1PWAL +M+U`,N0L_$]^&650C/X$D6#4QFD$\A/"_![4!O/5O/!KH`WCQ*4?T2*]4P#/D +M0'9I?EZG=N69Z0V;H0I=CP*$?".I\ +MGMG/80.A'^W>R4J'S/CZ%P`8`>F=R>R&R$2T@EM#X)"OQH1?A7,`:4IU9WV! +M#2W*DXT',;.4YIN4A:-X)O=IREL201ZSOC=YSAU[C4-::/YV8\)%"L17+>VC +M%/'B]ZCQN$2(Q*9*\KJZ`Y131`]5C&G';@1S-QES_RZF!2OX45@58+??ES%( +MUJ<(\`11M$NO)HK#/MK-9RT"15.2I:IZN8VTM1_?$G\L#BH67]$S%[4 +M%C-$\Q<+./&HV](4,7)OL-@C^M0F"2O!0N$OHOW54H87^QLBQVH*D%A<#SI% +M/#+-5U(W';:KC)RE>0Y^5YI!RECQNR"R4.UW9IR!@:B!UB8?_D5$FT8YCJHJ +M2[2"-&-_D2BJ6#XK[6G=%K"%;'^-+0]FHCY4ER#`^ Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8027C27783C; Fri, 13 Mar 2020 08:41:29 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dzgs0fTdz3DB5; Fri, 13 Mar 2020 08:41:29 +0000 (UTC) (envelope-from 0mp@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 D1157336B; Fri, 13 Mar 2020 08:41:28 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02D8fSXm008004; Fri, 13 Mar 2020 08:41:28 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D8fSKH008003; Fri, 13 Mar 2020 08:41:28 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003130841.02D8fSKH008003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 08:41:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358929 - stable/12/bin/ps X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/bin/ps X-SVN-Commit-Revision: 358929 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 08:41:29 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 08:41:28 2020 New Revision: 358929 URL: https://svnweb.freebsd.org/changeset/base/358929 Log: MFC r339962: Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24047 ps(1): Pet mandoc and igor - Use Xr to reference other manual pages. - Reference execve(2) instead of exec(2) as exec(2) does not exist. - Remove the deprecated "Tn" macro. - Improve the formatting of the etime description. Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17780 Modified: stable/12/bin/ps/ps.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/ps/ps.1 ============================================================================== --- stable/12/bin/ps/ps.1 Fri Mar 13 01:27:37 2020 (r358928) +++ stable/12/bin/ps/ps.1 Fri Mar 13 08:41:28 2020 (r358929) @@ -346,7 +346,7 @@ the include file .It Dv "P_HWPMC" Ta No "0x800000" Ta "Process is using HWPMCs" .It Dv "P_JAILED" Ta No "0x1000000" Ta "Process is in jail" .It Dv "P_TOTAL_STOP" Ta No "0x2000000" Ta "Stopped for system suspend" -.It Dv "P_INEXEC" Ta No "0x4000000" Ta "Process is in execve()" +.It Dv "P_INEXEC" Ta No "0x4000000" Ta Process is in Xr execve 2 .It Dv "P_STATCHILD" Ta No "0x8000000" Ta "Child process stopped or exited" .It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory" .It Dv "P_SWAPPINGOUT" Ta No "0x20000000" Ta "Process is being swapped out" @@ -361,8 +361,8 @@ the include file .In sys/proc.h : .Bl -column P2_INHERIT_PROTECTED 0x00000001 .It Dv "P2_INHERIT_PROTECTED" Ta No "0x00000001" Ta "New children get P_PROTECTED" -.It Dv "P2_NOTRACE" Ta No "0x00000002" Ta "No ptrace(2) attach or coredumps" -.It Dv "P2_NOTRACE_EXEC" Ta No "0x00000004" Ta "Keep P2_NOPTRACE on exec(2)" +.It Dv "P2_NOTRACE" Ta No "0x00000002" Ta "No" Xr ptrace 2 attach or coredumps +.It Dv "P2_NOTRACE_EXEC" Ta No "0x00000004" Ta Keep P2_NOPTRACE on Xr execve 2 .It Dv "P2_AST_SU" Ta No "0x00000008" Ta "Handles SU ast for kthreads" .It Dv "P2_PTRACE_FSTP" Ta No "0x00000010" Ta "SIGSTOP from PT_ATTACH not yet handled" .El @@ -453,8 +453,7 @@ Marks a process which is in The hostname of the prison can be found in .Pa /proc/ Ns Ao Ar pid Ac Ns Pa /status . .It Li L -The process has pages locked in core (for example, for raw -.Tn I/O ) . +The process has pages locked in core (for example, for raw I/O). .It Li N The process has reduced CPU scheduling priority (see .Xr setpriority 2 ) . @@ -553,9 +552,11 @@ data size (in Kbytes) system-call emulation environment (ABI) .It Cm etime elapsed running time, format +.Do .Op days- Ns -.Op hours: Ns -minutes:seconds. +.Op hours\&: Ns +minutes:seconds +.Dc .It Cm etimes elapsed running time, in decimal integer seconds .It Cm fib From owner-svn-src-stable-12@freebsd.org Fri Mar 13 08:49:07 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 536A9277B05; Fri, 13 Mar 2020 08:49:07 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dzrf6kCwz447L; Fri, 13 Mar 2020 08:49:06 +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 B1DF836A7; Fri, 13 Mar 2020 08:49:06 +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 02D8n6nw009188; Fri, 13 Mar 2020 08:49:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D8n6Pr009187; Fri, 13 Mar 2020 08:49:06 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003130849.02D8n6Pr009187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 13 Mar 2020 08:49:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358931 - stable/12/sys/ofed/drivers/infiniband/ulp/ipoib X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/ofed/drivers/infiniband/ulp/ipoib X-SVN-Commit-Revision: 358931 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 08:49:07 -0000 Author: hselasky Date: Fri Mar 13 08:49:06 2020 New Revision: 358931 URL: https://svnweb.freebsd.org/changeset/base/358931 Log: MFC r358694: Fix some whitespace issues in ipoib. Sponsored by: Mellanox Technologies Modified: stable/12/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c ============================================================================== --- stable/12/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Fri Mar 13 08:42:46 2020 (r358930) +++ stable/12/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Fri Mar 13 08:49:06 2020 (r358931) @@ -1744,12 +1744,12 @@ module_exit(ipoib_cleanup_module); static int ipoib_evhand(module_t mod, int event, void *arg) { - return (0); + return (0); } static moduledata_t ipoib_mod = { - .name = "ipoib", - .evhand = ipoib_evhand, + .name = "ipoib", + .evhand = ipoib_evhand, }; DECLARE_MODULE(ipoib, ipoib_mod, SI_SUB_LAST, SI_ORDER_ANY); From owner-svn-src-stable-12@freebsd.org Fri Mar 13 08:52:51 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA951277E9E; Fri, 13 Mar 2020 08:52:51 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dzwz2hpvz4F1l; Fri, 13 Mar 2020 08:52:51 +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 4A613389D; Fri, 13 Mar 2020 08:52:51 +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 02D8qpKS015040; Fri, 13 Mar 2020 08:52:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D8qpK4015039; Fri, 13 Mar 2020 08:52:51 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003130852.02D8qpK4015039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 13 Mar 2020 08:52:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358935 - stable/12/sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/sys X-SVN-Commit-Revision: 358935 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 08:52:51 -0000 Author: hselasky Date: Fri Mar 13 08:52:50 2020 New Revision: 358935 URL: https://svnweb.freebsd.org/changeset/base/358935 Log: MFC r358695: Define more subsystem orders. Intended for use with module_init_order() in the LinuxKPI. Sponsored by: Mellanox Technologies Modified: stable/12/sys/sys/kernel.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/sys/kernel.h ============================================================================== --- stable/12/sys/sys/kernel.h Fri Mar 13 08:51:46 2020 (r358934) +++ stable/12/sys/sys/kernel.h Fri Mar 13 08:52:50 2020 (r358935) @@ -182,6 +182,10 @@ enum sysinit_elem_order { SI_ORDER_SECOND = 0x0000001, /* second*/ SI_ORDER_THIRD = 0x0000002, /* third*/ SI_ORDER_FOURTH = 0x0000003, /* fourth*/ + SI_ORDER_FIFTH = 0x0000004, /* fifth*/ + SI_ORDER_SIXTH = 0x0000005, /* sixth*/ + SI_ORDER_SEVENTH = 0x0000006, /* seventh*/ + SI_ORDER_EIGHTH = 0x0000007, /* eighth*/ SI_ORDER_MIDDLE = 0x1000000, /* somewhere in the middle */ SI_ORDER_ANY = 0xfffffff /* last*/ }; From owner-svn-src-stable-12@freebsd.org Fri Mar 13 08:56:11 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E54522580FB; Fri, 13 Mar 2020 08:56:11 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f00q4gYRz4Nd4; Fri, 13 Mar 2020 08:56:11 +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 61EE1390C; Fri, 13 Mar 2020 08:56:11 +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 02D8uBw2015462; Fri, 13 Mar 2020 08:56:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D8uB3L015460; Fri, 13 Mar 2020 08:56:11 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003130856.02D8uB3L015460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 13 Mar 2020 08:56:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358939 - stable/12/sys/compat/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/compat/linux X-SVN-Commit-Revision: 358939 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 08:56:12 -0000 Author: hselasky Date: Fri Mar 13 08:56:10 2020 New Revision: 358939 URL: https://svnweb.freebsd.org/changeset/base/358939 Log: MFC r358838: Add support for the device statistics IOCTL, needed by the coming linux_libusb upgrade. Sponsored by: Mellanox Technologies Modified: stable/12/sys/compat/linux/linux_ioctl.c stable/12/sys/compat/linux/linux_ioctl.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linux/linux_ioctl.c ============================================================================== --- stable/12/sys/compat/linux/linux_ioctl.c Fri Mar 13 08:54:57 2020 (r358938) +++ stable/12/sys/compat/linux/linux_ioctl.c Fri Mar 13 08:56:10 2020 (r358939) @@ -3546,6 +3546,9 @@ linux_ioctl_fbsd_usb(struct thread *td, struct linux_i case FBSD_LUSB_GET_POWER_USAGE: args->cmd = USB_GET_POWER_USAGE; break; + case FBSD_LUSB_DEVICESTATS: + args->cmd = USB_DEVICESTATS; + break; default: error = ENOIOCTL; } Modified: stable/12/sys/compat/linux/linux_ioctl.h ============================================================================== --- stable/12/sys/compat/linux/linux_ioctl.h Fri Mar 13 08:54:57 2020 (r358938) +++ stable/12/sys/compat/linux/linux_ioctl.h Fri Mar 13 08:56:10 2020 (r358939) @@ -741,9 +741,10 @@ #define FBSD_LUSB_FS_OPEN_STREAM 0xffdf #define FBSD_LUSB_GET_DEV_PORT_PATH 0xffde #define FBSD_LUSB_GET_POWER_USAGE 0xffdd +#define FBSD_LUSB_DEVICESTATS 0xffdc #define FBSD_LUSB_MAX 0xffff -#define FBSD_LUSB_MIN 0xffdd +#define FBSD_LUSB_MIN 0xffdc /* * Linux btrfs clone operation From owner-svn-src-stable-12@freebsd.org Fri Mar 13 09:07:03 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 82AAF2588FD; Fri, 13 Mar 2020 09:07:03 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f0FM1F0sz4c6C; Fri, 13 Mar 2020 09:07:03 +0000 (UTC) (envelope-from 0mp@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 8F9E23B4B; Fri, 13 Mar 2020 09:07:02 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02D97211021637; Fri, 13 Mar 2020 09:07:02 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D972ie021636; Fri, 13 Mar 2020 09:07:02 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003130907.02D972ie021636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 09:07:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358943 - stable/12/bin/ps X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/bin/ps X-SVN-Commit-Revision: 358943 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 09:07:03 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 09:07:02 2020 New Revision: 358943 URL: https://svnweb.freebsd.org/changeset/base/358943 Log: MFC r339957: Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24052 ps(1): Add a standard exit status section Reviewed by: bcr, eadler Approved by: krion (mentor) Differential Revision: https://reviews.freebsd.org/D17146 Modified: stable/12/bin/ps/ps.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/ps/ps.1 ============================================================================== --- stable/12/bin/ps/ps.1 Fri Mar 13 09:06:39 2020 (r358942) +++ stable/12/bin/ps/ps.1 Fri Mar 13 09:07:02 2020 (r358943) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd March 13, 2018 +.Dd October 31, 2018 .Dt PS 1 .Os .Sh NAME @@ -751,6 +751,8 @@ attempts to automatically determine the terminal width .It Pa /boot/kernel/kernel default system namelist .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES Display information on all system processes: .Pp From owner-svn-src-stable-12@freebsd.org Fri Mar 13 09:17:05 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 62477258EB7; Fri, 13 Mar 2020 09:17:05 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f0Sx0GnLz40TK; Fri, 13 Mar 2020 09:17:05 +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 CAD593D4C; Fri, 13 Mar 2020 09:17: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 02D9H4Ju028281; Fri, 13 Mar 2020 09:17:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D9H4TA028280; Fri, 13 Mar 2020 09:17:04 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003130917.02D9H4TA028280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 13 Mar 2020 09:17:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358947 - stable/12/lib/libusb X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/lib/libusb X-SVN-Commit-Revision: 358947 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 09:17:05 -0000 Author: hselasky Date: Fri Mar 13 09:17:04 2020 New Revision: 358947 URL: https://svnweb.freebsd.org/changeset/base/358947 Log: MFC r358841: Fix for building libusb under Linux. Sponsored by: Mellanox Technologies Modified: stable/12/lib/libusb/libusb_global_linux.h Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libusb/libusb_global_linux.h ============================================================================== --- stable/12/lib/libusb/libusb_global_linux.h Fri Mar 13 09:15:13 2020 (r358946) +++ stable/12/lib/libusb/libusb_global_linux.h Fri Mar 13 09:17:04 2020 (r358947) @@ -77,4 +77,11 @@ } while (0) #endif +#ifndef TAILQ_FOREACH_SAFE +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + #endif /* _LIBUSB_GLOBAL_LINUX_H_ */ From owner-svn-src-stable-12@freebsd.org Fri Mar 13 09:41:41 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53854259A32; Fri, 13 Mar 2020 09:41:41 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f11J6M9Qz47gn; Fri, 13 Mar 2020 09:41:40 +0000 (UTC) (envelope-from 0mp@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 833D841FB; Fri, 13 Mar 2020 09:41:40 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02D9feXa062551; Fri, 13 Mar 2020 09:41:40 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D9feGc062550; Fri, 13 Mar 2020 09:41:40 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003130941.02D9feGc062550@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 09:41:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358950 - stable/12/share/man/man4 X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/share/man/man4 X-SVN-Commit-Revision: 358950 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 09:41:41 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 09:41:40 2020 New Revision: 358950 URL: https://svnweb.freebsd.org/changeset/base/358950 Log: MFC 339952: Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24054 tpm(4): Add the STANDARDS and HISTORY sections Also, link to the homepage of the BSSSD project, which developed the original driver. Reviewed by: bcr, kevans Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17608 Modified: stable/12/share/man/man4/tpm.4 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/tpm.4 ============================================================================== --- stable/12/share/man/man4/tpm.4 Fri Mar 13 09:18:28 2020 (r358949) +++ stable/12/share/man/man4/tpm.4 Fri Mar 13 09:41:40 2020 (r358950) @@ -15,7 +15,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 15, 2010 +.Dd October 31, 2018 .Dt TPM 4 .Os .Sh NAME @@ -76,6 +76,44 @@ interrupt vector in .Xr intro 4 , .Xr device.hints 5 , .Xr config 8 +.Pp +The homepage of the BSSSD project, which developed the original +.Nm +driver: +.Lk "http://bsssd.sourceforge.net/" . +.Pp +TPM main specification can be found at: +.Lk "https://trustedcomputinggroup.org/resource/tpm-main-specification/" . +.Sh STANDARDS +TPM Main Specification Level 2 Version 1.2: +.Bl -dash +.It +.Rs +.%A ISO/IEC +.%T 11889-1:2009, Information technology -- Trusted Platform Module -- Part 1: Overview +.%U "https://www.iso.org/standard/50970.html" +.Re +.It +.Rs +.%A ISO/IEC +.%T 11889-2:2009, Information technology -- Trusted Platform Module -- Part 2: Design principles +.%U "https://www.iso.org/standard/50971.html" +.Re +.It +.Rs +.%A ISO/IEC +.%T 11889-3:2009, Information technology -- Trusted Platform Module -- Part 3: Structures +.%U "https://www.iso.org/standard/50972.html" +.Re +.El +.Sh HISTORY +The +.Nm +driver +first appeared in +.Fx 8.2 +and was later added to +.Ox 6.1 . .Sh AUTHORS .An -nosplit The From owner-svn-src-stable-12@freebsd.org Fri Mar 13 10:04:55 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A8C425A236; Fri, 13 Mar 2020 10:04:55 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f1X71p1dz42GP; Fri, 13 Mar 2020 10:04:55 +0000 (UTC) (envelope-from 0mp@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 3905F476B; Fri, 13 Mar 2020 10:04:55 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DA4tY7080445; Fri, 13 Mar 2020 10:04:55 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DA4tPA080444; Fri, 13 Mar 2020 10:04:55 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131004.02DA4tPA080444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 10:04:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358952 - stable/12/share/man/man3 X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/share/man/man3 X-SVN-Commit-Revision: 358952 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 10:04:55 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 10:04:54 2020 New Revision: 358952 URL: https://svnweb.freebsd.org/changeset/base/358952 Log: MFC 340001: Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24055 CMSG_DATA(3): Use consistent variable names The description of CMSG_FIRSTHDR used two variables (mhdr and msg) to reference the same thing. Use msghdr consistency across the manual page instead. Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17804 Modified: stable/12/share/man/man3/CMSG_DATA.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man3/CMSG_DATA.3 ============================================================================== --- stable/12/share/man/man3/CMSG_DATA.3 Fri Mar 13 09:41:54 2020 (r358951) +++ stable/12/share/man/man3/CMSG_DATA.3 Fri Mar 13 10:04:54 2020 (r358952) @@ -2,7 +2,7 @@ .\" Public domain, July 3, 2005 .\" .\" $FreeBSD$ -.Dd August 19, 2018 +.Dd November 1, 2018 .Dt CMSG_DATA 3 .Os .Sh NAME @@ -50,10 +50,10 @@ This routine accesses the data portion of the control .Fa cmsg . It ensures proper alignment constraints on the beginning of ancillary data are met. -.It Fn CMSG_FIRSTHDR mhdr +.It Fn CMSG_FIRSTHDR msghdr This routine accesses the first control message attached to the message -.Fa msg . +.Fa msghdr . If no control messages are attached to the message, this routine returns .Dv NULL . @@ -67,11 +67,11 @@ This value is what is normally stored in the of each control message. This routine accounts for any alignment constraints on the beginning of ancillary data. -.It Fn CMSG_NXTHDR mhdr cmsg +.It Fn CMSG_NXTHDR msghdr cmsg This routine returns the location of the control message following .Fa cmsg in the message -.Fa mhdr . +.Fa msghdr . If .Fa cmsg is the last control message in the chain, this routine returns From owner-svn-src-stable-12@freebsd.org Fri Mar 13 10:29:33 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CFB3125AAB3; Fri, 13 Mar 2020 10:29:33 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f24Y2WqFz4mWq; Fri, 13 Mar 2020 10:29:32 +0000 (UTC) (envelope-from 0mp@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 B4FB34B42; Fri, 13 Mar 2020 10:29:32 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DATWhr092672; Fri, 13 Mar 2020 10:29:32 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DATWsO092669; Fri, 13 Mar 2020 10:29:32 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131029.02DATWsO092669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 10:29:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358953 - in stable/12: contrib/smbfs/mount_smbfs contrib/smbfs/smbutil share/man/man5 X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in stable/12: contrib/smbfs/mount_smbfs contrib/smbfs/smbutil share/man/man5 X-SVN-Commit-Revision: 358953 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 10:29:33 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 10:29:31 2020 New Revision: 358953 URL: https://svnweb.freebsd.org/changeset/base/358953 Log: MFC r340031, r340032, r340048: Improve SMB documentation Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24057 smbutil(1): Reference nsmb.conf(5) and mount_smbfs(8) Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17809 mount_smbfs(8): Mention /etc/nsmb.conf, smbutil(1) and nsmb.conf(5) Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17808 nsmb.conf(5): Document the order of configuration loading Based on the comments in /etc/nsmb.conf. Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17810 Modified: stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 stable/12/contrib/smbfs/smbutil/smbutil.1 stable/12/share/man/man5/nsmb.conf.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 ============================================================================== --- stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 Fri Mar 13 10:04:54 2020 (r358952) +++ stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8 Fri Mar 13 10:29:31 2020 (r358953) @@ -136,12 +136,14 @@ are 137. Path to mount point. .El .Sh FILES -.Bl -tag -width ".Pa ~/.nsmbrc" -compact +.Bl -tag -width ".Pa /etc/nsmb.conf" -compact .It Pa ~/.nsmbrc -Keeps static parameters for connections and other information. +Keeps user-specific static parameters for connections and other information. See .Pa /usr/share/examples/smbfs/dot.nsmbrc for details. +.It Pa /etc/nsmb.conf +Keeps system-wide static parameters for connections and other information. .El .Sh EXAMPLES The following example illustrates how to connect to SMB server @@ -163,7 +165,11 @@ for smbfs mounts (the example below does not prompt fo .Pp .Dl "//guest@samba/public /smb/public smbfs rw,noauto,-N 0 0" .Sh SEE ALSO -.Bl -dash +.Xr smbutil 1 , +.Xr nsmb.conf 5 +.Pp +Other resources: +.Bl -dash -compact .It Chapter dedicated to Samba configuration in the .Fx Modified: stable/12/contrib/smbfs/smbutil/smbutil.1 ============================================================================== --- stable/12/contrib/smbfs/smbutil/smbutil.1 Fri Mar 13 10:04:54 2020 (r358952) +++ stable/12/contrib/smbfs/smbutil/smbutil.1 Fri Mar 13 10:29:31 2020 (r358953) @@ -1,5 +1,5 @@ .\" $Id: smbutil.1,v 1.5 2002/04/16 02:48:16 bp Exp $ -.Dd February 14, 2000 +.Dd November 1, 2018 .Dt SMBUTIL 1 .Os .Sh NAME @@ -127,6 +127,9 @@ See .Pa ./examples/dot.nsmbrc for details. .El +.Sh SEE ALSO +.Xr nsmb.conf 5 , +.Xr mount_smbfs 8 .Sh AUTHORS .An Boris Popov Aq bp@butya.kz , .Aq bp@FreeBSD.org Modified: stable/12/share/man/man5/nsmb.conf.5 ============================================================================== --- stable/12/share/man/man5/nsmb.conf.5 Fri Mar 13 10:04:54 2020 (r358952) +++ stable/12/share/man/man5/nsmb.conf.5 Fri Mar 13 10:29:31 2020 (r358953) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 24, 2016 +.Dd November 2, 2018 .Dt NSMB.CONF 5 .Os .Sh NAME @@ -40,6 +40,21 @@ file contains information about the computers, users, or mount points for the .Tn SMB network protocol. +.Pp +The configuration files are loaded in the following order: +.Pp +.Bl -enum -offset indent -width "" -compact +.It +.Pa ~/.nsmbrc +.It +.Pa /etc/nsmb.conf +.El +.Pp +As a result, +.Pa /etc/nsmb.conf +settings +override those in +.Pa ~/.nsmbrc . .Pp The configuration hierarchy is made up of several sections, each section containing a few or several lines of parameters From owner-svn-src-stable-12@freebsd.org Fri Mar 13 11:27:30 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1FAA25C08F; Fri, 13 Mar 2020 11:27:30 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f3MQ39zVz3K7R; Fri, 13 Mar 2020 11:27:30 +0000 (UTC) (envelope-from 0mp@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 53E3D56C5; Fri, 13 Mar 2020 11:27:30 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DBRUbI028232; Fri, 13 Mar 2020 11:27:30 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DBRTTS028228; Fri, 13 Mar 2020 11:27:29 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131127.02DBRTTS028228@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 11:27:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358955 - in stable/12: etc/mtree usr.sbin/mixer usr.sbin/mixer/tests X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in stable/12: etc/mtree usr.sbin/mixer usr.sbin/mixer/tests X-SVN-Commit-Revision: 358955 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 11:27:30 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 11:27:29 2020 New Revision: 358955 URL: https://svnweb.freebsd.org/changeset/base/358955 Log: MFC 351481, 357619: Approved by: bcr (mentor), hselasky (src) Differential Revision: https://reviews.freebsd.org/D24058 mixer(8): Report an error if the passed value is an empty string This patch fixes a bug that made the mixer command enter an infinite loop when instructed to set the value of a device to an empty string (e.g., `mixer vol ""`). Additionally, some tests for mixer(8) are being added. PR: 240039 Reviewed by: hselasky, mav Approved by: src (hselasky, mav) Differential Revision: https://reviews.freebsd.org/D21409 mixer: call the cleanup function in a test The set_empty_value test has a cleanup function, but is not called. Fix it Reviewed by: 0mp Approved by: kp Differential Revision: https://reviews.freebsd.org/D23498 Added: stable/12/usr.sbin/mixer/tests/ - copied from r351481, head/usr.sbin/mixer/tests/ Modified: stable/12/etc/mtree/BSD.tests.dist stable/12/usr.sbin/mixer/Makefile stable/12/usr.sbin/mixer/mixer.c stable/12/usr.sbin/mixer/tests/mixer_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/etc/mtree/BSD.tests.dist ============================================================================== --- stable/12/etc/mtree/BSD.tests.dist Fri Mar 13 11:07:48 2020 (r358954) +++ stable/12/etc/mtree/BSD.tests.dist Fri Mar 13 11:27:29 2020 (r358955) @@ -817,6 +817,8 @@ .. link .. + mixer + .. mkdir .. mkfifo Modified: stable/12/usr.sbin/mixer/Makefile ============================================================================== --- stable/12/usr.sbin/mixer/Makefile Fri Mar 13 11:07:48 2020 (r358954) +++ stable/12/usr.sbin/mixer/Makefile Fri Mar 13 11:27:29 2020 (r358955) @@ -1,6 +1,11 @@ # $FreeBSD$ +.include + PROG= mixer MAN= mixer.8 + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include Modified: stable/12/usr.sbin/mixer/mixer.c ============================================================================== --- stable/12/usr.sbin/mixer/mixer.c Fri Mar 13 11:07:48 2020 (r358954) +++ stable/12/usr.sbin/mixer/mixer.c Fri Mar 13 11:27:29 2020 (r358955) @@ -241,6 +241,11 @@ main(int argc, char *argv[]) lrel = rrel = 0; if (argc > 1) { m = sscanf(argv[1], "%7[^:]:%7s", lstr, rstr); + if (m == EOF) { + warnx("invalid value: %s", argv[1]); + dusage = 1; + break; + } if (m > 0) { if (*lstr == '+' || *lstr == '-') lrel = rrel = 1; Modified: stable/12/usr.sbin/mixer/tests/mixer_test.sh ============================================================================== --- head/usr.sbin/mixer/tests/mixer_test.sh Sun Aug 25 17:55:31 2019 (r351481) +++ stable/12/usr.sbin/mixer/tests/mixer_test.sh Fri Mar 13 11:27:29 2020 (r358955) @@ -93,7 +93,7 @@ S_flag_cleanup() restore_mixer_vol } -atf_test_case set_empty_value +atf_test_case set_empty_value cleanup set_empty_value_head() { atf_set "descr" "Verify that mixer returns when the provided " \ From owner-svn-src-stable-12@freebsd.org Fri Mar 13 13:06:43 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0707725FF2E; Fri, 13 Mar 2020 13:06:43 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f5Yt4dc4z4KNM; Fri, 13 Mar 2020 13:06:42 +0000 (UTC) (envelope-from 0mp@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 5BBAE691E; Fri, 13 Mar 2020 13:06:42 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DD6gIn088174; Fri, 13 Mar 2020 13:06:42 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DD6gfX088173; Fri, 13 Mar 2020 13:06:42 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131306.02DD6gfX088173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 13:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358956 - stable/12/etc/mtree X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/etc/mtree X-SVN-Commit-Revision: 358956 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 13:06:43 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 13:06:41 2020 New Revision: 358956 URL: https://svnweb.freebsd.org/changeset/base/358956 Log: MFC 351484: Fix build (head: r351481, stable/12: r358955) Approved by: emaste (src) Modified: stable/12/etc/mtree/BSD.tests.dist Directory Properties: stable/12/ (props changed) Modified: stable/12/etc/mtree/BSD.tests.dist ============================================================================== --- stable/12/etc/mtree/BSD.tests.dist Fri Mar 13 11:27:29 2020 (r358955) +++ stable/12/etc/mtree/BSD.tests.dist Fri Mar 13 13:06:41 2020 (r358956) @@ -817,8 +817,6 @@ .. link .. - mixer - .. mkdir .. mkfifo @@ -1083,6 +1081,8 @@ jail .. makefs + .. + mixer .. newsyslog .. From owner-svn-src-stable-12@freebsd.org Fri Mar 13 13:23:29 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6906226064E; Fri, 13 Mar 2020 13:23:29 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f5xF1sblz44Qh; Fri, 13 Mar 2020 13:23:29 +0000 (UTC) (envelope-from 0mp@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 2E8326CCF; Fri, 13 Mar 2020 13:23:29 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DDNT0I099890; Fri, 13 Mar 2020 13:23:29 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DDNTiB099889; Fri, 13 Mar 2020 13:23:29 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131323.02DDNTiB099889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 13:23:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358957 - stable/12/usr.sbin/bsdinstall X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/usr.sbin/bsdinstall X-SVN-Commit-Revision: 358957 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 13:23:29 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 13:23:28 2020 New Revision: 358957 URL: https://svnweb.freebsd.org/changeset/base/358957 Log: MFC 354967: Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24060 bsdinstall.8: Fix description of DISTRIBUTIONS environment variable Reviewed by: bcr Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D22478 Modified: stable/12/usr.sbin/bsdinstall/bsdinstall.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/bsdinstall/bsdinstall.8 ============================================================================== --- stable/12/usr.sbin/bsdinstall/bsdinstall.8 Fri Mar 13 13:06:41 2020 (r358956) +++ stable/12/usr.sbin/bsdinstall/bsdinstall.8 Fri Mar 13 13:23:28 2020 (r358957) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 4, 2018 +.Dd November 21, 2019 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -260,7 +260,7 @@ Others are set by various interactive user prompts, an overridden when making scripted or customized installers. .Bl -tag -width ".Ev BSDINSTALL_DISTSITE" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base kernel ports". +The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". Default: unset .It Ev BSDINSTALL_DISTDIR The directory in which the distribution files can be found (or to which they From owner-svn-src-stable-12@freebsd.org Fri Mar 13 13:45:28 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6ED6260D37; Fri, 13 Mar 2020 13:45:28 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f6Qc12qhz40Zm; Fri, 13 Mar 2020 13:45:28 +0000 (UTC) (envelope-from 0mp@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 E9C9D70A0; Fri, 13 Mar 2020 13:45:27 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DDjRPg012116; Fri, 13 Mar 2020 13:45:27 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DDjRRg012115; Fri, 13 Mar 2020 13:45:27 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131345.02DDjRRg012115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 13:45:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358958 - stable/12/usr.sbin/bsdinstall X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/usr.sbin/bsdinstall X-SVN-Commit-Revision: 358958 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 13:45:29 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 13:45:27 2020 New Revision: 358958 URL: https://svnweb.freebsd.org/changeset/base/358958 Log: MFC 357638: Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24063 Improve documentation of bootconfig and PARTITIONS - Mention bootconfig target in TARGETS section. - Document PARTITIONS variable, which is only mentioned in the examples, but doesn't have its own point. Submitted by: arrowd@ Reviewed by: bcr Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D22927 Modified: stable/12/usr.sbin/bsdinstall/bsdinstall.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/bsdinstall/bsdinstall.8 ============================================================================== --- stable/12/usr.sbin/bsdinstall/bsdinstall.8 Fri Mar 13 13:23:28 2020 (r358957) +++ stable/12/usr.sbin/bsdinstall/bsdinstall.8 Fri Mar 13 13:45:27 2020 (r358958) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 21, 2019 +.Dd February 6, 2020 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -118,6 +118,8 @@ is set, also configures the network interfaces of the Provides the installer's interactive guided disk partitioner for single-disk installations. Defaults to UFS. +.It Cm bootconfig +Detects an appropriate partition and installs UEFI boot loader files. .It Cm zfsboot Provides an alternative ZFS-only automatic interactive disk partitioner. Creates a single @@ -262,6 +264,15 @@ overridden when making scripted or customized installe .It Ev DISTRIBUTIONS The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". Default: unset +.It Ev PARTITIONS +The partitioning of the disk onto which the system is being installed. +See +.Cm scriptedpart +of +the +.Sx TARGETS +section for format details. +Default: unset .It Ev BSDINSTALL_DISTDIR The directory in which the distribution files can be found (or to which they should be downloaded). @@ -439,6 +450,7 @@ PARTITIONS=ada0 DISTRIBUTIONS="kernel.txz base.txz" #!/bin/sh +gpart bootcode -b /boot/pmbr -p /boot/gptboot -i 1 ada0 sysrc ifconfig_em0=DHCP sysrc sshd_enable=YES pkg install puppet From owner-svn-src-stable-12@freebsd.org Fri Mar 13 16:52:18 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94A3A264306; Fri, 13 Mar 2020 16:52:18 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fBZB2fDtz42lR; Fri, 13 Mar 2020 16:52:18 +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 1E93D930D; Fri, 13 Mar 2020 16:52:18 +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 02DGqHep026313; Fri, 13 Mar 2020 16:52:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DGqHoW026308; Fri, 13 Mar 2020 16:52:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003131652.02DGqHoW026308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 13 Mar 2020 16:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358962 - in stable/12: share/man/man9 sys/kern sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12: share/man/man9 sys/kern sys/sys X-SVN-Commit-Revision: 358962 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 16:52:18 -0000 Author: markj Date: Fri Mar 13 16:52:16 2020 New Revision: 358962 URL: https://svnweb.freebsd.org/changeset/base/358962 Log: MFC r358715: Add COUNTER_U64_SYSINIT() and COUNTER_U64_DEFINE_EARLY(). Modified: stable/12/share/man/man9/counter.9 stable/12/sys/kern/subr_counter.c stable/12/sys/kern/subr_pcpu.c stable/12/sys/sys/counter.h stable/12/sys/sys/kernel.h Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man9/counter.9 ============================================================================== --- stable/12/share/man/man9/counter.9 Fri Mar 13 16:44:48 2020 (r358961) +++ stable/12/share/man/man9/counter.9 Fri Mar 13 16:52:16 2020 (r358962) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 22, 2017 +.Dd March 6, 2020 .Dt COUNTER 9 .Os .Sh NAME @@ -53,6 +53,8 @@ .Fn counter_u64_zero "counter_u64_t c" .Ft int64_t .Fn counter_ratecheck "struct counter_rate *cr" "int64_t limit" +.Fn COUNTER_U64_SYSINIT "counter_u64_t c" +.Fn COUNTER_U64_DEFINE_EARLY "counter_u64_t c" .In sys/sysctl.h .Fn SYSCTL_COUNTER_U64 parent nbr name access ptr descr .Fn SYSCTL_ADD_COUNTER_U64 ctx parent nbr name access ptr descr @@ -142,6 +144,20 @@ If the limit was reached on previous second, but was j then .Fn counter_ratecheck returns number of events since previous reset. +.It Fn COUNTER_U64_SYSINIT c +Define a +.Xr SYSINIT 9 +initializer for the global counter +.Fa c . +.It Fn COUNTER_U64_DEFINE_EARLY c +Define and initialize a global counter +.Fa c . +It is always safe to increment +.Fa c , +though updates prior to the +.Dv SI_SUB_COUNTER +.Xr SYSINIT 9 +event are lost. .It Fn SYSCTL_COUNTER_U64 parent nbr name access ptr descr Declare a static .Xr sysctl 9 @@ -245,6 +261,7 @@ SYSCTL_COUNTER_U64_ARRAY(_debug, OID_AUTO, counter_arr .Xr malloc 9 , .Xr ratecheck 9 , .Xr sysctl 9 , +.Xr SYSINIT 9 , .Xr uma 9 .Sh HISTORY The Modified: stable/12/sys/kern/subr_counter.c ============================================================================== --- stable/12/sys/kern/subr_counter.c Fri Mar 13 16:44:48 2020 (r358961) +++ stable/12/sys/kern/subr_counter.c Fri Mar 13 16:52:16 2020 (r358962) @@ -172,3 +172,21 @@ counter_ratecheck(struct counter_rate *cr, int64_t lim return (val); } + +void +counter_u64_sysinit(void *arg) +{ + counter_u64_t *cp; + + cp = arg; + *cp = counter_u64_alloc(M_WAITOK); +} + +void +counter_u64_sysuninit(void *arg) +{ + counter_u64_t *cp; + + cp = arg; + counter_u64_free(*cp); +} Modified: stable/12/sys/kern/subr_pcpu.c ============================================================================== --- stable/12/sys/kern/subr_pcpu.c Fri Mar 13 16:44:48 2020 (r358961) +++ stable/12/sys/kern/subr_pcpu.c Fri Mar 13 16:52:16 2020 (r358962) @@ -151,7 +151,7 @@ pcpu_zones_startup(void) pcpu_zone_ptr = uma_zcreate("ptr pcpu", sizeof(void *), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU); } -SYSINIT(pcpu_zones, SI_SUB_VM, SI_ORDER_ANY, pcpu_zones_startup, NULL); +SYSINIT(pcpu_zones, SI_SUB_COUNTER, SI_ORDER_FIRST, pcpu_zones_startup, NULL); /* * First-fit extent based allocator for allocating space in the per-cpu Modified: stable/12/sys/sys/counter.h ============================================================================== --- stable/12/sys/sys/counter.h Fri Mar 13 16:44:48 2020 (r358961) +++ stable/12/sys/sys/counter.h Fri Mar 13 16:52:16 2020 (r358962) @@ -74,5 +74,18 @@ struct counter_rate { int64_t counter_ratecheck(struct counter_rate *, int64_t); +#define COUNTER_U64_SYSINIT(c) \ + SYSINIT(c##_counter_sysinit, SI_SUB_COUNTER, \ + SI_ORDER_ANY, counter_u64_sysinit, &c); \ + SYSUNINIT(c##_counter_sysuninit, SI_SUB_COUNTER, \ + SI_ORDER_ANY, counter_u64_sysuninit, &c) + +#define COUNTER_U64_DEFINE_EARLY(c) \ + counter_u64_t __read_mostly c = EARLY_COUNTER; \ + COUNTER_U64_SYSINIT(c) + +void counter_u64_sysinit(void *); +void counter_u64_sysuninit(void *); + #endif /* _KERNEL */ #endif /* ! __SYS_COUNTER_H__ */ Modified: stable/12/sys/sys/kernel.h ============================================================================== --- stable/12/sys/sys/kernel.h Fri Mar 13 16:44:48 2020 (r358961) +++ stable/12/sys/sys/kernel.h Fri Mar 13 16:52:16 2020 (r358962) @@ -91,7 +91,8 @@ enum sysinit_sub_id { SI_SUB_DONE = 0x0000001, /* processed*/ SI_SUB_TUNABLES = 0x0700000, /* establish tunable values */ SI_SUB_COPYRIGHT = 0x0800001, /* first use of console*/ - SI_SUB_VM = 0x1000000, /* virtual memory system init*/ + SI_SUB_VM = 0x1000000, /* virtual memory system init */ + SI_SUB_COUNTER = 0x1100000, /* counter(9) is initialized */ SI_SUB_KMEM = 0x1800000, /* kernel memory*/ SI_SUB_HYPERVISOR = 0x1A40000, /* * Hypervisor detection and From owner-svn-src-stable-12@freebsd.org Fri Mar 13 16:56:09 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2FC48264504; Fri, 13 Mar 2020 16:56:09 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fBfc5ZYHz4Cjx; Fri, 13 Mar 2020 16:56:08 +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 B8B18935E; Fri, 13 Mar 2020 16:56:08 +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 02DGu8T8027286; Fri, 13 Mar 2020 16:56:08 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DGu8Ng027285; Fri, 13 Mar 2020 16:56:08 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003131656.02DGu8Ng027285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 13 Mar 2020 16:56:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358963 - stable/12/sys/powerpc/powerpc X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/powerpc/powerpc X-SVN-Commit-Revision: 358963 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 16:56:09 -0000 Author: markj Date: Fri Mar 13 16:56:08 2020 New Revision: 358963 URL: https://svnweb.freebsd.org/changeset/base/358963 Log: MFC r358718: Remove dead code from the powerpc uma_small_alloc(). Modified: stable/12/sys/powerpc/powerpc/uma_machdep.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/powerpc/powerpc/uma_machdep.c ============================================================================== --- stable/12/sys/powerpc/powerpc/uma_machdep.c Fri Mar 13 16:52:16 2020 (r358962) +++ stable/12/sys/powerpc/powerpc/uma_machdep.c Fri Mar 13 16:56:08 2020 (r358963) @@ -66,11 +66,6 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int return (NULL); pa = VM_PAGE_TO_PHYS(m); - - /* On book-e sizeof(void *) < sizeof(vm_paddr_t) */ - if ((vm_offset_t)pa != pa) - return (NULL); - if (!hw_direct_map) { pmap_kenter(pa, pa); va = (void *)(vm_offset_t)pa; From owner-svn-src-stable-12@freebsd.org Fri Mar 13 17:10:54 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0629D264B64; Fri, 13 Mar 2020 17:10:54 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fBzd5Y0Yz4cpy; Fri, 13 Mar 2020 17:10:53 +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 78FD796EE; Fri, 13 Mar 2020 17:10:53 +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 02DHAram033379; Fri, 13 Mar 2020 17:10:53 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DHArBt033378; Fri, 13 Mar 2020 17:10:53 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202003131710.02DHArBt033378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 13 Mar 2020 17:10:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358964 - stable/12/tests/sys/netpfil/pf X-SVN-Group: stable-12 X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: stable/12/tests/sys/netpfil/pf X-SVN-Commit-Revision: 358964 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 17:10:54 -0000 Author: lwhsu Date: Fri Mar 13 17:10:53 2020 New Revision: 358964 URL: https://svnweb.freebsd.org/changeset/base/358964 Log: MFC r358961: Skip sys.netpfil.pf.nat.exhaust on all platforms as it not only fails on amd64 PR: 244703 Sponsored by: The FreeBSD Foundation Modified: stable/12/tests/sys/netpfil/pf/nat.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/tests/sys/netpfil/pf/nat.sh ============================================================================== --- stable/12/tests/sys/netpfil/pf/nat.sh Fri Mar 13 16:56:08 2020 (r358963) +++ stable/12/tests/sys/netpfil/pf/nat.sh Fri Mar 13 17:10:53 2020 (r358964) @@ -11,8 +11,7 @@ exhaust_head() exhaust_body() { - if [ "$(atf_config_get ci false)" = "true" ] && \ - [ "$(uname -p)" = "amd64" ]; then + if [ "$(atf_config_get ci false)" = "true" ]; then atf_skip "https://bugs.freebsd.org/244703" fi From owner-svn-src-stable-12@freebsd.org Fri Mar 13 20:57:03 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AE925269C5B; Fri, 13 Mar 2020 20:57:03 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fJ0b22lrz4H57; Fri, 13 Mar 2020 20:57:03 +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 CC016C199; Fri, 13 Mar 2020 20:57:02 +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 02DKv2mj071111; Fri, 13 Mar 2020 20:57:02 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DKv2c2071110; Fri, 13 Mar 2020 20:57:02 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202003132057.02DKv2c2071110@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 13 Mar 2020 20:57:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358967 - stable/12/lib/libarchive/tests X-SVN-Group: stable-12 X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: stable/12/lib/libarchive/tests X-SVN-Commit-Revision: 358967 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 20:57:03 -0000 Author: lwhsu Date: Fri Mar 13 20:57:02 2020 New Revision: 358967 URL: https://svnweb.freebsd.org/changeset/base/358967 Log: Complete MFC r358533 Sponsored by: The FreeBSD Foundation Modified: stable/12/lib/libarchive/tests/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libarchive/tests/Makefile ============================================================================== --- stable/12/lib/libarchive/tests/Makefile Fri Mar 13 18:45:36 2020 (r358966) +++ stable/12/lib/libarchive/tests/Makefile Fri Mar 13 20:57:02 2020 (r358967) @@ -595,6 +595,7 @@ ${PACKAGE}FILES+= test_read_format_zip_length_at_end.z ${PACKAGE}FILES+= test_read_format_zip_lzma_alone_leak.zipx.uu ${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu ${PACKAGE}FILES+= test_read_format_zip_lzma_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_stream_end.zipx.uu ${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu ${PACKAGE}FILES+= test_read_format_zip_malformed1.zip.uu ${PACKAGE}FILES+= test_read_format_zip_msdos.zip.uu From owner-svn-src-stable-12@freebsd.org Fri Mar 13 21:45:52 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 000A526AC6A; Fri, 13 Mar 2020 21:45:51 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fK4v3p3nz4HFr; Fri, 13 Mar 2020 21:45:51 +0000 (UTC) (envelope-from np@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 6FE43CA87; Fri, 13 Mar 2020 21:45:51 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DLjpU5000734; Fri, 13 Mar 2020 21:45:51 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DLjpfj000733; Fri, 13 Mar 2020 21:45:51 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003132145.02DLjpfj000733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 13 Mar 2020 21:45:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358969 - stable/12/sys/dev/cxgbe/common X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe/common X-SVN-Commit-Revision: 358969 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 21:45:52 -0000 Author: np Date: Fri Mar 13 21:45:51 2020 New Revision: 358969 URL: https://svnweb.freebsd.org/changeset/base/358969 Log: MFC r354210: cxgbe(4): Use correct size while converting lpacaps32 to native endianness. Modified: stable/12/sys/dev/cxgbe/common/t4_hw.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/common/t4_hw.c ============================================================================== --- stable/12/sys/dev/cxgbe/common/t4_hw.c Fri Mar 13 20:59:02 2020 (r358968) +++ stable/12/sys/dev/cxgbe/common/t4_hw.c Fri Mar 13 21:45:51 2020 (r358969) @@ -8548,7 +8548,7 @@ static void handle_port_info(struct port_info *pi, con lc->supported = be32_to_cpu(p->u.info32.pcaps32); lc->advertising = be32_to_cpu(p->u.info32.acaps32); - lc->lp_advertising = be16_to_cpu(p->u.info32.lpacaps32); + lc->lp_advertising = be32_to_cpu(p->u.info32.lpacaps32); lc->link_ok = (stat & F_FW_PORT_CMD_LSTATUS32) != 0; lc->link_down_rc = G_FW_PORT_CMD_LINKDNRC32(stat); From owner-svn-src-stable-12@freebsd.org Fri Mar 13 22:18:43 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0371826BE4B; Fri, 13 Mar 2020 22:18:43 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fKpp6Kjrz4QPQ; Fri, 13 Mar 2020 22:18:42 +0000 (UTC) (envelope-from np@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 865E5CFFD; Fri, 13 Mar 2020 22:18:42 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DMIgBb020413; Fri, 13 Mar 2020 22:18:42 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DMIfOL020406; Fri, 13 Mar 2020 22:18:41 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003132218.02DMIfOL020406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 13 Mar 2020 22:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358970 - in stable/12/sys: conf dev/cxgbe dev/cxgbe/firmware modules/cxgbe/t4_firmware modules/cxgbe/t5_firmware modules/cxgbe/t6_firmware X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: in stable/12/sys: conf dev/cxgbe dev/cxgbe/firmware modules/cxgbe/t4_firmware modules/cxgbe/t5_firmware modules/cxgbe/t6_firmware X-SVN-Commit-Revision: 358970 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 22:18:43 -0000 Author: np Date: Fri Mar 13 22:18:40 2020 New Revision: 358970 URL: https://svnweb.freebsd.org/changeset/base/358970 Log: MFC r355046, r355579, r355595, and r357793. r355046: cxgbe(4): Update the firmware interface header. This allows the driver to be updated for the next firmware without waiting for it to be released. r355579: cxgbe(4): Update T4/5/6 firmwares to 1.24.11.0. These were obtained from the Chelsio Unified Wire v3.12.0.1 beta release. Note that the firmwares are not uuencoded any more. r355595: cxgbe(4): Simplify the firmware version checks a bit. No functional change. r357793: cxgbe(4): Update T4/5/6 firmwares to 1.24.12.0. Sponsored by: Chelsio Communications Added: stable/12/sys/dev/cxgbe/firmware/t4fw-1.24.12.0.bin - copied unchanged from r357793, head/sys/dev/cxgbe/firmware/t4fw-1.24.12.0.bin stable/12/sys/dev/cxgbe/firmware/t5fw-1.24.12.0.bin - copied unchanged from r357793, head/sys/dev/cxgbe/firmware/t5fw-1.24.12.0.bin stable/12/sys/dev/cxgbe/firmware/t6fw-1.24.12.0.bin - copied unchanged from r357793, head/sys/dev/cxgbe/firmware/t6fw-1.24.12.0.bin Deleted: stable/12/sys/dev/cxgbe/firmware/t4fw-1.23.0.0.bin.uu stable/12/sys/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu stable/12/sys/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu Modified: stable/12/sys/conf/files stable/12/sys/dev/cxgbe/firmware/t4fw_interface.h stable/12/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt stable/12/sys/dev/cxgbe/t4_main.c stable/12/sys/modules/cxgbe/t4_firmware/Makefile stable/12/sys/modules/cxgbe/t5_firmware/Makefile stable/12/sys/modules/cxgbe/t6_firmware/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/conf/files ============================================================================== --- stable/12/sys/conf/files Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/conf/files Fri Mar 13 22:18:40 2020 (r358970) @@ -1471,8 +1471,8 @@ t4fw.fwo optional cxgbe \ no-implicit-rule \ clean "t4fw.fwo" t4fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t4fw-1.23.0.0.bin.uu" \ - compile-with "${NORMAL_FW}" \ + dependency "$S/dev/cxgbe/firmware/t4fw-1.24.12.0.bin" \ + compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t4fw.fw" t5fw_cfg.c optional cxgbe \ @@ -1505,8 +1505,8 @@ t5fw.fwo optional cxgbe \ no-implicit-rule \ clean "t5fw.fwo" t5fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu" \ - compile-with "${NORMAL_FW}" \ + dependency "$S/dev/cxgbe/firmware/t5fw-1.24.12.0.bin" \ + compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t5fw.fw" t6fw_cfg.c optional cxgbe \ @@ -1539,8 +1539,8 @@ t6fw.fwo optional cxgbe \ no-implicit-rule \ clean "t6fw.fwo" t6fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu" \ - compile-with "${NORMAL_FW}" \ + dependency "$S/dev/cxgbe/firmware/t6fw-1.24.12.0.bin" \ + compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t6fw.fw" dev/cxgbe/crypto/t4_crypto.c optional ccr \ Copied: stable/12/sys/dev/cxgbe/firmware/t4fw-1.24.12.0.bin (from r357793, head/sys/dev/cxgbe/firmware/t4fw-1.24.12.0.bin) ============================================================================== Binary file (source and/or target). No diff available. Modified: stable/12/sys/dev/cxgbe/firmware/t4fw_interface.h ============================================================================== --- stable/12/sys/dev/cxgbe/firmware/t4fw_interface.h Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/dev/cxgbe/firmware/t4fw_interface.h Fri Mar 13 22:18:40 2020 (r358970) @@ -142,6 +142,7 @@ enum fw_wr_opcodes { FW_ISCSI_TX_DATA_WR = 0x45, FW_PTP_TX_PKT_WR = 0x46, FW_TLSTX_DATA_WR = 0x68, + FW_TLS_TUNNEL_OFLD_WR = 0x69, FW_CRYPTO_LOOKASIDE_WR = 0x6d, FW_COISCSI_TGT_WR = 0x70, FW_COISCSI_TGT_CONN_WR = 0x71, @@ -2200,6 +2201,11 @@ enum fw_chnet_ifconf_wr_subop { FW_CHNET_IFCONF_WR_SUBOP_ICMP_PING4, FW_CHNET_IFCONF_WR_SUBOP_ICMP_PING6, + FW_CHNET_IFCONF_WR_SUBOP_ICMP_PLD_PING4, + FW_CHNET_IFCONF_WR_SUBOP_ICMP_PLD_PING6, + + FW_CHNET_IFCONF_WR_SUBOP_PMTU6_CLEAR, + FW_CHNET_IFCONF_WR_SUBOP_MAX, }; @@ -2228,7 +2234,8 @@ struct fw_chnet_ifconf_wr { } mac; } u; struct fw_chnet_ifconf_params { - __be32 r0; + __be16 ping_pldsize; + __be16 r0; __be16 vlanid; __be16 mtu; union fw_chnet_ifconf_addr_type { @@ -4080,6 +4087,13 @@ struct fw_crypto_lookaside_wr { (((x) >> S_FW_CRYPTO_LOOKASIDE_WR_HASH_SIZE) & \ M_FW_CRYPTO_LOOKASIDE_WR_HASH_SIZE) +struct fw_tls_tunnel_ofld_wr { + __be32 op_compl; + __be32 flowid_len16; + __be32 plen; + __be32 r4; +}; + /****************************************************************************** * C O M M A N D s *********************/ @@ -4137,6 +4151,7 @@ enum fw_cmd_opcodes { FW_DEVLOG_CMD = 0x25, FW_WATCHDOG_CMD = 0x27, FW_CLIP_CMD = 0x28, + FW_CLIP2_CMD = 0x29, FW_CHNET_IFACE_CMD = 0x26, FW_FCOE_RES_INFO_CMD = 0x31, FW_FCOE_LINK_CMD = 0x32, @@ -4752,6 +4767,22 @@ enum fw_params_mnem { /* * device parameters */ +#define S_FW_PARAMS_PARAM_FILTER_MODE 16 +#define M_FW_PARAMS_PARAM_FILTER_MODE 0xffff +#define V_FW_PARAMS_PARAM_FILTER_MODE(x) \ + ((x) << S_FW_PARAMS_PARAM_FILTER_MODE) +#define G_FW_PARAMS_PARAM_FILTER_MODE(x) \ + (((x) >> S_FW_PARAMS_PARAM_FILTER_MODE) & \ + M_FW_PARAMS_PARAM_FILTER_MODE) + +#define S_FW_PARAMS_PARAM_FILTER_MASK 0 +#define M_FW_PARAMS_PARAM_FILTER_MASK 0xffff +#define V_FW_PARAMS_PARAM_FILTER_MASK(x) \ + ((x) << S_FW_PARAMS_PARAM_FILTER_MASK) +#define G_FW_PARAMS_PARAM_FILTER_MASK(x) \ + (((x) >> S_FW_PARAMS_PARAM_FILTER_MASK) & \ + M_FW_PARAMS_PARAM_FILTER_MASK) + enum fw_params_param_dev { FW_PARAMS_PARAM_DEV_CCLK = 0x00, /* chip core clock in khz */ FW_PARAMS_PARAM_DEV_PORTVEC = 0x01, /* the port vector */ @@ -4799,6 +4830,14 @@ enum fw_params_param_dev { FW_PARAMS_PARAM_DEV_ADD_SMAC = 0x25, FW_PARAMS_PARAM_DEV_HPFILTER_REGION_SUPPORT = 0x26, FW_PARAMS_PARAM_DEV_OPAQUE_VIID_SMT_EXTN = 0x27, + FW_PARAMS_PARAM_DEV_HASHFILTER_WITH_OFLD = 0x28, + FW_PARAMS_PARAM_DEV_DBQ_TIMER = 0x29, + FW_PARAMS_PARAM_DEV_DBQ_TIMERTICK = 0x2A, + FW_PARAMS_PARAM_DEV_NUM_TM_CLASS = 0x2B, + FW_PARAMS_PARAM_DEV_VF_TRVLAN = 0x2C, + FW_PARAMS_PARAM_DEV_TCB_CACHE_FLUSH = 0x2D, + FW_PARAMS_PARAM_DEV_FILTER = 0x2E, + FW_PARAMS_PARAM_DEV_CLIP2_CMD = 0x2F, }; /* @@ -4827,8 +4866,14 @@ enum fw_params_param_dev_diag { FW_PARAM_DEV_DIAG_TMP = 0x00, FW_PARAM_DEV_DIAG_VDD = 0x01, FW_PARAM_DEV_DIAG_MAXTMPTHRESH = 0x02, + FW_PARAM_DEV_DIAG_RESET_TMP_SENSOR = 0x03, }; +enum fw_params_param_dev_filter{ + FW_PARAM_DEV_FILTER_VNIC_MODE = 0x00, + FW_PARAM_DEV_FILTER_MODE_MASK = 0x01, +}; + enum fw_params_param_dev_fwcache { FW_PARAM_DEV_FWCACHE_FLUSH = 0x00, FW_PARAM_DEV_FWCACHE_FLUSHINV = 0x01, @@ -4892,9 +4937,21 @@ enum fw_params_param_pfvf { FW_PARAMS_PARAM_PFVF_PPOD_EDRAM_START = 0x3B, FW_PARAMS_PARAM_PFVF_PPOD_EDRAM_END = 0x3C, FW_PARAMS_PARAM_PFVF_MAX_PKTS_PER_ETH_TX_PKTS_WR = 0x3D, + FW_PARAMS_PARAM_PFVF_GET_SMT_START = 0x3E, + FW_PARAMS_PARAM_PFVF_GET_SMT_SIZE = 0x3F, + FW_PARAMS_PARAM_PFVF_LINK_STATE = 0x40, }; /* + * virtual link state as seen by the specified VF + */ +enum vf_link_states { + VF_LINK_STATE_AUTO = 0x00, + VF_LINK_STATE_ENABLE = 0x01, + VF_LINK_STATE_DISABLE = 0x02, +}; + +/* * dma queue parameters */ enum fw_params_param_dmaq { @@ -4907,6 +4964,7 @@ enum fw_params_param_dmaq { FW_PARAMS_PARAM_DMAQ_EQ_SCHEDCLASS_ETH = 0x12, FW_PARAMS_PARAM_DMAQ_EQ_DCBPRIO_ETH = 0x13, FW_PARAMS_PARAM_DMAQ_EQ_DCA = 0x14, + FW_PARAMS_PARAM_DMAQ_EQ_TIMERIX = 0x15, FW_PARAMS_PARAM_DMAQ_CONM_CTXT = 0x20, FW_PARAMS_PARAM_DMAQ_FLM_DCA = 0x30 }; @@ -4922,6 +4980,7 @@ enum fw_params_param_chnet_flags { FW_PARAMS_PARAM_CHNET_FLAGS_ENABLE_IPV6 = 0x1, FW_PARAMS_PARAM_CHNET_FLAGS_ENABLE_DAD = 0x2, FW_PARAMS_PARAM_CHNET_FLAGS_ENABLE_MLDV2= 0x4, + FW_PARAMS_PARAM_CHNET_FLAGS_ENABLE_IPV6_SLAAC = 0x8, }; #define S_FW_PARAMS_MNEM 24 @@ -5852,7 +5911,7 @@ struct fw_eq_eth_cmd { __be32 dcaen_to_eqsize; __be64 eqaddr; __be32 autoequiqe_to_viid; - __be32 r8_lo; + __be32 timeren_timerix; __be64 r9; }; @@ -6046,6 +6105,19 @@ struct fw_eq_eth_cmd { #define G_FW_EQ_ETH_CMD_VIID(x) \ (((x) >> S_FW_EQ_ETH_CMD_VIID) & M_FW_EQ_ETH_CMD_VIID) +#define S_FW_EQ_ETH_CMD_TIMEREN 3 +#define M_FW_EQ_ETH_CMD_TIMEREN 0x1 +#define V_FW_EQ_ETH_CMD_TIMEREN(x) ((x) << S_FW_EQ_ETH_CMD_TIMEREN) +#define G_FW_EQ_ETH_CMD_TIMEREN(x) \ + (((x) >> S_FW_EQ_ETH_CMD_TIMEREN) & M_FW_EQ_ETH_CMD_TIMEREN) +#define F_FW_EQ_ETH_CMD_TIMEREN V_FW_EQ_ETH_CMD_TIMEREN(1U) + +#define S_FW_EQ_ETH_CMD_TIMERIX 0 +#define M_FW_EQ_ETH_CMD_TIMERIX 0x7 +#define V_FW_EQ_ETH_CMD_TIMERIX(x) ((x) << S_FW_EQ_ETH_CMD_TIMERIX) +#define G_FW_EQ_ETH_CMD_TIMERIX(x) \ + (((x) >> S_FW_EQ_ETH_CMD_TIMERIX) & M_FW_EQ_ETH_CMD_TIMERIX) + struct fw_eq_ctrl_cmd { __be32 op_to_vfn; __be32 alloc_to_len16; @@ -6414,6 +6486,8 @@ struct fw_eq_ofld_cmd { #define G_FW_EQ_OFLD_CMD_EQSIZE(x) \ (((x) >> S_FW_EQ_OFLD_CMD_EQSIZE) & M_FW_EQ_OFLD_CMD_EQSIZE) +/* Following macros present here only to maintain backward + * compatibiity. Driver must not use these anymore */ /* Macros for VIID parsing: VIID - [10:8] PFN, [7] VI Valid, [6:0] VI number */ #define S_FW_VIID_PFN 8 @@ -7125,11 +7199,12 @@ enum fw_port_mdi { #define FW_PORT_CAP32_MDISTRAIGHT 0x00400000UL #define FW_PORT_CAP32_FEC_RS 0x00800000UL #define FW_PORT_CAP32_FEC_BASER_RS 0x01000000UL -#define FW_PORT_CAP32_FEC_RESERVED1 0x02000000UL +#define FW_PORT_CAP32_FEC_NO_FEC 0x02000000UL #define FW_PORT_CAP32_FEC_RESERVED2 0x04000000UL #define FW_PORT_CAP32_FEC_RESERVED3 0x08000000UL #define FW_PORT_CAP32_FORCE_PAUSE 0x10000000UL -#define FW_PORT_CAP32_RESERVED2 0xe0000000UL +#define FW_PORT_CAP32_FORCE_FEC 0x20000000UL +#define FW_PORT_CAP32_RESERVED2 0xc0000000UL #define S_FW_PORT_CAP32_SPEED 0 #define M_FW_PORT_CAP32_SPEED 0xfff @@ -7190,6 +7265,14 @@ enum fw_port_mdi32 { #define CAP32_FC(__cap32) \ (V_FW_PORT_CAP32_FC(M_FW_PORT_CAP32_FC) & __cap32) +static inline bool +fec_supported(uint32_t caps) +{ + + return ((caps & (FW_PORT_CAP32_SPEED_25G | FW_PORT_CAP32_SPEED_50G | + FW_PORT_CAP32_SPEED_100G)) != 0); +} + enum fw_port_action { FW_PORT_ACTION_L1_CFG = 0x0001, FW_PORT_ACTION_L2_CFG = 0x0002, @@ -7226,7 +7309,8 @@ enum fw_port_l2cfg_ctlbf { FW_PORT_L2_CTLBF_OVLAN3 = 0x08, FW_PORT_L2_CTLBF_IVLAN = 0x10, FW_PORT_L2_CTLBF_TXIPG = 0x20, - FW_PORT_L2_CTLBF_MTU = 0x40 + FW_PORT_L2_CTLBF_MTU = 0x40, + FW_PORT_L2_CTLBF_OVLAN_FILT = 0x80, }; enum fw_dcb_app_tlv_sf { @@ -7435,6 +7519,13 @@ struct fw_port_cmd { (((x) >> S_FW_PORT_CMD_IVLAN0) & M_FW_PORT_CMD_IVLAN0) #define F_FW_PORT_CMD_IVLAN0 V_FW_PORT_CMD_IVLAN0(1U) +#define S_FW_PORT_CMD_OVLAN_FILT 2 +#define M_FW_PORT_CMD_OVLAN_FILT 0x1 +#define V_FW_PORT_CMD_OVLAN_FILT(x) ((x) << S_FW_PORT_CMD_OVLAN_FILT) +#define G_FW_PORT_CMD_OVLAN_FILT(x) \ + (((x) >> S_FW_PORT_CMD_OVLAN_FILT) & M_FW_PORT_CMD_OVLAN_FILT) +#define F_FW_PORT_CMD_OVLAN_FILT V_FW_PORT_CMD_OVLAN_FILT(1U) + #define S_FW_PORT_CMD_TXIPG 3 #define M_FW_PORT_CMD_TXIPG 0x1fff #define V_FW_PORT_CMD_TXIPG(x) ((x) << S_FW_PORT_CMD_TXIPG) @@ -8145,7 +8236,7 @@ struct fw_ptp_cmd { __u8 txchan; __be16 absid; __be16 mode; - __be16 r3; + __be16 ptp_rx_ctrl_pkd; } init; struct fw_ptp_ts { __u8 sc; @@ -8164,6 +8255,14 @@ struct fw_ptp_cmd { #define G_FW_PTP_CMD_PORTID(x) \ (((x) >> S_FW_PTP_CMD_PORTID) & M_FW_PTP_CMD_PORTID) +#define S_FW_PTP_CMD_PTP_RX_CTRL 15 +#define M_FW_PTP_CMD_PTP_RX_CTRL 0x1 +#define V_FW_PTP_CMD_PTP_RX_CTRL(x) ((x) << S_FW_PTP_CMD_PTP_RX_CTRL) +#define G_FW_PTP_CMD_PTP_RX_CTRL(x) \ + (((x) >> S_FW_PTP_CMD_PTP_RX_CTRL) & M_FW_PTP_CMD_PTP_RX_CTRL) +#define F_FW_PTP_CMD_PTP_RX_CTRL V_FW_PTP_CMD_PTP_RX_CTRL(1U) + + struct fw_rss_ind_tbl_cmd { __be32 op_to_viid; __be32 retval_len16; @@ -8815,6 +8914,16 @@ struct fw_clip_cmd { #define G_FW_CLIP_CMD_INDEX(x) \ (((x) >> S_FW_CLIP_CMD_INDEX) & M_FW_CLIP_CMD_INDEX) +struct fw_clip2_cmd { + __be32 op_to_write; + __be32 alloc_to_len16; + __be64 ip_hi; + __be64 ip_lo; + __be64 ipm_hi; + __be64 ipm_lo; + __be32 r4[2]; +}; + /****************************************************************************** * F O i S C S I C O M M A N D s **************************************/ @@ -9829,20 +9938,20 @@ enum fw_hdr_chip { (((x) >> S_FW_HDR_FW_VER_BUILD) & M_FW_HDR_FW_VER_BUILD) enum { - T4FW_VERSION_MAJOR = 0x01, - T4FW_VERSION_MINOR = 0x17, - T4FW_VERSION_MICRO = 0x00, - T4FW_VERSION_BUILD = 0x00, + T4FW_VERSION_MAJOR = 1, + T4FW_VERSION_MINOR = 24, + T4FW_VERSION_MICRO = 12, + T4FW_VERSION_BUILD = 0, - T5FW_VERSION_MAJOR = 0x01, - T5FW_VERSION_MINOR = 0x17, - T5FW_VERSION_MICRO = 0x00, - T5FW_VERSION_BUILD = 0x00, + T5FW_VERSION_MAJOR = 1, + T5FW_VERSION_MINOR = 24, + T5FW_VERSION_MICRO = 12, + T5FW_VERSION_BUILD = 0, - T6FW_VERSION_MAJOR = 0x01, - T6FW_VERSION_MINOR = 0x17, - T6FW_VERSION_MICRO = 0x00, - T6FW_VERSION_BUILD = 0x00, + T6FW_VERSION_MAJOR = 1, + T6FW_VERSION_MINOR = 24, + T6FW_VERSION_MICRO = 12, + T6FW_VERSION_BUILD = 0, }; enum { @@ -9880,6 +9989,10 @@ enum { T6FW_HDR_INTFVER_FCOE = 0x00, }; +#define FW_VERSION32(MAJOR, MINOR, MICRO, BUILD) ( \ + V_FW_HDR_FW_VER_MAJOR(MAJOR) | V_FW_HDR_FW_VER_MINOR(MINOR) | \ + V_FW_HDR_FW_VER_MICRO(MICRO) | V_FW_HDR_FW_VER_BUILD(BUILD)) + enum { FW_HDR_MAGIC_RUNTIME = 0x00000000, FW_HDR_MAGIC_BOOTSTRAP = 0x626f6f74, @@ -9918,6 +10031,10 @@ struct fw_ifconf_dhcp_info { __u8 op; __u8 len; __u8 data[270]; +}; + +struct fw_ifconf_ping_info { + __be16 ping_pldsize; }; #endif /* _T4FW_INTERFACE_H_ */ Copied: stable/12/sys/dev/cxgbe/firmware/t5fw-1.24.12.0.bin (from r357793, head/sys/dev/cxgbe/firmware/t5fw-1.24.12.0.bin) ============================================================================== Binary file (source and/or target). No diff available. Copied: stable/12/sys/dev/cxgbe/firmware/t6fw-1.24.12.0.bin (from r357793, head/sys/dev/cxgbe/firmware/t6fw-1.24.12.0.bin) ============================================================================== Binary file (source and/or target). No diff available. Modified: stable/12/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt ============================================================================== --- stable/12/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt Fri Mar 13 22:18:40 2020 (r358970) @@ -95,12 +95,19 @@ sge_timer_value = 5, 10, 20, 50, 100, 200 # SGE_TIMER_VALUE* in usecs reg[0x10c4] = 0x20000000/0x20000000 # GK_CONTROL, enable 5th thread - # Set the SGE Doorbell Queue Timer "tick" to 5us and initialize + # Set the SGE Doorbell Queue Timer "tick" to 50us and initialize # the Timer Table to a default set of values (which are multiples - # of the Timer Tick). + # of the Timer Tick). Note that the set of Tick Multipliers are + # NOT sorted. The Host Drivers are expected to pick amongst them + # for (Tick * Multiplier[i]) values which most closely match the Host + # Drivers' needs. Also, most Host Drivers will be default start + # start with (Tick * Multiplier[0]), so this gives us some flexibility + # in terms of picking a Tick and a default Multiplier somewhere in + # the middle of the achievable set of (Tick * Multiplier[i]) values. + # Thus, the below select for 150us by this default. # - sge_dbq_timertick = 5 - sge_dbq_timer = 1, 2, 3, 5, 7, 9, 12, 16 + sge_dbq_timertick = 50 + sge_dbq_timer = 3, 2, 1, 5, 7, 9, 12, 16 # enable TP_OUT_CONFIG.IPIDSPLITMODE reg[0x7d04] = 0x00010000/0x00010000 @@ -423,10 +430,10 @@ tp_l2t = 3072 tp_ddp = 2 tp_ddp_iscsi = 2 - tp_tls_key = 3 + tp_tls_key = 2 tp_tls_mxrxsize = 17408 # 16384 + 1024, governs max rx data, pm max xfer len, rx coalesce sizes tp_stag = 2 - tp_pbl = 5 + tp_pbl = 7 tp_rq = 7 tp_srq = 128 @@ -471,7 +478,7 @@ nhash = 2048 tp_l2t = 4 protocol = fcoe_initiator - tp_ddp = 2 + tp_ddp = 1 fcoe_nfcf = 16 fcoe_nvnp = 32 fcoe_nssn = 1024 @@ -581,7 +588,7 @@ [fini] version = 0x1425001d - checksum = 0xdbff9437 + checksum = 0x14a022cd # Total resources used by above allocations: # Virtual Interfaces: 104 @@ -592,4 +599,4 @@ # Virtual Functions: 64 # # $FreeBSD$ -# +# \ No newline at end of file Modified: stable/12/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_main.c Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/dev/cxgbe/t4_main.c Fri Mar 13 22:18:40 2020 (r358970) @@ -4096,9 +4096,8 @@ set_params__pre_init(struct adapter *sc) val = 1; rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val); /* firmwares < 1.20.1.0 do not have this param. */ - if (rc == FW_EINVAL && sc->params.fw_vers < - (V_FW_HDR_FW_VER_MAJOR(1) | V_FW_HDR_FW_VER_MINOR(20) | - V_FW_HDR_FW_VER_MICRO(1) | V_FW_HDR_FW_VER_BUILD(0))) { + if (rc == FW_EINVAL && + sc->params.fw_vers < FW_VERSION32(1, 20, 1, 0)) { rc = 0; } if (rc != 0) { @@ -4263,9 +4262,7 @@ get_params__post_init(struct adapter *sc) return (rc); } sc->tids.ntids = val[0]; - if (sc->params.fw_vers < - (V_FW_HDR_FW_VER_MAJOR(1) | V_FW_HDR_FW_VER_MINOR(20) | - V_FW_HDR_FW_VER_MICRO(5) | V_FW_HDR_FW_VER_BUILD(0))) { + if (sc->params.fw_vers < FW_VERSION32(1, 20, 5, 0)) { MPASS(sc->tids.ntids >= sc->tids.nhpftids); sc->tids.ntids -= sc->tids.nhpftids; } @@ -4305,9 +4302,7 @@ get_params__post_init(struct adapter *sc) return (rc); } sc->tids.ntids = val[0]; - if (sc->params.fw_vers < - (V_FW_HDR_FW_VER_MAJOR(1) | V_FW_HDR_FW_VER_MINOR(20) | - V_FW_HDR_FW_VER_MICRO(5) | V_FW_HDR_FW_VER_BUILD(0))) { + if (sc->params.fw_vers < FW_VERSION32(1, 20, 5, 0)) { MPASS(sc->tids.ntids >= sc->tids.nhpftids); sc->tids.ntids -= sc->tids.nhpftids; } Modified: stable/12/sys/modules/cxgbe/t4_firmware/Makefile ============================================================================== --- stable/12/sys/modules/cxgbe/t4_firmware/Makefile Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/modules/cxgbe/t4_firmware/Makefile Fri Mar 13 22:18:40 2020 (r358970) @@ -17,11 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T4FW_VER= 1.23.0.0 -FIRMWS+= t4fw.fw:t4fw:${T4FW_VER} -CLEANFILES+= t4fw.fw - -t4fw.fw: t4fw-${T4FW_VER}.bin.uu - uudecode -o ${.TARGET} ${.ALLSRC} +T4FW_VER= 1.24.12.0 +FIRMWS+= t4fw-${T4FW_VER}.bin:t4fw:${T4FW_VER} .include Modified: stable/12/sys/modules/cxgbe/t5_firmware/Makefile ============================================================================== --- stable/12/sys/modules/cxgbe/t5_firmware/Makefile Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/modules/cxgbe/t5_firmware/Makefile Fri Mar 13 22:18:40 2020 (r358970) @@ -17,11 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T5FW_VER= 1.23.0.0 -FIRMWS+= t5fw.fw:t5fw:${T5FW_VER} -CLEANFILES+= t5fw.fw - -t5fw.fw: t5fw-${T5FW_VER}.bin.uu - uudecode -o ${.TARGET} ${.ALLSRC} +T5FW_VER= 1.24.12.0 +FIRMWS+= t5fw-${T5FW_VER}.bin:t5fw:${T5FW_VER} .include Modified: stable/12/sys/modules/cxgbe/t6_firmware/Makefile ============================================================================== --- stable/12/sys/modules/cxgbe/t6_firmware/Makefile Fri Mar 13 21:45:51 2020 (r358969) +++ stable/12/sys/modules/cxgbe/t6_firmware/Makefile Fri Mar 13 22:18:40 2020 (r358970) @@ -17,11 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T6FW_VER= 1.23.0.0 -FIRMWS+= t6fw.fw:t6fw:${T6FW_VER} -CLEANFILES+= t6fw.fw - -t6fw.fw: t6fw-${T6FW_VER}.bin.uu - uudecode -o ${.TARGET} ${.ALLSRC} +T6FW_VER= 1.24.12.0 +FIRMWS+= t6fw-${T6FW_VER}.bin:t6fw:${T6FW_VER} .include From owner-svn-src-stable-12@freebsd.org Sat Mar 14 00:50:00 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B615F26F79D; Sat, 14 Mar 2020 00:50:00 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fP9N1tz3z3yBN; Sat, 14 Mar 2020 00:50:00 +0000 (UTC) (envelope-from np@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 EFD13EAD3; Sat, 14 Mar 2020 00:49:59 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E0nxc2010562; Sat, 14 Mar 2020 00:49:59 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E0nxs1010560; Sat, 14 Mar 2020 00:49:59 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140049.02E0nxs1010560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 00:49:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358972 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358972 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 00:50:00 -0000 Author: np Date: Sat Mar 14 00:49:59 2020 New Revision: 358972 URL: https://svnweb.freebsd.org/changeset/base/358972 Log: MFC r355059: cxgbe(4): sysctl to reset the temperature/voltage sensor. # sysctl dev...reset_sensor=1 # sysctl dev.t6nex.0.reset_sensor=1 Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/adapter.h stable/12/sys/dev/cxgbe/t4_main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/adapter.h ============================================================================== --- stable/12/sys/dev/cxgbe/adapter.h Sat Mar 14 00:16:15 2020 (r358971) +++ stable/12/sys/dev/cxgbe/adapter.h Sat Mar 14 00:49:59 2020 (r358972) @@ -897,6 +897,7 @@ struct adapter { int last_op_flags; int swintr; + int sensor_resets; }; #define ADAPTER_LOCK(sc) mtx_lock(&(sc)->sc_lock) Modified: stable/12/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 00:16:15 2020 (r358971) +++ stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 00:49:59 2020 (r358972) @@ -646,6 +646,7 @@ static int sysctl_autoneg(SYSCTL_HANDLER_ARGS); static int sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS); static int sysctl_temperature(SYSCTL_HANDLER_ARGS); static int sysctl_vdd(SYSCTL_HANDLER_ARGS); +static int sysctl_reset_sensor(SYSCTL_HANDLER_ARGS); static int sysctl_loadavg(SYSCTL_HANDLER_ARGS); static int sysctl_cctrl(SYSCTL_HANDLER_ARGS); static int sysctl_cim_ibq_obq(SYSCTL_HANDLER_ARGS); @@ -6009,6 +6010,9 @@ t4_sysctls(struct adapter *sc) SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, sc, 0, sysctl_temperature, "I", "chip temperature (in Celsius)"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "reset_sensor", CTLTYPE_INT | + CTLFLAG_RW, sc, 0, sysctl_reset_sensor, "I", + "reset the chip's temperature sensor."); SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "loadavg", CTLTYPE_STRING | CTLFLAG_RD, sc, 0, sysctl_loadavg, "A", @@ -7171,6 +7175,36 @@ sysctl_vdd(SYSCTL_HANDLER_ARGS) } return (sysctl_handle_int(oidp, &sc->params.core_vdd, 0, req)); +} + +static int +sysctl_reset_sensor(SYSCTL_HANDLER_ARGS) +{ + struct adapter *sc = arg1; + int rc, v; + uint32_t param, val; + + v = sc->sensor_resets; + rc = sysctl_handle_int(oidp, &v, 0, req); + if (rc != 0 || req->newptr == NULL || v <= 0) + return (rc); + + if (sc->params.fw_vers < FW_VERSION32(1, 24, 7, 0) || + chip_id(sc) < CHELSIO_T5) + return (ENOTSUP); + + rc = begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4srst"); + if (rc) + return (rc); + param = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) | + V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_DIAG) | + V_FW_PARAMS_PARAM_Y(FW_PARAM_DEV_DIAG_RESET_TMP_SENSOR)); + val = 1; + rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val); + end_synchronized_op(sc, 0); + if (rc == 0) + sc->sensor_resets++; + return (rc); } static int From owner-svn-src-stable-12@freebsd.org Sat Mar 14 00:57:22 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B277C26F9BE; Sat, 14 Mar 2020 00:57:22 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fPKt36MQz4GmZ; Sat, 14 Mar 2020 00:57:22 +0000 (UTC) (envelope-from np@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 1976BECBF; Sat, 14 Mar 2020 00:57:22 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E0vLd6016388; Sat, 14 Mar 2020 00:57:21 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E0vLKT016385; Sat, 14 Mar 2020 00:57:21 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140057.02E0vLKT016385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 00:57:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358973 - in stable/12: share/man/man4 sys/dev/cxgbe sys/dev/cxgbe/common X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: in stable/12: share/man/man4 sys/dev/cxgbe sys/dev/cxgbe/common X-SVN-Commit-Revision: 358973 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 00:57:22 -0000 Author: np Date: Sat Mar 14 00:57:20 2020 New Revision: 358973 URL: https://svnweb.freebsd.org/changeset/base/358973 Log: MFC r355107 and r355597. r355107: cxgbe(4): Allow the driver to specify multiple FECs that the firmware should try in order to link up with the peer. Various FEC variables within the driver can now have multiple bits set instead of being powers of 2. 0 and -1 in the user knobs still mean no FEC and auto (driver decides) respectively for backward compatibility, but no-FEC and auto now have their own bits in the internal representation. There is a new bit that can be set to request the FEC recommended by the cable/transceiver module. Add sysctls to display link related capabilities of the local side as well as the link partner. Note that all this needs a new firmware and the documentation for the driver FEC knobs will be updated after that firmware is added to the driver. r355597: cxgbe(4): Man page updates to go with r355107. Sponsored by: Chelsio Communications Modified: stable/12/share/man/man4/cxgbe.4 stable/12/sys/dev/cxgbe/common/common.h stable/12/sys/dev/cxgbe/common/t4_hw.c stable/12/sys/dev/cxgbe/t4_main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/cxgbe.4 ============================================================================== --- stable/12/share/man/man4/cxgbe.4 Sat Mar 14 00:49:59 2020 (r358972) +++ stable/12/share/man/man4/cxgbe.4 Sat Mar 14 00:57:20 2020 (r358973) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Oct 25, 2019 +.Dd Dec 10, 2019 .Dt CXGBE 4 .Os .Sh NAME @@ -291,10 +291,14 @@ This tunable establishes the default PAUSE settings fo Settings can be displayed and controlled on a per-port basis via the dev..X.pause_settings sysctl. .It Va hw.cxgbe.fec -FEC (Forward Error Correction) settings. +Forward Error Correction settings. +-1 (default) means driver should automatically pick a value. 0 disables FEC. -Bit 0 enables RS FEC, bit 1 enables BASE-R FEC (aka Firecode FEC). -The default is -1 which lets the driver pick a value. +Finer grained control can be achieved by setting individual bits. +Bit 0 enables RS FEC, bit 1 enables BASE-R FEC (aka Firecode FEC), bit +2 enables NO FEC, and bit 6 enables the FEC that is recommended by the +transceiver/cable that is plugged in. +These bits can be set together in any combination. This tunable establishes the default FEC settings for all ports. Settings can be displayed and controlled on a per-port basis via the dev..X.fec sysctl. Modified: stable/12/sys/dev/cxgbe/common/common.h ============================================================================== --- stable/12/sys/dev/cxgbe/common/common.h Sat Mar 14 00:49:59 2020 (r358972) +++ stable/12/sys/dev/cxgbe/common/common.h Sat Mar 14 00:57:20 2020 (r358973) @@ -62,10 +62,21 @@ enum { }; enum { - FEC_NONE = 0, - FEC_RS = 1 << 0, - FEC_BASER_RS = 1 << 1, - FEC_AUTO = 1 << 5, /* M_FW_PORT_CAP32_FEC + 1 */ + /* + * Real FECs. In the same order as the FEC portion of caps32 so that + * the code can do (fec & M_FW_PORT_CAP32_FEC) to get all the real FECs. + */ + FEC_RS = 1 << 0, /* Reed-Solomon */ + FEC_BASER_RS = 1 << 1, /* BASE-R, aka Firecode */ + FEC_NONE = 1 << 2, /* no FEC */ + + /* + * Pseudo FECs that translate to real FECs. The firmware knows nothing + * about these and they start at M_FW_PORT_CAP32_FEC + 1. AUTO should + * be set all by itself. + */ + FEC_AUTO = 1 << 5, + FEC_MODULE = 1 << 6, /* FEC suggested by the cable/transceiver. */ }; enum t4_bar2_qtype { T4_BAR2_QTYPE_EGRESS, T4_BAR2_QTYPE_INGRESS }; @@ -409,20 +420,20 @@ struct trace_params { struct link_config { /* OS-specific code owns all the requested_* fields. */ - int8_t requested_aneg; /* link autonegotiation */ - int8_t requested_fc; /* flow control */ - int8_t requested_fec; /* FEC */ - u_int requested_speed; /* speed (Mbps) */ + int8_t requested_aneg; /* link autonegotiation */ + int8_t requested_fc; /* flow control */ + int8_t requested_fec; /* FEC */ + u_int requested_speed; /* speed (Mbps) */ - uint32_t supported; /* link capabilities */ - uint32_t advertising; /* advertised capabilities */ - uint32_t lp_advertising; /* peer advertised capabilities */ - uint32_t fec_hint; /* use this fec */ - u_int speed; /* actual link speed (Mbps) */ - int8_t fc; /* actual link flow control */ - int8_t fec; /* actual FEC */ - bool link_ok; /* link up? */ - uint8_t link_down_rc; /* link down reason */ + uint32_t pcaps; /* link capabilities */ + uint32_t acaps; /* advertised capabilities */ + uint32_t lpacaps; /* peer advertised capabilities */ + u_int speed; /* actual link speed (Mbps) */ + int8_t fc; /* actual link flow control */ + int8_t fec_hint; /* cable/transceiver recommended fec */ + int8_t fec; /* actual FEC */ + bool link_ok; /* link up? */ + uint8_t link_down_rc; /* link down reason */ }; #include "adapter.h" @@ -881,7 +892,7 @@ port_top_speed(const struct port_info *pi) { /* Mbps -> Gbps */ - return (fwcap_to_speed(pi->link_cfg.supported) / 1000); + return (fwcap_to_speed(pi->link_cfg.pcaps) / 1000); } #endif /* __CHELSIO_COMMON_H */ Modified: stable/12/sys/dev/cxgbe/common/t4_hw.c ============================================================================== --- stable/12/sys/dev/cxgbe/common/t4_hw.c Sat Mar 14 00:49:59 2020 (r358972) +++ stable/12/sys/dev/cxgbe/common/t4_hw.c Sat Mar 14 00:57:20 2020 (r358973) @@ -3841,6 +3841,43 @@ is_bt(struct port_info *pi) pi->port_type == FW_PORT_TYPE_BT_XAUI); } +static int8_t fwcap_to_fec(uint32_t caps, bool unset_means_none) +{ + int8_t fec = 0; + + if ((caps & V_FW_PORT_CAP32_FEC(M_FW_PORT_CAP32_FEC)) == 0) + return (unset_means_none ? FEC_NONE : 0); + + if (caps & FW_PORT_CAP32_FEC_RS) + fec |= FEC_RS; + if (caps & FW_PORT_CAP32_FEC_BASER_RS) + fec |= FEC_BASER_RS; + if (caps & FW_PORT_CAP32_FEC_NO_FEC) + fec |= FEC_NONE; + + return (fec); +} + +/* + * Note that 0 is not translated to NO_FEC. + */ +static uint32_t fec_to_fwcap(int8_t fec) +{ + uint32_t caps = 0; + + /* Only real FECs allowed. */ + MPASS((fec & ~M_FW_PORT_CAP32_FEC) == 0); + + if (fec & FEC_RS) + caps |= FW_PORT_CAP32_FEC_RS; + if (fec & FEC_BASER_RS) + caps |= FW_PORT_CAP32_FEC_BASER_RS; + if (fec & FEC_NONE) + caps |= FW_PORT_CAP32_FEC_NO_FEC; + + return (caps); +} + /** * t4_link_l1cfg - apply link configuration to MAC/PHY * @phy: the PHY to setup @@ -3869,41 +3906,61 @@ int t4_link_l1cfg(struct adapter *adap, unsigned int m if (!(lc->requested_fc & PAUSE_AUTONEG)) fc |= FW_PORT_CAP32_FORCE_PAUSE; - fec = 0; - if (lc->requested_fec == FEC_AUTO) - fec = lc->fec_hint; - else { - if (lc->requested_fec & FEC_RS) - fec |= FW_PORT_CAP32_FEC_RS; - if (lc->requested_fec & FEC_BASER_RS) - fec |= FW_PORT_CAP32_FEC_BASER_RS; - } - if (lc->requested_aneg == AUTONEG_DISABLE) aneg = 0; else if (lc->requested_aneg == AUTONEG_ENABLE) aneg = FW_PORT_CAP32_ANEG; else - aneg = lc->supported & FW_PORT_CAP32_ANEG; + aneg = lc->pcaps & FW_PORT_CAP32_ANEG; if (aneg) { - speed = lc->supported & V_FW_PORT_CAP32_SPEED(M_FW_PORT_CAP32_SPEED); + speed = lc->pcaps & + V_FW_PORT_CAP32_SPEED(M_FW_PORT_CAP32_SPEED); } else if (lc->requested_speed != 0) speed = speed_to_fwcap(lc->requested_speed); else - speed = fwcap_top_speed(lc->supported); + speed = fwcap_top_speed(lc->pcaps); + fec = 0; + if (fec_supported(lc->pcaps)) { + if (lc->requested_fec == FEC_AUTO) { + if (lc->pcaps & FW_PORT_CAP32_FORCE_FEC) { + if (speed & FW_PORT_CAP32_SPEED_100G) { + fec |= FW_PORT_CAP32_FEC_RS; + fec |= FW_PORT_CAP32_FEC_NO_FEC; + } else { + fec |= FW_PORT_CAP32_FEC_RS; + fec |= FW_PORT_CAP32_FEC_BASER_RS; + fec |= FW_PORT_CAP32_FEC_NO_FEC; + } + } else { + /* Set only 1b with old firmwares. */ + fec |= fec_to_fwcap(lc->fec_hint); + } + } else { + fec |= fec_to_fwcap(lc->requested_fec & + M_FW_PORT_CAP32_FEC); + if (lc->requested_fec & FEC_MODULE) + fec |= fec_to_fwcap(lc->fec_hint); + } + + if (lc->pcaps & FW_PORT_CAP32_FORCE_FEC) + fec |= FW_PORT_CAP32_FORCE_FEC; + else if (fec == FW_PORT_CAP32_FEC_NO_FEC) + fec = 0; + } + /* Force AN on for BT cards. */ if (is_bt(adap->port[adap->chan_map[port]])) - aneg = lc->supported & FW_PORT_CAP32_ANEG; + aneg = lc->pcaps & FW_PORT_CAP32_ANEG; rcap = aneg | speed | fc | fec; - if ((rcap | lc->supported) != lc->supported) { + if ((rcap | lc->pcaps) != lc->pcaps) { #ifdef INVARIANTS - CH_WARN(adap, "rcap 0x%08x, pcap 0x%08x\n", rcap, - lc->supported); + CH_WARN(adap, "rcap 0x%08x, pcap 0x%08x, removed 0x%x\n", rcap, + lc->pcaps, rcap & (rcap ^ lc->pcaps)); #endif - rcap &= lc->supported; + rcap &= lc->pcaps; } rcap |= mdi; @@ -8470,7 +8527,6 @@ uint32_t fwcap_top_speed(uint32_t caps) return 0; } - /** * lstatus_to_fwcap - translate old lstatus to 32-bit Port Capabilities * @lstatus: old FW_PORT_ACTION_GET_PORT_INFO lstatus value @@ -8516,7 +8572,7 @@ static void handle_port_info(struct port_info *pi, con enum fw_port_action action, bool *mod_changed, bool *link_changed) { struct link_config old_lc, *lc = &pi->link_cfg; - unsigned char fc, fec; + unsigned char fc; u32 stat, linkattr; int old_ptype, old_mtype; @@ -8531,9 +8587,9 @@ static void handle_port_info(struct port_info *pi, con pi->mdio_addr = stat & F_FW_PORT_CMD_MDIOCAP ? G_FW_PORT_CMD_MDIOADDR(stat) : -1; - lc->supported = fwcaps16_to_caps32(be16_to_cpu(p->u.info.pcap)); - lc->advertising = fwcaps16_to_caps32(be16_to_cpu(p->u.info.acap)); - lc->lp_advertising = fwcaps16_to_caps32(be16_to_cpu(p->u.info.lpacap)); + lc->pcaps = fwcaps16_to_caps32(be16_to_cpu(p->u.info.pcap)); + lc->acaps = fwcaps16_to_caps32(be16_to_cpu(p->u.info.acap)); + lc->lpacaps = fwcaps16_to_caps32(be16_to_cpu(p->u.info.lpacap)); lc->link_ok = (stat & F_FW_PORT_CMD_LSTATUS) != 0; lc->link_down_rc = G_FW_PORT_CMD_LINKDNRC(stat); @@ -8546,9 +8602,9 @@ static void handle_port_info(struct port_info *pi, con pi->mdio_addr = stat & F_FW_PORT_CMD_MDIOCAP32 ? G_FW_PORT_CMD_MDIOADDR32(stat) : -1; - lc->supported = be32_to_cpu(p->u.info32.pcaps32); - lc->advertising = be32_to_cpu(p->u.info32.acaps32); - lc->lp_advertising = be32_to_cpu(p->u.info32.lpacaps32); + lc->pcaps = be32_to_cpu(p->u.info32.pcaps32); + lc->acaps = be32_to_cpu(p->u.info32.acaps32); + lc->lpacaps = be32_to_cpu(p->u.info32.lpacaps32); lc->link_ok = (stat & F_FW_PORT_CMD_LSTATUS32) != 0; lc->link_down_rc = G_FW_PORT_CMD_LINKDNRC32(stat); @@ -8559,6 +8615,7 @@ static void handle_port_info(struct port_info *pi, con } lc->speed = fwcap_to_speed(linkattr); + lc->fec = fwcap_to_fec(linkattr, true); fc = 0; if (linkattr & FW_PORT_CAP32_FC_RX) @@ -8567,23 +8624,14 @@ static void handle_port_info(struct port_info *pi, con fc |= PAUSE_TX; lc->fc = fc; - fec = FEC_NONE; - if (linkattr & FW_PORT_CAP32_FEC_RS) - fec |= FEC_RS; - if (linkattr & FW_PORT_CAP32_FEC_BASER_RS) - fec |= FEC_BASER_RS; - lc->fec = fec; - if (mod_changed != NULL) *mod_changed = false; if (link_changed != NULL) *link_changed = false; if (old_ptype != pi->port_type || old_mtype != pi->mod_type || - old_lc.supported != lc->supported) { - if (pi->mod_type != FW_PORT_MOD_TYPE_NONE) { - lc->fec_hint = lc->advertising & - V_FW_PORT_CAP32_FEC(M_FW_PORT_CAP32_FEC); - } + old_lc.pcaps != lc->pcaps) { + if (pi->mod_type != FW_PORT_MOD_TYPE_NONE) + lc->fec_hint = fwcap_to_fec(lc->acaps, true); if (mod_changed != NULL) *mod_changed = true; } Modified: stable/12/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 00:49:59 2020 (r358972) +++ stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 00:57:20 2020 (r358973) @@ -642,6 +642,7 @@ static int sysctl_qsize_rxq(SYSCTL_HANDLER_ARGS); static int sysctl_qsize_txq(SYSCTL_HANDLER_ARGS); static int sysctl_pause_settings(SYSCTL_HANDLER_ARGS); static int sysctl_fec(SYSCTL_HANDLER_ARGS); +static int sysctl_module_fec(SYSCTL_HANDLER_ARGS); static int sysctl_autoneg(SYSCTL_HANDLER_ARGS); static int sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS); static int sysctl_temperature(SYSCTL_HANDLER_ARGS); @@ -2243,7 +2244,7 @@ cxgbe_media_change(struct ifnet *ifp) PORT_LOCK(pi); if (IFM_SUBTYPE(ifm->ifm_media) == IFM_AUTO) { /* ifconfig .. media autoselect */ - if (!(lc->supported & FW_PORT_CAP32_ANEG)) { + if (!(lc->pcaps & FW_PORT_CAP32_ANEG)) { rc = ENOTSUP; /* AN not supported by transceiver */ goto done; } @@ -4547,7 +4548,7 @@ set_current_media(struct port_info *pi) lc = &pi->link_cfg; if (lc->requested_aneg != AUTONEG_DISABLE && - lc->supported & FW_PORT_CAP32_ANEG) { + lc->pcaps & FW_PORT_CAP32_ANEG) { ifmedia_set(ifm, IFM_ETHER | IFM_AUTO); return; } @@ -4604,7 +4605,7 @@ build_medialist(struct port_info *pi) ifm = &pi->media; ifmedia_removeall(ifm); lc = &pi->link_cfg; - ss = G_FW_PORT_CAP32_SPEED(lc->supported); /* Supported Speeds */ + ss = G_FW_PORT_CAP32_SPEED(lc->pcaps); /* Supported Speeds */ if (__predict_false(ss == 0)) { /* not supposed to happen. */ MPASS(ss != 0); no_media: @@ -4630,7 +4631,7 @@ no_media: } if (unknown > 0) /* Add one unknown for all unknown media types. */ ifmedia_add4(ifm, IFM_ETHER | IFM_FDX | IFM_UNKNOWN); - if (lc->supported & FW_PORT_CAP32_ANEG) + if (lc->pcaps & FW_PORT_CAP32_ANEG) ifmedia_add(ifm, IFM_ETHER | IFM_AUTO, 0, NULL); set_current_media(pi); @@ -4658,14 +4659,16 @@ init_link_config(struct port_info *pi) lc->requested_fc = t4_pause_settings & (PAUSE_TX | PAUSE_RX | PAUSE_AUTONEG); - if (t4_fec == -1 || t4_fec & FEC_AUTO) + if (t4_fec & FEC_AUTO) lc->requested_fec = FEC_AUTO; - else { + else if (t4_fec == 0) lc->requested_fec = FEC_NONE; - if (t4_fec & FEC_RS) - lc->requested_fec |= FEC_RS; - if (t4_fec & FEC_BASER_RS) - lc->requested_fec |= FEC_BASER_RS; + else { + /* -1 is handled by the FEC_AUTO block above and not here. */ + lc->requested_fec = t4_fec & + (FEC_RS | FEC_BASER_RS | FEC_NONE | FEC_MODULE); + if (lc->requested_fec == 0) + lc->requested_fec = FEC_AUTO; } } @@ -4685,7 +4688,7 @@ fixup_link_config(struct port_info *pi) /* Speed (when not autonegotiating) */ if (lc->requested_speed != 0) { fwspeed = speed_to_fwcap(lc->requested_speed); - if ((fwspeed & lc->supported) == 0) { + if ((fwspeed & lc->pcaps) == 0) { n++; lc->requested_speed = 0; } @@ -4696,7 +4699,7 @@ fixup_link_config(struct port_info *pi) lc->requested_aneg == AUTONEG_DISABLE || lc->requested_aneg == AUTONEG_AUTO); if (lc->requested_aneg == AUTONEG_ENABLE && - !(lc->supported & FW_PORT_CAP32_ANEG)) { + !(lc->pcaps & FW_PORT_CAP32_ANEG)) { n++; lc->requested_aneg = AUTONEG_AUTO; } @@ -4704,26 +4707,26 @@ fixup_link_config(struct port_info *pi) /* Flow control */ MPASS((lc->requested_fc & ~(PAUSE_TX | PAUSE_RX | PAUSE_AUTONEG)) == 0); if (lc->requested_fc & PAUSE_TX && - !(lc->supported & FW_PORT_CAP32_FC_TX)) { + !(lc->pcaps & FW_PORT_CAP32_FC_TX)) { n++; lc->requested_fc &= ~PAUSE_TX; } if (lc->requested_fc & PAUSE_RX && - !(lc->supported & FW_PORT_CAP32_FC_RX)) { + !(lc->pcaps & FW_PORT_CAP32_FC_RX)) { n++; lc->requested_fc &= ~PAUSE_RX; } if (!(lc->requested_fc & PAUSE_AUTONEG) && - !(lc->supported & FW_PORT_CAP32_FORCE_PAUSE)) { + !(lc->pcaps & FW_PORT_CAP32_FORCE_PAUSE)) { n++; lc->requested_fc |= PAUSE_AUTONEG; } /* FEC */ if ((lc->requested_fec & FEC_RS && - !(lc->supported & FW_PORT_CAP32_FEC_RS)) || + !(lc->pcaps & FW_PORT_CAP32_FEC_RS)) || (lc->requested_fec & FEC_BASER_RS && - !(lc->supported & FW_PORT_CAP32_FEC_BASER_RS))) { + !(lc->pcaps & FW_PORT_CAP32_FEC_BASER_RS))) { n++; lc->requested_fec = FEC_AUTO; } @@ -4747,17 +4750,17 @@ apply_link_config(struct port_info *pi) PORT_LOCK_ASSERT_OWNED(pi); if (lc->requested_aneg == AUTONEG_ENABLE) - MPASS(lc->supported & FW_PORT_CAP32_ANEG); + MPASS(lc->pcaps & FW_PORT_CAP32_ANEG); if (!(lc->requested_fc & PAUSE_AUTONEG)) - MPASS(lc->supported & FW_PORT_CAP32_FORCE_PAUSE); + MPASS(lc->pcaps & FW_PORT_CAP32_FORCE_PAUSE); if (lc->requested_fc & PAUSE_TX) - MPASS(lc->supported & FW_PORT_CAP32_FC_TX); + MPASS(lc->pcaps & FW_PORT_CAP32_FC_TX); if (lc->requested_fc & PAUSE_RX) - MPASS(lc->supported & FW_PORT_CAP32_FC_RX); + MPASS(lc->pcaps & FW_PORT_CAP32_FC_RX); if (lc->requested_fec & FEC_RS) - MPASS(lc->supported & FW_PORT_CAP32_FEC_RS); + MPASS(lc->pcaps & FW_PORT_CAP32_FEC_RS); if (lc->requested_fec & FEC_BASER_RS) - MPASS(lc->supported & FW_PORT_CAP32_FEC_BASER_RS); + MPASS(lc->pcaps & FW_PORT_CAP32_FEC_BASER_RS); #endif rc = -t4_link_l1cfg(sc, sc->mbox, pi->tx_chan, lc); if (rc != 0) { @@ -6469,11 +6472,21 @@ cxgbe_sysctls(struct port_info *pi) "PAUSE settings (bit 0 = rx_pause, 1 = tx_pause, 2 = pause_autoneg)"); SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "fec", CTLTYPE_STRING | CTLFLAG_RW, pi, 0, sysctl_fec, "A", - "Forward Error Correction (bit 0 = RS, bit 1 = BASER_RS)"); + "FECs to use (bit 0 = RS, 1 = FC, 2 = none, 5 = auto, 6 = module)"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "module_fec", + CTLTYPE_STRING, pi, 0, sysctl_module_fec, "A", + "FEC recommended by the cable/transceiver"); SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "autoneg", CTLTYPE_INT | CTLFLAG_RW, pi, 0, sysctl_autoneg, "I", "autonegotiation (-1 = not supported)"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "pcaps", CTLFLAG_RD, + &pi->link_cfg.pcaps, 0, "port capabilities"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "acaps", CTLFLAG_RD, + &pi->link_cfg.acaps, 0, "advertised capabilities"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "lpacaps", CTLFLAG_RD, + &pi->link_cfg.lpacaps, 0, "link partner advertised capabilities"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "max_speed", CTLFLAG_RD, NULL, port_top_speed(pi), "max speed (in Gbps)"); SYSCTL_ADD_INT(ctx, children, OID_AUTO, "mps_bg_map", CTLFLAG_RD, NULL, @@ -6994,7 +7007,8 @@ sysctl_fec(SYSCTL_HANDLER_ARGS) if (req->newptr == NULL) { struct sbuf *sb; - static char *bits = "\20\1RS\2BASE-R\3RSVD1\4RSVD2\5RSVD3\6AUTO"; + static char *bits = "\20\1RS-FEC\2FC-FEC\3NO-FEC\4RSVD2" + "\5RSVD3\6auto\7module"; rc = sysctl_wire_old_buffer(req, 0); if (rc != 0) @@ -7010,19 +7024,20 @@ sysctl_fec(SYSCTL_HANDLER_ARGS) */ if (lc->link_ok) { sbuf_printf(sb, "%b", (lc->fec & M_FW_PORT_CAP32_FEC) | - (lc->requested_fec & FEC_AUTO), bits); + (lc->requested_fec & (FEC_AUTO | FEC_MODULE)), + bits); } else { sbuf_printf(sb, "%b", lc->requested_fec, bits); } rc = sbuf_finish(sb); sbuf_delete(sb); } else { - char s[3]; + char s[8]; int n; snprintf(s, sizeof(s), "%d", lc->requested_fec == FEC_AUTO ? -1 : - lc->requested_fec & M_FW_PORT_CAP32_FEC); + lc->requested_fec & (M_FW_PORT_CAP32_FEC | FEC_MODULE)); rc = sysctl_handle_string(oidp, s, sizeof(s), req); if (rc != 0) @@ -7031,12 +7046,8 @@ sysctl_fec(SYSCTL_HANDLER_ARGS) n = strtol(&s[0], NULL, 0); if (n < 0 || n & FEC_AUTO) n = FEC_AUTO; - else { - if (n & ~M_FW_PORT_CAP32_FEC) - return (EINVAL);/* some other bit is set too */ - if (!powerof2(n)) - return (EINVAL);/* one bit can be set at most */ - } + else if (n & ~(M_FW_PORT_CAP32_FEC | FEC_MODULE)) + return (EINVAL);/* some other bit is set too */ rc = begin_synchronized_op(sc, &pi->vi[0], SLEEP_OK | INTR_OK, "t4fec"); @@ -7046,15 +7057,17 @@ sysctl_fec(SYSCTL_HANDLER_ARGS) old = lc->requested_fec; if (n == FEC_AUTO) lc->requested_fec = FEC_AUTO; - else if (n == 0) + else if (n == 0 || n == FEC_NONE) lc->requested_fec = FEC_NONE; else { - if ((lc->supported | V_FW_PORT_CAP32_FEC(n)) != - lc->supported) { + if ((lc->pcaps | + V_FW_PORT_CAP32_FEC(n & M_FW_PORT_CAP32_FEC)) != + lc->pcaps) { rc = ENOTSUP; goto done; } - lc->requested_fec = n; + lc->requested_fec = n & (M_FW_PORT_CAP32_FEC | + FEC_MODULE); } fixup_link_config(pi); if (pi->up_vis > 0) { @@ -7074,6 +7087,56 @@ done: } static int +sysctl_module_fec(SYSCTL_HANDLER_ARGS) +{ + struct port_info *pi = arg1; + struct adapter *sc = pi->adapter; + struct link_config *lc = &pi->link_cfg; + int rc; + int8_t fec; + struct sbuf *sb; + static char *bits = "\20\1RS-FEC\2FC-FEC\3NO-FEC\4RSVD2\5RSVD3"; + + rc = sysctl_wire_old_buffer(req, 0); + if (rc != 0) + return (rc); + + sb = sbuf_new_for_sysctl(NULL, NULL, 128, req); + if (sb == NULL) + return (ENOMEM); + + if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4mfec") != 0) + return (EBUSY); + PORT_LOCK(pi); + if (pi->up_vis == 0) { + /* + * If all the interfaces are administratively down the firmware + * does not report transceiver changes. Refresh port info here. + * This is the only reason we have a synchronized op in this + * function. Just PORT_LOCK would have been enough otherwise. + */ + t4_update_port_info(pi); + } + + fec = lc->fec_hint; + if (pi->mod_type == FW_PORT_MOD_TYPE_NONE || + !fec_supported(lc->pcaps)) { + sbuf_printf(sb, "n/a"); + } else { + if (fec == 0) + fec = FEC_NONE; + sbuf_printf(sb, "%b", fec & M_FW_PORT_CAP32_FEC, bits); + } + rc = sbuf_finish(sb); + sbuf_delete(sb); + + PORT_UNLOCK(pi); + end_synchronized_op(sc, 0); + + return (rc); +} + +static int sysctl_autoneg(SYSCTL_HANDLER_ARGS) { struct port_info *pi = arg1; @@ -7081,7 +7144,7 @@ sysctl_autoneg(SYSCTL_HANDLER_ARGS) struct link_config *lc = &pi->link_cfg; int rc, val; - if (lc->supported & FW_PORT_CAP32_ANEG) + if (lc->pcaps & FW_PORT_CAP32_ANEG) val = lc->requested_aneg == AUTONEG_DISABLE ? 0 : 1; else val = -1; @@ -7100,7 +7163,7 @@ sysctl_autoneg(SYSCTL_HANDLER_ARGS) if (rc) return (rc); PORT_LOCK(pi); - if (val == AUTONEG_ENABLE && !(lc->supported & FW_PORT_CAP32_ANEG)) { + if (val == AUTONEG_ENABLE && !(lc->pcaps & FW_PORT_CAP32_ANEG)) { rc = ENOTSUP; goto done; } From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:03:50 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3376526FBC8; Sat, 14 Mar 2020 01:03:50 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fPTK3wbfz4PSS; Sat, 14 Mar 2020 01:03:49 +0000 (UTC) (envelope-from np@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 6429AEE99; Sat, 14 Mar 2020 01:03:49 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E13nZr022447; Sat, 14 Mar 2020 01:03:49 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E13mJ6022444; Sat, 14 Mar 2020 01:03:48 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140103.02E13mJ6022444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:03:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358974 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358974 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:03:50 -0000 Author: np Date: Sat Mar 14 01:03:48 2020 New Revision: 358974 URL: https://svnweb.freebsd.org/changeset/base/358974 Log: MFC r355580, r355673, and r357553. r355580: cxgbe(4): Use TX_PKTS2 work requests in netmap Tx if it's available. TX_PKTS2 is more efficient within the firmware and this improves netmap Tx by a few Mpps in some common scenarios. r355673: cxgbe(4): Never use hardware checksumming in netmap tx. r357553: cxgbe(4): Add a knob to allow netmap tx traffic to be checksummed by the hardware. hw.cxgbe.nm_txcsum=1 Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/adapter.h stable/12/sys/dev/cxgbe/t4_netmap.c stable/12/sys/dev/cxgbe/t4_sge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/adapter.h ============================================================================== --- stable/12/sys/dev/cxgbe/adapter.h Sat Mar 14 00:57:20 2020 (r358973) +++ stable/12/sys/dev/cxgbe/adapter.h Sat Mar 14 01:03:48 2020 (r358974) @@ -724,6 +724,7 @@ struct sge_nm_txq { u_int udb_qid; u_int cntxt_id; __be32 cpl_ctrl0; /* for convenience */ + __be32 op_pkd; /* ditto */ u_int nid; /* netmap ring # for this queue */ /* infrequently used items after this */ Modified: stable/12/sys/dev/cxgbe/t4_netmap.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_netmap.c Sat Mar 14 00:57:20 2020 (r358973) +++ stable/12/sys/dev/cxgbe/t4_netmap.c Sat Mar 14 01:03:48 2020 (r358974) @@ -110,6 +110,16 @@ static int nm_split_rss = 0; SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_split_rss, CTLFLAG_RWTUN, &nm_split_rss, 0, "Split the netmap rx queues into two groups."); +/* + * netmap(4) says "netmap does not use features such as checksum offloading, TCP + * segmentation offloading, encryption, VLAN encapsulation/decapsulation, etc." + * but this knob can be used to get the hardware to checksum all tx traffic + * anyway. + */ +static int nm_txcsum = 0; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_txcsum, CTLFLAG_RWTUN, + &nm_txcsum, 0, "Enable transmit checksum offloading."); + static int alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq *nm_rxq, int cong) { @@ -573,7 +583,10 @@ ndesc_to_npkt(const int n) } #define MAX_NPKT_IN_TYPE1_WR (ndesc_to_npkt(SGE_MAX_WR_NDESC)) -/* Space (in descriptors) needed for a type1 WR that carries n packets */ +/* + * Space (in descriptors) needed for a type1 WR (TX_PKTS or TX_PKTS2) that + * carries n packets + */ static inline int npkt_to_ndesc(const int n) { @@ -583,7 +596,10 @@ npkt_to_ndesc(const int n) return ((n + 2) / 2); } -/* Space (in 16B units) needed for a type1 WR that carries n packets */ +/* + * Space (in 16B units) needed for a type1 WR (TX_PKTS or TX_PKTS2) that + * carries n packets + */ static inline int npkt_to_len16(const int n) { @@ -653,7 +669,7 @@ ring_nm_txq_db(struct adapter *sc, struct sge_nm_txq * */ static void cxgbe_nm_tx(struct adapter *sc, struct sge_nm_txq *nm_txq, - struct netmap_kring *kring, int npkt, int npkt_remaining, int txcsum) + struct netmap_kring *kring, int npkt, int npkt_remaining) { struct netmap_ring *ring = kring->ring; struct netmap_slot *slot; @@ -670,7 +686,7 @@ cxgbe_nm_tx(struct adapter *sc, struct sge_nm_txq *nm_ len = 0; wr = (void *)&nm_txq->desc[nm_txq->pidx]; - wr->op_pkd = htobe32(V_FW_WR_OP(FW_ETH_TX_PKTS_WR)); + wr->op_pkd = nm_txq->op_pkd; wr->equiq_to_len16 = htobe32(V_FW_WR_LEN16(npkt_to_len16(n))); wr->npkt = n; wr->r3 = 0; @@ -685,16 +701,7 @@ cxgbe_nm_tx(struct adapter *sc, struct sge_nm_txq *nm_ cpl->ctrl0 = nm_txq->cpl_ctrl0; cpl->pack = 0; cpl->len = htobe16(slot->len); - /* - * netmap(4) says "netmap does not use features such as - * checksum offloading, TCP segmentation offloading, - * encryption, VLAN encapsulation/decapsulation, etc." - * - * So the ncxl interfaces have tx hardware checksumming - * disabled by default. But you can override netmap by - * enabling IFCAP_TXCSUM on the interface manully. - */ - cpl->ctrl1 = txcsum ? 0 : + cpl->ctrl1 = nm_txcsum ? 0 : htobe64(F_TXPKT_IPCSUM_DIS | F_TXPKT_L4CSUM_DIS); usgl = (void *)(cpl + 1); @@ -778,7 +785,8 @@ reclaim_nm_tx_desc(struct sge_nm_txq *nm_txq) while (nm_txq->cidx != hw_cidx) { wr = (void *)&nm_txq->desc[nm_txq->cidx]; - MPASS(wr->op_pkd == htobe32(V_FW_WR_OP(FW_ETH_TX_PKTS_WR))); + MPASS(wr->op_pkd == htobe32(V_FW_WR_OP(FW_ETH_TX_PKTS_WR)) || + wr->op_pkd == htobe32(V_FW_WR_OP(FW_ETH_TX_PKTS2_WR))); MPASS(wr->type == 1); MPASS(wr->npkt > 0 && wr->npkt <= MAX_NPKT_IN_TYPE1_WR); @@ -808,7 +816,7 @@ cxgbe_netmap_txsync(struct netmap_kring *kring, int fl struct sge_nm_txq *nm_txq = &sc->sge.nm_txq[vi->first_nm_txq + kring->ring_id]; const u_int head = kring->rhead; u_int reclaimed = 0; - int n, d, npkt_remaining, ndesc_remaining, txcsum; + int n, d, npkt_remaining, ndesc_remaining; /* * Tx was at kring->nr_hwcur last time around and now we need to advance @@ -819,7 +827,6 @@ cxgbe_netmap_txsync(struct netmap_kring *kring, int fl npkt_remaining = head >= kring->nr_hwcur ? head - kring->nr_hwcur : kring->nkr_num_slots - kring->nr_hwcur + head; - txcsum = ifp->if_capenable & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); while (npkt_remaining) { reclaimed += reclaim_nm_tx_desc(nm_txq); ndesc_remaining = contiguous_ndesc_available(nm_txq); @@ -843,7 +850,7 @@ cxgbe_netmap_txsync(struct netmap_kring *kring, int fl /* Send n packets and update nm_txq->pidx and kring->nr_hwcur */ npkt_remaining -= n; - cxgbe_nm_tx(sc, nm_txq, kring, n, npkt_remaining, txcsum); + cxgbe_nm_tx(sc, nm_txq, kring, n, npkt_remaining); } MPASS(npkt_remaining == 0); MPASS(kring->nr_hwcur == head); Modified: stable/12/sys/dev/cxgbe/t4_sge.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 00:57:20 2020 (r358973) +++ stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:03:48 2020 (r358974) @@ -3650,6 +3650,10 @@ alloc_nm_txq(struct vi_info *vi, struct sge_nm_txq *nm nm_txq->cpl_ctrl0 = htobe32(V_TXPKT_OPCODE(CPL_TX_PKT) | V_TXPKT_INTF(pi->tx_chan) | V_TXPKT_PF(sc->pf) | V_TXPKT_VF(vi->vin) | V_TXPKT_VF_VLD(vi->vfvld)); + if (sc->params.fw_vers >= FW_VERSION32(1, 24, 11, 0)) + nm_txq->op_pkd = htobe32(V_FW_WR_OP(FW_ETH_TX_PKTS2_WR)); + else + nm_txq->op_pkd = htobe32(V_FW_WR_OP(FW_ETH_TX_PKTS_WR)); nm_txq->cntxt_id = INVALID_NM_TXQ_CNTXT_ID; snprintf(name, sizeof(name), "%d", idx); From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:28:54 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0D57270B2F; Sat, 14 Mar 2020 01:28:54 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQ2G5rCwz4716; Sat, 14 Mar 2020 01:28:54 +0000 (UTC) (envelope-from np@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 9E455F299; Sat, 14 Mar 2020 01:28:54 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1Ss2b034433; Sat, 14 Mar 2020 01:28:54 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1Ss7o034432; Sat, 14 Mar 2020 01:28:54 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140128.02E1Ss7o034432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:28:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358975 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358975 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:28:55 -0000 Author: np Date: Sat Mar 14 01:28:53 2020 New Revision: 358975 URL: https://svnweb.freebsd.org/changeset/base/358975 Log: MFC r355730: cxgbe(4): Use the _XT variant of the CPL used to transmit NIC traffic. CPL_TX_PKT_XT disables the internal parser on the chip and instead relies on the driver to provide the exact length of the L2 and L3 headers. This allows hw checksumming and TSO to be used with L2 and L3 encapsulations that the chip doesn't understand directly. Note that netmap tx still uses the old CPL as it never uses the hw to generate the checksum on tx. Reviewed by: jhb@ Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D22788 Modified: stable/12/sys/dev/cxgbe/t4_sched.c stable/12/sys/dev/cxgbe/t4_sge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_sched.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_sched.c Sat Mar 14 01:03:48 2020 (r358974) +++ stable/12/sys/dev/cxgbe/t4_sched.c Sat Mar 14 01:28:53 2020 (r358975) @@ -798,7 +798,7 @@ failed: cst->tx_credits = sc->params.eo_wr_cred; cst->tx_total = cst->tx_credits; cst->plen = 0; - cst->ctrl0 = htobe32(V_TXPKT_OPCODE(CPL_TX_PKT) | + cst->ctrl0 = htobe32(V_TXPKT_OPCODE(CPL_TX_PKT_XT) | V_TXPKT_INTF(pi->tx_chan) | V_TXPKT_PF(sc->pf) | V_TXPKT_VF(vi->vin) | V_TXPKT_VF_VLD(vi->vfvld)); Modified: stable/12/sys/dev/cxgbe/t4_sge.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:03:48 2020 (r358974) +++ stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:28:53 2020 (r358975) @@ -289,14 +289,14 @@ static inline u_int txpkt_vm_len16(u_int, u_int); static inline u_int txpkts0_len16(u_int); static inline u_int txpkts1_len16(void); static u_int write_raw_wr(struct sge_txq *, void *, struct mbuf *, u_int); -static u_int write_txpkt_wr(struct sge_txq *, struct fw_eth_tx_pkt_wr *, - struct mbuf *, u_int); +static u_int write_txpkt_wr(struct adapter *, struct sge_txq *, + struct fw_eth_tx_pkt_wr *, struct mbuf *, u_int); static u_int write_txpkt_vm_wr(struct adapter *, struct sge_txq *, struct fw_eth_tx_pkt_vm_wr *, struct mbuf *, u_int); static int try_txpkts(struct mbuf *, struct mbuf *, struct txpkts *, u_int); static int add_to_txpkts(struct mbuf *, struct txpkts *, u_int); -static u_int write_txpkts_wr(struct sge_txq *, struct fw_eth_tx_pkts_wr *, - struct mbuf *, const struct txpkts *, u_int); +static u_int write_txpkts_wr(struct adapter *, struct sge_txq *, + struct fw_eth_tx_pkts_wr *, struct mbuf *, const struct txpkts *, u_int); static void write_gl_to_txd(struct sge_txq *, struct mbuf *, caddr_t *, int); static inline void copy_to_txd(struct sge_eq *, caddr_t, caddr_t *, int); static inline void ring_eq_db(struct adapter *, struct sge_eq *, u_int); @@ -2352,31 +2352,31 @@ alloc_wr_mbuf(int len, int how) } static inline int -needs_tso(struct mbuf *m) +needs_hwcsum(struct mbuf *m) { M_ASSERTPKTHDR(m); - return (m->m_pkthdr.csum_flags & CSUM_TSO); + return (m->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_IP | + CSUM_TSO | CSUM_UDP_IPV6 | CSUM_TCP_IPV6)); } static inline int -needs_l3_csum(struct mbuf *m) +needs_tso(struct mbuf *m) { M_ASSERTPKTHDR(m); - return (m->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TSO)); + return (m->m_pkthdr.csum_flags & CSUM_TSO); } static inline int -needs_l4_csum(struct mbuf *m) +needs_l3_csum(struct mbuf *m) { M_ASSERTPKTHDR(m); - return (m->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_UDP_IPV6 | - CSUM_TCP_IPV6 | CSUM_TSO)); + return (m->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TSO)); } static inline int @@ -2389,6 +2389,16 @@ needs_tcp_csum(struct mbuf *m) #ifdef RATELIMIT static inline int +needs_l4_csum(struct mbuf *m) +{ + + M_ASSERTPKTHDR(m); + + return (m->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_UDP_IPV6 | + CSUM_TCP_IPV6 | CSUM_TSO)); +} + +static inline int needs_udp_csum(struct mbuf *m) { @@ -2540,11 +2550,11 @@ restart: m0->m_pkthdr.snd_tag = NULL; #endif - if (!needs_tso(m0) && + if (!needs_hwcsum(m0) #ifdef RATELIMIT - !needs_eo(m0) && + && !needs_eo(m0) #endif - !(sc->flags & IS_VF && (needs_l3_csum(m0) || needs_l4_csum(m0)))) + ) return (0); m = m0; @@ -2885,7 +2895,7 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx) next_cidx = 0; } - n = write_txpkts_wr(txq, wr, m0, &txp, available); + n = write_txpkts_wr(sc, txq, wr, m0, &txp, available); total += txp.npkt; remaining -= txp.npkt; } else if (mbuf_cflags(m0) & MC_RAW_WR) { @@ -2896,7 +2906,7 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx) total++; remaining--; ETHER_BPF_MTAP(ifp, m0); - n = write_txpkt_wr(txq, (void *)wr, m0, available); + n = write_txpkt_wr(sc, txq, (void *)wr, m0, available); } MPASS(n >= 1 && n <= available && n <= SGE_MAX_WR_NDESC); @@ -4057,7 +4067,7 @@ alloc_txq(struct vi_info *vi, struct sge_txq *txq, int txq->cpl_ctrl0 = htobe32(V_TXPKT_OPCODE(CPL_TX_PKT_XT) | V_TXPKT_INTF(pi->tx_chan)); else - txq->cpl_ctrl0 = htobe32(V_TXPKT_OPCODE(CPL_TX_PKT) | + txq->cpl_ctrl0 = htobe32(V_TXPKT_OPCODE(CPL_TX_PKT_XT) | V_TXPKT_INTF(pi->tx_chan) | V_TXPKT_PF(sc->pf) | V_TXPKT_VF(vi->vin) | V_TXPKT_VF_VLD(vi->vfvld)); txq->tc_idx = -1; @@ -4485,6 +4495,55 @@ imm_payload(u_int ndesc) return (n); } +static inline uint64_t +csum_to_ctrl(struct adapter *sc, struct mbuf *m) +{ + uint64_t ctrl; + int csum_type; + + M_ASSERTPKTHDR(m); + + if (needs_hwcsum(m) == 0) + return (F_TXPKT_IPCSUM_DIS | F_TXPKT_L4CSUM_DIS); + + ctrl = 0; + if (needs_l3_csum(m) == 0) + ctrl |= F_TXPKT_IPCSUM_DIS; + switch (m->m_pkthdr.csum_flags & + (CSUM_IP_TCP | CSUM_IP_UDP | CSUM_IP6_TCP | CSUM_IP6_UDP)) { + case CSUM_IP_TCP: + csum_type = TX_CSUM_TCPIP; + break; + case CSUM_IP_UDP: + csum_type = TX_CSUM_UDPIP; + break; + case CSUM_IP6_TCP: + csum_type = TX_CSUM_TCPIP6; + break; + case CSUM_IP6_UDP: + csum_type = TX_CSUM_UDPIP6; + break; + default: + /* needs_hwcsum told us that at least some hwcsum is needed. */ + MPASS(ctrl == 0); + MPASS(m->m_pkthdr.csum_flags & CSUM_IP); + ctrl |= F_TXPKT_L4CSUM_DIS; + csum_type = TX_CSUM_IP; + break; + } + + MPASS(m->m_pkthdr.l2hlen > 0); + MPASS(m->m_pkthdr.l3hlen > 0); + ctrl |= V_TXPKT_CSUM_TYPE(csum_type) | + V_TXPKT_IPHDR_LEN(m->m_pkthdr.l3hlen); + if (chip_id(sc) <= CHELSIO_T5) + ctrl |= V_TXPKT_ETHHDR_LEN(m->m_pkthdr.l2hlen - ETHER_HDR_LEN); + else + ctrl |= V_T6_TXPKT_ETHHDR_LEN(m->m_pkthdr.l2hlen - ETHER_HDR_LEN); + + return (ctrl); +} + /* * Write a VM txpkt WR for this packet to the hardware descriptors, update the * software descriptor, and advance the pidx. It is guaranteed that enough @@ -4501,7 +4560,7 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq * struct cpl_tx_pkt_core *cpl; uint32_t ctrl; /* used in many unrelated places */ uint64_t ctrl1; - int csum_type, len16, ndesc, pktlen, nsegs; + int len16, ndesc, pktlen, nsegs; caddr_t dst; TXQ_LOCK_ASSERT_OWNED(txq); @@ -4526,7 +4585,7 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq * wr->equiq_to_len16 = htobe32(ctrl); wr->r3[0] = 0; wr->r3[1] = 0; - + /* * Copy over ethmacdst, ethmacsrc, ethtype, and vlantci. * vlantci is ignored unless the ethtype is 0x8100, so it's @@ -4536,7 +4595,6 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq * */ m_copydata(m0, 0, sizeof(struct ether_header) + 2, wr->ethmacdst); - csum_type = -1; if (needs_tso(m0)) { struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1); @@ -4546,10 +4604,10 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq * __func__, m0)); ctrl = V_LSO_OPCODE(CPL_TX_PKT_LSO) | F_LSO_FIRST_SLICE | - F_LSO_LAST_SLICE | V_LSO_IPHDR_LEN(m0->m_pkthdr.l3hlen >> 2) - | V_LSO_TCPHDR_LEN(m0->m_pkthdr.l4hlen >> 2); - if (m0->m_pkthdr.l2hlen == sizeof(struct ether_vlan_header)) - ctrl |= V_LSO_ETHHDR_LEN(1); + F_LSO_LAST_SLICE | V_LSO_ETHHDR_LEN((m0->m_pkthdr.l2hlen - + ETHER_HDR_LEN) >> 2) | + V_LSO_IPHDR_LEN(m0->m_pkthdr.l3hlen >> 2) | + V_LSO_TCPHDR_LEN(m0->m_pkthdr.l4hlen >> 2); if (m0->m_pkthdr.l3hlen == sizeof(struct ip6_hdr)) ctrl |= F_LSO_IPV6; @@ -4559,70 +4617,15 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq * lso->seqno_offset = htobe32(0); lso->len = htobe32(pktlen); - if (m0->m_pkthdr.l3hlen == sizeof(struct ip6_hdr)) - csum_type = TX_CSUM_TCPIP6; - else - csum_type = TX_CSUM_TCPIP; - cpl = (void *)(lso + 1); txq->tso_wrs++; - } else { - if (m0->m_pkthdr.csum_flags & CSUM_IP_TCP) - csum_type = TX_CSUM_TCPIP; - else if (m0->m_pkthdr.csum_flags & CSUM_IP_UDP) - csum_type = TX_CSUM_UDPIP; - else if (m0->m_pkthdr.csum_flags & CSUM_IP6_TCP) - csum_type = TX_CSUM_TCPIP6; - else if (m0->m_pkthdr.csum_flags & CSUM_IP6_UDP) - csum_type = TX_CSUM_UDPIP6; -#if defined(INET) - else if (m0->m_pkthdr.csum_flags & CSUM_IP) { - /* - * XXX: The firmware appears to stomp on the - * fragment/flags field of the IP header when - * using TX_CSUM_IP. Fall back to doing - * software checksums. - */ - u_short *sump; - struct mbuf *m; - int offset; - - m = m0; - offset = 0; - sump = m_advance(&m, &offset, m0->m_pkthdr.l2hlen + - offsetof(struct ip, ip_sum)); - *sump = in_cksum_skip(m0, m0->m_pkthdr.l2hlen + - m0->m_pkthdr.l3hlen, m0->m_pkthdr.l2hlen); - m0->m_pkthdr.csum_flags &= ~CSUM_IP; - } -#endif - + } else cpl = (void *)(wr + 1); - } /* Checksum offload */ - ctrl1 = 0; - if (needs_l3_csum(m0) == 0) - ctrl1 |= F_TXPKT_IPCSUM_DIS; - if (csum_type >= 0) { - KASSERT(m0->m_pkthdr.l2hlen > 0 && m0->m_pkthdr.l3hlen > 0, - ("%s: mbuf %p needs checksum offload but missing header lengths", - __func__, m0)); - - if (chip_id(sc) <= CHELSIO_T5) { - ctrl1 |= V_TXPKT_ETHHDR_LEN(m0->m_pkthdr.l2hlen - - ETHER_HDR_LEN); - } else { - ctrl1 |= V_T6_TXPKT_ETHHDR_LEN(m0->m_pkthdr.l2hlen - - ETHER_HDR_LEN); - } - ctrl1 |= V_TXPKT_IPHDR_LEN(m0->m_pkthdr.l3hlen); - ctrl1 |= V_TXPKT_CSUM_TYPE(csum_type); - } else - ctrl1 |= F_TXPKT_L4CSUM_DIS; - if (m0->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TCP | CSUM_UDP | - CSUM_UDP_IPV6 | CSUM_TCP_IPV6 | CSUM_TSO)) + ctrl1 = csum_to_ctrl(sc, m0); + if (ctrl1 != (F_TXPKT_IPCSUM_DIS | F_TXPKT_L4CSUM_DIS)) txq->txcsum++; /* some hardware assistance provided */ /* VLAN tag insertion */ @@ -4705,8 +4708,8 @@ write_raw_wr(struct sge_txq *txq, void *wr, struct mbu * The return value is the # of hardware descriptors used. */ static u_int -write_txpkt_wr(struct sge_txq *txq, struct fw_eth_tx_pkt_wr *wr, - struct mbuf *m0, u_int available) +write_txpkt_wr(struct adapter *sc, struct sge_txq *txq, + struct fw_eth_tx_pkt_wr *wr, struct mbuf *m0, u_int available) { struct sge_eq *eq = &txq->eq; struct tx_sdesc *txsd; @@ -4754,10 +4757,10 @@ write_txpkt_wr(struct sge_txq *txq, struct fw_eth_tx_p __func__, m0)); ctrl = V_LSO_OPCODE(CPL_TX_PKT_LSO) | F_LSO_FIRST_SLICE | - F_LSO_LAST_SLICE | V_LSO_IPHDR_LEN(m0->m_pkthdr.l3hlen >> 2) - | V_LSO_TCPHDR_LEN(m0->m_pkthdr.l4hlen >> 2); - if (m0->m_pkthdr.l2hlen == sizeof(struct ether_vlan_header)) - ctrl |= V_LSO_ETHHDR_LEN(1); + F_LSO_LAST_SLICE | V_LSO_ETHHDR_LEN((m0->m_pkthdr.l2hlen - + ETHER_HDR_LEN) >> 2) | + V_LSO_IPHDR_LEN(m0->m_pkthdr.l3hlen >> 2) | + V_LSO_TCPHDR_LEN(m0->m_pkthdr.l4hlen >> 2); if (m0->m_pkthdr.l3hlen == sizeof(struct ip6_hdr)) ctrl |= F_LSO_IPV6; @@ -4774,13 +4777,8 @@ write_txpkt_wr(struct sge_txq *txq, struct fw_eth_tx_p cpl = (void *)(wr + 1); /* Checksum offload */ - ctrl1 = 0; - if (needs_l3_csum(m0) == 0) - ctrl1 |= F_TXPKT_IPCSUM_DIS; - if (needs_l4_csum(m0) == 0) - ctrl1 |= F_TXPKT_L4CSUM_DIS; - if (m0->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TCP | CSUM_UDP | - CSUM_UDP_IPV6 | CSUM_TCP_IPV6 | CSUM_TSO)) + ctrl1 = csum_to_ctrl(sc, m0); + if (ctrl1 != (F_TXPKT_IPCSUM_DIS | F_TXPKT_L4CSUM_DIS)) txq->txcsum++; /* some hardware assistance provided */ /* VLAN tag insertion */ @@ -4898,8 +4896,9 @@ add_to_txpkts(struct mbuf *m, struct txpkts *txp, u_in * The return value is the # of hardware descriptors used. */ static u_int -write_txpkts_wr(struct sge_txq *txq, struct fw_eth_tx_pkts_wr *wr, - struct mbuf *m0, const struct txpkts *txp, u_int available) +write_txpkts_wr(struct adapter *sc, struct sge_txq *txq, + struct fw_eth_tx_pkts_wr *wr, struct mbuf *m0, const struct txpkts *txp, + u_int available) { struct sge_eq *eq = &txq->eq; struct tx_sdesc *txsd; @@ -4963,13 +4962,8 @@ write_txpkts_wr(struct sge_txq *txq, struct fw_eth_tx_ } /* Checksum offload */ - ctrl1 = 0; - if (needs_l3_csum(m) == 0) - ctrl1 |= F_TXPKT_IPCSUM_DIS; - if (needs_l4_csum(m) == 0) - ctrl1 |= F_TXPKT_L4CSUM_DIS; - if (m->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TCP | CSUM_UDP | - CSUM_UDP_IPV6 | CSUM_TCP_IPV6 | CSUM_TSO)) + ctrl1 = csum_to_ctrl(sc, m); + if (ctrl1 != (F_TXPKT_IPCSUM_DIS | F_TXPKT_L4CSUM_DIS)) txq->txcsum++; /* some hardware assistance provided */ /* VLAN tag insertion */ @@ -5797,10 +5791,10 @@ write_ethofld_wr(struct cxgbe_snd_tag *cst, struct fw_ ctrl = V_LSO_OPCODE(CPL_TX_PKT_LSO) | F_LSO_FIRST_SLICE | F_LSO_LAST_SLICE | + V_LSO_ETHHDR_LEN((m0->m_pkthdr.l2hlen - + ETHER_HDR_LEN) >> 2) | V_LSO_IPHDR_LEN(m0->m_pkthdr.l3hlen >> 2) | V_LSO_TCPHDR_LEN(m0->m_pkthdr.l4hlen >> 2); - if (m0->m_pkthdr.l2hlen == sizeof(struct ether_vlan_header)) - ctrl |= V_LSO_ETHHDR_LEN(1); if (m0->m_pkthdr.l3hlen == sizeof(struct ip6_hdr)) ctrl |= F_LSO_IPV6; lso->lso_ctrl = htobe32(ctrl); @@ -5817,8 +5811,8 @@ write_ethofld_wr(struct cxgbe_snd_tag *cst, struct fw_ } /* Checksum offload must be requested for ethofld. */ - ctrl1 = 0; MPASS(needs_l4_csum(m0)); + ctrl1 = csum_to_ctrl(cst->adapter, m0); /* VLAN tag insertion */ if (needs_vlan_insertion(m0)) { From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:33:12 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 70B9E271143; Sat, 14 Mar 2020 01:33:12 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQ7D28Hfz49mT; Sat, 14 Mar 2020 01:33:12 +0000 (UTC) (envelope-from np@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 42822F4A4; Sat, 14 Mar 2020 01:33:12 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1XCuV040362; Sat, 14 Mar 2020 01:33:12 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1XCKx040361; Sat, 14 Mar 2020 01:33:12 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140133.02E1XCKx040361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:33:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358976 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:33:12 -0000 Author: np Date: Sat Mar 14 01:33:11 2020 New Revision: 358976 URL: https://svnweb.freebsd.org/changeset/base/358976 Log: MFC r355886: cxgbe(4): check if the firmware supports FW_RI_FR_NSMR_TPTE_WR work request. This is used by iw_cxgbe to figure out how best to register memory. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/t4_main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 01:28:53 2020 (r358975) +++ stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 01:33:11 2020 (r358976) @@ -4226,6 +4226,14 @@ get_params__post_init(struct adapter *sc) else sc->params.ulptx_memwrite_dsgl = false; + /* FW_RI_FR_NSMR_TPTE_WR support */ + param[0] = FW_PARAM_DEV(RI_FR_NSMR_TPTE_WR); + rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, param, val); + if (rc == 0) + sc->params.fr_nsmr_tpte_wr_support = val[0] != 0; + else + sc->params.fr_nsmr_tpte_wr_support = false; + /* get capabilites */ bzero(&caps, sizeof(caps)); caps.op_to_write = htobe32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) | From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:38:05 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 108FD2717B3; Sat, 14 Mar 2020 01:38:05 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQDr4kfyz4JT9; Sat, 14 Mar 2020 01:38:04 +0000 (UTC) (envelope-from np@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 84973F4D5; Sat, 14 Mar 2020 01:38:04 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1c4O6040658; Sat, 14 Mar 2020 01:38:04 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1c385040655; Sat, 14 Mar 2020 01:38:03 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140138.02E1c385040655@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358977 - stable/12/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe/iw_cxgbe X-SVN-Commit-Revision: 358977 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:38:05 -0000 Author: np Date: Sat Mar 14 01:38:03 2020 New Revision: 358977 URL: https://svnweb.freebsd.org/changeset/base/358977 Log: MFC r356713: cxgbe/iw_cxgbe: Do not allow memory registrations with page size greater than 128MB, which is the maximum supported by the hardware in RDMA mode. Obtained from: Chelsio Communications Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Sat Mar 14 01:33:11 2020 (r358976) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Sat Mar 14 01:38:03 2020 (r358977) @@ -91,6 +91,7 @@ static inline void *cplhdr(struct mbuf *m) #define C4IW_ID_TABLE_F_RANDOM 1 /* Pseudo-randomize the id's returned */ #define C4IW_ID_TABLE_F_EMPTY 2 /* Table is initially empty */ +#define C4IW_MAX_PAGE_SIZE 0x8000000 struct c4iw_id_table { u32 flags; Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Sat Mar 14 01:33:11 2020 (r358976) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Sat Mar 14 01:38:03 2020 (r358977) @@ -287,6 +287,8 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 if (reset_tpt_entry) memset(&tpt, 0, sizeof(tpt)); else { + if (page_size > ilog2(C4IW_MAX_PAGE_SIZE) - 12) + return -EINVAL; tpt.valid_to_pdid = cpu_to_be32(F_FW_RI_TPTE_VALID | V_FW_RI_TPTE_STAGKEY((*stag & M_FW_RI_TPTE_STAGKEY)) | V_FW_RI_TPTE_STAGSTATE(stag_state) | Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c Sat Mar 14 01:33:11 2020 (r358976) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c Sat Mar 14 01:38:03 2020 (r358977) @@ -669,11 +669,14 @@ static void complete_rq_drain_wr(struct c4iw_qp *qhp, spin_unlock_irqrestore(&rchp->comp_handler_lock, flag); } -static void build_tpte_memreg(struct fw_ri_fr_nsmr_tpte_wr *fr, +static int build_tpte_memreg(struct fw_ri_fr_nsmr_tpte_wr *fr, struct ib_reg_wr *wr, struct c4iw_mr *mhp, u8 *len16) { __be64 *p = (__be64 *)fr->pbl; + if (wr->mr->page_size > C4IW_MAX_PAGE_SIZE) + return -EINVAL; + fr->r2 = cpu_to_be32(0); fr->stag = cpu_to_be32(mhp->ibmr.rkey); @@ -698,6 +701,7 @@ static void build_tpte_memreg(struct fw_ri_fr_nsmr_tpt p[1] = cpu_to_be64((u64)mhp->mpl[1]); *len16 = DIV_ROUND_UP(sizeof(*fr), 16); + return 0; } static int build_memreg(struct t4_sq *sq, union t4_wr *wqe, @@ -712,6 +716,8 @@ static int build_memreg(struct t4_sq *sq, union t4_wr if (mhp->mpl_len > t4_max_fr_depth(use_dsgl && dsgl_supported)) return -EINVAL; + if (wr->mr->page_size > C4IW_MAX_PAGE_SIZE) + return -EINVAL; wqe->fr.qpbinde_to_dcacpu = 0; wqe->fr.pgsz_shift = ilog2(wr->mr->page_size) - 12; @@ -852,16 +858,16 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_ if (rdev->adap->params.fr_nsmr_tpte_wr_support && !mhp->attr.state && mhp->mpl_len <= 2) { fw_opcode = FW_RI_FR_NSMR_TPTE_WR; - build_tpte_memreg(&wqe->fr_tpte, reg_wr(wr), + err = build_tpte_memreg(&wqe->fr_tpte, reg_wr(wr), mhp, &len16); } else { fw_opcode = FW_RI_FR_NSMR_WR; err = build_memreg(&qhp->wq.sq, wqe, reg_wr(wr), mhp, &len16, rdev->adap->params.ulptx_memwrite_dsgl); - if (err) - break; } + if (err) + break; mhp->attr.state = 1; break; } From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:42:22 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BE4BC271CDD; Sat, 14 Mar 2020 01:42:22 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQKp2QJ4z4TBw; Sat, 14 Mar 2020 01:42:22 +0000 (UTC) (envelope-from np@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 F3720F6A1; Sat, 14 Mar 2020 01:42:21 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1gLPf045561; Sat, 14 Mar 2020 01:42:21 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1gL5X045560; Sat, 14 Mar 2020 01:42:21 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140142.02E1gL5X045560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:42:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358978 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358978 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:42:22 -0000 Author: np Date: Sat Mar 14 01:42:21 2020 New Revision: 358978 URL: https://svnweb.freebsd.org/changeset/base/358978 Log: MFC r357474: cxgbe(4): Only checksummed TCP should be considered for LRO. This avoids the per-packet nanouptime in tcp_lro_rx for traffic that's not even TCP. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/t4_sge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_sge.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:38:03 2020 (r358977) +++ stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:42:21 2020 (r358978) @@ -2047,7 +2047,9 @@ t4_eth_rx(struct sge_iq *iq, const struct rss_header * } #if defined(INET) || defined(INET6) - if (iq->flags & IQ_LRO_ENABLED) { + if (iq->flags & IQ_LRO_ENABLED && + (M_HASHTYPE_GET(m0) == M_HASHTYPE_RSS_TCP_IPV4 || + M_HASHTYPE_GET(m0) == M_HASHTYPE_RSS_TCP_IPV6)) { if (sort_before_lro(lro)) { tcp_lro_queue_mbuf(lro, m0); return (0); /* queued for sort, then LRO */ From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:53:59 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A9D5527235F; Sat, 14 Mar 2020 01:53:59 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQbC1qd6z3xrR; Sat, 14 Mar 2020 01:53:59 +0000 (UTC) (envelope-from np@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 EA437F899; Sat, 14 Mar 2020 01:53:58 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1rwd0052263; Sat, 14 Mar 2020 01:53:58 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1rwiI052262; Sat, 14 Mar 2020 01:53:58 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140153.02E1rwiI052262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:53:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358980 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358980 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:53:59 -0000 Author: np Date: Sat Mar 14 01:53:58 2020 New Revision: 358980 URL: https://svnweb.freebsd.org/changeset/base/358980 Log: MFC r357476: cxgbe(4): Do not use pack boundary > 512B unless it is explicitly requested. This is a tradeoff between PCIe efficiency during large packet rx and packing efficiency during small packet rx. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/t4_sge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_sge.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:52:38 2020 (r358979) +++ stable/12/sys/dev/cxgbe/t4_sge.c Sat Mar 14 01:53:58 2020 (r358980) @@ -584,6 +584,9 @@ t4_sge_extfree_refs(void) return (refs - rels); } +/* max 4096 */ +#define MAX_PACK_BOUNDARY 512 + static inline void setup_pad_and_pack_boundaries(struct adapter *sc) { @@ -630,7 +633,10 @@ setup_pad_and_pack_boundaries(struct adapter *sc) pack = fl_pack; if (fl_pack < 16 || fl_pack == 32 || fl_pack > 4096 || !powerof2(fl_pack)) { - pack = max(sc->params.pci.mps, CACHE_LINE_SIZE); + if (sc->params.pci.mps > MAX_PACK_BOUNDARY) + pack = MAX_PACK_BOUNDARY; + else + pack = max(sc->params.pci.mps, CACHE_LINE_SIZE); MPASS(powerof2(pack)); if (pack < 16) pack = 16; From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:59:40 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EF8B2272BA6; Sat, 14 Mar 2020 01:59:40 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQjm58zlz4BM9; Sat, 14 Mar 2020 01:59:40 +0000 (UTC) (envelope-from np@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 6A54DF8B4; Sat, 14 Mar 2020 01:59:40 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1xeiG052587; Sat, 14 Mar 2020 01:59:40 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1xeA1052586; Sat, 14 Mar 2020 01:59:40 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140159.02E1xeA1052586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358981 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358981 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:59:41 -0000 Author: np Date: Sat Mar 14 01:59:39 2020 New Revision: 358981 URL: https://svnweb.freebsd.org/changeset/base/358981 Log: MFC r357551: cxgbe(4): Report accurate rx_buf_maxsize to netmap. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/t4_netmap.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_netmap.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_netmap.c Sat Mar 14 01:53:58 2020 (r358980) +++ stable/12/sys/dev/cxgbe/t4_netmap.c Sat Mar 14 01:59:39 2020 (r358981) @@ -991,6 +991,7 @@ cxgbe_nm_attach(struct vi_info *vi) na.nm_register = cxgbe_netmap_reg; na.num_tx_rings = vi->nnmtxq; na.num_rx_rings = vi->nnmrxq; + na.rx_buf_maxsize = MAX_MTU; netmap_attach(&na); /* This adds IFCAP_NETMAP to if_capabilities */ } From owner-svn-src-stable-12@freebsd.org Sat Mar 14 02:05:13 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0349E27316F; Sat, 14 Mar 2020 02:05:13 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQr85cYWz4FVP; Sat, 14 Mar 2020 02:05:12 +0000 (UTC) (envelope-from np@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 B7E68FAA3; Sat, 14 Mar 2020 02:05:12 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E25C50058466; Sat, 14 Mar 2020 02:05:12 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E25CGS058465; Sat, 14 Mar 2020 02:05:12 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140205.02E25CGS058465@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 02:05:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358982 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358982 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 02:05:13 -0000 Author: np Date: Sat Mar 14 02:05:12 2020 New Revision: 358982 URL: https://svnweb.freebsd.org/changeset/base/358982 Log: MFC r357552: cxgbe(4): Allow nm_black_hole and nm_cong_drop to be set at any time. The cong_drop setting will apply to queues created after the setting is changed and not to existing queues. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/t4_netmap.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_netmap.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_netmap.c Sat Mar 14 01:59:39 2020 (r358981) +++ stable/12/sys/dev/cxgbe/t4_netmap.c Sat Mar 14 02:05:12 2020 (r358982) @@ -63,7 +63,7 @@ extern int fl_pad; /* XXXNM */ * 2 = supermassive black hole (buffer packing enabled) */ int black_hole = 0; -SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_black_hole, CTLFLAG_RDTUN, &black_hole, 0, +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_black_hole, CTLFLAG_RWTUN, &black_hole, 0, "Sink incoming packets."); int rx_ndesc = 256; @@ -85,7 +85,7 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_holdoff_tmr_idx, CT * 1: no backpressure, drop packets for the congested queue immediately. */ static int nm_cong_drop = 1; -SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_cong_drop, CTLFLAG_RDTUN, +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_cong_drop, CTLFLAG_RWTUN, &nm_cong_drop, 0, "Congestion control for netmap rx queues (0 = backpressure, 1 = drop"); From owner-svn-src-stable-12@freebsd.org Sat Mar 14 02:11:35 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 74C80273761; Sat, 14 Mar 2020 02:11:35 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQzV6rL8z4Rt0; Sat, 14 Mar 2020 02:11:34 +0000 (UTC) (envelope-from np@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 A3CF5FC06; Sat, 14 Mar 2020 02:11:34 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E2BYkC063743; Sat, 14 Mar 2020 02:11:34 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E2BYYb063742; Sat, 14 Mar 2020 02:11:34 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140211.02E2BYYb063742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 02:11:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358983 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 358983 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 02:11:35 -0000 Author: np Date: Sat Mar 14 02:11:34 2020 New Revision: 358983 URL: https://svnweb.freebsd.org/changeset/base/358983 Log: MFC r357606: cxgbe(4): Add native netmap support to the main interface. This means that extra virtual interfaces (VIs) created with hw.cxgbe.num_vis are no longer required to use netmap. Use this tunable to enable native netmap support on the main interface: hw.cxgbe.native_netmap="3" There is no change in default behavior. Suggested by: jch@ Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/t4_main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 02:05:12 2020 (r358982) +++ stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 02:11:34 2020 (r358983) @@ -389,6 +389,22 @@ SYSCTL_INT(_hw_cxgbe_toe_rexmt_backoff, OID_AUTO, 15, #endif #ifdef DEV_NETMAP +#define NN_MAIN_VI (1 << 0) /* Native netmap on the main VI */ +#define NN_EXTRA_VI (1 << 1) /* Native netmap on the extra VI(s) */ +static int t4_native_netmap = NN_EXTRA_VI; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, native_netmap, CTLFLAG_RDTUN, &t4_native_netmap, + 0, "Native netmap support. bit 0 = main VI, bit 1 = extra VIs"); + +#define NNMTXQ 8 +static int t4_nnmtxq = -NNMTXQ; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nnmtxq, CTLFLAG_RDTUN, &t4_nnmtxq, 0, + "Number of netmap TX queues"); + +#define NNMRXQ 8 +static int t4_nnmrxq = -NNMRXQ; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nnmrxq, CTLFLAG_RDTUN, &t4_nnmrxq, 0, + "Number of netmap RX queues"); + #define NNMTXQ_VI 2 static int t4_nnmtxq_vi = -NNMTXQ_VI; SYSCTL_INT(_hw_cxgbe, OID_AUTO, nnmtxq_vi, CTLFLAG_RDTUN, &t4_nnmtxq_vi, 0, @@ -587,6 +603,8 @@ struct intrs_and_queues { uint16_t nrxq; /* # of NIC rxq's for each port */ uint16_t nofldtxq; /* # of TOE/ETHOFLD txq's for each port */ uint16_t nofldrxq; /* # of TOE rxq's for each port */ + uint16_t nnmtxq; /* # of netmap txq's */ + uint16_t nnmrxq; /* # of netmap rxq's */ /* The vcxgbe/vcxl interfaces use these and not the ones above. */ uint16_t ntxq_vi; /* # of NIC txq's */ @@ -1209,10 +1227,16 @@ t4_attach(device_t dev) } #endif #ifdef DEV_NETMAP - if (num_vis > 1) { - s->nnmrxq = nports * (num_vis - 1) * iaq.nnmrxq_vi; - s->nnmtxq = nports * (num_vis - 1) * iaq.nnmtxq_vi; + s->nnmrxq = 0; + s->nnmtxq = 0; + if (t4_native_netmap & NN_MAIN_VI) { + s->nnmrxq += nports * iaq.nnmrxq; + s->nnmtxq += nports * iaq.nnmtxq; } + if (num_vis > 1 && t4_native_netmap & NN_EXTRA_VI) { + s->nnmrxq += nports * (num_vis - 1) * iaq.nnmrxq_vi; + s->nnmtxq += nports * (num_vis - 1) * iaq.nnmtxq_vi; + } s->neq += s->nnmtxq + s->nnmrxq; s->niq += s->nnmrxq; @@ -1305,14 +1329,17 @@ t4_attach(device_t dev) ofld_rqidx += vi->nofldrxq; #endif #ifdef DEV_NETMAP - if (j > 0) { - vi->first_nm_rxq = nm_rqidx; - vi->first_nm_txq = nm_tqidx; + vi->first_nm_rxq = nm_rqidx; + vi->first_nm_txq = nm_tqidx; + if (j == 0) { + vi->nnmrxq = iaq.nnmrxq; + vi->nnmtxq = iaq.nnmtxq; + } else { vi->nnmrxq = iaq.nnmrxq_vi; vi->nnmtxq = iaq.nnmtxq_vi; - nm_rqidx += vi->nnmrxq; - nm_tqidx += vi->nnmtxq; } + nm_rqidx += vi->nnmrxq; + nm_tqidx += vi->nnmtxq; #endif } } @@ -3151,10 +3178,10 @@ fixup_devlog_params(struct adapter *sc) static void update_nirq(struct intrs_and_queues *iaq, int nports) { - int extra = T4_EXTRA_INTR; - iaq->nirq = extra; - iaq->nirq += nports * (iaq->nrxq + iaq->nofldrxq); + iaq->nirq = T4_EXTRA_INTR; + iaq->nirq += nports * max(iaq->nrxq, iaq->nnmrxq); + iaq->nirq += nports * iaq->nofldrxq; iaq->nirq += nports * (iaq->num_vis - 1) * max(iaq->nrxq_vi, iaq->nnmrxq_vi); iaq->nirq += nports * (iaq->num_vis - 1) * iaq->nofldrxq_vi; @@ -3193,8 +3220,14 @@ calculate_iaq(struct adapter *sc, struct intrs_and_que } #endif #ifdef DEV_NETMAP - iaq->nnmtxq_vi = t4_nnmtxq_vi; - iaq->nnmrxq_vi = t4_nnmrxq_vi; + if (t4_native_netmap & NN_MAIN_VI) { + iaq->nnmtxq = t4_nnmtxq; + iaq->nnmrxq = t4_nnmrxq; + } + if (t4_native_netmap & NN_EXTRA_VI) { + iaq->nnmtxq_vi = t4_nnmtxq_vi; + iaq->nnmrxq_vi = t4_nnmrxq_vi; + } #endif update_nirq(iaq, nports); @@ -3252,6 +3285,8 @@ calculate_iaq(struct adapter *sc, struct intrs_and_que do { iaq->nrxq--; } while (!powerof2(iaq->nrxq)); + if (iaq->nnmrxq > iaq->nrxq) + iaq->nnmrxq = iaq->nrxq; } if (iaq->nofldrxq > 1) iaq->nofldrxq >>= 1; @@ -3273,10 +3308,14 @@ calculate_iaq(struct adapter *sc, struct intrs_and_que device_printf(sc->dev, "running with minimal number of queues. " "itype %d, navail %u.\n", itype, navail); iaq->nirq = 1; - MPASS(iaq->nrxq == 1); + iaq->nrxq = 1; iaq->ntxq = 1; - if (iaq->nofldrxq > 1) + if (iaq->nofldrxq > 0) { + iaq->nofldrxq = 1; iaq->nofldtxq = 1; + } + iaq->nnmtxq = 0; + iaq->nnmrxq = 0; done: MPASS(iaq->num_vis > 0); if (iaq->num_vis > 1) { @@ -10591,6 +10630,8 @@ tweak_tunables(void) #endif #ifdef DEV_NETMAP + calculate_nqueues(&t4_nnmtxq, nc, NNMTXQ); + calculate_nqueues(&t4_nnmrxq, nc, NNMRXQ); calculate_nqueues(&t4_nnmtxq_vi, nc, NNMTXQ_VI); calculate_nqueues(&t4_nnmrxq_vi, nc, NNMRXQ_VI); #endif From owner-svn-src-stable-12@freebsd.org Sat Mar 14 02:15:22 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1917D273A25; Sat, 14 Mar 2020 02:15:22 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fR3s6YQ3z4bjL; Sat, 14 Mar 2020 02:15:21 +0000 (UTC) (envelope-from np@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 C8D6BFC7B; Sat, 14 Mar 2020 02:15:21 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E2FLkv064685; Sat, 14 Mar 2020 02:15:21 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E2FLOu064684; Sat, 14 Mar 2020 02:15:21 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140215.02E2FLOu064684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 02:15:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358984 - stable/12/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe/iw_cxgbe X-SVN-Commit-Revision: 358984 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 02:15:22 -0000 Author: np Date: Sat Mar 14 02:15:21 2020 New Revision: 358984 URL: https://svnweb.freebsd.org/changeset/base/358984 Log: MFC r358082: cxgbe/iw_cxgbe: correctly enforce the max reg_mr depth. Reported by: Andrew Zhu @ Netapp Obtained from: Chelsio Communications Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Sat Mar 14 02:11:34 2020 (r358983) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Sat Mar 14 02:15:21 2020 (r358984) @@ -682,7 +682,7 @@ static int c4iw_set_page(struct ib_mr *ibmr, u64 addr) { struct c4iw_mr *mhp = to_c4iw_mr(ibmr); - if (unlikely(mhp->mpl_len == mhp->max_mpl_len)) + if (unlikely(mhp->mpl_len == mhp->attr.pbl_size)) return -ENOMEM; mhp->mpl[mhp->mpl_len++] = addr; From owner-svn-src-stable-12@freebsd.org Sat Mar 14 02:20:55 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB378273DFA; Sat, 14 Mar 2020 02:20:55 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fRBG2dW2z3L1H; Sat, 14 Mar 2020 02:20:54 +0000 (UTC) (envelope-from np@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 03AECFCB1; Sat, 14 Mar 2020 02:20:54 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E2KrOE065891; Sat, 14 Mar 2020 02:20:53 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E2Kr4M065889; Sat, 14 Mar 2020 02:20:53 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140220.02E2Kr4M065889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 02:20:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358985 - in stable/12/sys/dev/cxgbe: . common X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: in stable/12/sys/dev/cxgbe: . common X-SVN-Commit-Revision: 358985 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 02:20:56 -0000 Author: np Date: Sat Mar 14 02:20:53 2020 New Revision: 358985 URL: https://svnweb.freebsd.org/changeset/base/358985 Log: MFC r358086: cxgbe(4): Congestion drops are maintained per E-channel and not per buffer group. This fixes a bug where congestion drops on port 1 of a T6 card would incorrectly be counted as drops on port 0. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/common/t4_hw.c stable/12/sys/dev/cxgbe/t4_main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/common/t4_hw.c ============================================================================== --- stable/12/sys/dev/cxgbe/common/t4_hw.c Sat Mar 14 02:15:21 2020 (r358984) +++ stable/12/sys/dev/cxgbe/common/t4_hw.c Sat Mar 14 02:20:53 2020 (r358985) @@ -6781,9 +6781,10 @@ static unsigned int t4_get_mps_bg_map(struct adapter * static unsigned int t4_get_rx_e_chan_map(struct adapter *adap, int idx) { u32 n = G_NUMPORTS(t4_read_reg(adap, A_MPS_CMN_CTL)); + const u32 all_chan = (1 << adap->chip_params->nchan) - 1; if (n == 0) - return idx == 0 ? 0xf : 0; + return idx == 0 ? all_chan : 0; if (n == 1 && chip_id(adap) <= CHELSIO_T5) return idx < 2 ? (3 << (2 * idx)) : 0; return 1 << idx; Modified: stable/12/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 02:15:21 2020 (r358984) +++ stable/12/sys/dev/cxgbe/t4_main.c Sat Mar 14 02:20:53 2020 (r358985) @@ -5875,7 +5875,7 @@ vi_refresh_stats(struct adapter *sc, struct vi_info *v static void cxgbe_refresh_stats(struct adapter *sc, struct port_info *pi) { - u_int i, v, tnl_cong_drops, bg_map; + u_int i, v, tnl_cong_drops, chan_map; struct timeval tv; const struct timeval interval = {0, 250000}; /* 250ms */ @@ -5886,15 +5886,15 @@ cxgbe_refresh_stats(struct adapter *sc, struct port_in tnl_cong_drops = 0; t4_get_port_stats(sc, pi->tx_chan, &pi->stats); - bg_map = pi->mps_bg_map; - while (bg_map) { - i = ffs(bg_map) - 1; + chan_map = pi->rx_e_chan_map; + while (chan_map) { + i = ffs(chan_map) - 1; mtx_lock(&sc->reg_lock); t4_read_indirect(sc, A_TP_MIB_INDEX, A_TP_MIB_DATA, &v, 1, A_TP_MIB_TNL_CNG_DROP_0 + i); mtx_unlock(&sc->reg_lock); tnl_cong_drops += v; - bg_map &= ~(1 << i); + chan_map &= ~(1 << i); } pi->tnl_cong_drops = tnl_cong_drops; getmicrotime(&pi->last_refreshed); @@ -10004,7 +10004,7 @@ read_i2c(struct adapter *sc, struct t4_i2c_data *i2cd) static int clear_stats(struct adapter *sc, u_int port_id) { - int i, v, bg_map; + int i, v, chan_map; struct port_info *pi; struct vi_info *vi; struct sge_rxq *rxq; @@ -10029,13 +10029,13 @@ clear_stats(struct adapter *sc, u_int port_id) if (vi->flags & VI_INIT_DONE) t4_clr_vi_stats(sc, vi->vin); } - bg_map = pi->mps_bg_map; + chan_map = pi->rx_e_chan_map; v = 0; /* reuse */ - while (bg_map) { - i = ffs(bg_map) - 1; + while (chan_map) { + i = ffs(chan_map) - 1; t4_write_indirect(sc, A_TP_MIB_INDEX, A_TP_MIB_DATA, &v, 1, A_TP_MIB_TNL_CNG_DROP_0 + i); - bg_map &= ~(1 << i); + chan_map &= ~(1 << i); } mtx_unlock(&sc->reg_lock); From owner-svn-src-stable-12@freebsd.org Sat Mar 14 02:24:12 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C8E4274062; Sat, 14 Mar 2020 02:24:12 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fRG41Hqlz3y7L; Sat, 14 Mar 2020 02:24:12 +0000 (UTC) (envelope-from np@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 140B7FE53; Sat, 14 Mar 2020 02:24:12 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E2OBcj070622; Sat, 14 Mar 2020 02:24:11 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E2OBxo070620; Sat, 14 Mar 2020 02:24:11 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140224.02E2OBxo070620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 02:24:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358986 - stable/12/sys/dev/cxgbe/tom X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe/tom X-SVN-Commit-Revision: 358986 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 02:24:12 -0000 Author: np Date: Sat Mar 14 02:24:11 2020 New Revision: 358986 URL: https://svnweb.freebsd.org/changeset/base/358986 Log: MFC r358717: cxgbe/t4_tom: Do not uninitialize a toepcb that has not been initialized. This fixes the following panic: --- trap 0xc, rip = 0xffffffff80c00411, rsp = 0xfffffe0025192840, rbp = 0xfffffe0025192860 --- vmem_xfree() at vmem_xfree+0xd1/frame 0xfffffe0025192860 tls_uninit_toep() at tls_uninit_toep+0x78/frame 0xfffffe0025192880 free_toepcb() at free_toepcb+0x32/frame 0xfffffe00251928a0 t4_connect() at t4_connect+0x3be/frame 0xfffffe0025192950 tcp_offload_connect() at tcp_offload_connect+0xa4/frame 0xfffffe0025192990 tcp_usr_connect() at tcp_usr_connect+0xec/frame 0xfffffe00251929f0 soconnect() at soconnect+0xae/frame 0xfffffe0025192a30 kern_connectat() at kern_connectat+0xe2/frame 0xfffffe0025192a90 sys_connect() at sys_connect+0x75/frame 0xfffffe0025192ad0 amd64_syscall() at amd64_syscall+0x137/frame 0xfffffe0025192bf0 fast_syscall_common() at fast_syscall_common+0x101/frame 0xfffffe0025192bf0 --- syscall (98, FreeBSD ELF64, sys_connect), rip = 0x8008e9d8a, rsp = 0x7fffffffc0f8, rbp = 0x7fffffffc130 --- Reviewed by: jhb@ Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D23989 Modified: stable/12/sys/dev/cxgbe/tom/t4_tom.c stable/12/sys/dev/cxgbe/tom/t4_tom.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/tom/t4_tom.c ============================================================================== --- stable/12/sys/dev/cxgbe/tom/t4_tom.c Sat Mar 14 02:20:53 2020 (r358985) +++ stable/12/sys/dev/cxgbe/tom/t4_tom.c Sat Mar 14 02:24:11 2020 (r358986) @@ -186,6 +186,8 @@ init_toepcb(struct vi_info *vi, struct toepcb *toep) if (ulp_mode(toep) == ULP_MODE_TCPDDP) ddp_init_toep(toep); + toep->flags |= TPF_INITIALIZED; + return (0); } @@ -209,9 +211,11 @@ free_toepcb(struct toepcb *toep) KASSERT(!(toep->flags & TPF_CPL_PENDING), ("%s: CPL pending", __func__)); - if (ulp_mode(toep) == ULP_MODE_TCPDDP) - ddp_uninit_toep(toep); - tls_uninit_toep(toep); + if (toep->flags & TPF_INITIALIZED) { + if (ulp_mode(toep) == ULP_MODE_TCPDDP) + ddp_uninit_toep(toep); + tls_uninit_toep(toep); + } free(toep, M_CXGBE); } Modified: stable/12/sys/dev/cxgbe/tom/t4_tom.h ============================================================================== --- stable/12/sys/dev/cxgbe/tom/t4_tom.h Sat Mar 14 02:20:53 2020 (r358985) +++ stable/12/sys/dev/cxgbe/tom/t4_tom.h Sat Mar 14 02:24:11 2020 (r358986) @@ -72,6 +72,7 @@ enum { TPF_SYNQE = (1 << 8), /* synq_entry, not really a toepcb */ TPF_SYNQE_EXPANDED = (1 << 9), /* toepcb ready, tid context updated */ TPF_FORCE_CREDITS = (1 << 10), /* always send credits */ + TPF_INITIALIZED = (1 << 12), /* init_toepcb has been called */ }; enum { From owner-svn-src-stable-12@freebsd.org Sat Mar 14 06:57:52 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44A322797FA; Sat, 14 Mar 2020 06:57:52 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fYKq6jczz4Dv9; Sat, 14 Mar 2020 06:57:51 +0000 (UTC) (envelope-from cperciva@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 B0B031B0FE; Sat, 14 Mar 2020 06:57:51 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E6vpw7032964; Sat, 14 Mar 2020 06:57:51 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E6vpW1032962; Sat, 14 Mar 2020 06:57:51 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <202003140657.02E6vpW1032962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sat, 14 Mar 2020 06:57:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358990 - stable/12/usr.sbin/powerd X-SVN-Group: stable-12 X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: stable/12/usr.sbin/powerd X-SVN-Commit-Revision: 358990 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 06:57:52 -0000 Author: cperciva Date: Sat Mar 14 06:57:50 2020 New Revision: 358990 URL: https://svnweb.freebsd.org/changeset/base/358990 Log: MFC r358478: Add -N option to powerd(8) to ignore "nice" time. Modified: stable/12/usr.sbin/powerd/powerd.8 stable/12/usr.sbin/powerd/powerd.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/powerd/powerd.8 ============================================================================== --- stable/12/usr.sbin/powerd/powerd.8 Sat Mar 14 06:36:03 2020 (r358989) +++ stable/12/usr.sbin/powerd/powerd.8 Sat Mar 14 06:57:50 2020 (r358990) @@ -37,6 +37,7 @@ .Op Fl i Ar percent .Op Fl m Ar freq .Op Fl M Ar freq +.Op Fl N .Op Fl n Ar mode .Op Fl p Ar ival .Op Fl P Ar pidfile @@ -102,6 +103,10 @@ The default is 50% or lower. Specifies the minimum frequency to throttle down to. .It Fl M Ar freq Specifies the maximum frequency to throttle up to. +.It Fl N +Treat "nice" time as idle for the purpose of load calculation; +i.e. do not increase the CPU frequency if the CPU is only busy +with "nice" processes. .It Fl n Ar mode Selects the .Ar mode Modified: stable/12/usr.sbin/powerd/powerd.c ============================================================================== --- stable/12/usr.sbin/powerd/powerd.c Sat Mar 14 06:36:03 2020 (r358989) +++ stable/12/usr.sbin/powerd/powerd.c Sat Mar 14 06:57:50 2020 (r358990) @@ -86,7 +86,7 @@ static const char *modes[] = { #define DEVDPIPE "/var/run/devd.pipe" #define DEVCTL_MAXBUF 1024 -static int read_usage_times(int *load); +static int read_usage_times(int *load, int nonice); static int read_freqs(int *numfreqs, int **freqs, int **power, int minfreq, int maxfreq); static int set_freq(int freq); @@ -135,15 +135,17 @@ static struct timeval tried_devd; * This function returns summary load of all CPUs. It was made so * intentionally to not reduce performance in scenarios when several * threads are processing requests as a pipeline -- running one at - * a time on different CPUs and waiting for each other. + * a time on different CPUs and waiting for each other. If nonice + * is nonzero, only user+sys+intr time will be counted as load; any + * nice time will be treated as if idle. */ static int -read_usage_times(int *load) +read_usage_times(int *load, int nonice) { static long *cp_times = NULL, *cp_times_old = NULL; static int ncpus = 0; size_t cp_times_len; - int error, cpu, i, total; + int error, cpu, i, total, excl; if (cp_times == NULL) { cp_times_len = 0; @@ -175,8 +177,12 @@ read_usage_times(int *load) } if (total == 0) continue; - *load += 100 - (cp_times[cpu * CPUSTATES + CP_IDLE] - - cp_times_old[cpu * CPUSTATES + CP_IDLE]) * 100 / total; + excl = cp_times[cpu * CPUSTATES + CP_IDLE] - + cp_times_old[cpu * CPUSTATES + CP_IDLE]; + if (nonice) + excl += cp_times[cpu * CPUSTATES + CP_NICE] - + cp_times_old[cpu * CPUSTATES + CP_NICE]; + *load += 100 - excl * 100 / total; } } @@ -473,7 +479,7 @@ usage(void) { fprintf(stderr, -"usage: powerd [-v] [-a mode] [-b mode] [-i %%] [-m freq] [-M freq] [-n mode] [-p ival] [-r %%] [-s source] [-P pidfile]\n"); +"usage: powerd [-v] [-a mode] [-b mode] [-i %%] [-m freq] [-M freq] [-N] [-n mode] [-p ival] [-r %%] [-s source] [-P pidfile]\n"); exit(1); } @@ -490,6 +496,7 @@ main(int argc, char * argv[]) int ch, mode, mode_ac, mode_battery, mode_none, idle, to; uint64_t mjoules_used; size_t len; + int nonice; /* Default mode for all AC states is adaptive. */ mode_ac = mode_none = MODE_HIADAPTIVE; @@ -499,12 +506,13 @@ main(int argc, char * argv[]) poll_ival = DEFAULT_POLL_INTERVAL; mjoules_used = 0; vflag = 0; + nonice = 0; /* User must be root to control frequencies. */ if (geteuid() != 0) errx(1, "must be root to run"); - while ((ch = getopt(argc, argv, "a:b:i:m:M:n:p:P:r:s:v")) != -1) + while ((ch = getopt(argc, argv, "a:b:i:m:M:Nn:p:P:r:s:v")) != -1) switch (ch) { case 'a': parse_mode(optarg, &mode_ac, ch); @@ -539,6 +547,9 @@ main(int argc, char * argv[]) usage(); } break; + case 'N': + nonice = 1; + break; case 'n': parse_mode(optarg, &mode_none, ch); break; @@ -584,7 +595,7 @@ main(int argc, char * argv[]) err(1, "lookup freq_levels"); /* Check if we can read the load and supported freqs. */ - if (read_usage_times(NULL)) + if (read_usage_times(NULL, nonice)) err(1, "read_usage_times"); if (read_freqs(&numfreqs, &freqs, &mwatts, minfreq, maxfreq)) err(1, "error reading supported CPU frequencies"); @@ -766,7 +777,7 @@ main(int argc, char * argv[]) } /* Adaptive mode; get the current CPU usage times. */ - if (read_usage_times(&load)) { + if (read_usage_times(&load, nonice)) { if (vflag) warn("read_usage_times() failed"); continue; From owner-svn-src-stable-12@freebsd.org Sat Mar 14 11:55:28 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6555727F07C; Sat, 14 Mar 2020 11:55:28 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fgxD0sKdz4Md6; Sat, 14 Mar 2020 11:55:28 +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 EDCC21E7D9; Sat, 14 Mar 2020 11:55:27 +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 02EBtRu7010966; Sat, 14 Mar 2020 11:55:27 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02EBtRPp010965; Sat, 14 Mar 2020 11:55:27 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202003141155.02EBtRPp010965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 14 Mar 2020 11:55:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358991 - stable/12/tools/build/mk X-SVN-Group: stable-12 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/12/tools/build/mk X-SVN-Commit-Revision: 358991 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 11:55:28 -0000 Author: dim Date: Sat Mar 14 11:55:27 2020 New Revision: 358991 URL: https://svnweb.freebsd.org/changeset/base/358991 Log: MFC r348677 (by emaste): move llvm-ar and llvm-nm to appropriate location in OptionalObsoleteFiles.inc After r348610 `make delete-old` was still removing llvm-ar and llvm-nm (and associated man pages). Reported by: jhb Sponsored by: The FreeBSD Foundation MFC r348761 (by jkim): Move llvm-ranlib to appropriate location in OptionalObsoleteFiles.inc. Note llvm-ar is linked to llvm-ranlib since r311565. r348677 fixed "make delete-old" issue with llvm-ar but missed it somehow. Discussed with: emaste, jhb Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/12/tools/build/mk/OptionalObsoleteFiles.inc Sat Mar 14 06:57:50 2020 (r358990) +++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc Sat Mar 14 11:55:27 2020 (r358991) @@ -1317,7 +1317,10 @@ OLD_FILES+=usr/bin/clang OLD_FILES+=usr/bin/clang++ OLD_FILES+=usr/bin/clang-cpp OLD_FILES+=usr/bin/clang-tblgen +OLD_FILES+=usr/bin/llvm-ar +OLD_FILES+=usr/bin/llvm-nm OLD_FILES+=usr/bin/llvm-objdump +OLD_FILES+=usr/bin/llvm-ranlib OLD_FILES+=usr/bin/llvm-symbolizer OLD_FILES+=usr/bin/llvm-tblgen OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/algorithm @@ -1579,6 +1582,8 @@ OLD_DIRS+=usr/share/doc/llvm OLD_FILES+=usr/share/man/man1/clang.1.gz OLD_FILES+=usr/share/man/man1/clang++.1.gz OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz +OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz +OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz .endif @@ -1588,7 +1593,6 @@ OLD_FILES+=usr/bin/bugpoint OLD_FILES+=usr/bin/clang-format OLD_FILES+=usr/bin/llc OLD_FILES+=usr/bin/lli -OLD_FILES+=usr/bin/llvm-ar OLD_FILES+=usr/bin/llvm-as OLD_FILES+=usr/bin/llvm-bcanalyzer OLD_FILES+=usr/bin/llvm-cxxdump @@ -1603,17 +1607,14 @@ OLD_FILES+=usr/bin/llvm-lto2 OLD_FILES+=usr/bin/llvm-mc OLD_FILES+=usr/bin/llvm-mca OLD_FILES+=usr/bin/llvm-modextract -OLD_FILES+=usr/bin/llvm-nm OLD_FILES+=usr/bin/llvm-objcopy OLD_FILES+=usr/bin/llvm-pdbutil -OLD_FILES+=usr/bin/llvm-ranlib OLD_FILES+=usr/bin/llvm-rtdyld OLD_FILES+=usr/bin/llvm-xray OLD_FILES+=usr/bin/opt OLD_FILES+=usr/share/man/man1/bugpoint.1.gz OLD_FILES+=usr/share/man/man1/llc.1.gz OLD_FILES+=usr/share/man/man1/lli.1.gz -OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz OLD_FILES+=usr/share/man/man1/llvm-as.1.gz OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz @@ -1621,7 +1622,6 @@ OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz OLD_FILES+=usr/share/man/man1/llvm-link.1.gz -OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz OLD_FILES+=usr/share/man/man1/llvm-pdbutil.1.gz OLD_FILES+=usr/share/man/man1/opt.1.gz .endif From owner-svn-src-stable-12@freebsd.org Sat Mar 14 22:03:50 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A6E44265958; Sat, 14 Mar 2020 22:03: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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fxRB3znbz4XPJ; Sat, 14 Mar 2020 22:03: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 6BC4F25A31; Sat, 14 Mar 2020 22:03: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 02EM3oqI079693; Sat, 14 Mar 2020 22:03:50 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02EM3o90079692; Sat, 14 Mar 2020 22:03:50 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <202003142203.02EM3o90079692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Sat, 14 Mar 2020 22:03:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359003 - stable/12/sys/dev/usb/input X-SVN-Group: stable-12 X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: stable/12/sys/dev/usb/input X-SVN-Commit-Revision: 359003 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 22:03:50 -0000 Author: wulf Date: Sat Mar 14 22:03:49 2020 New Revision: 359003 URL: https://svnweb.freebsd.org/changeset/base/359003 Log: MFC r358895 wmt(4): Reapply r358872 (by hselasky) modified to use maximal input report size instead of wMaxPacketSize. If the USB frame length is set to 1024 bytes, WMT_BSIZE, the EETI controller will pack multiple touch events in the packet and the current code will only process the first touch event. As a result some important events are lost like releasing the finger from the touchscreen. Use the maximal input report size as buffer size instead. PR: 244718 Tested by: Oskar Holmlund , wulf Discussed with: hselasky Modified: stable/12/sys/dev/usb/input/wmt.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/input/wmt.c ============================================================================== --- stable/12/sys/dev/usb/input/wmt.c Sat Mar 14 20:13:42 2020 (r359002) +++ stable/12/sys/dev/usb/input/wmt.c Sat Mar 14 22:03:49 2020 (r359003) @@ -201,6 +201,7 @@ struct wmt_softc uint32_t caps; uint32_t isize; uint32_t nconts_max; + uint32_t report_len; uint8_t report_id; struct hid_location cont_max_loc; @@ -492,10 +493,11 @@ wmt_intr_callback(struct usb_xfer *xfer, usb_error_t e DPRINTFN(6, "sc=%p actlen=%d\n", sc, len); - if (len >= (int)sc->isize || (len > 0 && sc->report_id != 0)) { + if (len >= (int)sc->report_len || + (len > 0 && sc->report_id != 0)) { /* Limit report length to the maximum */ - if (len > (int)sc->isize) - len = sc->isize; + if (len > (int)sc->report_len) + len = sc->report_len; usbd_copy_out(pc, 0, buf, len); @@ -504,8 +506,8 @@ wmt_intr_callback(struct usb_xfer *xfer, usb_error_t e goto tr_ignore; /* Make sure we don't process old data */ - if (len < sc->isize) - bzero(buf + len, sc->isize - len); + if (len < sc->report_len) + bzero(buf + len, sc->report_len - len); /* Strip leading "report ID" byte */ if (sc->report_id) { @@ -521,7 +523,7 @@ tr_ignore: case USB_ST_SETUP: tr_setup: - usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); + usbd_xfer_set_frame_len(xfer, 0, sc->isize); usbd_transfer_submit(xfer); break; default: @@ -808,7 +810,9 @@ wmt_hid_parse(struct wmt_softc *sc, const void *d_ptr, sc->ai[WMT_ORIENTATION].max = 1; } - sc->isize = wmt_hid_report_size(d_ptr, d_len, hid_input, report_id); + sc->isize = hid_report_size(d_ptr, d_len, hid_input, NULL); + sc->report_len = wmt_hid_report_size(d_ptr, d_len, hid_input, + report_id); sc->cont_max_rlen = wmt_hid_report_size(d_ptr, d_len, hid_feature, cont_max_rid); if (thqa_cert_rid > 0)