From owner-svn-src-stable-11@freebsd.org Sun Jun 21 09:24:49 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0AEAE3483C6; Sun, 21 Jun 2020 09:24:49 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49qRvh6QRPz4d6c; Sun, 21 Jun 2020 09:24:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D79F81ADE8; Sun, 21 Jun 2020 09:24:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05L9Omnh005694; Sun, 21 Jun 2020 09:24:48 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05L9OmHv005692; Sun, 21 Jun 2020 09:24:48 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202006210924.05L9OmHv005692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 21 Jun 2020 09:24:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362461 - in stable: 11/contrib/llvm-project/llvm/lib/Analysis 11/lib/clang/include/clang/Config 12/contrib/llvm-project/llvm/lib/Analysis 12/lib/clang/include/clang/Config X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 11/contrib/llvm-project/llvm/lib/Analysis 11/lib/clang/include/clang/Config 12/contrib/llvm-project/llvm/lib/Analysis 12/lib/clang/include/clang/Config X-SVN-Commit-Revision: 362461 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2020 09:24:49 -0000 Author: dim Date: Sun Jun 21 09:24:47 2020 New Revision: 362461 URL: https://svnweb.freebsd.org/changeset/base/362461 Log: MFC r362341: Merge commit 0cecafd647cc from llvm git (by Alina Sbirlea): [BasicAA] Make BasicAA a cfg pass. Summary: Part of the changes in D44564 made BasicAA not CFG only due to it using PhiAnalysisValues which may have values invalidated. Subsequent patches (rL340613) appear to have addressed this limitation. BasicAA should not be invalidated by non-CFG-altering passes. A concrete example is MemCpyOpt which preserves CFG, but we are testing it invalidates BasicAA. llvm-dev RFC: https://groups.google.com/forum/#!topic/llvm-dev/eSPXuWnNfzM Reviewers: john.brawn, sebpop, hfinkel, brzycki Subscribers: hiraditya, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D74353 This fixes an issue with clang's -fintegrated-cc1 feature, which could make it output slightly different assembly code, depending on the way it was invoked. In r361755 we attempted to work around it by disabling the integrated cc1 stage, but it did not solve the root cause for all situations. Extensive testing and bisecting showed that the above change finally makes the output deterministic, even if -fintegrated-cc1 is on. Reported by: Fabian Keil PR: 246630 Modified: stable/11/contrib/llvm-project/llvm/lib/Analysis/BasicAliasAnalysis.cpp stable/11/lib/clang/include/clang/Config/config.h Directory Properties: stable/11/ (props changed) stable/11/contrib/llvm-project/llvm/ (props changed) Changes in other areas also in this revision: Modified: stable/12/contrib/llvm-project/llvm/lib/Analysis/BasicAliasAnalysis.cpp stable/12/lib/clang/include/clang/Config/config.h Directory Properties: stable/12/ (props changed) Modified: stable/11/contrib/llvm-project/llvm/lib/Analysis/BasicAliasAnalysis.cpp ============================================================================== --- stable/11/contrib/llvm-project/llvm/lib/Analysis/BasicAliasAnalysis.cpp Sun Jun 21 08:51:24 2020 (r362460) +++ stable/11/contrib/llvm-project/llvm/lib/Analysis/BasicAliasAnalysis.cpp Sun Jun 21 09:24:47 2020 (r362461) @@ -2059,12 +2059,13 @@ char BasicAAWrapperPass::ID = 0; void BasicAAWrapperPass::anchor() {} INITIALIZE_PASS_BEGIN(BasicAAWrapperPass, "basicaa", - "Basic Alias Analysis (stateless AA impl)", false, true) + "Basic Alias Analysis (stateless AA impl)", true, true) INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker) INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass) INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(PhiValuesWrapperPass) INITIALIZE_PASS_END(BasicAAWrapperPass, "basicaa", - "Basic Alias Analysis (stateless AA impl)", false, true) + "Basic Alias Analysis (stateless AA impl)", true, true) FunctionPass *llvm::createBasicAAWrapperPass() { return new BasicAAWrapperPass(); Modified: stable/11/lib/clang/include/clang/Config/config.h ============================================================================== --- stable/11/lib/clang/include/clang/Config/config.h Sun Jun 21 08:51:24 2020 (r362460) +++ stable/11/lib/clang/include/clang/Config/config.h Sun Jun 21 09:24:47 2020 (r362461) @@ -82,6 +82,6 @@ /* #undef CLANG_ENABLE_STATIC_ANALYZER */ /* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */ -#define CLANG_SPAWN_CC1 1 +#define CLANG_SPAWN_CC1 0 #endif From owner-svn-src-stable-11@freebsd.org Mon Jun 22 19:09:48 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7791D338529; Mon, 22 Jun 2020 19:09:48 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rJrD2c12z4DpD; Mon, 22 Jun 2020 19:09:48 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 54B131330F; Mon, 22 Jun 2020 19:09:48 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05MJ9mYu058198; Mon, 22 Jun 2020 19:09:48 GMT (envelope-from pstef@FreeBSD.org) Received: (from pstef@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05MJ9mZ2058197; Mon, 22 Jun 2020 19:09:48 GMT (envelope-from pstef@FreeBSD.org) Message-Id: <202006221909.05MJ9mZ2058197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pstef set sender to pstef@FreeBSD.org using -f From: Piotr Pawel Stefaniak Date: Mon, 22 Jun 2020 19:09:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362507 - stable/11/share/man/man4 X-SVN-Group: stable-11 X-SVN-Commit-Author: pstef X-SVN-Commit-Paths: stable/11/share/man/man4 X-SVN-Commit-Revision: 362507 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2020 19:09:48 -0000 Author: pstef Date: Mon Jun 22 19:09:47 2020 New Revision: 362507 URL: https://svnweb.freebsd.org/changeset/base/362507 Log: MFC r357186 (by imp): Remove old device list Modified: stable/11/share/man/man4/umass.4 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/umass.4 ============================================================================== --- stable/11/share/man/man4/umass.4 Mon Jun 22 19:09:17 2020 (r362506) +++ stable/11/share/man/man4/umass.4 Mon Jun 22 19:09:47 2020 (r362507) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 19, 2014 +.Dd January 27, 2020 .Dt UMASS 4 .Os .Sh NAME @@ -73,114 +73,6 @@ requires and .Xr scbus 4 to be included in the kernel. -.Sh HARDWARE -The -.Nm -driver supports USB Mass Storage devices, including: -.Pp -.Bl -bullet -compact -.It -ADTEC Stick Drive AD-UST32M, 64M, 128M, 256M -.It -Denno FireWire/USB2 Removable 2.5-inch HDD Case MIFU-25CB20 -.It -FujiFilm Zip USB Drive ZDR100 USB A -.It -GREEN HOUSE USB Flash Memory "PicoDrive" GH-UFD32M, 64M, 128M -.It -Huawei Mobile (SD slot) -.It -IBM 32MB USB Memory Key (P/N 22P5296) -.It -IBM 256MB USB Drive (MSYSTEM DiskOnKey2) -.It -IBM ThinkPad USB Portable CD-ROM Drive (P/N 33L5151) -.It -I-O DATA USB CD/CD-R/CD-RW/DVD-R/DVD-RW/DVD-RAM/DVD-ROM Drive DVR-iUH2 (CDROM, DVD-RAM only) -.It -I-O DATA USB x6 CD-RW Drive CDRW-i64/USB (CDROM only) -.It -I-O DATA USB/IEEE1394 Portable HD Drive HDP-i30P/CI, HDP-i40P/CI -.It -Iomega USB Zip 100/250 drive -.It -Iomega Zip750 USB2.0 drive -.It -Keian USB1.1/2.0 3.5-inch HDD Case KU350A -.It -Kurouto Shikou USB 2.5-inch HDD Case GAWAP2.5PS-USB2.0 -.It -LaCie P3 HardDrive USB 200GB -.It -Logitec LDR-H443U2 DVD-RAM/-R/+R/-RW/+RW drive -.It -Logitec Mobile USB Memory LMC-256UD -.It -Logitec USB1.1/2.0 HDD Unit SHD-E60U2 -.It -Logitec USB Double-Speed Floppy Drive LFD-31U2 -.It -Logitec USB/IEEE1394 DVD-RAM/R/RW Unit LDR-N21FU2 (CDROM only) -.It -MELCO USB Flash Disk "ClipDrive", RUF-C32M, -C64M, -C128M, -C256M, -C512M -.It -MELCO USB Flash Disk "PetitDrive", RUF-32M, -64M, -128M, -256Mm -.It -MELCO USB2.0 Flash Disk "PetitDrive2", RUF-256M/U2, -512M/U2 -.It -MELCO USB2.0 MO Drive MO-CH640U2 -.It -Matshita CF-VFDU03 floppy drive -.It -Merlin SM300 MP3/WMA Player (256Mb) -.It -Microtech International, Inc.\& USB-SCSI-HD 50 USB to SCSI cable -.It -Motorola E398 Mobile Phone (TransFlash memory card) -.It -NOVAC USB2.0 2.5/3.5-inch HDD Case NV-HD351U -.It -PNY Attache Flash Drive -.It -Panasonic ("Matshita FDD CF-VFDU03") -.It -Panasonic KXL-CB20AN Portable DVD-ROM/CD-R/RW -.It -Panasonic KXL-CB35AN (DVD-ROM & CD-R/RW) -.It -Panasonic USB2.0 Portable CD-RW Drive KXL-RW40AN (CDROM only) -.It -Panasonic floppy drive -.It -Qware BeatZkey!\& Pro -.It -RATOC Systems USB2.0 Removable HDD Case U2-MDK1, U2-MDK1B -.It -SanDisk SDDR-31 (Compact Flash) -.It -SanDisk SDDR-75 (only Compact Flash port works) -.It -Sitecom CN-300 MultiFlash (MMC/SD, SmartMedia, CF, MemoryStick) -.It -Sony Portable CD-R/RW Drive CRX10U (CDROM only) -.It -TEAC Portable USB CD-ROM Unit CD-110PU/210PU -.It -Time DPA20B MP3 Player (1Gb) -.It -Trek Thumbdrive 8MB -.It -VAIO floppy drive (includes Y-E Data Flashbuster-U) -.It -Y-E Data floppy drive (720/1.44/2.88Mb) -.El -.Pp -Among the supported digital cameras are: -.Pp -.Bl -bullet -compact -.It -Asahi Optical (PENTAX) Optio 230 & 330 -.El .Sh EXAMPLES .Bd -literal -offset indent device umass @@ -193,11 +85,6 @@ Add the .Nm driver to the kernel. .Pp -.Dl "camcontrol rescan 0" -.Pp -Rescan a Zip drive that was added after boot. -The command above -assumes that the Zip drive is on the first SCSI bus in the system. .Bd -literal -offset indent camcontrol rescan 0:0:0 camcontrol rescan 0:0:1 @@ -208,46 +95,14 @@ camcontrol rescan 0:0:3 Rescan all slots on a multi-slot flash reader, where the slots map to separate LUNs on a single SCSI ID. Typically only the first slot will be enabled at boot time. -Again, this assumes that the flash reader is the first SCSI bus in the system. -.Bd -literal -offset indent -bsdlabel -w da0 zip100 -newfs da0c -mount -t ufs /dev/da0c /mnt -.Ed -.Pp -Write a disklabel to the Zip drive (see -.Xr vpo 4 -for the -.Xr disktab 5 -entry), creates the file system and mounts the new file system on /mnt. -.Pp -.Dl "newfs_msdos /dev/da0" -.Pp -Create a new FAT type file system. -Care should be taken not to run -.Xr newfs 8 -on devices that already contain data, as this will result in the -information being lost. -.Pp -Many consumer devices such as digital cameras automatically create -.Tn MS-DOS -based file systems when storing information such as images and -videos. -These file systems can be accessed by specifying the file system -type as -.Cm msdosfs -when using -.Xr mount 8 . +This assumes that the flash reader is the first SCSI bus in the system and has 4 slots. .Sh SEE ALSO .Xr cfumass 4 , .Xr ehci 4 , .Xr ohci 4 , .Xr uhci 4 , .Xr usb 4 , -.Xr vpo 4 , .Xr xhci 4 , -.Xr disktab 5 , -.Xr bsdlabel 8 , .Xr camcontrol 8 .\".Sh HISTORY .Sh AUTHORS From owner-svn-src-stable-11@freebsd.org Mon Jun 22 21:28:52 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B20D433CC54; Mon, 22 Jun 2020 21:28:52 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rMwh4JfXz4Rtw; Mon, 22 Jun 2020 21:28:52 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F1F81497E; Mon, 22 Jun 2020 21:28:52 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05MLSquS048471; Mon, 22 Jun 2020 21:28:52 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05MLSpQZ048464; Mon, 22 Jun 2020 21:28:51 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202006222128.05MLSpQZ048464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Mon, 22 Jun 2020 21:28:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362511 - in stable: 11/sys/dev/cxgb 11/sys/dev/cxgbe 11/sys/dev/mlx4/mlx4_en 11/sys/dev/mlx5/mlx5_en 11/sys/dev/mxge 11/sys/dev/oce 12/sys/dev/cxgb 12/sys/dev/cxgbe 12/sys/dev/mlx4/mlx... X-SVN-Group: stable-11 X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: in stable: 11/sys/dev/cxgb 11/sys/dev/cxgbe 11/sys/dev/mlx4/mlx4_en 11/sys/dev/mlx5/mlx5_en 11/sys/dev/mxge 11/sys/dev/oce 12/sys/dev/cxgb 12/sys/dev/cxgbe 12/sys/dev/mlx4/mlx4_en 12/sys/dev/mlx5/mlx5... X-SVN-Commit-Revision: 362511 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2020 21:28:52 -0000 Author: freqlabs Date: Mon Jun 22 21:28:51 2020 New Revision: 362511 URL: https://svnweb.freebsd.org/changeset/base/362511 Log: MFC r362201: Avoid trying to toggle TSO twice Remove TSO from the toggle mask when automatically disabled by TXCKSUM* in various NIC drivers. Reviewed by: hselasky, np, gallatin, jpaetzel Approved by: mav (mentor) Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D25120 Modified: stable/11/sys/dev/cxgb/cxgb_main.c stable/11/sys/dev/cxgbe/t4_main.c stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c stable/11/sys/dev/mxge/if_mxge.c stable/11/sys/dev/oce/oce_if.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/dev/cxgb/cxgb_main.c stable/12/sys/dev/cxgbe/t4_main.c stable/12/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c stable/12/sys/dev/mxge/if_mxge.c stable/12/sys/dev/oce/oce_if.c Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/11/sys/dev/cxgb/cxgb_main.c Mon Jun 22 20:55:45 2020 (r362510) +++ stable/11/sys/dev/cxgb/cxgb_main.c Mon Jun 22 21:28:51 2020 (r362511) @@ -1952,6 +1952,7 @@ fail: if (IFCAP_TSO4 & ifp->if_capenable && !(IFCAP_TXCSUM & ifp->if_capenable)) { + mask &= ~IFCAP_TSO4; ifp->if_capenable &= ~IFCAP_TSO4; if_printf(ifp, "tso4 disabled due to -txcsum.\n"); @@ -1963,6 +1964,7 @@ fail: if (IFCAP_TSO6 & ifp->if_capenable && !(IFCAP_TXCSUM_IPV6 & ifp->if_capenable)) { + mask &= ~IFCAP_TSO6; ifp->if_capenable &= ~IFCAP_TSO6; if_printf(ifp, "tso6 disabled due to -txcsum6.\n"); Modified: stable/11/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/11/sys/dev/cxgbe/t4_main.c Mon Jun 22 20:55:45 2020 (r362510) +++ stable/11/sys/dev/cxgbe/t4_main.c Mon Jun 22 21:28:51 2020 (r362511) @@ -1865,6 +1865,7 @@ cxgbe_ioctl(struct ifnet *ifp, unsigned long cmd, cadd if (IFCAP_TSO4 & ifp->if_capenable && !(IFCAP_TXCSUM & ifp->if_capenable)) { + mask &= ~IFCAP_TSO4; ifp->if_capenable &= ~IFCAP_TSO4; if_printf(ifp, "tso4 disabled due to -txcsum.\n"); @@ -1876,6 +1877,7 @@ cxgbe_ioctl(struct ifnet *ifp, unsigned long cmd, cadd if (IFCAP_TSO6 & ifp->if_capenable && !(IFCAP_TXCSUM_IPV6 & ifp->if_capenable)) { + mask &= ~IFCAP_TSO6; ifp->if_capenable &= ~IFCAP_TSO6; if_printf(ifp, "tso6 disabled due to -txcsum6.\n"); Modified: stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c ============================================================================== --- stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Mon Jun 22 20:55:45 2020 (r362510) +++ stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Mon Jun 22 21:28:51 2020 (r362511) @@ -2006,6 +2006,7 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long com if (IFCAP_TSO4 & dev->if_capenable && !(IFCAP_TXCSUM & dev->if_capenable)) { + mask &= ~IFCAP_TSO4; dev->if_capenable &= ~IFCAP_TSO4; dev->if_hwassist &= ~CSUM_IP_TSO; if_printf(dev, @@ -2018,6 +2019,7 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long com if (IFCAP_TSO6 & dev->if_capenable && !(IFCAP_TXCSUM_IPV6 & dev->if_capenable)) { + mask &= ~IFCAP_TSO6; dev->if_capenable &= ~IFCAP_TSO6; dev->if_hwassist &= ~CSUM_IP6_TSO; if_printf(dev, Modified: stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c ============================================================================== --- stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jun 22 20:55:45 2020 (r362510) +++ stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jun 22 21:28:51 2020 (r362511) @@ -3167,6 +3167,7 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t if (IFCAP_TSO4 & ifp->if_capenable && !(IFCAP_TXCSUM & ifp->if_capenable)) { + mask &= ~IFCAP_TSO4; ifp->if_capenable &= ~IFCAP_TSO4; ifp->if_hwassist &= ~CSUM_IP_TSO; mlx5_en_err(ifp, @@ -3179,6 +3180,7 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t if (IFCAP_TSO6 & ifp->if_capenable && !(IFCAP_TXCSUM_IPV6 & ifp->if_capenable)) { + mask &= ~IFCAP_TSO6; ifp->if_capenable &= ~IFCAP_TSO6; ifp->if_hwassist &= ~CSUM_IP6_TSO; mlx5_en_err(ifp, Modified: stable/11/sys/dev/mxge/if_mxge.c ============================================================================== --- stable/11/sys/dev/mxge/if_mxge.c Mon Jun 22 20:55:45 2020 (r362510) +++ stable/11/sys/dev/mxge/if_mxge.c Mon Jun 22 21:28:51 2020 (r362511) @@ -4201,13 +4201,15 @@ mxge_ioctl(struct ifnet *ifp, u_long command, caddr_t mask = ifr->ifr_reqcap ^ ifp->if_capenable; if (mask & IFCAP_TXCSUM) { if (IFCAP_TXCSUM & ifp->if_capenable) { + mask &= ~IFCAP_TSO4; ifp->if_capenable &= ~(IFCAP_TXCSUM|IFCAP_TSO4); ifp->if_hwassist &= ~(CSUM_TCP | CSUM_UDP); } else { ifp->if_capenable |= IFCAP_TXCSUM; ifp->if_hwassist |= (CSUM_TCP | CSUM_UDP); } - } else if (mask & IFCAP_RXCSUM) { + } + if (mask & IFCAP_RXCSUM) { if (IFCAP_RXCSUM & ifp->if_capenable) { ifp->if_capenable &= ~IFCAP_RXCSUM; } else { @@ -4229,6 +4231,7 @@ mxge_ioctl(struct ifnet *ifp, u_long command, caddr_t #if IFCAP_TSO6 if (mask & IFCAP_TXCSUM_IPV6) { if (IFCAP_TXCSUM_IPV6 & ifp->if_capenable) { + mask &= ~IFCAP_TSO6; ifp->if_capenable &= ~(IFCAP_TXCSUM_IPV6 | IFCAP_TSO6); ifp->if_hwassist &= ~(CSUM_TCP_IPV6 @@ -4238,7 +4241,8 @@ mxge_ioctl(struct ifnet *ifp, u_long command, caddr_t ifp->if_hwassist |= (CSUM_TCP_IPV6 | CSUM_UDP_IPV6); } - } else if (mask & IFCAP_RXCSUM_IPV6) { + } + if (mask & IFCAP_RXCSUM_IPV6) { if (IFCAP_RXCSUM_IPV6 & ifp->if_capenable) { ifp->if_capenable &= ~IFCAP_RXCSUM_IPV6; } else { Modified: stable/11/sys/dev/oce/oce_if.c ============================================================================== --- stable/11/sys/dev/oce/oce_if.c Mon Jun 22 20:55:45 2020 (r362510) +++ stable/11/sys/dev/oce/oce_if.c Mon Jun 22 21:28:51 2020 (r362511) @@ -534,6 +534,7 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t d if (IFCAP_TSO & ifp->if_capenable && !(IFCAP_TXCSUM & ifp->if_capenable)) { + u &= ~IFCAP_TSO; ifp->if_capenable &= ~IFCAP_TSO; ifp->if_hwassist &= ~CSUM_TSO; if_printf(ifp, From owner-svn-src-stable-11@freebsd.org Mon Jun 22 21:41:51 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CFF8133CDD4; Mon, 22 Jun 2020 21:41:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rNCg52kXz4SQK; Mon, 22 Jun 2020 21:41:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A852015017; Mon, 22 Jun 2020 21:41:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05MLfpHa060349; Mon, 22 Jun 2020 21:41:51 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05MLfpvQ060348; Mon, 22 Jun 2020 21:41:51 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <202006222141.05MLfpvQ060348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 22 Jun 2020 21:41:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362512 - stable/11/release/doc/en_US.ISO8859-1/hardware X-SVN-Group: stable-11 X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/hardware X-SVN-Commit-Revision: 362512 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2020 21:41:51 -0000 Author: hrs Date: Mon Jun 22 21:41:51 2020 New Revision: 362512 URL: https://svnweb.freebsd.org/changeset/base/362512 Log: Fix a build error due to removal of hardware section in umass(4). Modified: stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml Mon Jun 22 21:28:51 2020 (r362511) +++ stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml Mon Jun 22 21:41:51 2020 (r362512) @@ -1543,8 +1543,6 @@ &hwlist.umct; - &hwlist.umass; - [&arch.amd64;, &arch.i386;, &arch.pc98;] Audio Devices (&man.uaudio.4; driver) From owner-svn-src-stable-11@freebsd.org Mon Jun 22 21:59:43 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2A92533DDA0; Mon, 22 Jun 2020 21:59:43 +0000 (UTC) (envelope-from pstef@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rNcH0Lbwz4TXl; Mon, 22 Jun 2020 21:59:43 +0000 (UTC) (envelope-from pstef@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1403) id E05181963E; Mon, 22 Jun 2020 21:59:42 +0000 (UTC) Date: Mon, 22 Jun 2020 23:59:42 +0200 From: "Piotr P. Stefaniak" To: Hiroki Sato Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r362512 - stable/11/release/doc/en_US.ISO8859-1/hardware Message-ID: <20200622215942.GD28243@freefall.freebsd.org> References: <202006222141.05MLfpvQ060348@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <202006222141.05MLfpvQ060348@repo.freebsd.org> X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2020 21:59:43 -0000 On 2020-06-22 21:41:51, Hiroki Sato wrote: >Author: hrs >Date: Mon Jun 22 21:41:51 2020 >New Revision: 362512 >URL: https://svnweb.freebsd.org/changeset/base/362512 > >Log: > Fix a build error due to removal of hardware section in umass(4). Oops, sorry, I didn't predict that. Thank you for the fix! From owner-svn-src-stable-11@freebsd.org Tue Jun 23 03:31:35 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 77F9C347272; Tue, 23 Jun 2020 03:31:35 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rWzC2d51z3f1T; Tue, 23 Jun 2020 03:31:35 +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 556A619E6F; Tue, 23 Jun 2020 03:31:35 +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 05N3VZaA075995; Tue, 23 Jun 2020 03:31:35 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N3VZIE075994; Tue, 23 Jun 2020 03:31:35 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006230331.05N3VZIE075994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 23 Jun 2020 03:31:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362527 - stable/11/libexec/rtld-elf X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/libexec/rtld-elf X-SVN-Commit-Revision: 362527 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 03:31:35 -0000 Author: kib Date: Tue Jun 23 03:31:34 2020 New Revision: 362527 URL: https://svnweb.freebsd.org/changeset/base/362527 Log: MFC r362249: Systematically pass RTLD_LO_TRACE to load_needed_objects(). Modified: stable/11/libexec/rtld-elf/rtld.c Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.c ============================================================================== --- stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:18:57 2020 (r362526) +++ stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:31:34 2020 (r362527) @@ -689,7 +689,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr preload_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q)); dbg("loading needed objects"); - if (load_needed_objects(obj_main, 0) == -1) + if (load_needed_objects(obj_main, ld_tracing != NULL ? RTLD_LO_TRACE : + 0) == -1) rtld_die(); /* Make a list of all objects loaded at startup. */ @@ -3398,7 +3399,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *ref } if (result != -1) result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN | - RTLD_LO_EARLY | RTLD_LO_IGNSTLS)); + RTLD_LO_EARLY | RTLD_LO_IGNSTLS | RTLD_LO_TRACE)); init_dag(obj); ref_dag(obj); if (result != -1) From owner-svn-src-stable-11@freebsd.org Tue Jun 23 03:32:21 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 26FAE347122; Tue, 23 Jun 2020 03:32: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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rX050GZxz3f41; Tue, 23 Jun 2020 03:32:21 +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 0461119E7E; Tue, 23 Jun 2020 03:32:21 +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 05N3WKlL076084; Tue, 23 Jun 2020 03:32:20 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N3WKtw076083; Tue, 23 Jun 2020 03:32:20 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006230332.05N3WKtw076083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 23 Jun 2020 03:32:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362528 - stable/11/libexec/rtld-elf X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/libexec/rtld-elf X-SVN-Commit-Revision: 362528 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 03:32:21 -0000 Author: kib Date: Tue Jun 23 03:32:20 2020 New Revision: 362528 URL: https://svnweb.freebsd.org/changeset/base/362528 Log: MFC r362250: rtld: Add debug line for dlopen_object(). Modified: stable/11/libexec/rtld-elf/rtld.c Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.c ============================================================================== --- stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:31:34 2020 (r362527) +++ stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:32:20 2020 (r362528) @@ -3364,6 +3364,9 @@ dlopen_object(const char *name, int fd, Obj_Entry *ref RtldLockState mlockstate; int result; + dbg("dlopen_object name \"%s\" fd %d refobj \"%s\" lo_flags %#x mode %#x", + name != NULL ? name : "", fd, refobj == NULL ? "" : + refobj->path, lo_flags, mode); objlist_init(&initlist); if (lockstate == NULL && !(lo_flags & RTLD_LO_EARLY)) { From owner-svn-src-stable-11@freebsd.org Tue Jun 23 03:32:58 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B11FC34729D; Tue, 23 Jun 2020 03:32:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49rX0p4GXlz3fP3; Tue, 23 Jun 2020 03:32:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DC271A04A; Tue, 23 Jun 2020 03:32:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05N3Ww04076164; Tue, 23 Jun 2020 03:32:58 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N3WwTt076163; Tue, 23 Jun 2020 03:32:58 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006230332.05N3WwTt076163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 23 Jun 2020 03:32:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362529 - stable/11/libexec/rtld-elf X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/libexec/rtld-elf X-SVN-Commit-Revision: 362529 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 03:32:58 -0000 Author: kib Date: Tue Jun 23 03:32:58 2020 New Revision: 362529 URL: https://svnweb.freebsd.org/changeset/base/362529 Log: MFC r362251: rtld: Allow to load ET_DYN && DF_1_PIE when tracing. Modified: stable/11/libexec/rtld-elf/rtld.c Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.c ============================================================================== --- stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:32:20 2020 (r362528) +++ stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:32:58 2020 (r362529) @@ -2541,12 +2541,13 @@ do_load_object(int fd, const char *name, char *path, s obj->path = path; if (!digest_dynamic(obj, 0)) goto errp; - if (obj->z_pie) { + dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path, + obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount); + if (obj->z_pie && (flags & RTLD_LO_TRACE) == 0) { + dbg("refusing to load PIE executable \"%s\"", obj->path); _rtld_error("Cannot load PIE binary %s as DSO", obj->path); goto errp; } - dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path, - obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount); if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN | RTLD_LO_TRACE)) == RTLD_LO_DLOPEN) { dbg("refusing to load non-loadable \"%s\"", obj->path); From owner-svn-src-stable-11@freebsd.org Wed Jun 24 05:12:01 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F24D343726; Wed, 24 Jun 2020 05:12:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sB8d0zjJz4ZZc; Wed, 24 Jun 2020 05:12:01 +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 1D023C3F7; Wed, 24 Jun 2020 05:12:01 +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 05O5C1rf020224; Wed, 24 Jun 2020 05:12:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05O5C0ci020223; Wed, 24 Jun 2020 05:12:00 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202006240512.05O5C0ci020223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 24 Jun 2020 05:12:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362571 - stable/11/sys/dev/mlx4/mlx4_en X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/dev/mlx4/mlx4_en X-SVN-Commit-Revision: 362571 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2020 05:12:01 -0000 Author: hselasky Date: Wed Jun 24 05:12:00 2020 New Revision: 362571 URL: https://svnweb.freebsd.org/changeset/base/362571 Log: MFC r362271: Allow multicast packets to be received in promiscious mode, in mlx4en(4). Make sure we disable the multicast filter in promiscious mode aswell as when the all multicast flag is set. Found by: Tycho Nightingale Sponsored by: Mellanox Technologies Modified: stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c ============================================================================== --- stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Wed Jun 24 05:10:41 2020 (r362570) +++ stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Wed Jun 24 05:12:00 2020 (r362571) @@ -850,9 +850,11 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv * int err = 0; u64 mcast_addr = 0; - - /* Enable/disable the multicast filter according to IFF_ALLMULTI */ - if (dev->if_flags & IFF_ALLMULTI) { + /* + * Enable/disable the multicast filter according to + * IFF_ALLMULTI and IFF_PROMISC: + */ + if (dev->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) { err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 0, MLX4_MCAST_DISABLE); if (err) From owner-svn-src-stable-11@freebsd.org Thu Jun 25 00:01:25 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5197B346A05; Thu, 25 Jun 2020 00:01:25 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sgCn1XPtz4Fk9; Thu, 25 Jun 2020 00:01:25 +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 2DF361A1B8; Thu, 25 Jun 2020 00:01:25 +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 05P01Pjb055461; Thu, 25 Jun 2020 00:01:25 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05P01PN1055455; Thu, 25 Jun 2020 00:01:25 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <202006250001.05P01PN1055455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Thu, 25 Jun 2020 00:01:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362598 - stable/11/sys/dev/evdev X-SVN-Group: stable-11 X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: stable/11/sys/dev/evdev X-SVN-Commit-Revision: 362598 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 00:01:25 -0000 Author: wulf Date: Thu Jun 25 00:01:24 2020 New Revision: 362598 URL: https://svnweb.freebsd.org/changeset/base/362598 Log: MFC r362260: evdev: Add AT translated set1 scancodes for 'Eisu' & 'Kana' keys. PR: 247292 Submitted by: Yuichiro NAITO Modified: stable/11/sys/dev/evdev/evdev_utils.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/evdev/evdev_utils.c ============================================================================== --- stable/11/sys/dev/evdev/evdev_utils.c Thu Jun 25 00:00:04 2020 (r362597) +++ stable/11/sys/dev/evdev/evdev_utils.c Thu Jun 25 00:01:24 2020 (r362598) @@ -148,7 +148,7 @@ static uint16_t evdev_at_set1_scancodes[] = { NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - KEY_KATAKANAHIRAGANA, NONE, NONE, KEY_RO, + KEY_KATAKANAHIRAGANA, KEY_HANGEUL, KEY_HANJA, KEY_RO, NONE, NONE, KEY_ZENKAKUHANKAKU, KEY_HIRAGANA, KEY_KATAKANA, KEY_HENKAN, NONE, KEY_MUHENKAN, NONE, KEY_YEN, KEY_KPCOMMA, NONE, From owner-svn-src-stable-11@freebsd.org Thu Jun 25 05:35:46 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D2D9A3510DA; Thu, 25 Jun 2020 05:35:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49spdZ5Cwqz4c20; Thu, 25 Jun 2020 05:35:46 +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 AE5001E481; Thu, 25 Jun 2020 05:35:46 +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 05P5ZkhZ060690; Thu, 25 Jun 2020 05:35:46 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05P5ZkU2060689; Thu, 25 Jun 2020 05:35:46 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006250535.05P5ZkU2060689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 25 Jun 2020 05:35:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362606 - stable/11/sys/compat/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/compat/linux X-SVN-Commit-Revision: 362606 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 05:35:46 -0000 Author: kib Date: Thu Jun 25 05:35:46 2020 New Revision: 362606 URL: https://svnweb.freebsd.org/changeset/base/362606 Log: MFC r362342: Fix execution of linux binary from multithreaded non-Linux process. Modified: stable/11/sys/compat/linux/linux_emul.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linux/linux_emul.c ============================================================================== --- stable/11/sys/compat/linux/linux_emul.c Thu Jun 25 05:24:35 2020 (r362605) +++ stable/11/sys/compat/linux/linux_emul.c Thu Jun 25 05:35:46 2020 (r362606) @@ -261,22 +261,13 @@ linux_common_execve(struct thread *td, struct image_ar void linux_proc_exec(void *arg __unused, struct proc *p, struct image_params *imgp) { - struct thread *td = curthread; + struct thread *td; struct thread *othertd; #if defined(__amd64__) struct linux_pemuldata *pem; #endif - /* - * In a case of execing from Linux binary properly detach - * other threads from the user space. - */ - if (__predict_false(SV_PROC_ABI(p) == SV_ABI_LINUX)) { - FOREACH_THREAD_IN_PROC(p, othertd) { - if (td != othertd) - (p->p_sysent->sv_thread_detach)(othertd); - } - } + td = curthread; /* * In a case of execing to Linux binary we create Linux @@ -284,11 +275,32 @@ linux_proc_exec(void *arg __unused, struct proc *p, st */ if (__predict_false((imgp->sysent->sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)) { - - if (SV_PROC_ABI(p) == SV_ABI_LINUX) + if (SV_PROC_ABI(p) == SV_ABI_LINUX) { + /* + * Process already was under Linuxolator + * before exec. Update emuldata to reflect + * single-threaded cleaned state after exec. + */ linux_proc_init(td, NULL, 0); - else + } else { + /* + * We are switching the process to Linux emulator. + */ linux_proc_init(td, td, 0); + + /* + * Create a transient td_emuldata for all suspended + * threads, so that p->p_sysent->sv_thread_detach() == + * linux_thread_detach() can find expected but unused + * emuldata. + */ + FOREACH_THREAD_IN_PROC(td->td_proc, othertd) { + if (othertd != td) { + linux_proc_init(td, othertd, + LINUX_CLONE_THREAD); + } + } + } #if defined(__amd64__) /* * An IA32 executable which has executable stack will have the From owner-svn-src-stable-11@freebsd.org Thu Jun 25 05:44:07 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7275735191B; Thu, 25 Jun 2020 05:44:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49spqC2SpMz4cLX; Thu, 25 Jun 2020 05:44:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FE4A1E425; Thu, 25 Jun 2020 05:44:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05P5i7Xn066800; Thu, 25 Jun 2020 05:44:07 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05P5i7Uk066799; Thu, 25 Jun 2020 05:44:07 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006250544.05P5i7Uk066799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 25 Jun 2020 05:44:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362607 - stable/11/libexec/rtld-elf X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/libexec/rtld-elf X-SVN-Commit-Revision: 362607 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 05:44:07 -0000 Author: kib Date: Thu Jun 25 05:44:06 2020 New Revision: 362607 URL: https://svnweb.freebsd.org/changeset/base/362607 Log: MFC r362346: rtld: Parse own phdr and notes. Modified: stable/11/libexec/rtld-elf/rtld.c Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.c ============================================================================== --- stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:35:46 2020 (r362606) +++ stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:44:06 2020 (r362607) @@ -2111,6 +2111,34 @@ process_z(Obj_Entry *root) } } } + +static void +parse_rtld_phdr(Obj_Entry *obj) +{ + const Elf_Phdr *ph; + Elf_Addr note_start, note_end; + + obj->stack_flags = PF_X | PF_R | PF_W; + for (ph = obj->phdr; (const char *)ph < (const char *)obj->phdr + + obj->phsize; ph++) { + switch (ph->p_type) { + case PT_GNU_STACK: + obj->stack_flags = ph->p_flags; + break; + case PT_GNU_RELRO: + obj->relro_page = obj->relocbase + + trunc_page(ph->p_vaddr); + obj->relro_size = round_page(ph->p_memsz); + break; + case PT_NOTE: + note_start = (Elf_Addr)obj->relocbase + ph->p_vaddr; + note_end = note_start + ph->p_filesz; + digest_notes(obj, note_start, note_end); + break; + } + } +} + /* * Initialize the dynamic linker. The argument is the address at which * the dynamic linker has been mapped into memory. The primary task of @@ -2179,6 +2207,8 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) /* Replace the path with a dynamically allocated copy. */ obj_rtld.path = xstrdup(ld_path_rtld); + + parse_rtld_phdr(&obj_rtld); r_debug.r_brk = r_debug_state; r_debug.r_state = RT_CONSISTENT; From owner-svn-src-stable-11@freebsd.org Thu Jun 25 06:39:19 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 511F6352DE7; Thu, 25 Jun 2020 06:39:19 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sr2v1Rvvz4g56; Thu, 25 Jun 2020 06:39:19 +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 2C7E11ED3D; Thu, 25 Jun 2020 06:39:19 +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 05P6dJMT098316; Thu, 25 Jun 2020 06:39:19 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05P6dJfY098315; Thu, 25 Jun 2020 06:39:19 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202006250639.05P6dJfY098315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 25 Jun 2020 06:39:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362608 - stable/11/libexec/rtld-elf X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/libexec/rtld-elf X-SVN-Commit-Revision: 362608 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 06:39:19 -0000 Author: kib Date: Thu Jun 25 06:39:18 2020 New Revision: 362608 URL: https://svnweb.freebsd.org/changeset/base/362608 Log: MFC r362347: rtld: Apply relro to itself. Modified: stable/11/libexec/rtld-elf/rtld.c Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.c ============================================================================== --- stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:44:06 2020 (r362607) +++ stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 06:39:18 2020 (r362608) @@ -2209,6 +2209,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) obj_rtld.path = xstrdup(ld_path_rtld); parse_rtld_phdr(&obj_rtld); + obj_enforce_relro(&obj_rtld); r_debug.r_brk = r_debug_state; r_debug.r_state = RT_CONSISTENT; From owner-svn-src-stable-11@freebsd.org Thu Jun 25 06:44:59 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 784A3353174; Thu, 25 Jun 2020 06:44:59 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49sr9M2qxLz3Rmh; Thu, 25 Jun 2020 06:44:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 05P6ien8042127 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 25 Jun 2020 09:44:43 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 05P6ien8042127 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 05P6ie7f042125; Thu, 25 Jun 2020 09:44:40 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 25 Jun 2020 09:44:40 +0300 From: Konstantin Belousov To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r362608 - stable/11/libexec/rtld-elf Message-ID: <20200625064440.GA32126@kib.kiev.ua> References: <202006250639.05P6dJfY098315@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006250639.05P6dJfY098315@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49sr9M2qxLz3Rmh X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com X-Spamd-Result: default: False [1.38 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; NEURAL_SPAM_MEDIUM(0.72)[0.721]; NEURAL_HAM_SHORT(-0.10)[-0.103]; NEURAL_SPAM_LONG(0.76)[0.759]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_ENVFROM(0.00)[gmail.com]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 06:44:59 -0000 On Thu, Jun 25, 2020 at 06:39:19AM +0000, Konstantin Belousov wrote: > Author: kib > Date: Thu Jun 25 06:39:18 2020 > New Revision: 362608 > URL: https://svnweb.freebsd.org/changeset/base/362608 > > Log: > MFC r362347: > rtld: Apply relro to itself. On stable/11, due to the configuration of old bfd ld, rtld does not have relro segment, so this is a merge to keep code similar between branches. > > Modified: > stable/11/libexec/rtld-elf/rtld.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/libexec/rtld-elf/rtld.c > ============================================================================== > --- stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:44:06 2020 (r362607) > +++ stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 06:39:18 2020 (r362608) > @@ -2209,6 +2209,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) > obj_rtld.path = xstrdup(ld_path_rtld); > > parse_rtld_phdr(&obj_rtld); > + obj_enforce_relro(&obj_rtld); > > r_debug.r_brk = r_debug_state; > r_debug.r_state = RT_CONSISTENT; From owner-svn-src-stable-11@freebsd.org Fri Jun 26 00:58:59 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 99E37349AB0; Fri, 26 Jun 2020 00:58:59 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49tJRl3Yn8z3ZVY; Fri, 26 Jun 2020 00:58:59 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7564AC125; Fri, 26 Jun 2020 00:58:59 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05Q0wxgY074129; Fri, 26 Jun 2020 00:58:59 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05Q0wxSf074128; Fri, 26 Jun 2020 00:58:59 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202006260058.05Q0wxSf074128@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Fri, 26 Jun 2020 00:58:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362638 - in stable: 11/lib/libdevdctl 12/lib/libdevdctl X-SVN-Group: stable-11 X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: in stable: 11/lib/libdevdctl 12/lib/libdevdctl X-SVN-Commit-Revision: 362638 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2020 00:58:59 -0000 Author: freqlabs Date: Fri Jun 26 00:58:59 2020 New Revision: 362638 URL: https://svnweb.freebsd.org/changeset/base/362638 Log: MFC r362544: libdevdctl: Force full match of "timestamp" field name OpenZFS generates events with a "zio_timestamp" field, which gets mistaken for "timestamp" by libdevdctl due to imprecise string matching. Then later it is assumed a "timestamp" field exists when it doesn't and an exception is thrown. Add a space to the search string so we match exactly "timestamp" rather than anything with that as a suffix. Approved by: mav (mentor) Sponsored by: iXsystems, Inc. Modified: stable/11/lib/libdevdctl/event.cc Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/lib/libdevdctl/event.cc Directory Properties: stable/12/ (props changed) Modified: stable/11/lib/libdevdctl/event.cc ============================================================================== --- stable/11/lib/libdevdctl/event.cc Fri Jun 26 00:01:31 2020 (r362637) +++ stable/11/lib/libdevdctl/event.cc Fri Jun 26 00:58:59 2020 (r362638) @@ -427,7 +427,7 @@ Event::TimestampEventString(std::string &eventString) * Add a timestamp as the final field of the event if it is * not already present. */ - if (eventString.find("timestamp=") == string::npos) { + if (eventString.find(" timestamp=") == string::npos) { const size_t bufsize = 32; // Long enough for a 64-bit int timeval now; char timebuf[bufsize]; From owner-svn-src-stable-11@freebsd.org Fri Jun 26 18:01:58 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8346735D3AE; Fri, 26 Jun 2020 18:01:58 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49tl862zjHz3SXl; Fri, 26 Jun 2020 18:01:58 +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 619AF18014; Fri, 26 Jun 2020 18:01:58 +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 05QI1wh5018215; Fri, 26 Jun 2020 18:01:58 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05QI1wqg018214; Fri, 26 Jun 2020 18:01:58 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202006261801.05QI1wqg018214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 26 Jun 2020 18:01:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362658 - stable/11/contrib/netbsd-tests/kernel X-SVN-Group: stable-11 X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: stable/11/contrib/netbsd-tests/kernel X-SVN-Commit-Revision: 362658 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2020 18:01:58 -0000 Author: lwhsu Date: Fri Jun 26 18:01:57 2020 New Revision: 362658 URL: https://svnweb.freebsd.org/changeset/base/362658 Log: MFC r362656: Temporarily skip flakey sys.kern.sysv_test.msg in CI PR: 233649 Modified: stable/11/contrib/netbsd-tests/kernel/t_sysv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/netbsd-tests/kernel/t_sysv.c ============================================================================== --- stable/11/contrib/netbsd-tests/kernel/t_sysv.c Fri Jun 26 18:01:35 2020 (r362657) +++ stable/11/contrib/netbsd-tests/kernel/t_sysv.c Fri Jun 26 18:01:57 2020 (r362658) @@ -212,6 +212,9 @@ ATF_TC_BODY(msg, tc) int loop; int c_status; + if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) + atf_tc_skip("https://bugs.freebsd.org/233649"); + /* * Install a SIGSYS handler so that we can exit gracefully if * System V Message Queue support isn't in the kernel. From owner-svn-src-stable-11@freebsd.org Sat Jun 27 10:57:31 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1D5E34BE3C; Sat, 27 Jun 2020 10:57:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49v9gv3qlmz3Rp6; Sat, 27 Jun 2020 10:57:31 +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 64EC823DE8; Sat, 27 Jun 2020 10:57:31 +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 05RAvV6a043791; Sat, 27 Jun 2020 10:57:31 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RAvVwU043790; Sat, 27 Jun 2020 10:57:31 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202006271057.05RAvVwU043790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 27 Jun 2020 10:57:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362674 - stable/11/tools/build/mk X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/tools/build/mk X-SVN-Commit-Revision: 362674 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 10:57:31 -0000 Author: dim Date: Sat Jun 27 10:57:30 2020 New Revision: 362674 URL: https://svnweb.freebsd.org/changeset/base/362674 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/11/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 27 09:01:30 2020 (r362673) +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 27 10:57:30 2020 (r362674) @@ -1334,7 +1334,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/10.0.0/include/cuda_wrappers/algorithm @@ -1613,6 +1616,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-tblgen.1.gz .endif @@ -1621,7 +1626,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 @@ -1636,17 +1640,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 @@ -1654,7 +1655,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/llvm-symbolizer.1.gz OLD_FILES+=usr/share/man/man1/opt.1.gz From owner-svn-src-stable-11@freebsd.org Sat Jun 27 14:31:36 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6685C352490; Sat, 27 Jun 2020 14:31:36 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vGQv0PT8z3ypL; Sat, 27 Jun 2020 14:31:35 +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 E1A7F26994; Sat, 27 Jun 2020 14:31:34 +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 05REVYvH076783; Sat, 27 Jun 2020 14:31:34 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05REVYF8076781; Sat, 27 Jun 2020 14:31:34 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202006271431.05REVYF8076781@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: Sat, 27 Jun 2020 14:31:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362688 - in stable/11/usr.bin/sed: . tests X-SVN-Group: stable-11 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in stable/11/usr.bin/sed: . tests X-SVN-Commit-Revision: 362688 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 14:31:37 -0000 Author: 0mp (doc,ports committer) Date: Sat Jun 27 14:31:33 2020 New Revision: 362688 URL: https://svnweb.freebsd.org/changeset/base/362688 Log: MFC 362017, 362039, 362071: Read commands from stdin when -f - is passed to sed(1) This patch teaches sed to interpret a "-" in a special way when given as an argument to the -f flag. This behavior is also present in GNU sed. PR: 244872 Tested by: antoine (exp-run) Reviewed by: pfg, tobik (older version) Approved by: pfg (src) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D24079 Remove duplicate lines from sed tests Reported by: yuripv Approved by: pfg (src) Remove some more duplicate test cases I accidentally committed Reported by: markj, yuripv Modified: stable/11/usr.bin/sed/main.c stable/11/usr.bin/sed/sed.1 stable/11/usr.bin/sed/tests/sed2_test.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/sed/main.c ============================================================================== --- stable/11/usr.bin/sed/main.c Sat Jun 27 14:27:37 2020 (r362687) +++ stable/11/usr.bin/sed/main.c Sat Jun 27 14:31:33 2020 (r362688) @@ -125,12 +125,13 @@ static void usage(void); int main(int argc, char *argv[]) { - int c, fflag; + int c, fflag, fflagstdin; char *temp_arg; (void) setlocale(LC_ALL, ""); fflag = 0; + fflagstdin = 0; inplace = NULL; while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1) @@ -156,6 +157,8 @@ main(int argc, char *argv[]) break; case 'f': fflag = 1; + if (strcmp(optarg, "-") == 0) + fflagstdin = 1; add_compunit(CU_FILE, optarg); break; case 'i': @@ -192,6 +195,8 @@ main(int argc, char *argv[]) if (*argv) for (; *argv; argv++) add_file(*argv); + else if (fflagstdin) + exit(rval); else add_file(NULL); process(); @@ -235,9 +240,14 @@ again: linenum = 0; switch (script->type) { case CU_FILE: - if ((f = fopen(script->s, "r")) == NULL) - err(1, "%s", script->s); - fname = script->s; + if (strcmp(script->s, "-") == 0) { + f = stdin; + fname = "stdin"; + } else { + if ((f = fopen(script->s, "r")) == NULL) + err(1, "%s", script->s); + fname = script->s; + } state = ST_FILE; goto again; case CU_STRING: Modified: stable/11/usr.bin/sed/sed.1 ============================================================================== --- stable/11/usr.bin/sed/sed.1 Sat Jun 27 14:27:37 2020 (r362687) +++ stable/11/usr.bin/sed/sed.1 Sat Jun 27 14:31:33 2020 (r362688) @@ -31,7 +31,7 @@ .\" @(#)sed.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd March 27, 2017 +.Dd June 10, 2020 .Dt SED 1 .Os .Sh NAME @@ -96,6 +96,10 @@ Append the editing commands found in the file .Ar command_file to the list of commands. The editing commands should each be listed on a separate line. +The commands are read from the standard input if +.Ar command_file +is +.Dq Li - . .It Fl I Ar extension Edit files in-place, saving backups with the specified .Ar extension . @@ -633,7 +637,9 @@ The .Fl E , I , a and .Fl i -options, the prefixing +options, the special meaning of +.Fl f Cm - , +the prefixing .Dq \&+ in the second member of an address range, as well as the Modified: stable/11/usr.bin/sed/tests/sed2_test.sh ============================================================================== --- stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 14:27:37 2020 (r362687) +++ stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 14:31:33 2020 (r362688) @@ -69,9 +69,30 @@ inplace_command_q_body() atf_check -s not-exit:0 stat -q '.!'* } +atf_test_case commands_on_stdin +commands_on_stdin_head() +{ + atf_set "descr" "Verify -f -" +} +commands_on_stdin_body() +{ + printf "a\n" > a + printf "s/a/b/\n" > a_to_b + printf "s/b/c/\n" > b_to_c + printf "s/c/d/\n" > ./- + atf_check -o 'inline:d\n' sed -f a_to_b -f - -f ./- a < b_to_c + + # Verify that nothing is printed if there are no input files provided. + printf 'i\\\nx' > insert_x + atf_check -o 'empty' sed -f - < insert_x +} + atf_init_test_cases() { atf_add_test_case inplace_command_q atf_add_test_case inplace_hardlink_src atf_add_test_case inplace_symlink_src + atf_add_test_case escape_subst + atf_add_test_case commands_on_stdin + atf_add_test_case hex_subst } From owner-svn-src-stable-11@freebsd.org Sat Jun 27 14:43:45 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7EB26352E76; Sat, 27 Jun 2020 14:43:45 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vGhv2Pw0z41bt; Sat, 27 Jun 2020 14:43: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 3888B269FE; Sat, 27 Jun 2020 14:43: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 05REhfgp086538; Sat, 27 Jun 2020 14:43:41 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05REhf8u086537; Sat, 27 Jun 2020 14:43:41 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202006271443.05REhf8u086537@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: Sat, 27 Jun 2020 14:43:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362694 - stable/11/usr.bin/fstat X-SVN-Group: stable-11 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/11/usr.bin/fstat X-SVN-Commit-Revision: 362694 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 14:43:45 -0000 Author: 0mp (doc,ports committer) Date: Sat Jun 27 14:43:41 2020 New Revision: 362694 URL: https://svnweb.freebsd.org/changeset/base/362694 Log: MFC 362290: Clean up fstat.1 - Sort options in the list & indent for readability. - Pet linters - Use "\(em" instead of "--" - Remove Tn macros - Use Ql instead of Dq Li - Add arguments to the -M, -N, -p, and -u options in their descriptions. - Use Sy instead of Li for field names. Li is deprecated, and Ql makes no sense here. - Replace a literal block with a list for the table of special names related to FD. - Use Ql instead of ``X''. - Add a dot after etc. - Reference fuser(1). Modified: stable/11/usr.bin/fstat/fstat.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/fstat/fstat.1 ============================================================================== --- stable/11/usr.bin/fstat/fstat.1 Sat Jun 27 14:43:29 2020 (r362693) +++ stable/11/usr.bin/fstat/fstat.1 Sat Jun 27 14:43:41 2020 (r362694) @@ -28,7 +28,7 @@ .\" @(#)fstat.1 8.3 (Berkeley) 2/25/94 .\" $FreeBSD$ .\" -.Dd September 28, 2011 +.Dd June 17, 2020 .Dt FSTAT 1 .Os .Sh NAME @@ -54,7 +54,7 @@ If no options are specified, reports on all open files in the system. .Pp The following options are available: -.Bl -tag -width indent +.Bl -tag -width "-N system" .It Fl f Restrict examination to files open in the same file systems as the named file arguments, or to the file system containing the @@ -63,17 +63,17 @@ For example, to find all files open in the file system directory .Pa /usr/src resides, type -.Dq Li fstat -f /usr/src . -.It Fl M +.Ql fstat -f /usr/src . +.It Fl M Ar core Extract values associated with the name list from the specified core instead of the default .Pa /dev/kmem . -.It Fl N -Extract the name list from the specified system instead of the default, -which is the kernel image the system has booted from. .It Fl m Include memory-mapped files in the listing; normally these are excluded due to the extra processing required. +.It Fl N Ar system +Extract the name list from the specified system instead of the default, +which is the kernel image the system has booted from. .It Fl n Numerical format. Print the device number (maj,min) of the file system @@ -83,9 +83,9 @@ device number that the special device refers to rather in .Pa /dev ; and print the mode of the file in octal instead of symbolic form. -.It Fl p +.It Fl p Ar pid Report all files open by the specified process. -.It Fl u +.It Fl u Ar user Report all files open by the specified user. .It Fl v Verbose mode. @@ -106,46 +106,52 @@ Restrict reports to the specified files. .Pp The following fields are printed: .Bl -tag -width MOUNT -.It Li USER +.It Sy USER The username of the owner of the process (effective uid). -.It Li CMD +.It Sy CMD The command name of the process. -.It Li PID +.It Sy PID The process id. -.It Li FD +.It Sy FD The file number in the per-process open file table or one of the following special names: .Pp -.Bd -literal -offset indent -compact -jail - jail root directory -mmap - memory-mapped file -root - root inode -text - executable text inode -tr - kernel trace file -wd - current working directory -.Ed +.Bl -tag -offset indent -compact +.It Sy jail +jail root directory +.It Sy mmap +memory-mapped file +.It Sy root +root inode +.It Sy text +executable text inode +.It Sy tr +kernel trace file +.It Sy wd +current working directory +.El .Pp -If the file number is followed by an asterisk (``*''), the file is -not an inode, but rather a socket, -.Tn FIFO , -or there is an error. +If the file number is followed by an asterisk +.Pq Ql * , +the file is +not an inode, but rather a socket, FIFO, or there is an error. In this case the remainder of the line does not -correspond to the remaining headers -- the format of the line +correspond to the remaining headers\(em the format of the line is described later under .Sx SOCKETS . -.It Li MOUNT +.It Sy MOUNT If the .Fl n flag was not specified, this header is present and is the pathname that the file system the file resides in is mounted on. -.It Li DEV +.It Sy DEV If the .Fl n flag is specified, this header is present and is the number of the device that this file resides in. -.It Li INUM +.It Sy INUM The inode number of the file. -.It Li MODE +.It Sy MODE The mode of the file. If the .Fl n @@ -154,7 +160,7 @@ using a symbolic format (see .Xr strmode 3 ) ; otherwise, the mode is printed as an octal number. -.It Li SZ\&|DV +.It Sy SZ\&|DV If the file is a semaphore, prints the current value of the semaphore. If the file is not a character or block special, prints the size of @@ -169,13 +175,17 @@ located, or the .Fl n flag is specified, prints the major/minor device number that the special device refers to. -.It Li R/W +.It Sy R/W This column describes the access mode that the file allows. -The letter ``r'' indicates open for reading; -the letter ``w'' indicates open for writing. +The letter +.Ql r +indicates open for reading; +the letter +.Ql w +indicates open for writing. This field is useful when trying to find the processes that are preventing a file system from being down graded to read-only. -.It Li NAME +.It Sy NAME If filename arguments are specified and the .Fl f flag is not, then @@ -192,11 +202,11 @@ name that the process originally used to open that fil .Sh SOCKETS The formatting of open sockets depends on the protocol domain. In all cases the first field is the domain name, the second field -is the socket type (stream, dgram, etc), and the third is the socket +is the socket type (stream, dgram, etc.), and the third is the socket flags field (in hex). The remaining fields are protocol dependent. -For tcp, it is the address of the tcpcb, and for udp, the inpcb (socket pcb). -For unix domain sockets, its the address of the socket pcb and the address +For TCP, it is the address of the tcpcb, and for UDP, the inpcb (socket pcb). +For UNIX-domain sockets, its the address of the socket pcb and the address of the connected pcb (if connected). Otherwise the protocol number and address of the socket itself are printed. The attempt is to make enough information available to @@ -204,14 +214,20 @@ permit further analysis without duplicating .Xr netstat 1 . .Pp For example, the addresses mentioned above are the addresses which the -.Dq Li netstat -A -command would print for tcp, udp, and unixdomain. +.Ql netstat -A +command would print for TCP, UDP, and UNIX-domain. Note that since pipes are implemented using sockets, a pipe appears as a -connected unix domain stream socket. -A unidirectional unix domain socket indicates the direction of flow with -an arrow (``<-'' or ``->''), and a full duplex socket shows a double arrow -(``<->''). +connected UNIX-domain stream socket. +A unidirectional UNIX-domain socket indicates the direction of flow with +an arrow +.Po Ql <- +or +.Ql -> +.Pc , +and a full duplex socket shows a double arrow +.Pq Ql <-> . .Sh SEE ALSO +.Xr fuser 1 , .Xr netstat 1 , .Xr nfsstat 1 , .Xr procstat 1 , From owner-svn-src-stable-11@freebsd.org Sat Jun 27 14:47:28 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 291133530C3; Sat, 27 Jun 2020 14:47: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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vGnD0BCyz41XQ; Sat, 27 Jun 2020 14:47: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 01B2126AD6; Sat, 27 Jun 2020 14:47: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 05RElRHx086809; Sat, 27 Jun 2020 14:47:27 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RElRhN086808; Sat, 27 Jun 2020 14:47:27 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202006271447.05RElRhN086808@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: Sat, 27 Jun 2020 14:47:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362695 - stable/11/sbin/umount X-SVN-Group: stable-11 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/11/sbin/umount X-SVN-Commit-Revision: 362695 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 14:47:28 -0000 Author: 0mp (doc,ports committer) Date: Sat Jun 27 14:47:27 2020 New Revision: 362695 URL: https://svnweb.freebsd.org/changeset/base/362695 Log: MFC 362348: Document that umount -A does not unmount /dev Reported by: kaktus Reviewed by: kaktus Differential Revision: https://reviews.freebsd.org/D25351 Modified: stable/11/sbin/umount/umount.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/umount/umount.8 ============================================================================== --- stable/11/sbin/umount/umount.8 Sat Jun 27 14:43:41 2020 (r362694) +++ stable/11/sbin/umount/umount.8 Sat Jun 27 14:47:27 2020 (r362695) @@ -28,7 +28,7 @@ .\" @(#)umount.8 8.2 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd April 14, 2020 +.Dd June 19, 2020 .Dt UMOUNT 8 .Os .Sh NAME @@ -69,8 +69,11 @@ All the file systems described in .Xr fstab 5 are unmounted. .It Fl A -All the currently mounted file systems except -the root are unmounted. +All the currently mounted file systems are unmounted, +except for those mounted at +.Pa / +or +.Pa /dev . .It Fl F Ar fstab Specify the .Pa fstab From owner-svn-src-stable-11@freebsd.org Sat Jun 27 17:03:56 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3005D3574EA; Sat, 27 Jun 2020 17:03:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vKph0VQGz4CMJ; Sat, 27 Jun 2020 17:03:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0307D85ED; Sat, 27 Jun 2020 17:03:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05RH3tPQ074614; Sat, 27 Jun 2020 17:03:55 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RH3t2K074613; Sat, 27 Jun 2020 17:03:55 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202006271703.05RH3t2K074613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 27 Jun 2020 17:03:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362701 - stable/11/tools/build/mk X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/tools/build/mk X-SVN-Commit-Revision: 362701 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 17:03:56 -0000 Author: dim Date: Sat Jun 27 17:03:55 2020 New Revision: 362701 URL: https://svnweb.freebsd.org/changeset/base/362701 Log: MFC r348689 (by emaste): Use CLANG knob to remove llvm-symbolizer man page r348504 moved llvm-symbolizer from the CLANG_EXTRAS knob to CLANG, but the man page was still in the CLANG_EXTRAS section in OptionalObsoleteFiles.inc. Reported by: jhb Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 27 16:31:04 2020 (r362700) +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 27 17:03:55 2020 (r362701) @@ -1618,6 +1618,7 @@ 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 @@ -1656,7 +1657,6 @@ 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-pdbutil.1.gz -OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz OLD_FILES+=usr/share/man/man1/opt.1.gz .endif From owner-svn-src-stable-11@freebsd.org Sat Jun 27 22:51:16 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5193E35E847; Sat, 27 Jun 2020 22:51:16 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vTWS1VCCz4YkG; Sat, 27 Jun 2020 22:51:16 +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 2E78ECDD8; Sat, 27 Jun 2020 22:51:16 +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 05RMpGFe087000; Sat, 27 Jun 2020 22:51:16 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RMpGxH086999; Sat, 27 Jun 2020 22:51:16 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202006272251.05RMpGxH086999@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: Sat, 27 Jun 2020 22:51:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362710 - stable/11/usr.bin/sed/tests X-SVN-Group: stable-11 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/11/usr.bin/sed/tests X-SVN-Commit-Revision: 362710 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-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 22:51:16 -0000 Author: 0mp (doc,ports committer) Date: Sat Jun 27 22:51:15 2020 New Revision: 362710 URL: https://svnweb.freebsd.org/changeset/base/362710 Log: Disable mismerged tests committed in r362687 Reported by: lwhsu Modified: stable/11/usr.bin/sed/tests/sed2_test.sh Modified: stable/11/usr.bin/sed/tests/sed2_test.sh ============================================================================== --- stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 21:37:48 2020 (r362709) +++ stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 22:51:15 2020 (r362710) @@ -92,7 +92,5 @@ atf_init_test_cases() atf_add_test_case inplace_command_q atf_add_test_case inplace_hardlink_src atf_add_test_case inplace_symlink_src - atf_add_test_case escape_subst atf_add_test_case commands_on_stdin - atf_add_test_case hex_subst } From owner-svn-src-stable-11@freebsd.org Sat Jun 27 23:29:08 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49E0035F409; Sat, 27 Jun 2020 23:29:08 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vVM81DB5z4blf; Sat, 27 Jun 2020 23:29:08 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 1FA2825C8A; Sat, 27 Jun 2020 23:29:08 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f181.google.com with SMTP id i3so10249733qtq.13; Sat, 27 Jun 2020 16:29:08 -0700 (PDT) X-Gm-Message-State: AOAM532MR2vI1+5vk2n9i+ugGlXXEoc9gVQ/NtJQo46FxJRctVjDoP5g NFueH+RFw64Sjt4OQxbB0xm7IQnnIR9G5w4idz0= X-Google-Smtp-Source: ABdhPJz2mmvbdDCNu2GjtdUPj1F0gkGMO1jTD7zYebAg4mhqqTsEHqMPoyKNOqCna8a3yRqO2oNf4fIZnoge9xOiNTc= X-Received: by 2002:ac8:464f:: with SMTP id f15mr8996912qto.211.1593300547649; Sat, 27 Jun 2020 16:29:07 -0700 (PDT) MIME-Version: 1.0 References: <202006272251.05RMpGxH086999@repo.freebsd.org> In-Reply-To: <202006272251.05RMpGxH086999@repo.freebsd.org> From: Kyle Evans Date: Sat, 27 Jun 2020 18:28:56 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r362710 - stable/11/usr.bin/sed/tests To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 23:29:08 -0000 (sorry, still on mobile) Please restore escape_subst...as per my last email, it was only hex_subst that needed to go away. The former was already there. On Sat, Jun 27, 2020, 17:51 Mateusz Piotrowski <0mp@freebsd.org> wrote: > Author: 0mp (doc,ports committer) > Date: Sat Jun 27 22:51:15 2020 > New Revision: 362710 > URL: https://svnweb.freebsd.org/changeset/base/362710 > > Log: > Disable mismerged tests committed in r362687 > > Reported by: lwhsu > > Modified: > stable/11/usr.bin/sed/tests/sed2_test.sh > > Modified: stable/11/usr.bin/sed/tests/sed2_test.sh > > ============================================================================== > --- stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 21:37:48 2020 > (r362709) > +++ stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 22:51:15 2020 > (r362710) > @@ -92,7 +92,5 @@ atf_init_test_cases() > atf_add_test_case inplace_command_q > atf_add_test_case inplace_hardlink_src > atf_add_test_case inplace_symlink_src > - atf_add_test_case escape_subst > atf_add_test_case commands_on_stdin > - atf_add_test_case hex_subst > } > From owner-svn-src-stable-11@freebsd.org Sat Jun 27 23:32:55 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7294035F48A; Sat, 27 Jun 2020 23:32:55 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vVRV3x28z4bqG; Sat, 27 Jun 2020 23:32:54 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-ej1-f53.google.com with SMTP id i14so12725569ejr.9; Sat, 27 Jun 2020 16:32:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=CMuUinqPsKvSK6hR9nIuD25ZtKSSEltOvjpgnmT54+0=; b=E2xSpcU07bPdVK76TKSy0MWz8bXDCrAR/ihL9IGzhand9yZLMlhPfD5wep0tgzzPhw 6Rv5GlnWzoe9USIo3s8gQ1yR86trL433As1a4iEalxQ7wJLBM/rFnkt+1K+hgmGidnP9 LrD09OUDC5Z122X4njF6WIK/5n0hUwMjWNeeSSD5iR1/cn3wawhfB6Vs2/9Ca8x1r1iA URlkSmK7sNV0O8MIPPjqEHZCXCDFFuAOcjY+NyC+/CpzBXLZCWvSkWMOsg4umPT6No3S 3Ik8zmlwKYowGfdaOmNMEz2J/Nsxw2rmFpFRnhaqQPfyBVVwWiflvjqHVLNgzfNBsyDq Dh/w== X-Gm-Message-State: AOAM5320vfpj72RfVTpf7WuAd0kSoCowyxBfzfngXCBqvuIDoQQmB7cY zqhRSGvesFOcM7gj16PsqeM7aUWE X-Google-Smtp-Source: ABdhPJwfVwrMFp8RYCMnFnbv7DMh++Kk9BrizaNesRIMXbgR2LrWmJYe+vKcPQ4BzEzS/aWZ3HWrdA== X-Received: by 2002:a17:906:1499:: with SMTP id x25mr8112808ejc.406.1593300772906; Sat, 27 Jun 2020 16:32:52 -0700 (PDT) Received: from ?IPv6:2a02:8109:98c0:1bc0:5e5f:67ff:fef4:ffd8? ([2a02:8109:98c0:1bc0:5e5f:67ff:fef4:ffd8]) by smtp.gmail.com with ESMTPSA id q24sm19651624edg.51.2020.06.27.16.32.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 27 Jun 2020 16:32:52 -0700 (PDT) Subject: Re: svn commit: r362710 - stable/11/usr.bin/sed/tests To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <202006272251.05RMpGxH086999@repo.freebsd.org> From: Mateusz Piotrowski <0mp@FreeBSD.org> Message-ID: <1c896bbe-7a85-bc76-5163-cf83a0c39b8e@FreeBSD.org> Date: Sun, 28 Jun 2020 01:32:47 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Rspamd-Queue-Id: 49vVRV3x28z4bqG X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=mpp302@gmail.com X-Spamd-Result: default: False [-1.94 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-0.80)[-0.801]; RWL_MAILSPIKE_GOOD(0.00)[209.85.218.53:from]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.90)[-0.902]; NEURAL_HAM_SHORT(-0.24)[-0.236]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.218.53:from]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 23:32:55 -0000 On 6/28/20 1:28 AM, Kyle Evans wrote: > (sorry, still on mobile) > > Please restore escape_subst...as per my last email, it was only hex_subst that needed to go away. > The former was already there. > > On Sat, Jun 27, 2020, 17:51 Mateusz Piotrowski <0mp@freebsd.org > wrote: > > Author: 0mp (doc,ports committer) > Date: Sat Jun 27 22:51:15 2020 > New Revision: 362710 > URL: https://svnweb.freebsd.org/changeset/base/362710 > > Log: >   Disable mismerged tests committed in r362687 > >   Reported by:  lwhsu > > Modified: >   stable/11/usr.bin/sed/tests/sed2_test.sh > > Modified: stable/11/usr.bin/sed/tests/sed2_test.sh > ============================================================================== > --- stable/11/usr.bin/sed/tests/sed2_test.sh    Sat Jun 27 21:37:48 2020        (r362709) > +++ stable/11/usr.bin/sed/tests/sed2_test.sh    Sat Jun 27 22:51:15 2020        (r362710) > @@ -92,7 +92,5 @@ atf_init_test_cases() >         atf_add_test_case inplace_command_q >         atf_add_test_case inplace_hardlink_src >         atf_add_test_case inplace_symlink_src > -       atf_add_test_case escape_subst >         atf_add_test_case commands_on_stdin > -       atf_add_test_case hex_subst >  } > I've tested the change and atf_add_test_case escape_subst was also failing... Would you like me to bring back escape_subst?