From owner-svn-src-stable@freebsd.org Sun Jul 31 10:37:10 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5087CBA9350; Sun, 31 Jul 2016 10:37:10 +0000 (UTC) (envelope-from ache@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BDD71E50; Sun, 31 Jul 2016 10:37:10 +0000 (UTC) (envelope-from ache@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VAb9WS009035; Sun, 31 Jul 2016 10:37:09 GMT (envelope-from ache@FreeBSD.org) Received: (from ache@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VAb9Sh009033; Sun, 31 Jul 2016 10:37:09 GMT (envelope-from ache@FreeBSD.org) Message-Id: <201607311037.u6VAb9Sh009033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ache set sender to ache@FreeBSD.org using -f From: "Andrey A. Chernov" Date: Sun, 31 Jul 2016 10:37:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303582 - in stable/10/usr.bin/calendar/calendars: ru_RU.KOI8-R ru_RU.UTF-8 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 10:37:10 -0000 Author: ache Date: Sun Jul 31 10:37:09 2016 New Revision: 303582 URL: https://svnweb.freebsd.org/changeset/base/303582 Log: Direct commit of adapted r303581. Fix date. Modified: stable/10/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military stable/10/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military Modified: stable/10/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military ============================================================================== --- stable/10/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military Sun Jul 31 10:15:04 2016 (r303581) +++ stable/10/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military Sun Jul 31 10:37:09 2016 (r303582) @@ -20,7 +20,7 @@ LANG=ru_RU.KOI8-R 8 сен День Бородинского сражения русской армии под командованием М.И. Кутузова с французской армией (1812 год) 11 сен День победы русской эскадры под командованием Ф.Ф. Ушакова над турецкой эскадрой у мыса Тендра (1790 год) 21 сен День победы русских полков во главе с великим князем Дмитрием Донским над монголо-татарскими войсками в Куликовской битве (1380 год) - 7 ноя День освобождения Москвы силами народного ополчения под руководством Кузьмы Минина и Дмитрия Пожарского от польских интервентов (1612 год) + 4 ноя День освобождения Москвы силами народного ополчения под руководством Кузьмы Минина и Дмитрия Пожарского от польских интервентов (1612 год) 1 дек День победы русской эскадры под командованием П.С. Нахимова над турецкой эскадрой у мыса Синоп (1853 год) 5 дек День начала контрнаступления советских войск против немецко-фашистских войск в битве под Москвой (1941 год) 24 дек День взятия турецкой крепости Измаил русскими войсками под командованием А.В. Суворова (1790 год) Modified: stable/10/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military ============================================================================== --- stable/10/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military Sun Jul 31 10:15:04 2016 (r303581) +++ stable/10/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military Sun Jul 31 10:37:09 2016 (r303582) @@ -20,7 +20,7 @@ LANG=ru_RU.UTF-8 8 я│п╣п╫ п■п╣п╫я▄ п▒п╬я─п╬п╢п╦п╫я│п╨п╬пЁп╬ я│я─п╟п╤п╣п╫п╦я▐ я─я┐я│я│п╨п╬п╧ п╟я─п╪п╦п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п°.п≤. п я┐я┌я┐п╥п╬п╡п╟ я│ я└я─п╟п╫я├я┐п╥я│п╨п╬п╧ п╟я─п╪п╦п╣п╧ (1812 пЁп╬п╢) 11 я│п╣п╫ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ я█я│п╨п╟п╢я─я▀ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п╓.п╓. пёя┬п╟п╨п╬п╡п╟ п╫п╟п╢ я┌я┐я─п╣я├п╨п╬п╧ я█я│п╨п╟п╢я─п╬п╧ я┐ п╪я▀я│п╟ п╒п╣п╫п╢я─п╟ (1790 пЁп╬п╢) 21 я│п╣п╫ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╦я┘ п©п╬п╩п╨п╬п╡ п╡п╬ пЁп╩п╟п╡п╣ я│ п╡п╣п╩п╦п╨п╦п╪ п╨п╫я▐п╥п╣п╪ п■п╪п╦я┌я─п╦п╣п╪ п■п╬п╫я│п╨п╦п╪ п╫п╟п╢ п╪п╬п╫пЁп╬п╩п╬-я┌п╟я┌п╟я─я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╡ п я┐п╩п╦п╨п╬п╡я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1380 пЁп╬п╢) - 7 п╫п╬я▐ п■п╣п╫я▄ п╬я│п╡п╬п╠п╬п╤п╢п╣п╫п╦я▐ п°п╬я│п╨п╡я▀ я│п╦п╩п╟п╪п╦ п╫п╟я─п╬п╢п╫п╬пЁп╬ п╬п©п╬п╩я┤п╣п╫п╦я▐ п©п╬п╢ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬п╪ п я┐п╥я▄п╪я▀ п°п╦п╫п╦п╫п╟ п╦ п■п╪п╦я┌я─п╦я▐ п÷п╬п╤п╟я─я│п╨п╬пЁп╬ п╬я┌ п©п╬п╩я▄я│п╨п╦я┘ п╦п╫я┌п╣я─п╡п╣п╫я┌п╬п╡ (1612 пЁп╬п╢) + 4 п╫п╬я▐ п■п╣п╫я▄ п╬я│п╡п╬п╠п╬п╤п╢п╣п╫п╦я▐ п°п╬я│п╨п╡я▀ я│п╦п╩п╟п╪п╦ п╫п╟я─п╬п╢п╫п╬пЁп╬ п╬п©п╬п╩я┤п╣п╫п╦я▐ п©п╬п╢ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬п╪ п я┐п╥я▄п╪я▀ п°п╦п╫п╦п╫п╟ п╦ п■п╪п╦я┌я─п╦я▐ п÷п╬п╤п╟я─я│п╨п╬пЁп╬ п╬я┌ п©п╬п╩я▄я│п╨п╦я┘ п╦п╫я┌п╣я─п╡п╣п╫я┌п╬п╡ (1612 пЁп╬п╢) 1 п╢п╣п╨ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ я█я│п╨п╟п╢я─я▀ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷.п║. п²п╟я┘п╦п╪п╬п╡п╟ п╫п╟п╢ я┌я┐я─п╣я├п╨п╬п╧ я█я│п╨п╟п╢я─п╬п╧ я┐ п╪я▀я│п╟ п║п╦п╫п╬п© (1853 пЁп╬п╢) 5 п╢п╣п╨ п■п╣п╫я▄ п╫п╟я┤п╟п╩п╟ п╨п╬п╫я┌я─п╫п╟я│я┌я┐п©п╩п╣п╫п╦я▐ я│п╬п╡п╣я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п©я─п╬я┌п╦п╡ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п╠п╦я┌п╡п╣ п©п╬п╢ п°п╬я│п╨п╡п╬п╧ (1941 пЁп╬п╢) 24 п╢п╣п╨ п■п╣п╫я▄ п╡п╥я▐я┌п╦я▐ я┌я┐я─п╣я├п╨п╬п╧ п╨я─п╣п©п╬я│я┌п╦ п≤п╥п╪п╟п╦п╩ я─я┐я│я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п░.п▓. п║я┐п╡п╬я─п╬п╡п╟ (1790 пЁп╬п╢) From owner-svn-src-stable@freebsd.org Sun Jul 31 15:03:33 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2512ABA95B9; Sun, 31 Jul 2016 15:03:33 +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 mx1.freebsd.org (Postfix) with ESMTPS id E5C041C4F; Sun, 31 Jul 2016 15:03:32 +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 u6VF3WQF011953; Sun, 31 Jul 2016 15:03:32 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VF3WhT011952; Sun, 31 Jul 2016 15:03:32 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201607311503.u6VF3WhT011952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 31 Jul 2016 15:03:32 +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: r303589 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 15:03:33 -0000 Author: dim Date: Sun Jul 31 15:03:31 2016 New Revision: 303589 URL: https://svnweb.freebsd.org/changeset/base/303589 Log: MFC r303456: Add tblgen to ObsoleteFiles.inc, as it was renamed to llvm-tblgen. Approved by: re (kib) Noticed by: pluknet Modified: stable/11/ObsoleteFiles.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/ObsoleteFiles.inc ============================================================================== --- stable/11/ObsoleteFiles.inc Sun Jul 31 15:02:53 2016 (r303588) +++ stable/11/ObsoleteFiles.inc Sun Jul 31 15:03:31 2016 (r303589) @@ -229,6 +229,7 @@ OLD_LIBS+=usr/lib/libdevinfo.so.5 OLD_LIBS+=usr/lib32/libdevinfo.so.5 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0. OLD_FILES+=usr/bin/macho-dump +OLD_FILES+=usr/bin/tblgen OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h From owner-svn-src-stable@freebsd.org Sun Jul 31 15:13:52 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0708BA97CB; Sun, 31 Jul 2016 15:13:52 +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 mx1.freebsd.org (Postfix) with ESMTPS id 9112C125F; Sun, 31 Jul 2016 15:13:52 +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 u6VFDp1M015704; Sun, 31 Jul 2016 15:13:51 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VFDphu015703; Sun, 31 Jul 2016 15:13:51 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201607311513.u6VFDphu015703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 31 Jul 2016 15:13: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: r303590 - stable/11/sys/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 15:13:52 -0000 Author: kib Date: Sun Jul 31 15:13:51 2016 New Revision: 303590 URL: https://svnweb.freebsd.org/changeset/base/303590 Log: MFC r303424: Fix typo in comment. Approved by: re (gjb) Modified: stable/11/sys/sys/proc.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/sys/proc.h ============================================================================== --- stable/11/sys/sys/proc.h Sun Jul 31 15:03:31 2016 (r303589) +++ stable/11/sys/sys/proc.h Sun Jul 31 15:13:51 2016 (r303590) @@ -739,7 +739,7 @@ struct proc { #define SW_TYPE_MASK 0xff /* First 8 bits are switch type */ #define SWT_NONE 0 /* Unspecified switch. */ #define SWT_PREEMPT 1 /* Switching due to preemption. */ -#define SWT_OWEPREEMPT 2 /* Switching due to opepreempt. */ +#define SWT_OWEPREEMPT 2 /* Switching due to owepreempt. */ #define SWT_TURNSTILE 3 /* Turnstile contention. */ #define SWT_SLEEPQ 4 /* Sleepq wait. */ #define SWT_SLEEPQTIMO 5 /* Sleepq timeout wait. */ From owner-svn-src-stable@freebsd.org Sun Jul 31 15:15:28 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7887BA98D9; Sun, 31 Jul 2016 15:15:28 +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 mx1.freebsd.org (Postfix) with ESMTPS id 97361161B; Sun, 31 Jul 2016 15:15:28 +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 u6VFFRD8016085; Sun, 31 Jul 2016 15:15:27 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VFFRvo016084; Sun, 31 Jul 2016 15:15:27 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201607311515.u6VFFRvo016084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 31 Jul 2016 15:15:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303591 - stable/10/sys/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 15:15:28 -0000 Author: kib Date: Sun Jul 31 15:15:27 2016 New Revision: 303591 URL: https://svnweb.freebsd.org/changeset/base/303591 Log: MFC r303424: Fix typo in comment. Modified: stable/10/sys/sys/proc.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/proc.h ============================================================================== --- stable/10/sys/sys/proc.h Sun Jul 31 15:13:51 2016 (r303590) +++ stable/10/sys/sys/proc.h Sun Jul 31 15:15:27 2016 (r303591) @@ -701,7 +701,7 @@ struct proc { #define SW_TYPE_MASK 0xff /* First 8 bits are switch type */ #define SWT_NONE 0 /* Unspecified switch. */ #define SWT_PREEMPT 1 /* Switching due to preemption. */ -#define SWT_OWEPREEMPT 2 /* Switching due to opepreempt. */ +#define SWT_OWEPREEMPT 2 /* Switching due to owepreempt. */ #define SWT_TURNSTILE 3 /* Turnstile contention. */ #define SWT_SLEEPQ 4 /* Sleepq wait. */ #define SWT_SLEEPQTIMO 5 /* Sleepq timeout wait. */ From owner-svn-src-stable@freebsd.org Mon Aug 1 06:34:56 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 935B5BAD247; Mon, 1 Aug 2016 06:34:56 +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 mx1.freebsd.org (Postfix) with ESMTPS id 70E351229; Mon, 1 Aug 2016 06:34:56 +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 u716Yt36059271; Mon, 1 Aug 2016 06:34:55 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u716Yt3x059269; Mon, 1 Aug 2016 06:34:55 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608010634.u716Yt3x059269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 1 Aug 2016 06:34: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: r303606 - stable/11/sys/kern X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 06:34:56 -0000 Author: kib Date: Mon Aug 1 06:34:55 2016 New Revision: 303606 URL: https://svnweb.freebsd.org/changeset/base/303606 Log: MFC r302614: Revive the check, disabled in r197963. MFC r302999: On first exec after vfork(), call signotify() to handle pending reenabled signals. Approved by: re (delphij) Modified: stable/11/sys/kern/kern_exec.c stable/11/sys/kern/subr_trap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/kern_exec.c ============================================================================== --- stable/11/sys/kern/kern_exec.c Mon Aug 1 05:09:11 2016 (r303605) +++ stable/11/sys/kern/kern_exec.c Mon Aug 1 06:34:55 2016 (r303606) @@ -759,6 +759,8 @@ interpret: if (p->p_flag & P_PPWAIT) { p->p_flag &= ~(P_PPWAIT | P_PPTRACE); cv_broadcast(&p->p_pwait); + /* STOPs are no longer ignored, arrange for AST */ + signotify(td); } /* Modified: stable/11/sys/kern/subr_trap.c ============================================================================== --- stable/11/sys/kern/subr_trap.c Mon Aug 1 05:09:11 2016 (r303605) +++ stable/11/sys/kern/subr_trap.c Mon Aug 1 06:34:55 2016 (r303606) @@ -101,17 +101,29 @@ userret(struct thread *td, struct trapfr td->td_name); KASSERT((p->p_flag & P_WEXIT) == 0, ("Exiting process returns to usermode")); -#if 0 #ifdef DIAGNOSTIC - /* Check that we called signotify() enough. */ - PROC_LOCK(p); - thread_lock(td); - if (SIGPENDING(td) && ((td->td_flags & TDF_NEEDSIGCHK) == 0 || - (td->td_flags & TDF_ASTPENDING) == 0)) - printf("failed to set signal flags properly for ast()\n"); - thread_unlock(td); - PROC_UNLOCK(p); -#endif + /* + * Check that we called signotify() enough. For + * multi-threaded processes, where signal distribution might + * change due to other threads changing sigmask, the check is + * racy and cannot be performed reliably. + * If current process is vfork child, indicated by P_PPWAIT, then + * issignal() ignores stops, so we block the check to avoid + * classifying pending signals. + */ + if (p->p_numthreads == 1) { + PROC_LOCK(p); + thread_lock(td); + if ((p->p_flag & P_PPWAIT) == 0) { + KASSERT(!SIGPENDING(td) || (td->td_flags & + (TDF_NEEDSIGCHK | TDF_ASTPENDING)) == + (TDF_NEEDSIGCHK | TDF_ASTPENDING), + ("failed to set signal flags for ast p %p " + "td %p fl %x", p, td, td->td_flags)); + } + thread_unlock(td); + PROC_UNLOCK(p); + } #endif #ifdef KTRACE KTRUSERRET(td); @@ -265,6 +277,29 @@ ast(struct trapframe *framep) #endif } +#ifdef DIAGNOSTIC + if (p->p_numthreads == 1 && (flags & TDF_NEEDSIGCHK) == 0) { + PROC_LOCK(p); + thread_lock(td); + /* + * Note that TDF_NEEDSIGCHK should be re-read from + * td_flags, since signal might have been delivered + * after we cleared td_flags above. This is one of + * the reason for looping check for AST condition. + * See comment in userret() about P_PPWAIT. + */ + if ((p->p_flag & P_PPWAIT) == 0) { + KASSERT(!SIGPENDING(td) || (td->td_flags & + (TDF_NEEDSIGCHK | TDF_ASTPENDING)) == + (TDF_NEEDSIGCHK | TDF_ASTPENDING), + ("failed2 to set signal flags for ast p %p td %p " + "fl %x %x", p, td, flags, td->td_flags)); + } + thread_unlock(td); + PROC_UNLOCK(p); + } +#endif + /* * Check for signals. Unlocked reads of p_pendingcnt or * p_siglist might cause process-directed signal to be handled From owner-svn-src-stable@freebsd.org Mon Aug 1 06:35:36 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BEADBAD30D; Mon, 1 Aug 2016 06:35:36 +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 mx1.freebsd.org (Postfix) with ESMTPS id 4751D1334; Mon, 1 Aug 2016 06:35:36 +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 u716ZZBD059353; Mon, 1 Aug 2016 06:35:35 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u716ZZbI059351; Mon, 1 Aug 2016 06:35:35 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608010635.u716ZZbI059351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 1 Aug 2016 06:35:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303607 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 06:35:36 -0000 Author: kib Date: Mon Aug 1 06:35:35 2016 New Revision: 303607 URL: https://svnweb.freebsd.org/changeset/base/303607 Log: MFC r302614: Revive the check, disabled in r197963. MFC r302999: On first exec after vfork(), call signotify() to handle pending reenabled signals. Modified: stable/10/sys/kern/kern_exec.c stable/10/sys/kern/subr_trap.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_exec.c ============================================================================== --- stable/10/sys/kern/kern_exec.c Mon Aug 1 06:34:55 2016 (r303606) +++ stable/10/sys/kern/kern_exec.c Mon Aug 1 06:35:35 2016 (r303607) @@ -751,6 +751,8 @@ interpret: if (p->p_flag & P_PPWAIT) { p->p_flag &= ~(P_PPWAIT | P_PPTRACE); cv_broadcast(&p->p_pwait); + /* STOPs are no longer ignored, arrange for AST */ + signotify(td); } /* Modified: stable/10/sys/kern/subr_trap.c ============================================================================== --- stable/10/sys/kern/subr_trap.c Mon Aug 1 06:34:55 2016 (r303606) +++ stable/10/sys/kern/subr_trap.c Mon Aug 1 06:35:35 2016 (r303607) @@ -108,17 +108,29 @@ userret(struct thread *td, struct trapfr td->td_name); KASSERT((p->p_flag & P_WEXIT) == 0, ("Exiting process returns to usermode")); -#if 0 #ifdef DIAGNOSTIC - /* Check that we called signotify() enough. */ - PROC_LOCK(p); - thread_lock(td); - if (SIGPENDING(td) && ((td->td_flags & TDF_NEEDSIGCHK) == 0 || - (td->td_flags & TDF_ASTPENDING) == 0)) - printf("failed to set signal flags properly for ast()\n"); - thread_unlock(td); - PROC_UNLOCK(p); -#endif + /* + * Check that we called signotify() enough. For + * multi-threaded processes, where signal distribution might + * change due to other threads changing sigmask, the check is + * racy and cannot be performed reliably. + * If current process is vfork child, indicated by P_PPWAIT, then + * issignal() ignores stops, so we block the check to avoid + * classifying pending signals. + */ + if (p->p_numthreads == 1) { + PROC_LOCK(p); + thread_lock(td); + if ((p->p_flag & P_PPWAIT) == 0) { + KASSERT(!SIGPENDING(td) || (td->td_flags & + (TDF_NEEDSIGCHK | TDF_ASTPENDING)) == + (TDF_NEEDSIGCHK | TDF_ASTPENDING), + ("failed to set signal flags for ast p %p " + "td %p fl %x", p, td, td->td_flags)); + } + thread_unlock(td); + PROC_UNLOCK(p); + } #endif #ifdef KTRACE KTRUSERRET(td); @@ -268,6 +280,29 @@ ast(struct trapframe *framep) #endif } +#ifdef DIAGNOSTIC + if (p->p_numthreads == 1 && (flags & TDF_NEEDSIGCHK) == 0) { + PROC_LOCK(p); + thread_lock(td); + /* + * Note that TDF_NEEDSIGCHK should be re-read from + * td_flags, since signal might have been delivered + * after we cleared td_flags above. This is one of + * the reason for looping check for AST condition. + * See comment in userret() about P_PPWAIT. + */ + if ((p->p_flag & P_PPWAIT) == 0) { + KASSERT(!SIGPENDING(td) || (td->td_flags & + (TDF_NEEDSIGCHK | TDF_ASTPENDING)) == + (TDF_NEEDSIGCHK | TDF_ASTPENDING), + ("failed2 to set signal flags for ast p %p td %p " + "fl %x %x", p, td, flags, td->td_flags)); + } + thread_unlock(td); + PROC_UNLOCK(p); + } +#endif + /* * Check for signals. Unlocked reads of p_pendingcnt or * p_siglist might cause process-directed signal to be handled From owner-svn-src-stable@freebsd.org Mon Aug 1 06:59:37 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5A0ABABA0A; Mon, 1 Aug 2016 06:59:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B31881206; Mon, 1 Aug 2016 06:59:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u716xavg067160; Mon, 1 Aug 2016 06:59:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u716xaIK067151; Mon, 1 Aug 2016 06:59:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608010659.u716xaIK067151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 1 Aug 2016 06:59:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303609 - stable/10/sys/conf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 06:59:37 -0000 Author: ngie Date: Mon Aug 1 06:59:35 2016 New Revision: 303609 URL: https://svnweb.freebsd.org/changeset/base/303609 Log: MFC r288071: - arm64 change was omitted due to lack of architecture support - ia64 change was added as the architecture was removed from ^/head Sponsored by: EMC / Isilon Storage Division r288071 (by emaste): Move kbd.c to main sys/conf/files list It is (optionally) used on all architectures. Modified: stable/10/sys/conf/files stable/10/sys/conf/files.amd64 stable/10/sys/conf/files.arm stable/10/sys/conf/files.i386 stable/10/sys/conf/files.ia64 stable/10/sys/conf/files.mips stable/10/sys/conf/files.pc98 stable/10/sys/conf/files.powerpc stable/10/sys/conf/files.sparc64 Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files Mon Aug 1 06:59:35 2016 (r303609) @@ -1782,6 +1782,7 @@ dev/jme/if_jme.c optional jme pci dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard +dev/kbd/kbd.c optional atkbd | pckbd | sc | ukbd | vt dev/kbdmux/kbdmux.c optional kbdmux dev/ksyms/ksyms.c optional ksyms dev/le/am7990.c optional le Modified: stable/10/sys/conf/files.amd64 ============================================================================== --- stable/10/sys/conf/files.amd64 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.amd64 Mon Aug 1 06:59:35 2016 (r303609) @@ -281,7 +281,6 @@ dev/hyperv/vmbus/vmbus.c optional hyp dev/hyperv/vmbus/vmbus_et.c optional hyperv dev/hyperv/vmbus/amd64/hyperv_machdep.c optional hyperv dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv -dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev dev/nfe/if_nfe.c optional nfe pci Modified: stable/10/sys/conf/files.arm ============================================================================== --- stable/10/sys/conf/files.arm Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.arm Mon Aug 1 06:59:35 2016 (r303609) @@ -66,7 +66,6 @@ crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/fb/fb.c optional sc dev/hwpmc/hwpmc_arm.c optional hwpmc -dev/kbd/kbd.c optional sc | vt dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc Modified: stable/10/sys/conf/files.i386 ============================================================================== --- stable/10/sys/conf/files.i386 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.i386 Mon Aug 1 06:59:35 2016 (r303609) @@ -274,7 +274,6 @@ dev/ipmi/ipmi_smbios.c optional ipmi dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.c optional ipmi pci dev/ipmi/ipmi_linux.c optional ipmi compat_linux -dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/le/if_le_isa.c optional le isa dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev Modified: stable/10/sys/conf/files.ia64 ============================================================================== --- stable/10/sys/conf/files.ia64 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.ia64 Mon Aug 1 06:59:35 2016 (r303609) @@ -52,7 +52,6 @@ dev/fb/fb.c optional fb | vga dev/fb/vga.c optional vga dev/hwpmc/hwpmc_ia64.c optional hwpmc dev/io/iodev.c optional io -dev/kbd/kbd.c optional atkbd | sc | ukbd dev/syscons/scterm-teken.c optional sc dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc Modified: stable/10/sys/conf/files.mips ============================================================================== --- stable/10/sys/conf/files.mips Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.mips Mon Aug 1 06:59:35 2016 (r303609) @@ -68,7 +68,6 @@ dev/cfe/cfe_env.c optional cfe_env # syscons support dev/fb/fb.c optional sc -dev/kbd/kbd.c optional sc dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc Modified: stable/10/sys/conf/files.pc98 ============================================================================== --- stable/10/sys/conf/files.pc98 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.pc98 Mon Aug 1 06:59:35 2016 (r303609) @@ -126,7 +126,6 @@ dev/hwpmc/hwpmc_ppro.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc dev/io/iodev.c optional io -dev/kbd/kbd.c optional pckbd | sc | ukbd dev/le/if_le_cbus.c optional le isa dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev Modified: stable/10/sys/conf/files.powerpc ============================================================================== --- stable/10/sys/conf/files.powerpc Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.powerpc Mon Aug 1 06:59:35 2016 (r303609) @@ -39,7 +39,6 @@ dev/iicbus/adt746x.c optional ad dev/iicbus/ds1631.c optional ds1631 powermac dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/max6690.c optional max6690 powermac -dev/kbd/kbd.c optional sc | vt dev/nand/nfc_fsl.c optional nand mpc85xx # ofw can be either aim or fdt: fdt case handled in files. aim only powerpc specific. dev/ofw/openfirm.c optional aim Modified: stable/10/sys/conf/files.sparc64 ============================================================================== --- stable/10/sys/conf/files.sparc64 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.sparc64 Mon Aug 1 06:59:35 2016 (r303609) @@ -40,7 +40,6 @@ dev/fb/fb.c optional sc dev/fb/gallant12x22.c optional sc dev/fb/machfb.c optional machfb sc dev/hwpmc/hwpmc_sparc64.c optional hwpmc -dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/le/if_le_lebuffer.c optional le sbus dev/le/if_le_ledma.c optional le sbus dev/le/lebuffer_sbus.c optional le sbus From owner-svn-src-stable@freebsd.org Mon Aug 1 15:49:52 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F1FCBAB8DD; Mon, 1 Aug 2016 15:49:52 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F356B1217; Mon, 1 Aug 2016 15:49:51 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71Fnpkx067989; Mon, 1 Aug 2016 15:49:51 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71FnpwT067988; Mon, 1 Aug 2016 15:49:51 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608011549.u71FnpwT067988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 15:49: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: r303616 - stable/11/sys/modules X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 15:49:52 -0000 Author: emaste Date: Mon Aug 1 15:49:50 2016 New Revision: 303616 URL: https://svnweb.freebsd.org/changeset/base/303616 Log: MFC r303282: avoid building otusfw when WITHOUT_SOURCELESS_UCODE set PR: 204748 Approved by: re (kib) Modified: stable/11/sys/modules/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/modules/Makefile ============================================================================== --- stable/11/sys/modules/Makefile Mon Aug 1 13:38:48 2016 (r303615) +++ stable/11/sys/modules/Makefile Mon Aug 1 15:49:50 2016 (r303616) @@ -278,7 +278,7 @@ SUBDIR= \ ${_nxge} \ oce \ otus \ - otusfw \ + ${_otusfw} \ ow \ ${_padlock} \ ${_padlock_rng} \ @@ -493,6 +493,7 @@ _fatm= fatm _fxp= fxp _ispfw= ispfw _mwlfw= mwlfw +_otusfw= otusfw _ralfw= ralfw _rtwnfw= rtwnfw _urtwnfw= urtwnfw From owner-svn-src-stable@freebsd.org Mon Aug 1 16:03:21 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 573A6BABEC1; Mon, 1 Aug 2016 16:03:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2342D1C13; Mon, 1 Aug 2016 16:03:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71G3Kq0075189; Mon, 1 Aug 2016 16:03:20 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71G3K86075188; Mon, 1 Aug 2016 16:03:20 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608011603.u71G3K86075188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 16:03: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: r303617 - stable/11/contrib/llvm/projects/libunwind/src X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 16:03:21 -0000 Author: emaste Date: Mon Aug 1 16:03:20 2016 New Revision: 303617 URL: https://svnweb.freebsd.org/changeset/base/303617 Log: MFC r303521: libunwind: correct return code in unwinding trace log message Approved by: re (gjb) Modified: stable/11/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp ============================================================================== --- stable/11/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp Mon Aug 1 15:49:50 2016 (r303616) +++ stable/11/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp Mon Aug 1 16:03:20 2016 (r303617) @@ -572,7 +572,7 @@ static _Unwind_Reason_Code unwind_phase2 unw_get_reg(cursor, UNW_REG_SP, &sp); if (unw_get_proc_info(cursor, &frameInfo) != UNW_ESUCCESS) { _LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p): unw_get_proc_info " - "failed => _URC_FATAL_PHASE1_ERROR\n", + "failed => _URC_FATAL_PHASE2_ERROR\n", static_cast(exception_object)); return _URC_FATAL_PHASE2_ERROR; } From owner-svn-src-stable@freebsd.org Mon Aug 1 16:16:50 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9D23BAA0D3; Mon, 1 Aug 2016 16:16:49 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA01B13E6; Mon, 1 Aug 2016 16:16:49 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71GGmDt079171; Mon, 1 Aug 2016 16:16:48 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71GGmh9079170; Mon, 1 Aug 2016 16:16:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608011616.u71GGmh9079170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 16:16:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303618 - stable/10/contrib/libcxxrt X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 16:16:50 -0000 Author: emaste Date: Mon Aug 1 16:16:48 2016 New Revision: 303618 URL: https://svnweb.freebsd.org/changeset/base/303618 Log: MFC r303400: libcxxrt: fix demangling of wchar_t 'wchar_t' is 7 characters long, not 6. r303297 fixed this (in head) in libelftc, but not the second copy of this file that we have in libcxxrt. PR: 208661 Modified: stable/10/contrib/libcxxrt/libelftc_dem_gnu3.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/libcxxrt/libelftc_dem_gnu3.c ============================================================================== --- stable/10/contrib/libcxxrt/libelftc_dem_gnu3.c Mon Aug 1 16:03:20 2016 (r303617) +++ stable/10/contrib/libcxxrt/libelftc_dem_gnu3.c Mon Aug 1 16:16:48 2016 (r303618) @@ -2842,7 +2842,7 @@ again: case 'w': /* wchar_t */ - if (!cpp_demangle_push_str(ddata, "wchar_t", 6)) + if (!cpp_demangle_push_str(ddata, "wchar_t", 7)) goto clean; ++ddata->cur; goto rtn; From owner-svn-src-stable@freebsd.org Mon Aug 1 16:18:02 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2D3CBAA160; Mon, 1 Aug 2016 16:18:02 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 752D115DE; Mon, 1 Aug 2016 16:18:02 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71GI1bn079274; Mon, 1 Aug 2016 16:18:01 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71GI1xD079273; Mon, 1 Aug 2016 16:18:01 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608011618.u71GI1xD079273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 16:18:01 +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: r303619 - stable/11/contrib/libcxxrt X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 16:18:02 -0000 Author: emaste Date: Mon Aug 1 16:18:01 2016 New Revision: 303619 URL: https://svnweb.freebsd.org/changeset/base/303619 Log: iMFC r303400: libcxxrt: fix demangling of wchar_t 'wchar_t' is 7 characters long, not 6. r303297 (MFC'd in r303398) fixed this in libelftc, but not the second copy of this file that we have in libcxxrt. PR: 208661 Approved by: re (gjb) Modified: stable/11/contrib/libcxxrt/libelftc_dem_gnu3.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/libcxxrt/libelftc_dem_gnu3.c ============================================================================== --- stable/11/contrib/libcxxrt/libelftc_dem_gnu3.c Mon Aug 1 16:16:48 2016 (r303618) +++ stable/11/contrib/libcxxrt/libelftc_dem_gnu3.c Mon Aug 1 16:18:01 2016 (r303619) @@ -2842,7 +2842,7 @@ again: case 'w': /* wchar_t */ - if (!cpp_demangle_push_str(ddata, "wchar_t", 6)) + if (!cpp_demangle_push_str(ddata, "wchar_t", 7)) goto clean; ++ddata->cur; goto rtn; From owner-svn-src-stable@freebsd.org Mon Aug 1 16:24:48 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27E21BAA523; Mon, 1 Aug 2016 16:24:48 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBAB01C67; Mon, 1 Aug 2016 16:24:47 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71GOlT7082823; Mon, 1 Aug 2016 16:24:47 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71GOlXm082821; Mon, 1 Aug 2016 16:24:47 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201608011624.u71GOlXm082821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 1 Aug 2016 16:24:47 +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: r303620 - stable/11/share/man/man9 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 16:24:48 -0000 Author: vangyzen Date: Mon Aug 1 16:24:46 2016 New Revision: 303620 URL: https://svnweb.freebsd.org/changeset/base/303620 Log: MFC r303519 Fix two return types in the cpuset(9) and bitset(9) man pages The *_FFS() and *_COUNT() functions return int, not size_t. Approved by: re (gjb) Sponsored by: Dell Inc. Modified: stable/11/share/man/man9/bitset.9 stable/11/share/man/man9/cpuset.9 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man9/bitset.9 ============================================================================== --- stable/11/share/man/man9/bitset.9 Mon Aug 1 16:18:01 2016 (r303619) +++ stable/11/share/man/man9/bitset.9 Mon Aug 1 16:24:46 2016 (r303620) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 20, 2015 +.Dd August 1, 2016 .Dt BITSET 9 .Os .Sh NAME @@ -77,9 +77,9 @@ .Fn BIT_EMPTY "const SETSIZE" "struct STRUCTNAME *bitset" .Ft bool .Fn BIT_ISFULLSET "const SETSIZE" "struct STRUCTNAME *bitset" -.Ft size_t +.Ft int .Fn BIT_FFS "const SETSIZE" "struct STRUCTNAME *bitset" -.Ft size_t +.Ft int .Fn BIT_COUNT "const SETSIZE" "struct STRUCTNAME *bitset" .\" .Ft bool Modified: stable/11/share/man/man9/cpuset.9 ============================================================================== --- stable/11/share/man/man9/cpuset.9 Mon Aug 1 16:18:01 2016 (r303619) +++ stable/11/share/man/man9/cpuset.9 Mon Aug 1 16:24:46 2016 (r303620) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 20, 2015 +.Dd August 1, 2016 .Dt CPUSET 9 .Os .Sh NAME @@ -75,9 +75,9 @@ .Fn CPU_EMPTY "cpuset_t *cpuset" .Ft bool .Fn CPU_ISFULLSET "cpuset_t *cpuset" -.Ft size_t +.Ft int .Fn CPU_FFS "cpuset_t *cpuset" -.Ft size_t +.Ft int .Fn CPU_COUNT "cpuset_t *cpuset" .\" .Ft bool From owner-svn-src-stable@freebsd.org Mon Aug 1 16:39:42 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01908BAA9A5; Mon, 1 Aug 2016 16:39:42 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C58DB197F; Mon, 1 Aug 2016 16:39:41 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71GdepT087158; Mon, 1 Aug 2016 16:39:40 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71GdeN5087157; Mon, 1 Aug 2016 16:39:40 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201608011639.u71GdeN5087157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 1 Aug 2016 16:39:40 +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: r303624 - stable/11/usr.bin/cpuset X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 16:39:42 -0000 Author: vangyzen Date: Mon Aug 1 16:39:40 2016 New Revision: 303624 URL: https://svnweb.freebsd.org/changeset/base/303624 Log: MFC r303520 Fix markup for -j in cpuset(1) synopsis Approved by: re (kib) Sponsored by: Dell Inc. Modified: stable/11/usr.bin/cpuset/cpuset.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/cpuset/cpuset.1 ============================================================================== --- stable/11/usr.bin/cpuset/cpuset.1 Mon Aug 1 16:29:32 2016 (r303623) +++ stable/11/usr.bin/cpuset/cpuset.1 Mon Aug 1 16:39:40 2016 (r303624) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 8, 2015 +.Dd August 1, 2016 .Dt CPUSET 1 .Os .Sh NAME @@ -52,7 +52,7 @@ .Nm .Fl g .Op Fl cir -.Op Fl d Ar domain | j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq +.Op Fl d Ar domain | Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq .Sh DESCRIPTION The .Nm From owner-svn-src-stable@freebsd.org Mon Aug 1 17:51:37 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACFB0BABDE0; Mon, 1 Aug 2016 17:51:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5112E1C6A; Mon, 1 Aug 2016 17:51:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71HpaRS014761; Mon, 1 Aug 2016 17:51:36 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71Hpacu014756; Mon, 1 Aug 2016 17:51:36 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201608011751.u71Hpacu014756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 1 Aug 2016 17:51:36 +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: r303628 - in stable/11: share/man/man4 sys/conf sys/contrib/dev/iwm sys/dev/iwm sys/modules/iwmfw sys/modules/iwmfw/iwm3160fw sys/modules/iwmfw/iwm7260fw sys/modules/iwmfw/iwm7265fw sys... X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 17:51:37 -0000 Author: sbruno Date: Mon Aug 1 17:51:35 2016 New Revision: 303628 URL: https://svnweb.freebsd.org/changeset/base/303628 Log: MFC r303322,303326,303327,303345,303413,303416,303418,303557 Update iwm(4) and iwmfw(4) to current in order to stabilize and improve functionality. Approved by: re (gjb) Added: stable/11/sys/contrib/dev/iwm/iwm-3160-16.fw.uu - copied unchanged from r303322, head/sys/contrib/dev/iwm/iwm-3160-16.fw.uu stable/11/sys/contrib/dev/iwm/iwm-7260-16.fw.uu - copied unchanged from r303322, head/sys/contrib/dev/iwm/iwm-7260-16.fw.uu stable/11/sys/contrib/dev/iwm/iwm-7265-16.fw.uu - copied unchanged from r303322, head/sys/contrib/dev/iwm/iwm-7265-16.fw.uu stable/11/sys/contrib/dev/iwm/iwm-8000C-16.fw.uu - copied unchanged from r303322, head/sys/contrib/dev/iwm/iwm-8000C-16.fw.uu stable/11/sys/modules/iwmfw/iwm8000Cfw/ - copied from r303322, head/sys/modules/iwmfw/iwm8000Cfw/ Modified: stable/11/share/man/man4/iwm.4 stable/11/share/man/man4/iwmfw.4 stable/11/sys/conf/files stable/11/sys/contrib/dev/iwm/iwm-3160-9.fw.uu stable/11/sys/contrib/dev/iwm/iwm-7260-9.fw.uu stable/11/sys/contrib/dev/iwm/iwm-7265-9.fw.uu stable/11/sys/dev/iwm/if_iwm.c stable/11/sys/dev/iwm/if_iwm_led.c stable/11/sys/dev/iwm/if_iwm_led.h stable/11/sys/dev/iwm/if_iwm_mac_ctxt.c stable/11/sys/dev/iwm/if_iwm_pcie_trans.c stable/11/sys/dev/iwm/if_iwm_phy_ctxt.c stable/11/sys/dev/iwm/if_iwm_phy_db.c stable/11/sys/dev/iwm/if_iwm_power.c stable/11/sys/dev/iwm/if_iwm_scan.c stable/11/sys/dev/iwm/if_iwm_scan.h stable/11/sys/dev/iwm/if_iwm_time_event.c stable/11/sys/dev/iwm/if_iwm_util.c stable/11/sys/dev/iwm/if_iwm_util.h stable/11/sys/dev/iwm/if_iwmreg.h stable/11/sys/dev/iwm/if_iwmvar.h stable/11/sys/modules/iwmfw/Makefile stable/11/sys/modules/iwmfw/iwm3160fw/Makefile stable/11/sys/modules/iwmfw/iwm7260fw/Makefile stable/11/sys/modules/iwmfw/iwm7265fw/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/iwm.4 ============================================================================== --- stable/11/share/man/man4/iwm.4 Mon Aug 1 17:25:07 2016 (r303627) +++ stable/11/share/man/man4/iwm.4 Mon Aug 1 17:51:35 2016 (r303628) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2015 +.Dd July 26, 2016 .Dt IWM 4 .Os .Sh NAME @@ -48,6 +48,7 @@ Choose one from: .Cd "device iwm3160fw" .Cd "device iwm7260fw" .Cd "device iwm7265fw" +.Cd "device iwm8000Cfw" .Ed .Pp Or you can use @@ -65,6 +66,7 @@ if_iwm_load="YES" iwm3160fw_load="YES" iwm7260fw_load="YES" iwm7265fw_load="YES" +iwm8000Cfw_load="YES" .Ed .Sh DESCRIPTION The @@ -73,8 +75,10 @@ driver provides support for: .Pp .Bl -tag -width Ds -offset indent -compact .It Intel Dual Band Wireless AC 3160 +.It Intel Dual Band Wireless AC 3165 .It Intel Dual Band Wireless AC 7260 .It Intel Dual Band Wireless AC 7265 +.It Intel Dual Band Wireless AC 8260 .El .Pp .Nm Modified: stable/11/share/man/man4/iwmfw.4 ============================================================================== --- stable/11/share/man/man4/iwmfw.4 Mon Aug 1 17:25:07 2016 (r303627) +++ stable/11/share/man/man4/iwmfw.4 Mon Aug 1 17:51:35 2016 (r303628) @@ -22,7 +22,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 28, 2015 +.Dd July 26, 2016 .Dt IWMFW 4 .Os .Sh NAME @@ -45,6 +45,7 @@ of the following: .Cd "device iwm3160fw" .Cd "device iwm7260fw" .Cd "device iwm7265fw" +.Cd "device iwm8000Cfw" .Ed .Pp Alternatively, to load the driver as a @@ -54,10 +55,11 @@ module at boot time, place the following iwm3160fw_load="YES" iwm7260fw_load="YES" iwm7265fw_load="YES" +iwm8000Cfw_load="YES" .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Dual Band Wireless WiFi 3160, 7260 and 7265 series of +Intel Dual Band Wireless WiFi 3160, 3165, 7260, 7265 and 8260 series of IEEE 802.11n/11ac adapters. It may be statically linked into the kernel, or loaded as a module. Modified: stable/11/sys/conf/files ============================================================================== --- stable/11/sys/conf/files Mon Aug 1 17:25:07 2016 (r303627) +++ stable/11/sys/conf/files Mon Aug 1 17:51:35 2016 (r303628) @@ -1732,7 +1732,7 @@ iwm3160fw.fwo optional iwm3160fw | iwm no-implicit-rule \ clean "iwm3160fw.fwo" iwm3160.fw optional iwm3160fw | iwmfw \ - dependency "$S/contrib/dev/iwm/iwm-3160-9.fw.uu" \ + dependency "$S/contrib/dev/iwm/iwm-3160-16.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm3160.fw" @@ -1746,7 +1746,7 @@ iwm7260fw.fwo optional iwm7260fw | iwm no-implicit-rule \ clean "iwm7260fw.fwo" iwm7260.fw optional iwm7260fw | iwmfw \ - dependency "$S/contrib/dev/iwm/iwm-7260-9.fw.uu" \ + dependency "$S/contrib/dev/iwm/iwm-7260-16.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm7260.fw" @@ -1760,10 +1760,24 @@ iwm7265fw.fwo optional iwm7265fw | iwm no-implicit-rule \ clean "iwm7265fw.fwo" iwm7265.fw optional iwm7265fw | iwmfw \ - dependency "$S/contrib/dev/iwm/iwm-7265-9.fw.uu" \ + dependency "$S/contrib/dev/iwm/iwm-7265-16.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm7265.fw" +iwm8000Cfw.c optional iwm8000Cfw | iwmfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwm8000C.fw:iwm8000Cfw -miwm8000Cfw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwm8000Cfw.c" +iwm8000Cfw.fwo optional iwm8000Cfw | iwmfw \ + dependency "iwm8000C.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwm8000Cfw.fwo" +iwm8000C.fw optional iwm8000Cfw | iwmfw \ + dependency "$S/contrib/dev/iwm/iwm-8000C-16.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwm8000C.fw" dev/iwn/if_iwn.c optional iwn iwn1000fw.c optional iwn1000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \ Copied: stable/11/sys/contrib/dev/iwm/iwm-3160-16.fw.uu (from r303322, head/sys/contrib/dev/iwm/iwm-3160-16.fw.uu) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/contrib/dev/iwm/iwm-3160-16.fw.uu Mon Aug 1 17:51:35 2016 (r303628, copy of r303322, head/sys/contrib/dev/iwm/iwm-3160-16.fw.uu) @@ -0,0 +1,20408 @@ +begin 644 iwm-3160-16.fw +M`````$E73`IS=')E86TZ0V]R94-Y8VQE,3-?0=P!'8!,`2`0`;<`@``&$/'!TB!``=)N@=P!`!`!LPZ!W`$8($&R0(`!LE +M!"C`$>D/`&$``!LE``$;)%P$7`$)!% +MP!!@``!AX`3`$N@=P!$!`%(DM!_`$`(`$W`#``!A"`!8,`@`9#$'``!A#Q-2 +M(H($$R0(`!,E`0!2;@$``&$!``!A````80@`6&[H#P!A```3)0``$R0D$,`1 +M`(`3)#@!,B!`#*$0```20```$E"0`` +M84``$R4&`1,D!"C`$0]V$R(L2,<1#W@3(@``QA$#``$D```!)0]%`"(`7``Y +M[_\`,A@``&0``!,D`0`3)3@@=P!#F_Q,R__\3,^@=P!$```$D"``!)0\!8R(! +M`%(D"``';@(``&$``!4D````(0X``&'8!,`2Z!W`$0$`4B2T'\`0`@`3<`(` +M`&$(`&0QY@\`80\34B(/$U(B`0!2;@$``&$!``!A````81PJ@($``,`6`@$3 +M9$(!$R0$*,`18'Z`@0``P!8&`1-B!`C`$`0`$V0/7``B"@``0``&`'`:``!A +M```3)```$R4``,`7`$!8,,@@P!!P1<`0$`C`$```$R4#`!,D'`C`$1P(P!$` +M`!,D!`C`$0\4%2($`!4F#S`@(OO_,#(#`!,D&`C`$0\4%2("`!4F#R`P(@`` +M$R001<`1&`C`$0`06#`/`!,B`0`3,`0HP!$/?!,B"`#,$0``$R4``!,D-$C' +M$4``$R4'`1,D!"C`$0][$R(!`!,P!"C`$0\4%2("`!4F#TT3(@00Q1$"`!,D +M\!S`$0$`$R3L',`1```3)'``$R40',`1```3)0``$R3@',`14'Z`@0``P!8" +M`1-B#Q05(AL`%28``!,E`0`3)"00P!$``!,D``#`%P``%20````A```;)0`` +M&R0!`&1N`0`;)`(`9&X"`!LD!`!D;@0`&R0,`!MB#QL+(@\+8R(!`!M``@`; +M00```&$``!LE"`B`@0`;&B@``,`6```;)0(`&T```!MQ#V1C(@``'20````A +M```````````(```````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````````1`"`````````````#!`0``0!$`X0$!`0$!`0$!`0$!`0$!`0$!`0 +M$!`0$!`/$`D0$`4*$`L0$!`0`A`0#1`0$!`0$!`0$!`0!@,0$!`0$!`0$!`0 +M$!`0$`@0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0 +M$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0 +M$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0 +M$!`0$!`0$!`0$!`0$!`'$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0 +M$!`0$`````````0`S`,!``X`[`8%`,0`2`0&`$``#`4'`-@`9`4(`&@`/`8) +M`$``I`8*`#P`T`,+`#P`#`0/``@`Y`81`!@`3`42`*0!```3``P`_`84``,` +M"`<5``0`#`<````````````````````````````````````````````````` +M```````>````'H@>B%H```!6````5HA6B`(!``"J````JHBJB/X!``","@`` +M5(Q4C*0?````````````````_@```0#_``(!_P$`_P$!`/X"`0,"_P$!`/\! +M`0'_`@#_`P(`_@0"`P+_`@(`_P("`?\#`/\%`P#^!@,``_\#`P#_`P,!_P`` +M`````````````)1)```*````!````'A]@`````````````````#T20``!0`` +M``0```!X?8````````$```"8^```&/D``+#X``#T^```U/4``-#U``!D-P`` +M%#8``&0V```````````````!"_\```4#```$`@``!O\```#_```,_P``!_\` +M``C_```)_P``"O\```+_`0#_``$"`!$!`0(!`0$#_P$!!`(!`04#`0$&!`$! +M!P4!`0@&`0$)#P$!"A`!``S_`0#^_P(`_P<"`0'_`@(""`("`PD"`@0*`@(% +M"P("!@P"`@<-`@((#@(""0X"`@H-`@`,_P(`_O\````````````````````` +M``#_!P```/\```?_``$)"```"O\!`@```0,!_P$#`O\!`P/_`0$$_P$"!0`! +M`0O_`0(,_P$$!@8!`0?_`0`(_P$`"O\"`@#_`@,!_P(#`O\"`P/_`@$$`0(" +M!0`"`0L!`@(,`0($!@8"`@<``@`(`0(`"@$#`/\"`P,`_P,#`?\#`P+_`P,# +M!`,!!`4#`@4``P$+!0,"#`4#!`8&`P,'_P,`"`4#``H%`P#^`P0$`/\$!`'_ +M!`0"_P0$`_\$!`3_!`0%_P0$"_\$!`S_!`0&!@0$!P8$``C_!``*_P`````` +M``````#_`````0,``@("``,``@``!?\```;_```$_P``!P0```C_`0#_`0$! +M``,!`@$"`0("`@$`!/\!`0<$`0`(_P(#``8"`@(&`@`%_P(`!O\"``3_`@`' +M!P(`"`<#`P`&`P`!!0,"`@8#`07_`P`&_P,`!`<#``<'`P`(!P```````0#_ +M`0#_``$``?\!`@+_`@#_`0(``?\"`0/_`@,$_P(""O\"`@G_`@((_P,``?\# +M`0,*`P4%"@,$!O\#!@H(`P,)_P0`_P,$``'_!`$#"P0"!PL$`@@$!`,$_P0" +M"@D$!`G_!`0&_P4`_P(%!`;_!0$#!@4``?\%!0K_!04)!08`__\&!`;_!@$# +M!@8``?\&`P3_!@8)!P8&"O\```````````````````````@$#`(*!@X!"04- +M`PL'#P&1```!/P```I$``#X]```#D0``/3T```21```_`P``!9$```D0```& +MD0``%AP```>1```?'P``")$``!P6```)D0``$`D```J1```#/P``"Y$``#T] +M```,D0``/3X```V1```_`0``$1`^2$A(X!`$````#2`$````($,Y`````."$ +M`0``X1`!`````A"7RP4`,&`+````#]($````&-+\__\?">")AH2$"N"$A``` +M"^"F5=<@#.`BBRPR#>"JB8>^PQ%^"2C(N*&."*B@``&>!^2><@&N`B +MBRPR&^"33;>^PQ)&```````G,`````$2`4A0$``F#^%````V`1%``` +M!F`1%```&1`$`````7,P`0``81`@````$B"4`P``UA`<8P``UQ`<8P``V!`< +M8P``V1!Z@(``VA!X@(``VQ!X@(``"1!N7P``&A``````,1"&`0``,A"0`0`` +M,Q#(````-!!0````-1"`````.A!I````.Q#`````P1``````*N#YY>`>>^PQ*."+BXF)*>")B0```D'AX;%Q02"AX> +M'AX>'AX;%Q02"AX>'AX>'AX;%Q02"AX>````````````````(+'V````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````#0,H`!`#*``5`R@`%`,H`!,#*``'!R@`$`@H``H)*``;!"@`!@DH`!X +M)*``?"2@`(`DH`"$)*``4!"@`$@FH`!@$*``3":@`&00H`!H$*``6!"@`#`0 +MH``\$*``-!"@`"P,H```@:0``8&D``.!I`"()*``C"2@`)`DH`"4)*``F"2@ +M`)PDH`"@)*``I"2@``````````````````````!Q&PT`X($!`!:?`@`````` +M``````````!Q`0G?``#H``#B```^`5<_`69``7=!`9A"`0`/C.``*^`!;/``C3``C0``C4``C1``C5``C2`!C6```Q`"0$`$PX``#E +M`7/F`02/`?^#`6F.`0^0`0"1`7V2`7V3`7U9``;]``'^`!/_``9N``1\`0V` +M`0VY`07.`0*]`0G'`1_(`1:D`1"E`1"K`1"J`1"R`1.S`1/?`0'7`0!Z`0`` +M``````,!!0`0``0`$0`2``,`"@`T`34!-@$E``H`!``/``,!.``0`!(````' +M#!,`!!.``.P2@``H$X``Z!*```,!`@$%``0`$``*``8`?`&``7,!=P&7`9D! +ME@&8`=P!)0":`9P!```````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````0````(`````````+A$O%S`0,2@R$3/R-B(X$3D7.A`[*#P1 +M/?)`(D$!2#A).$HN2RY4'%4<5AQ7'%HX6SA<.%TX8%AA6'@X>3B('(DP``M'L``(P7``!L&```Z!<``&P7``!H&```9!<``%@7``!<%P``8!<` +M`$QP``"D<```?'```'1P``#_____________________!````/__________ +M_____P,```#_____``````````#_____``````````#_____```````````# +M````$`````,`````````````````````````_P``````````````_P`````` +M`````````````````````0`````!_P```O\```,!```%_P``!O\```C_```' +M_P``"?\```K_```+_P``#/\!`/\#`0$```$!`@H!`@4$`0$&_P$!!_\!`PH' +M`0$+_P$!#/\#`/\"`P,```,$!00#!0;_`P,*!P,!"_\#`PS_`@#_`P("```" +M`@0&`@(%_P("!O\"`@?_`@0*!P(""_\"`0P%!`#_`@0$```$`0$)!`0$!@0$ +M!?\$!0;_!`0*!P0""_\$`0P%!0#_`P4%```%!`C_!04'"`4#"?\%!0;_!04$ +M_P`````````````````````%```````````````>````$````!``````(@`B +M$3,1,_#P\/#`P,#`_/S\_/[^_OZJJJJJJJJJJJJJJJZJJJJJ*/\`S*JJ``"J +MJ@#,JJH```!``,```````%``\`!0`/"JJJJJJJJJJJJJJJJJJJJJ*/\`S*JJ +M``"JJ@#,JJH``````````````%``\`!0`/"JJJJJJJJJJJJJJNZJJJJJ*/\` +MS*JJ``"JJ@#,JJH```!``,``0`#``%``\`!0`/`'````#P`````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````__\``/__`````````````/__``#__P````````````#__P``__]@)P`` +MY"<``*@G``"D)P``C"<``&PG``!,*```D"@``&PH``#,)P``K"<````````` +M````````````````````````````````````````````````````!P```````````````!`0X.````````,@@"#P,` +M`0`````````!`0X.````````(P0""@````````````#T`0`````````````` +M`````````'Q/@``````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````````````````````````````````````````$`````"0`0```*``$"<` +M`.@#``#H`P``]".``/0C@``0A(``#(2```R$@``,A(``$(2```R$@``,A(`` +M#(2```R$@``0A(``$(2```R$@``0A(``#(2``/__```!``````````````!$ +M)`$`1"0!`$0D`0`H!@$`1"0!`$0D`0!<"`$`1"0!`$S^```0!0$`1"0!`$0D +M`0!$)`$`1"0!`$0D`0!$)`$`1"0!`$0D`0!$)`$`1"0!`$0D`0!$)`$`1"0! +M`/@>`0`@'`$`4!\!`$0D`0!$)`$`1"0!`-@5`0#0(P$`"!@!`,08`0#`%P$` +MV`P!`"@,`0"($0$`7!L!`&0D`0!$)`$`P$`Z'L!`)1[`0#8>@$`$'L!`*1Z`0"<>P$``0`````````` +M``````````````````````````-````4``````$```````!4*(`````````` +M`````````````````````````````)PQ`0`%```"!````'A]@``````````` +M``$``````````@````````!G12,!!0````("`@("`@("`@("`@("`@("`@(" +M`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@(" +M`@("`@("`@("`@("`@("`@("`@$"`@("`@("`0$"`@("`@("`@("`@("`@`` +M```0`@``````````````````````````````````Z,J````````````````` +M````````````````````````````"](.T@W2"-()T@K2$M(3TA32&](`8```#_!P!4!P```/\@```````8A(`````` +M```````````````````````````````````````````````````````````` +M_P```/__________________________```````````````````````````` +M````````````````````````````````````````````````````3+$!`-`[ +M`0`4MP$`T#L!`&1N`@#0.P$`W"D!`!Q.`@!L7`$`T#L!`-`[`0`L4@(`+%(" +M`"Q2`@`L4@(`+%("`"Q2`@`L4@(`T#L!`-`[`0#0.P$`T#L!`*2;``#0.P$` +MT#L!`-`[`0#0.P$`T#L!`#Q<`0`D7`$`T#L!`-`[`0`````````````````` +M```````````````````````````````!`````0`````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````0````(````#`````````/\```#_````_P```/\````````` +M``````````````````````````#_````B!,````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````````````/____\````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`(``````````````````````````_____P`````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````````@`````````````````````````#_____```````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````"``````````````````````````/____\````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````````````(``````````````````````````_____P`````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````````````````````````````@``````````````````````````````` +M`````````````````````/\````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``#_____`````/____\`````_____P````#_____```````````/`#\``0`` +M``\`/P`!````#P`_``$````/`#\``0````\`/P`!``````````\`/P`!```` +M#P`_``$````/`#\``0````\`/P`!````#P`_``$`````````#P`_``$````/ +M`#\``0````\`/P`!````#P`_``$````/`#\``0`````````/`#\``0````\` +M/P`!````#P`_``$````/`#\``0````\`/P`!``````````\`/P`!````#P`_ +M``$````/`#\``0````\`/P`!````#P`_``$``````````````*L````````` +M```````````````````````````````````````````````````````````` +M`````````````````````````````````````````````````````````.H* +MH@I>"AT*X`FE"6T)-PD$"=,(I`AW"$L((@CZ!],'K@>*!P`````````````` +M```````````````````````````````````````````````````````````` +M`````````````````````%1,```"````!````'A]@`````````````````"P +M3```!0````0```!X?8``````````````!0```PD#"0````````````````<` +M```>`````P```/____\````````````````````````````````````````` +M``````````````````````!F9@X``````&9F"@!F9@8`9F8&`&9F`@!F9@(` +M9F8^`&9F/@!F9CH`9F8Z``````!F9C8``````&9F,@``````9F8.```````` +M````9F8&```````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````````````````````````````````````````````D`"0D) +M"0D)"0D)``D`"0`)```)```````````````````````````````````````` +M``````````````````````````````````````````````#(!8`````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````#['8P`,Q$``````````!$````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````0%!@<("0H+#`T.#Q`J*RPM+B]*2TQ-3D]0:FML;6YO<(J+C(V. +MCY"JJZRMKJ^PR\S-SL_0T=+3U-76U]C9VMO#C($&QY?#C(%(!Y@#C(&)1YB#C('*AYC#C((+QYD#C()-!YE +M#C(*.1YG#C(+/AYH#C(,0QYI#C(-2!YJ#C(.31YL#C(B4$`-(``D8$`/(#$F +M<$`2(#0H`$$4(#$J$$$7(#$L($$9(#$N,$$<(#,P0$$>(#$R4$$A(#$T8$$C +M(#$V<$$F(#,X`$(H(#$Z$$(K(#$\($(M(#$^,$(P(#-`0$(R(#%D8$1?(C!F +M<$1B(C)H`$5D(B]J$$5G(B]L($5I(B]N,$5L(C)P0$5N(B]R4$5Q(B]T8$5S +M(B]V<$5V(C)X`$9X(B]Z$$9[(B]\($9](B]^,$:`(C&`0$:"(B^"4$:%(@"$ +M8$:'(BZ&<$:*(C&(`$>,(BZ*$$>/(BZ,($>1(BZ.,$>4(C"00$>6(BV12$>8 +M(@"5:$>=(BV7>$>?(C"9"$BB)"V;&$BD)"V=*$BG)"V?.$BI)#"A2$BL)"VE +M:$BQ)"T````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````/``\`#P`/``\`#P`/``\````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````````````````````````````````0`!``````#``)``T``` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````#_____H,2`````````````0$(/`$!"#P!`0@\`0$(/`$!" +M#P!`0@\`0$(/`$!"#P!`0@\`0$(/`.`'``!``0``X`<``$`!```@)P``X`<` +M`.`'``!``0``X`<``$`!```"``````````(````````````````````````` +M````````````````````````````````_&R``#SB@``8```````````````` +M`````````/____\````````````````````````````````````````````` +M````````````````````````````````````````^!,"`!P4`@`L%`(`!!0" +M`/03`@`P%`(`W!,"````````4````#`````````````````````````````` +M`$```(`Q``"`#@``````````````````````````````+@```#(````@```` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````H!X"```;`@"0'@(`C!T"`'`>`@#PJ0$`,!X"`#`;`@"X'`(`Y!H"`.@: +M`@`````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````````````````````````````````````"````````````` +M````````@````("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("` +M@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("` +M@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("` +M@("```(```````````````````````````````"```````#_```````````" +M````````````````````````````````@```````_P```````````@`````` +M`````````````````````````(```````/\```````````(````````````` +M``````````````````"```````#_```````````"```````````````````` +M````````````@```````_P```````````@`````````````````````````` +M`````(```````/\```````````(```````````````````````````````"` +M``````#_```````````"````````````````````````````````@``````` +M_P```````````@```````````````````````````````(```````/\````` +M``````(```````````````````````````````"```````#_```````````" +M````````````````````````````````@```````_P```````````@`````` +M`````````````````````````(```````/\```````````(````````````` +M``````````````````"```````#_```````````"```````````````````` +M````````````@```````_P```````````@`````````````````````````` +M`````(```````/\```````````(```````````````````````````````"` +M``````#_``````````````````"!`````````((`````````@P````````"$ +M`````````(4`````````A@````````"'`````````(@`````````B0`````` +M``"*`````````(L`````````C`````````"-`````````(X`````````CP`` +M``````#``0`````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````````````````````````````````````!(<0``&'$``)QQ +M```P<0``H'$``!!Q``!,<0``_P```/\```#_````_P```/\```#_````_P`` +M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_```` +M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_ +M````_P`````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````````!@@H``<(*``*""@`"P@H``X(*``(""@`"0@H``P(*`` +M-""@`#P@H`!`(:``1"&@`&@AH`!L(:``>"&@`$@AH`!,(:``<"&@`'0AH`!\ +M(:```````/\````````````````````````````````````````````````` +M````````""T"``4```($````>'V``````````````````*QQ```&````!``` +M`'A]@`````````````````!(+@$`"@````0```!X?8`````````````````` +MM&L```4```($````>'V``````````````````$"``0`%```"!````'A]@``` +M```````````````,@0$`!0```@0```!X?8``````````````````]"P"``8` +M````````>'V``'A]@`!X?8``M""@`&P@H```,```_X___P``````````F'V` +M`)A]@`"D(*``.""@``$```#X____``````````"X?8``N'V``*@@H``\(*`` +M$````,?___\``````````-A]@`#8?8``K""@`'@AH`!``0``/_[__P`````` +M````^'V``/A]@`"P(*``?"&@```,``#_\?__``````````#_````_P`````` +M`````````````````````````````````````````````````0#_```````` +M````````````````````````````,"R``,#3@``8``````````$````````` +M`````%`K@`"(TX``&``````````!``````````````!0;(``P.&``!@````` +M`````0`````````````````````````````````````````````````````` +M``#80(``B-F``!@``````````0`````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M````````````````````````__\``/__```````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````````````````\`/P`!````#P`_``$````/`#\``0````\` +M/P`!````#P`_``$````/`#\``0````\`/P`!````#P`_``(`````"P`0``L` +M"P`*``L`!H`!``@`"``(``@````(``:``0`(``@`"``(````"``&@`$````` +M``````````!(2#P\````````````````````````````````2$@\/``````` +M``````````````#_?P```````/]_````````_W\```````#_?P```````/]_ +M````````_W\``/]_``````````````````!]>79Y;WEI>7UW=G=O=VEW?75V +M=6]U:75]R%T(8\% +MAP5_!7@%CP.'`W\#>`-]>79Y;WEI>7UW=G=O=VEW?75V=6]U:75]4-R0VQ#9D-Y +M07)!;$%F07HEB-S(VTC9R-Z(7,A;2%G(7T%=@5O!6D%?0-V`V\# +M:0-]>79Y;WEI>7UW=G=O=VEW?75V=6]U:75]7EY8!W +M>7=R=VQW@'5Y=7)U;'6`7%R<6QQ@&]Y;W)O;&^`;7EM6MR:VQK@&EY:7)I;&F`9WEG65R96QE@&-Y8W)C;&.`87EA +M$5Q16M%?T-X0W%#:T-_07A!<4%K080E?25V)6\EA"-](W8C;R.$ +M(7TA=B%O(8<%?P5X!7(%AP-_`W@#<@,``````````/X```#0T+JYM[>XM[@` +M````````````````````````[[ZMWN^^K=[OOJW>[[ZMW@`````````````` +M````````````/'L```H````$````>'V```````#<"P$``````/\````$```` +M````````````````__\``#@Y``!,.0``8#D``.PX``#D.```]#@``&`X``!8 +M.```V.P``/#H``#LZ0``2.H``&SI``#,Z0``).H``"#M```T\P``?/,``"ST +M``"$]```X/,``!CT``!\]```M.D``)CI``#DZ``````````````"`@7_`@,` +M``(!`0$#`P#_`P$!`0,``@(#`@4&```"_P````,```$#``$$!``#`P4``@4& +M`0$!_P$``@(!`P`%`0(%!@````````````````````#L+`(`!@````0```!X +M?8``````````````````#"T"``8````$````>'V````````Q.3HS-CHS-@`` +M``#)``````````4"#0`(!#D4.0``.2,Y`!`,.3DY'!@Y(``*(#F70F!W/#@T +M,"PH)"`<&!00#`@$``0%!00"`@``'049`!,`````2D9-&`````3>W]\$W@`` +M`P`&!@8&!@8```````````,-,(J*.$>*BHJ*BG2*6F0`5H-L3HJ*BHJ*1TX= +MBGIZ9QIV+0`````&%!04!!04%`(4%!0`````!`8`!@0&!@8&!@8&!@8&!@8& +M`@8$``````L'`P`[-S,O*R____'____R#___\A_____R+___\C____)/___R7___\F +M`````````````````````````````(0Q````````A#$``````````````@`` +M``(````4AP$`J(P````````````````````````````````````````/`#\` +M`@````\`/P`"````#P`_``(````/`#\``@````\`/P`"(`````````$```"J +MJJJJJJJJJJJJJNZJJJJJ*/\`S*JJ``"JJ@#,JJH```!``,``0`#``%``\`!0 +M`/`````````````````````````````````````````````````````````` +M``````"JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ@`````````` +M````````````;&UN;W!QP$`).,``/Q[`0`DXP``4)(!`.@L`@```````````````````````````%CE +M````````6.4``-23`0``````('P!`(R2```@?`$`('P!`"1-`0"HY0``('P! +M`*CE``"(E`$`('P!````````````````````````````U.8```````#4Y@`` +M``````````````````````````!DHP$`3$T!`*CG``"`C0$`J.<``,24`0`` +M``````````\`/P`!````#P`_``$````/`#\``0````\`/P`!````#P`_``$` +M`````````````````````````````!SY``"(C0$`'/D``*B5`0`````````` +M``````````````````````!$_````````$3\``!LF`$``````"@`*``P`"P` +M+``H`#P`-``L`"P`/``T`#``+`!4`$0`?_\'#Q\_`0,%``<"`P0&!@T%!0D) +M"0D)"0D```$'#Q\_?_____\``/____\```"`555550```$#07D)[:"^A/9H? +M%BFTE]`>.([C.!S'<1R]A/82CN,X#AS'<1R.XS@.7D)["<=Q'`&8``-AE``#890```````*CX`0`@ +M^P$`J`$"`.P"`@`$````'!$``!PR```<,P``'!0```0````<`@``I<:$^)GN +MC?8-_[W6L=Y4D5!@`P*ISGU6&>=BM>9-FNQ%CYT?0(F'^A7OZ[+)C@O[[$%G +ML_U?ZD6_(_=3EN1;F\)U'.&N/6I,6FQ!?@+U3X-<:/11--$(^9/B5/%NW%AM>:56:4$<^*$.D&!('^\*!$>+HEXTOSHOY=P("* +M!:T_O"%(<`3QWV/!=W6O8T(P(!KE#OUMOTR!%!@U)B_#X;ZB-JS(Y[HK,I7FH,"8&=&>?Z-F1'Y4JSN#"\J,*:?BO!T6=JT[ +MVU9D3G0>%-N2"@QL2.2X79]NO>]#IL2H.:0Q-].+\C+50XM9;K?:C`%DL=*< +MX$FTV/JL!_,ESZ_*CO3I1Q@0U6^(\&]*RWO\J-9M.BP``0($!`8&`!$```````````````````!D````$````/\` +M#"`(````$@```````````````````"P!```0````_P`,(`(````3```````` +M````````````+`$``!````#_``P@!P```!0`````````0`8````````!```` +M$`````$`#$`$````%0````````!`!@````````$````0`````0`,0`,````6 +M`````````$`&`````````0```!`````!``Q``P```!<````````````````` +M```!````$````/\`!``$````&`````````!`!@```````#(````R`````0', +M0`,````9`````````````````````0````$````!`0"``0```!H````````` +M```````````!`````0```/__`*`%````&P`````````0``````````$````0 +M`````0($``8````<``````````0``````````0````$````!``P``0```!T` +M````````!``````````!`````0````$`#``!````'@`````````$```````` +M``$````!`````0``@`$````?`````````````````````0````@```#_``P@ +M!@```"`````````````````````!````"````/\`#"`"````(0`````````` +M``````````$````!````_P`,H`,````B`````````````````````0````$` +M```!`@R``0```",````````````````````!`````0```/\``*`&````)``` +M``````````````````$````!`````0)$``(````E```````````````````` +M`0```!````#_``P@`P```"8`````````V``````````!````9`````$`"``" +M````)P`````````L`0````````$````!`````0`,0`0````H`````````"P! +M`````````0````$```#_``Q`!````"D`````````+`$````````!`````0`` +M``$`#$`$````*@`````````L`0````````$````!`````0`,0`,````K```` +M`````"P!`````````0````$````!``Q`!0```"P``````````@`````````! +M`````0````$`!``%````+0`````````$``````````$````!`````0`,0`$` +M```N`````````"P!`````````0```&D````!``Q``P```"\````````````` +M`````````@``$@```/\`#&`"````,``````````R`````````&0````0```` +M_P`,8`8````Q`````````"P!`````````0```&X````!``Q`!`````0,#`@4 +M!`0$0````(```````0````(````$``!`````0````$````#_0555%0````"` +MB(@(`````0``'/____\`$```!`$`&/[__W\`"```!`(!&/____\`$````0$! +M&/____\`$````P``'/S_4M55#0```@``'/S_I^JK#@``!0(!&/S_4M55#0`` +M`@$!&/S_I^JK#@```P$!&/S_4M55#0``!0$`&/S_J6JK!@```$```!<```#L +MM@``%``````````!````,((!``````#TVP```P```-"[```$````A-8```@` +M```TU```#````##'```1`````````!,```!XMP``%@```&1P`@``````K-L` +M``0```#D;0(`!0```#C"```(````.-0```P```#'V````````````````````````````````````````!``````#0_@`````` +M````````````````````````````````````$``````````0```````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable@freebsd.org Mon Aug 1 19:50:29 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D204BAB997; Mon, 1 Aug 2016 19:50:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2464E1388; Mon, 1 Aug 2016 19:50:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71JoScK059092; Mon, 1 Aug 2016 19:50:28 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71JoSsq059091; Mon, 1 Aug 2016 19:50:28 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608011950.u71JoSsq059091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 19:50:28 +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: r303632 - stable/11/sys/dev/vt X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 19:50:29 -0000 Author: emaste Date: Mon Aug 1 19:50:28 2016 New Revision: 303632 URL: https://svnweb.freebsd.org/changeset/base/303632 Log: MFC r303338: vt: lock Giant around kbd calls in CONS_GETINFO Note that keyboards are stored in an array and are not freed (just "unregistered" by clearing some fields) so a race would be limited to obtaining stale information about an unregistered keyboard. Reported by: CTurt Approved by: re (gjb, kib) Modified: stable/11/sys/dev/vt/vt_core.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/vt/vt_core.c ============================================================================== --- stable/11/sys/dev/vt/vt_core.c Mon Aug 1 19:49:42 2016 (r303631) +++ stable/11/sys/dev/vt/vt_core.c Mon Aug 1 19:50:28 2016 (r303632) @@ -2228,9 +2228,11 @@ skip_thunk: return (EINVAL); if (vw == vd->vd_curwindow) { + mtx_lock(&Giant); kbd = kbd_get_keyboard(vd->vd_keyboard); if (kbd != NULL) vt_save_kbd_state(vw, kbd); + mtx_unlock(&Giant); } vi->m_num = vd->vd_curwindow->vw_number + 1; From owner-svn-src-stable@freebsd.org Mon Aug 1 19:53:19 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D65C0BABBB8; Mon, 1 Aug 2016 19:53:19 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1C2C1985; Mon, 1 Aug 2016 19:53:19 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71JrIHP062439; Mon, 1 Aug 2016 19:53:18 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71JrIvm062438; Mon, 1 Aug 2016 19:53:18 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608011953.u71JrIvm062438@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 19:53:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303633 - stable/10/sys/dev/vt X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 19:53:19 -0000 Author: emaste Date: Mon Aug 1 19:53:18 2016 New Revision: 303633 URL: https://svnweb.freebsd.org/changeset/base/303633 Log: MFC r303338: vt: lock Giant around kbd calls in CONS_GETINFO Note that keyboards are stored in an array and are not freed (just "unregistered" by clearing some fields) so a race would be limited to obtaining stale information about an unregistered keyboard. Reported by: CTurt Modified: stable/10/sys/dev/vt/vt_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/vt/vt_core.c ============================================================================== --- stable/10/sys/dev/vt/vt_core.c Mon Aug 1 19:50:28 2016 (r303632) +++ stable/10/sys/dev/vt/vt_core.c Mon Aug 1 19:53:18 2016 (r303633) @@ -2183,9 +2183,11 @@ skip_thunk: return (EINVAL); if (vw == vd->vd_curwindow) { + mtx_lock(&Giant); kbd = kbd_get_keyboard(vd->vd_keyboard); if (kbd != NULL) vt_save_kbd_state(vw, kbd); + mtx_unlock(&Giant); } vi->m_num = vd->vd_curwindow->vw_number + 1; From owner-svn-src-stable@freebsd.org Mon Aug 1 20:03:00 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86AD6BAA05F; Mon, 1 Aug 2016 20:03:00 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47DC51369; Mon, 1 Aug 2016 20:03:00 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71K2x0x066159; Mon, 1 Aug 2016 20:02:59 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71K2x6R066157; Mon, 1 Aug 2016 20:02:59 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608012002.u71K2x6R066157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 1 Aug 2016 20:02: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: r303634 - in stable/11: contrib/gcc/config/arm gnu/lib/libgcc X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 20:03:00 -0000 Author: emaste Date: Mon Aug 1 20:02:59 2016 New Revision: 303634 URL: https://svnweb.freebsd.org/changeset/base/303634 Log: MFC r303396: rename ARM's libunwind.S to to avoid conflict with llvm libunwind llvm libunwind includes a libunwind.cpp, but on ARM libunwind.S is found first in .PATH. Rename the latter one, since it is not going to be updated again. Approved by: re (kib) Added: stable/11/contrib/gcc/config/arm/libunwind-arm.S - copied unchanged from r303396, head/contrib/gcc/config/arm/libunwind-arm.S Deleted: stable/11/contrib/gcc/config/arm/libunwind.S Modified: stable/11/gnu/lib/libgcc/Makefile Directory Properties: stable/11/ (props changed) Copied: stable/11/contrib/gcc/config/arm/libunwind-arm.S (from r303396, head/contrib/gcc/config/arm/libunwind-arm.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/contrib/gcc/config/arm/libunwind-arm.S Mon Aug 1 20:02:59 2016 (r303634, copy of r303396, head/contrib/gcc/config/arm/libunwind-arm.S) @@ -0,0 +1,136 @@ +/* Support functions for the unwinder. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Contributed by Paul Brook + + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + In addition to the permissions in the GNU General Public License, the + Free Software Foundation gives you unlimited permission to link the + compiled version of this file into combinations with other programs, + and to distribute those combinations without any restriction coming + from the use of this file. (The General Public License restrictions + do apply in other respects; for example, they cover modification of + the file, and distribution when not linked into a combine + executable.) + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +#include + +/* Allow the use of VFP instructions */ +#if __ARM_ARCH >= 7 +.fpu vfp +#endif + +#ifndef __symbian__ + +#include "lib1funcs.asm" + +.macro UNPREFIX name + .global SYM (\name) + EQUIV SYM (\name), SYM (__\name) +.endm + +/* r0 points to a 16-word block. Upload these values to the actual core + state. */ +ARM_FUNC_START restore_core_regs + /* We must use sp as the base register when restoring sp. Push the + last 3 registers onto the top of the current stack to achieve + this. */ + add r1, r0, #52 + ldmia r1, {r3, r4, r5} /* {sp, lr, pc}. */ +#ifdef __INTERWORKING__ + /* Restore pc into ip. */ + mov r2, r5 + stmfd sp!, {r2, r3, r4} +#else + stmfd sp!, {r3, r4, r5} +#endif + /* Don't bother restoring ip. */ + ldmia r0, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp} + /* Pop the three registers we pushed earlier. */ +#ifdef __INTERWORKING__ + ldmfd sp, {ip, sp, lr} + bx ip +#else + ldmfd sp, {sp, lr, pc} +#endif + FUNC_END restore_core_regs + UNPREFIX restore_core_regs + +/* Load VFP registers d0-d15 from the address in r0. */ +ARM_FUNC_START gnu_Unwind_Restore_VFP + /* Use the generic coprocessor form so that gas doesn't complain + on soft-float targets. */ +#if __ARM_ARCH >= 7 + fldmiax r0, {d0-d15} +#else + ldc p11,cr0,[r0],{0x21} /* fldmiax r0, {d0-d15} */ +#endif + RET + +/* Store VFR regsters d0-d15 to the address in r0. */ +ARM_FUNC_START gnu_Unwind_Save_VFP + /* Use the generic coprocessor form so that gas doesn't complain + on soft-float targets. */ +#if __ARM_ARCH >= 7 + fstmiax r0, {d0-d15} +#else + stc p11,cr0,[r0],{0x21} /* fstmiax r0, {d0-d15} */ +#endif + RET + +/* Wrappers to save core registers, then call the real routine. */ + +.macro UNWIND_WRAPPER name nargs + ARM_FUNC_START \name + /* Create a phase2_vrs structure. */ + /* Split reg push in two to ensure the correct value for sp. */ + stmfd sp!, {sp, lr, pc} + stmfd sp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip} + + /* Demand-save flags, plus an extra word for alignment. */ + mov r3, #0 + stmfd sp!, {r2, r3} + + /* Point r1 at the block. Pass r[0..nargs) unchanged. */ + add r\nargs, sp, #4 +#if defined(__thumb__) + /* Switch back to thumb mode to avoid interworking hassle. */ + adr ip, .L1_\name + orr ip, ip, #1 + bx ip + .thumb +.L1_\name: + bl SYM (__gnu\name) __PLT__ + ldr r3, [sp, #64] + add sp, #72 + bx r3 +#else + bl SYM (__gnu\name) __PLT__ + ldr lr, [sp, #64] + add sp, sp, #72 + RET +#endif + FUNC_END \name + UNPREFIX \name +.endm + +UNWIND_WRAPPER _Unwind_RaiseException 1 +UNWIND_WRAPPER _Unwind_Resume 1 +UNWIND_WRAPPER _Unwind_Resume_or_Rethrow 1 +UNWIND_WRAPPER _Unwind_ForcedUnwind 3 +UNWIND_WRAPPER _Unwind_Backtrace 2 + +#endif /* ndef __symbian__ */ Modified: stable/11/gnu/lib/libgcc/Makefile ============================================================================== --- stable/11/gnu/lib/libgcc/Makefile Mon Aug 1 19:53:18 2016 (r303633) +++ stable/11/gnu/lib/libgcc/Makefile Mon Aug 1 20:02:59 2016 (r303634) @@ -99,7 +99,7 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -f .else # MK_LLVM_LIBUNWIND .if ${TARGET_CPUARCH} == "arm" -LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c +LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c .else LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \ unwind-c.c From owner-svn-src-stable@freebsd.org Mon Aug 1 21:21:27 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A66FEBABFE4; Mon, 1 Aug 2016 21:21:27 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DD7A139E; Mon, 1 Aug 2016 21:21:27 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u71LLQu0095809; Mon, 1 Aug 2016 21:21:26 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u71LLQYf095808; Mon, 1 Aug 2016 21:21:26 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201608012121.u71LLQYf095808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Mon, 1 Aug 2016 21:21:26 +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: r303641 - stable/11/sys/vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 21:21:27 -0000 Author: alc Date: Mon Aug 1 21:21:26 2016 New Revision: 303641 URL: https://svnweb.freebsd.org/changeset/base/303641 Log: MFC r303356 and r303465 Remove any mention of cache (PG_CACHE) pages from the comments in vm_pageout_scan(). That function has not cached pages since r284376. Approved by: re (kib) Modified: stable/11/sys/vm/vm_pageout.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/vm_pageout.c ============================================================================== --- stable/11/sys/vm/vm_pageout.c Mon Aug 1 21:21:21 2016 (r303640) +++ stable/11/sys/vm/vm_pageout.c Mon Aug 1 21:21:26 2016 (r303641) @@ -872,7 +872,7 @@ unlock_mp: * vm_pageout_scan does the dirty work for the pageout daemon. * * pass 0 - Update active LRU/deactivate pages - * pass 1 - Move inactive to cache or free + * pass 1 - Free inactive pages * pass 2 - Launder dirty pages */ static void @@ -915,8 +915,7 @@ vm_pageout_scan(struct vm_domain *vmd, i addl_page_shortage = 0; /* - * Calculate the number of pages we want to either free or move - * to the cache. + * Calculate the number of pages that we want to free. */ if (pass > 0) { deficit = atomic_readandclear_int(&vm_pageout_deficit); @@ -943,11 +942,10 @@ vm_pageout_scan(struct vm_domain *vmd, i vnodes_skipped = 0; /* - * Start scanning the inactive queue for pages we can move to the - * cache or free. The scan will stop when the target is reached or - * we have scanned the entire inactive queue. Note that m->act_count - * is not used to form decisions for the inactive queue, only for the - * active queue. + * Start scanning the inactive queue for pages that we can free. The + * scan will stop when we reach the target or we have scanned the + * entire queue. (Note that m->act_count is not used to make + * decisions for the inactive queue, only for the active queue.) */ pq = &vmd->vmd_pagequeues[PQ_INACTIVE]; maxscan = pq->pq_cnt; @@ -1072,10 +1070,9 @@ unlock_page: /* * If the page appears to be clean at the machine-independent * layer, then remove all of its mappings from the pmap in - * anticipation of placing it onto the cache queue. If, - * however, any of the page's mappings allow write access, - * then the page may still be modified until the last of those - * mappings are removed. + * anticipation of freeing it. If, however, any of the page's + * mappings allow write access, then the page may still be + * modified until the last of those mappings are removed. */ if (object->ref_count != 0) { vm_page_test_dirty(m); @@ -1171,8 +1168,8 @@ relock_queues: #if !defined(NO_SWAPPING) /* - * Wakeup the swapout daemon if we didn't cache or free the targeted - * number of pages. + * Wakeup the swapout daemon if we didn't free the targeted number of + * pages. */ if (vm_swap_enabled && page_shortage > 0) vm_req_vmdaemon(VM_SWAP_NORMAL); @@ -1180,7 +1177,7 @@ relock_queues: /* * Wakeup the sync daemon if we skipped a vnode in a writeable object - * and we didn't cache or free enough pages. + * and we didn't free enough pages. */ if (vnodes_skipped > 0 && page_shortage > vm_cnt.v_free_target - vm_cnt.v_free_min) From owner-svn-src-stable@freebsd.org Tue Aug 2 13:57:21 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83177BACC08; Tue, 2 Aug 2016 13:57:21 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48C33155B; Tue, 2 Aug 2016 13:57:21 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72DvKW9062050; Tue, 2 Aug 2016 13:57:20 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72DvKcU062048; Tue, 2 Aug 2016 13:57:20 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201608021357.u72DvKcU062048@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 2 Aug 2016 13:57: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: r303658 - in stable/11/sys: compat/svr4 net X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 13:57:21 -0000 Author: glebius Date: Tue Aug 2 13:57:20 2016 New Revision: 303658 URL: https://svnweb.freebsd.org/changeset/base/303658 Log: Merge r303263: Partially revert r257696/r257713, which have an issue with writing to user controlled address. Restore the old code that emulated OSIOCGIFCONF in if.c. Approved by: re (kib) Modified: stable/11/sys/compat/svr4/svr4_sockio.c stable/11/sys/net/if.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/svr4/svr4_sockio.c ============================================================================== --- stable/11/sys/compat/svr4/svr4_sockio.c Tue Aug 2 12:18:06 2016 (r303657) +++ stable/11/sys/compat/svr4/svr4_sockio.c Tue Aug 2 13:57:20 2016 (r303658) @@ -73,6 +73,8 @@ bsd_to_svr4_flags(bf) return sf; } +#define OSIOCGIFCONF _IOWR('i', 20, struct ifconf) + int svr4_sock_ioctl(fp, td, retval, fd, cmd, data) struct file *fp; @@ -144,7 +146,6 @@ svr4_sock_ioctl(fp, td, retval, fd, cmd, case SVR4_SIOCGIFCONF: { struct svr4_ifconf sc; - struct ifconf *ifc; if ((error = copyin(data, &sc, sizeof(sc))) != 0) return error; @@ -153,19 +154,9 @@ svr4_sock_ioctl(fp, td, retval, fd, cmd, sizeof(struct ifreq), sizeof(struct svr4_ifreq), sc.svr4_ifc_len)); - ifc = (struct ifconf *)≻ - ifc->ifc_req->ifr_addr.sa_family = - sc.svr4_ifc_req->svr4_ifr_addr.sa_family; - ifc->ifc_req->ifr_addr.sa_len = - sizeof(struct osockaddr); - - error = fo_ioctl(fp, SIOCGIFCONF, &sc, td->td_ucred, - td); - - sc.svr4_ifc_req->svr4_ifr_addr.sa_family = - ifc->ifc_req->ifr_addr.sa_family; - - if (error != 0) + if ((error = fo_ioctl(fp, OSIOCGIFCONF, + (caddr_t) &sc, td->td_ucred, + td)) != 0) return error; DPRINTF(("SIOCGIFCONF\n")); Modified: stable/11/sys/net/if.c ============================================================================== --- stable/11/sys/net/if.c Tue Aug 2 12:18:06 2016 (r303657) +++ stable/11/sys/net/if.c Tue Aug 2 13:57:20 2016 (r303658) @@ -2699,6 +2699,9 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, return (error); } +/* COMPAT_SVR4 */ +#define OSIOCGIFCONF _IOWR('i', 20, struct ifconf) + #ifdef COMPAT_FREEBSD32 struct ifconf32 { int32_t ifc_len; @@ -2738,6 +2741,7 @@ ifioctl(struct socket *so, u_long cmd, c switch (cmd) { case SIOCGIFCONF: + case OSIOCGIFCONF: /* COMPAT_SVR4 */ error = ifconf(cmd, data); CURVNET_RESTORE(); return (error); @@ -3009,6 +3013,15 @@ again: if (prison_if(curthread->td_ucred, sa) != 0) continue; addrs++; + /* COMPAT_SVR4 */ + if (cmd == OSIOCGIFCONF) { + struct osockaddr *osa = + (struct osockaddr *)&ifr.ifr_addr; + ifr.ifr_addr = *sa; + osa->sa_family = sa->sa_family; + sbuf_bcat(sb, &ifr, sizeof(ifr)); + max_len += sizeof(ifr); + } else if (sa->sa_len <= sizeof(*sa)) { ifr.ifr_addr = *sa; sbuf_bcat(sb, &ifr, sizeof(ifr)); From owner-svn-src-stable@freebsd.org Tue Aug 2 14:14:38 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33B05BAC26A; Tue, 2 Aug 2016 14:14:38 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFE15115B; Tue, 2 Aug 2016 14:14:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72EEbbq069354; Tue, 2 Aug 2016 14:14:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72EEaPM069349; Tue, 2 Aug 2016 14:14:36 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201608021414.u72EEaPM069349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 2 Aug 2016 14:14:36 +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: r303659 - stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 14:14:38 -0000 Author: glebius Date: Tue Aug 2 14:14:36 2016 New Revision: 303659 URL: https://svnweb.freebsd.org/changeset/base/303659 Log: Merge r303264 and corrections: The date format for ru_RU.UTF-8 locale has changed some time ago, adjust the ru_RU.UTF-8 calendar files. Approved by: re (kib) Modified: stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common ============================================================================== --- stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common Tue Aug 2 13:57:20 2016 (r303658) +++ stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common Tue Aug 2 14:14:36 2016 (r303659) @@ -9,97 +9,97 @@ LANG=ru_RU.UTF-8 -12 я▐п╫п╡ п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п©я─п╬п╨я┐я─п╟я┌я┐я─я▀ -13 я▐п╫п╡ п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ п©п╣я┤п╟я┌п╦ -14 я▐п╫п╡ п║я┌п╟я─я▀п╧ п²п╬п╡я▀п╧ пЁп╬п╢ -21 я▐п╫п╡ п■п╣п╫я▄ п╦п╫п╤п╣п╫п╣я─п╫я▀я┘ п╡п╬п╧я│п╨ -25 я▐п╫п╡ п╒п╟я┌я▄я▐п╫п╦п╫ п╢п╣п╫я▄. п║я┌я┐п╢п╣п╫я┤п╣я│п╨п╦п╧ п©я─п╟п╥п╢п╫п╦п╨ - 8 я└п╣п╡ п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ п╫п╟я┐п╨п╦ -10 я└п╣п╡ п■п╣п╫я▄ п╢п╦п©п╩п╬п╪п╟я┌п╦я┤п╣я│п╨п╬пЁп╬ я─п╟п╠п╬я┌п╫п╦п╨п╟ - 1 п╪п╟я─ п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ пЁя─п╟п╤п╢п╟п╫я│п╨п╬п╧ п╬п╠п╬я─п╬п╫я▀ +12 я▐п╫п╡. п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п©я─п╬п╨я┐я─п╟я┌я┐я─я▀ +13 я▐п╫п╡. п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ п©п╣я┤п╟я┌п╦ +14 я▐п╫п╡. п║я┌п╟я─я▀п╧ п²п╬п╡я▀п╧ пЁп╬п╢ +21 я▐п╫п╡. п■п╣п╫я▄ п╦п╫п╤п╣п╫п╣я─п╫я▀я┘ п╡п╬п╧я│п╨ +25 я▐п╫п╡. п╒п╟я┌я▄я▐п╫п╦п╫ п╢п╣п╫я▄. п║я┌я┐п╢п╣п╫я┤п╣я│п╨п╦п╧ п©я─п╟п╥п╢п╫п╦п╨ + 8 я└п╣п╡я─. п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ п╫п╟я┐п╨п╦ +10 я└п╣п╡я─. п■п╣п╫я▄ п╢п╦п©п╩п╬п╪п╟я┌п╦я┤п╣я│п╨п╬пЁп╬ я─п╟п╠п╬я┌п╫п╦п╨п╟ + 1 п╪п╟я─я┌п╟ п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ пЁя─п╟п╤п╢п╟п╫я│п╨п╬п╧ п╬п╠п╬я─п╬п╫я▀ 03/SunSecond п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ пЁп╣п╬п╢п╣п╥п╦п╦ п╦ п╨п╟я─я┌п╬пЁя─п╟я└п╦п╦ -11 п╪п╟я─ п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п╬я─пЁп╟п╫п╬п╡ п╫п╟я─п╨п╬п╨п╬п╫я┌я─п╬п╩я▐ -18 п╪п╟я─ п■п╣п╫я▄ п╫п╟п╩п╬пЁп╬п╡п╬п╧ п©п╬п╩п╦я├п╦п╦ +11 п╪п╟я─я┌п╟ п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п╬я─пЁп╟п╫п╬п╡ п╫п╟я─п╨п╬п╨п╬п╫я┌я─п╬п╩я▐ +18 п╪п╟я─я┌п╟ п■п╣п╫я▄ п╫п╟п╩п╬пЁп╬п╡п╬п╧ п©п╬п╩п╦я├п╦п╦ 03/SunThird п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ я┌п╬я─пЁп╬п╡п╩п╦, п╠я▀я┌п╬п╡п╬пЁп╬ п╬п╠я│п╩я┐п╤п╦п╡п╟п╫п╦я▐ п╫п╟я│п╣п╩п╣п╫п╦я▐ п╦ п╤п╦п╩п╦я┴п╫п╬-п╨п╬п╪п╪я┐п╫п╟п╩я▄п╫п╬пЁп╬ я┘п╬п╥я▐п╧я│я┌п╡п╟ -27 п╪п╟я─ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я┌п╣п╟я┌я─п╟ -27 п╪п╟я─ п■п╣п╫я▄ п╡п╫я┐я┌я─п╣п╫п╫п╦я┘ п╡п╬п╧я│п╨ - 1 п╟п©я─ п■п╣п╫я▄ я│п╪п╣я┘п╟ - 2 п╟п©я─ п■п╣п╫я▄ п╣п╢п╦п╫п╣п╫п╦я▐ п╫п╟я─п╬п╢п╬п╡ +27 п╪п╟я─я┌п╟ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я┌п╣п╟я┌я─п╟ +27 п╪п╟я─я┌п╟ п■п╣п╫я▄ п╡п╫я┐я┌я─п╣п╫п╫п╦я┘ п╡п╬п╧я│п╨ + 1 п╟п©я─. п■п╣п╫я▄ я│п╪п╣я┘п╟ + 2 п╟п©я─. п■п╣п╫я▄ п╣п╢п╦п╫п╣п╫п╦я▐ п╫п╟я─п╬п╢п╬п╡ 04/SunFirst п■п╣п╫я▄ пЁп╣п╬п╩п╬пЁп╟ -12 п╟п©я─ п■п╣п╫я▄ п╨п╬я│п╪п╬п╫п╟п╡я┌п╦п╨п╦ +12 п╟п©я─. п■п╣п╫я▄ п╨п╬я│п╪п╬п╫п╟п╡я┌п╦п╨п╦ 04/SunSecond п■п╣п╫я▄ п╡п╬п╧я│п╨ п©я─п╬я┌п╦п╡п╬п╡п╬п╥п╢я┐я┬п╫п╬п╧ п╬п╠п╬я─п╬п╫я▀ -26 п╟п©я─ п■п╣п╫я▄ п©п╟п╪я▐я┌п╦ п©п╬пЁп╦п╠я┬п╦я┘ п╡ я─п╟п╢п╦п╟я├п╦п╬п╫п╫я▀я┘ п╟п╡п╟я─п╦я▐я┘ п╦ п╨п╟я┌п╟я│я┌я─п╬я└п╟я┘ -30 п╟п©я─ п■п╣п╫я▄ п©п╬п╤п╟я─п╫п╬п╧ п╬я┘я─п╟п╫я▀ - 7 п╪п╟п╧ п■п╣п╫я▄ я─п╟п╢п╦п╬ -17 п╪п╟п╧ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я┌п╣п╩п╣п╨п╬п╪п╪я┐п╫п╦п╨п╟я├п╦п╧ -18 п╪п╟п╧ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ п╪я┐п╥п╣п╣п╡ -24 п╪п╟п╧ п■п╣п╫я▄ я│п╩п╟п╡я▐п╫я│п╨п╬п╧ п©п╦я│я▄п╪п╣п╫п╫п╬я│я┌п╦ п╦ п╨я┐п╩я▄я┌я┐я─я▀ -26 п╪п╟п╧ п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬пЁп╬ п©я─п╣п╢п©я─п╦п╫п╦п╪п╟я┌п╣п╩я▄я│я┌п╡п╟ -27 п╪п╟п╧ п·п╠я┴п╣я─п╬я│я│п╦п╧я│п╨п╦п╧ п╢п╣п╫я▄ п╠п╦п╠п╩п╦п╬я┌п╣п╨ -28 п╪п╟п╧ п■п╣п╫я▄ п©п╬пЁя─п╟п╫п╦я┤п╫п╦п╨п╟ -30 п╪п╟п╧ п■п╣п╫я▄ п©п╬п╤п╟я─п╫п╬п╧ п╬я┘я─п╟п╫я▀ -31 п╪п╟п╧ п■п╣п╫я▄ п═п╬я│я│п╦п╧я│п╨п╬п╧ п░п╢п╡п╬п╨п╟я┌я┐я─я▀ +26 п╟п©я─. п■п╣п╫я▄ п©п╟п╪я▐я┌п╦ п©п╬пЁп╦п╠я┬п╦я┘ п╡ я─п╟п╢п╦п╟я├п╦п╬п╫п╫я▀я┘ п╟п╡п╟я─п╦я▐я┘ п╦ п╨п╟я┌п╟я│я┌я─п╬я└п╟я┘ +30 п╟п©я─. п■п╣п╫я▄ п©п╬п╤п╟я─п╫п╬п╧ п╬я┘я─п╟п╫я▀ + 7 п╪п╟я▐ п■п╣п╫я▄ я─п╟п╢п╦п╬ +17 п╪п╟я▐ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я┌п╣п╩п╣п╨п╬п╪п╪я┐п╫п╦п╨п╟я├п╦п╧ +18 п╪п╟я▐ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ п╪я┐п╥п╣п╣п╡ +24 п╪п╟я▐ п■п╣п╫я▄ я│п╩п╟п╡я▐п╫я│п╨п╬п╧ п©п╦я│я▄п╪п╣п╫п╫п╬я│я┌п╦ п╦ п╨я┐п╩я▄я┌я┐я─я▀ +26 п╪п╟я▐ п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬пЁп╬ п©я─п╣п╢п©я─п╦п╫п╦п╪п╟я┌п╣п╩я▄я│я┌п╡п╟ +27 п╪п╟я▐ п·п╠я┴п╣я─п╬я│я│п╦п╧я│п╨п╦п╧ п╢п╣п╫я▄ п╠п╦п╠п╩п╦п╬я┌п╣п╨ +28 п╪п╟я▐ п■п╣п╫я▄ п©п╬пЁя─п╟п╫п╦я┤п╫п╦п╨п╟ +30 п╪п╟я▐ п■п╣п╫я▄ п©п╬п╤п╟я─п╫п╬п╧ п╬я┘я─п╟п╫я▀ +31 п╪п╟я▐ п■п╣п╫я▄ п═п╬я│я│п╦п╧я│п╨п╬п╧ п░п╢п╡п╬п╨п╟я┌я┐я─я▀ 05/SunLast п■п╣п╫я▄ я┘п╦п╪п╦п╨п╟ - 1 п╦я▌п╫ п■п╣п╫я▄ п╥п╟я┴п╦я┌я▀ п╢п╣я┌п╣п╧ - 5 п╦я▌п╫ п■п╣п╫я▄ я█п╨п╬п╩п╬пЁп╟ - 6 п╦я▌п╫ п÷я┐я┬п╨п╦п╫я│п╨п╦п╧ п╢п╣п╫я▄ - 8 п╦я▌п╫ п■п╣п╫я▄ я│п╬я├п╦п╟п╩я▄п╫п╬пЁп╬ я─п╟п╠п╬я┌п╫п╦п╨п╟ + 1 п╦я▌п╫я▐ п■п╣п╫я▄ п╥п╟я┴п╦я┌я▀ п╢п╣я┌п╣п╧ + 5 п╦я▌п╫я▐ п■п╣п╫я▄ я█п╨п╬п╩п╬пЁп╟ + 6 п╦я▌п╫я▐ п÷я┐я┬п╨п╦п╫я│п╨п╦п╧ п╢п╣п╫я▄ + 8 п╦я▌п╫я▐ п■п╣п╫я▄ я│п╬я├п╦п╟п╩я▄п╫п╬пЁп╬ я─п╟п╠п╬я┌п╫п╦п╨п╟ 06/SunSecond п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╩п╣пЁп╨п╬п╧ п©я─п╬п╪я▀я┬п╩п╣п╫п╫п╬я│я┌п╦ 06/SunThird п■п╣п╫я▄ п╪п╣п╢п╦я├п╦п╫я│п╨п╬пЁп╬ я─п╟п╠п╬я┌п╫п╦п╨п╟ -22 п╦я▌п╫ п■п╣п╫я▄ п©п╟п╪я▐я┌п╦ п╦ я│п╨п╬я─п╠п╦ (п²п╟я┤п╟п╩п╬ п▓п╣п╩п╦п╨п╬п╧ п·я┌п╣я┤п╣я│я┌п╡п╣п╫п╫п╬п╧ п▓п╬п╧п╫я▀, 1941 пЁп╬п╢) -27 п╦я▌п╫ п■п╣п╫я▄ п╪п╬п╩п╬п╢п╣п╤п╦ -29 п╦я▌п╫ п■п╣п╫я▄ п©п╟я─я┌п╦п╥п╟п╫ п╦ п©п╬п╢п©п╬п╩я▄я┴п╦п╨п╬п╡ +22 п╦я▌п╫я▐ п■п╣п╫я▄ п©п╟п╪я▐я┌п╦ п╦ я│п╨п╬я─п╠п╦ (п²п╟я┤п╟п╩п╬ п▓п╣п╩п╦п╨п╬п╧ п·я┌п╣я┤п╣я│я┌п╡п╣п╫п╫п╬п╧ п▓п╬п╧п╫я▀, 1941 пЁп╬п╢) +27 п╦я▌п╫я▐ п■п╣п╫я▄ п╪п╬п╩п╬п╢п╣п╤п╦ +29 п╦я▌п╫я▐ п■п╣п╫я▄ п©п╟я─я┌п╦п╥п╟п╫ п╦ п©п╬п╢п©п╬п╩я▄я┴п╦п╨п╬п╡ 06/SatLast п■п╣п╫я▄ п╦п╥п╬п╠я─п╣я┌п╟я┌п╣п╩я▐ п╦ я─п╟я├п╦п╬п╫п╟п╩п╦п╥п╟я┌п╬я─п╟ 07/SunFirst п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╪п╬я─я│п╨п╬пЁп╬ п╦ я─п╣я┤п╫п╬пЁп╬ я└п╩п╬я┌п╟ 07/SunSecond п■п╣п╫я▄ я─я▀п╠п╟п╨п╟ 07/SunSecond п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ п©п╬я┤я┌я▀ 07/SunThird п■п╣п╫я▄ п╪п╣я┌п╟п╩п╩я┐я─пЁп╟ 07/SunLast п■п╣п╫я▄ п▓п╬п╣п╫п╫п╬-п°п╬я─я│п╨п╬пЁп╬ п╓п╩п╬я┌п╟ -28 п╦я▌п╩ п■п╣п╫я▄ п╨я─п╣я┴п╣п╫п╦я▐ п═я┐я│п╦ - 6 п╟п╡пЁ п■п╣п╫я▄ п╤п╣п╩п╣п╥п╫п╬п╢п╬я─п╬п╤п╫я▀я┘ п╡п╬п╧я│п╨ +28 п╦я▌п╩я▐ п■п╣п╫я▄ п╨я─п╣я┴п╣п╫п╦я▐ п═я┐я│п╦ + 6 п╟п╡пЁ. п■п╣п╫я▄ п╤п╣п╩п╣п╥п╫п╬п╢п╬я─п╬п╤п╫я▀я┘ п╡п╬п╧я│п╨ 08/SunFirst п■п╣п╫я▄ п╤п╣п╩п╣п╥п╫п╬п╢п╬я─п╬п╤п╫п╦п╨п╟ -12 п╟п╡пЁ п■п╣п╫я▄ п╡п╬п╣п╫п╫п╬-п╡п╬п╥п╢я┐я┬п╫я▀я┘ я│п╦п╩ +12 п╟п╡пЁ. п■п╣п╫я▄ п╡п╬п╣п╫п╫п╬-п╡п╬п╥п╢я┐я┬п╫я▀я┘ я│п╦п╩ 08/SunSecond п■п╣п╫я▄ я│я┌я─п╬п╦я┌п╣п╩я▐ 08/SunThird п■п╣п╫я▄ п▓п╬п╥п╢я┐я┬п╫п╬пЁп╬ п╓п╩п╬я┌п╟ -22 п╟п╡пЁ п■п╣п╫я▄ пЁп╬я│я┐п╢п╟я─я│я┌п╡п╣п╫п╫п╬пЁп╬ я└п╩п╟пЁп╟ -27 п╟п╡пЁ п■п╣п╫я▄ п╨п╦п╫п╬ +22 п╟п╡пЁ. п■п╣п╫я▄ пЁп╬я│я┐п╢п╟я─я│я┌п╡п╣п╫п╫п╬пЁп╬ я└п╩п╟пЁп╟ +27 п╟п╡пЁ. п■п╣п╫я▄ п╨п╦п╫п╬ 08/SunLast п■п╣п╫я▄ я┬п╟я┘я┌п╣я─п╟ - 1 я│п╣п╫ п■п╣п╫я▄ п╥п╫п╟п╫п╦п╧ - 2 я│п╣п╫ п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ пЁп╡п╟я─п╢п╦п╦ - 3 я│п╣п╫ п■п╣п╫я▄ я│п╬п╩п╦п╢п╟я─п╫п╬я│я┌п╦ п╡ п╠п╬я─я▄п╠п╣ я│ я┌п╣я─я─п╬я─п╦п╥п╪п╬п╪ - 4 я│п╣п╫ п■п╣п╫я▄ я│п©п╣я├п╦п╟п╩п╦я│я┌п╟ п©п╬ я▐п╢п╣я─п╫п╬п╪я┐ п╬п╠п╣я│п©п╣я┤п╣п╫п╦я▌ + 1 я│п╣п╫я┌. п■п╣п╫я▄ п╥п╫п╟п╫п╦п╧ + 2 я│п╣п╫я┌. п■п╣п╫я▄ я─п╬я│я│п╦п╧я│п╨п╬п╧ пЁп╡п╟я─п╢п╦п╦ + 3 я│п╣п╫я┌. п■п╣п╫я▄ я│п╬п╩п╦п╢п╟я─п╫п╬я│я┌п╦ п╡ п╠п╬я─я▄п╠п╣ я│ я┌п╣я─я─п╬я─п╦п╥п╪п╬п╪ + 4 я│п╣п╫я┌. п■п╣п╫я▄ я│п©п╣я├п╦п╟п╩п╦я│я┌п╟ п©п╬ я▐п╢п╣я─п╫п╬п╪я┐ п╬п╠п╣я│п©п╣я┤п╣п╫п╦я▌ 09/SunFirst п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╫п╣я└я┌я▐п╫п╬п╧ п╦ пЁп╟п╥п╬п╡п╬п╧ п©я─п╬п╪я▀я┬п╩п╣п╫п╫п╬я│я┌п╦ 09/SunSecond п■п╣п╫я▄ я┌п╟п╫п╨п╦я│я┌п╟ 09/SunThird п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╩п╣я│п╟ -28 я│п╣п╫ п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п╟я┌п╬п╪п╫п╬п╧ п©я─п╬п╪я▀я┬п╩п╣п╫п╫п╬я│я┌п╦ +28 я│п╣п╫я┌. п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п╟я┌п╬п╪п╫п╬п╧ п©я─п╬п╪я▀я┬п╩п╣п╫п╫п╬я│я┌п╦ 09/SunLast п■п╣п╫я▄ п╪п╟я┬п╦п╫п╬я│я┌я─п╬п╦я┌п╣п╩я▐ - 1 п╬п╨я┌ п■п╣п╫я▄ п©п╬п╤п╦п╩я▀я┘ п╩я▌п╢п╣п╧ - 1 п╬п╨я┌ п■п╣п╫я▄ я│я┐я┘п╬п©я┐я┌п╫я▀я┘ п╡п╬п╧я│п╨ - 4 п╬п╨я┌ п■п╣п╫я▄ п╨п╬я│п╪п╦я┤п╣я│п╨п╦я┘ п╡п╬п╧я│п╨ - 5 п╬п╨я┌ п■п╣п╫я▄ я┐я┤п╦я┌п╣п╩я▐ -14 п╬п╨я┌ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я│я┌п╟п╫п╢п╟я─я┌п╦п╥п╟я├п╦п╦ + 1 п╬п╨я┌. п■п╣п╫я▄ п©п╬п╤п╦п╩я▀я┘ п╩я▌п╢п╣п╧ + 1 п╬п╨я┌. п■п╣п╫я▄ я│я┐я┘п╬п©я┐я┌п╫я▀я┘ п╡п╬п╧я│п╨ + 4 п╬п╨я┌. п■п╣п╫я▄ п╨п╬я│п╪п╦я┤п╣я│п╨п╦я┘ п╡п╬п╧я│п╨ + 5 п╬п╨я┌. п■п╣п╫я▄ я┐я┤п╦я┌п╣п╩я▐ +14 п╬п╨я┌. п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я│я┌п╟п╫п╢п╟я─я┌п╦п╥п╟я├п╦п╦ 10/SunSecond п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ я│п╣п╩я▄я│п╨п╬пЁп╬ я┘п╬п╥я▐п╧я│я┌п╡п╟ п╦ п©п╣я─п╣я─п╟п╠п╟я┌я▀п╡п╟я▌я┴п╣п╧ п©я─п╬п╪я▀я┬п╩п╣п╫п╫п╬я│я┌п╦ 10/SunThird п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╢п╬я─п╬п╤п╫п╬пЁп╬ я┘п╬п╥я▐п╧я│я┌п╡п╟ -24 п╬п╨я┌ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ п·п·п² -25 п╬п╨я┌ п■п╣п╫я▄ я┌п╟п╪п╬п╤п╣п╫п╫п╦п╨п╟ -30 п╬п╨я┌ п■п╣п╫я▄ п©п╟п╪я▐я┌п╦ п╤п╣я─я┌п╡ п©п╬п╩п╦я┌п╦я┤п╣я│п╨п╦я┘ я─п╣п©я─п╣я│я│п╦п╧ +24 п╬п╨я┌. п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ п·п·п² +25 п╬п╨я┌. п■п╣п╫я▄ я┌п╟п╪п╬п╤п╣п╫п╫п╦п╨п╟ +30 п╬п╨я┌. п■п╣п╫я▄ п©п╟п╪я▐я┌п╦ п╤п╣я─я┌п╡ п©п╬п╩п╦я┌п╦я┤п╣я│п╨п╦я┘ я─п╣п©я─п╣я│я│п╦п╧ 10/SunLast п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╟п╡я┌п╬п╪п╬п╠п╦п╩я▄п╫п╬пЁп╬ я┌я─п╟п╫я│п©п╬я─я┌п╟ - 7 п╫п╬я▐ п■п╣п╫я▄ п╬п╨я┌я▐п╠я─я▄я│п╨п╬п╧ я─п╣п╡п╬п╩я▌я├п╦п╦ 1917 пЁп╬п╢п╟ - 9 п╫п╬я▐ п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ п╨п╟я┤п╣я│я┌п╡п╟ -10 п╫п╬я▐ п■п╣п╫я▄ п╪п╦п╩п╦я├п╦п╦ -16 п╫п╬я▐ п■п╣п╫я▄ п╪п╬я─я│п╨п╬п╧ п©п╣я┘п╬я┌я▀ -17 п╫п╬я▐ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я│я┌я┐п╢п╣п╫я┌п╬п╡ -19 п╫п╬я▐ п■п╣п╫я▄ я─п╟п╨п╣я┌п╫я▀я┘ п╡п╬п╧я│п╨ п╦ п╟я─я┌п╦п╩п╩п╣я─п╦п╦ -21 п╫п╬я▐ п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╫п╟п╩п╬пЁп╬п╡я▀я┘ п╬я─пЁп╟п╫п╬п╡ -26 п╫п╬я▐ п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ п╦п╫я└п╬я─п╪п╟я├п╦п╦ + 7 п╫п╬я▐п╠. п■п╣п╫я▄ п╬п╨я┌я▐п╠я─я▄я│п╨п╬п╧ я─п╣п╡п╬п╩я▌я├п╦п╦ 1917 пЁп╬п╢п╟ + 9 п╫п╬я▐п╠. п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ п╨п╟я┤п╣я│я┌п╡п╟ +10 п╫п╬я▐п╠. п■п╣п╫я▄ п╪п╦п╩п╦я├п╦п╦ +16 п╫п╬я▐п╠. п■п╣п╫я▄ п╪п╬я─я│п╨п╬п╧ п©п╣я┘п╬я┌я▀ +17 п╫п╬я▐п╠. п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╢п╣п╫я▄ я│я┌я┐п╢п╣п╫я┌п╬п╡ +19 п╫п╬я▐п╠. п■п╣п╫я▄ я─п╟п╨п╣я┌п╫я▀я┘ п╡п╬п╧я│п╨ п╦ п╟я─я┌п╦п╩п╩п╣я─п╦п╦ +21 п╫п╬я▐п╠. п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╬п╡ п╫п╟п╩п╬пЁп╬п╡я▀я┘ п╬я─пЁп╟п╫п╬п╡ +26 п╫п╬я▐п╠. п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ п╦п╫я└п╬я─п╪п╟я├п╦п╦ 11/SunLast п■п╣п╫я▄ п╪п╟я┌п╣я─п╦ - 1 п╢п╣п╨ п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ п╠п╬я─я▄п╠я▀ я│п╬ п║п÷п≤п■п╬п╪ - 3 п╢п╣п╨ п■п╣п╫я▄ я▌я─п╦я│я┌п╟ - 9 п╢п╣п╨ п■п╣п╫я▄ п⌠п╣я─п╬п╣п╡ п·я┌п╣я┤п╣я│я┌п╡п╟ -12 п╢п╣п╨ п■п╣п╫я▄ п п╬п╫я│я┌п╦я┌я┐я├п╦п╦ -17 п╢п╣п╨ п■п╣п╫я▄ я─п╟п╨п╣я┌п╫я▀я┘ п╡п╬п╧я│п╨ я│я┌я─п╟я┌п╣пЁп╦я┤п╣я│п╨п╬пЁп╬ п╫п╟п╥п╫п╟я┤п╣п╫п╦я▐ -20 п╢п╣п╨ п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п╬я─пЁп╟п╫п╬п╡ п╠п╣п╥п╬п©п╟я│п╫п╬я│я┌п╦ -22 п╢п╣п╨ п■п╣п╫я▄ я█п╫п╣я─пЁп╣я┌п╦п╨п╟ -27 п╢п╣п╨ п■п╣п╫я▄ я│п©п╟я│п╟я┌п╣п╩я▐ + 1 п╢п╣п╨. п▓я│п╣п╪п╦я─п╫я▀п╧ п╢п╣п╫я▄ п╠п╬я─я▄п╠я▀ я│п╬ п║п÷п≤п■п╬п╪ + 3 п╢п╣п╨. п■п╣п╫я▄ я▌я─п╦я│я┌п╟ + 9 п╢п╣п╨. п■п╣п╫я▄ п⌠п╣я─п╬п╣п╡ п·я┌п╣я┤п╣я│я┌п╡п╟ +12 п╢п╣п╨. п■п╣п╫я▄ п п╬п╫я│я┌п╦я┌я┐я├п╦п╦ +17 п╢п╣п╨. п■п╣п╫я▄ я─п╟п╨п╣я┌п╫я▀я┘ п╡п╬п╧я│п╨ я│я┌я─п╟я┌п╣пЁп╦я┤п╣я│п╨п╬пЁп╬ п╫п╟п╥п╫п╟я┤п╣п╫п╦я▐ +20 п╢п╣п╨. п■п╣п╫я▄ я─п╟п╠п╬я┌п╫п╦п╨п╟ п╬я─пЁп╟п╫п╬п╡ п╠п╣п╥п╬п©п╟я│п╫п╬я│я┌п╦ +22 п╢п╣п╨. п■п╣п╫я▄ я█п╫п╣я─пЁп╣я┌п╦п╨п╟ +27 п╢п╣п╨. п■п╣п╫я▄ я│п©п╟я│п╟я┌п╣п╩я▐ #endif /* !_ru_RU_UTF_8_common_ */ Modified: stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday ============================================================================== --- stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday Tue Aug 2 13:57:20 2016 (r303658) +++ stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday Tue Aug 2 14:14:36 2016 (r303659) @@ -9,17 +9,17 @@ LANG=ru_RU.UTF-8 - 1 я▐п╫п╡ п²п╬п╡я▀п╧ пЁп╬п╢ - 2 я▐п╫п╡ п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ - 3 я▐п╫п╡ п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ - 4 я▐п╫п╡ п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ - 5 я▐п╫п╡ п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ - 7 я▐п╫п╡ п═п╬п╤п╢п╣я│я┌п╡п╬ п╔я─п╦я│я┌п╬п╡п╬ -23 я└п╣п╡ п■п╣п╫я▄ п╥п╟я┴п╦я┌п╫п╦п╨п╟ п·я┌п╣я┤п╣я│я┌п╡п╟ - 8 п╪п╟я─ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╤п╣п╫я│п╨п╦п╧ п╢п╣п╫я▄ - 1 п╪п╟п╧ п÷я─п╟п╥п╢п╫п╦п╨ п▓п╣я│п╫я▀ п╦ п╒я─я┐п╢п╟ - 9 п╪п╟п╧ п■п╣п╫я▄ п÷п╬п╠п╣п╢я▀ -12 п╦я▌п╫ п■п╣п╫я▄ п═п╬я│я│п╦п╦ - 4 п╫п╬я▐ п■п╣п╫я▄ п╫п╟я─п╬п╢п╫п╬пЁп╬ п╣п╢п╦п╫я│я┌п╡п╟ + 1 я▐п╫п╡. п²п╬п╡я▀п╧ пЁп╬п╢ + 2 я▐п╫п╡. п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ + 3 я▐п╫п╡. п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ + 4 я▐п╫п╡. п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ + 5 я▐п╫п╡. п²п╬п╡п╬пЁп╬п╢п╫п╦п╣ п╨п╟п╫п╦п╨я┐п╩я▀ + 7 я▐п╫п╡. п═п╬п╤п╢п╣я│я┌п╡п╬ п╔я─п╦я│я┌п╬п╡п╬ +23 я└п╣п╡я─. п■п╣п╫я▄ п╥п╟я┴п╦я┌п╫п╦п╨п╟ п·я┌п╣я┤п╣я│я┌п╡п╟ + 8 п╪п╟я─я┌п╟ п°п╣п╤п╢я┐п╫п╟я─п╬п╢п╫я▀п╧ п╤п╣п╫я│п╨п╦п╧ п╢п╣п╫я▄ + 1 п╪п╟я▐ п÷я─п╟п╥п╢п╫п╦п╨ п▓п╣я│п╫я▀ п╦ п╒я─я┐п╢п╟ + 9 п╪п╟я▐ п■п╣п╫я▄ п÷п╬п╠п╣п╢я▀ +12 п╦я▌п╫я▐ п■п╣п╫я▄ п═п╬я│я│п╦п╦ + 4 п╫п╬я▐п╠. п■п╣п╫я▄ п╫п╟я─п╬п╢п╫п╬пЁп╬ п╣п╢п╦п╫я│я┌п╡п╟ #endif /* !_ru_RU_UTF_8_holiday_ */ Modified: stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military ============================================================================== --- stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military Tue Aug 2 13:57:20 2016 (r303658) +++ stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military Tue Aug 2 14:14:36 2016 (r303659) @@ -9,20 +9,20 @@ LANG=ru_RU.UTF-8 -27 я▐п╫п╡ п■п╣п╫я▄ я│п╫я▐я┌п╦я▐ п╠п╩п╬п╨п╟п╢я▀ пЁп╬я─п╬п╢п╟ п⌡п╣п╫п╦п╫пЁя─п╟п╢п╟ (1944 пЁп╬п╢) - 2 я└п╣п╡ п■п╣п╫я▄ я─п╟п╥пЁя─п╬п╪п╟ я│п╬п╡п╣я┌я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п║я┌п╟п╩п╦п╫пЁя─п╟п╢я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1943 пЁп╬п╢) -23 я└п╣п╡ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ п я─п╟я│п╫п╬п╧ п░я─п╪п╦п╦ п╫п╟п╢ п╨п╟п╧п╥п╣я─п╬п╡я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п⌠п╣я─п╪п╟п╫п╦п╦ (1918 пЁп╬п╢) -18 п╟п©я─ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╦я┘ п╡п╬п╦п╫п╬п╡ п╨п╫я▐п╥я▐ п░п╩п╣п╨я│п╟п╫п╢я─п╟ п²п╣п╡я│п╨п╬пЁп╬ п╫п╟п╢ п╫п╣п╪п╣я├п╨п╦п╪п╦ я─я▀я├п╟я─я▐п╪п╦ п╫п╟ п╖я┐п╢я│п╨п╬п╪ п╬п╥п╣я─п╣ (п⌡п╣п╢п╬п╡п╬п╣ п©п╬п╠п╬п╦я┴п╣, 1242 пЁп╬п╢) -10 п╦я▌п╩ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ п╟я─п╪п╦п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷п╣я┌я─п╟ п÷п╣я─п╡п╬пЁп╬ п╫п╟п╢ я┬п╡п╣п╢п╟п╪п╦ п╡ п÷п╬п╩я┌п╟п╡я│п╨п╬п╪ я│я─п╟п╤п╣п╫п╦п╦ (1709 пЁп╬п╢) - 9 п╟п╡пЁ п■п╣п╫я▄ п©п╣я─п╡п╬п╧ п╡ я─п╬я│я│п╦п╧я│п╨п╬п╧ п╦я│я┌п╬я─п╦п╦ п╪п╬я─я│п╨п╬п╧ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬пЁп╬ я└п╩п╬я┌п╟ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷п╣я┌я─п╟ п÷п╣я─п╡п╬пЁп╬ п╫п╟п╢ я┬п╡п╣п╢п╟п╪п╦ я┐ п╪я▀я│п╟ п⌠п╟п╫пЁя┐я┌ (1714 пЁп╬п╢) -23 п╟п╡пЁ п■п╣п╫я▄ я─п╟п╥пЁя─п╬п╪п╟ я│п╬п╡п╣я┌я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п я┐я─я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1943 пЁп╬п╢) - 2 я│п╣п╫ п■п╣п╫я▄ п╬п╨п╬п╫я┤п╟п╫п╦я▐ п▓я┌п╬я─п╬п╧ п╪п╦я─п╬п╡п╬п╧ п╡п╬п╧п╫я▀ (1945 пЁп╬п╢) - 8 я│п╣п╫ п■п╣п╫я▄ п▒п╬я─п╬п╢п╦п╫я│п╨п╬пЁп╬ я│я─п╟п╤п╣п╫п╦я▐ я─я┐я│я│п╨п╬п╧ п╟я─п╪п╦п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п°.п≤. п я┐я┌я┐п╥п╬п╡п╟ я│ я└я─п╟п╫я├я┐п╥я│п╨п╬п╧ п╟я─п╪п╦п╣п╧ (1812 пЁп╬п╢) -11 я│п╣п╫ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ я█я│п╨п╟п╢я─я▀ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п╓.п╓. пёя┬п╟п╨п╬п╡п╟ п╫п╟п╢ я┌я┐я─п╣я├п╨п╬п╧ я█я│п╨п╟п╢я─п╬п╧ я┐ п╪я▀я│п╟ п╒п╣п╫п╢я─п╟ (1790 пЁп╬п╢) -21 я│п╣п╫ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╦я┘ п©п╬п╩п╨п╬п╡ п╡п╬ пЁп╩п╟п╡п╣ я│ п╡п╣п╩п╦п╨п╦п╪ п╨п╫я▐п╥п╣п╪ п■п╪п╦я┌я─п╦п╣п╪ п■п╬п╫я│п╨п╦п╪ п╫п╟п╢ п╪п╬п╫пЁп╬п╩п╬-я┌п╟я┌п╟я─я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╡ п я┐п╩п╦п╨п╬п╡я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1380 пЁп╬п╢) - 7 п╫п╬я▐ п■п╣п╫я▄ п╬я│п╡п╬п╠п╬п╤п╢п╣п╫п╦я▐ п°п╬я│п╨п╡я▀ я│п╦п╩п╟п╪п╦ п╫п╟я─п╬п╢п╫п╬пЁп╬ п╬п©п╬п╩я┤п╣п╫п╦я▐ п©п╬п╢ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬п╪ п я┐п╥я▄п╪я▀ п°п╦п╫п╦п╫п╟ п╦ п■п╪п╦я┌я─п╦я▐ п÷п╬п╤п╟я─я│п╨п╬пЁп╬ п╬я┌ п©п╬п╩я▄я│п╨п╦я┘ п╦п╫я┌п╣я─п╡п╣п╫я┌п╬п╡ (1612 пЁп╬п╢) - 1 п╢п╣п╨ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ я█я│п╨п╟п╢я─я▀ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷.п║. п²п╟я┘п╦п╪п╬п╡п╟ п╫п╟п╢ я┌я┐я─п╣я├п╨п╬п╧ я█я│п╨п╟п╢я─п╬п╧ я┐ п╪я▀я│п╟ п║п╦п╫п╬п© (1853 пЁп╬п╢) - 5 п╢п╣п╨ п■п╣п╫я▄ п╫п╟я┤п╟п╩п╟ п╨п╬п╫я┌я─п╫п╟я│я┌я┐п©п╩п╣п╫п╦я▐ я│п╬п╡п╣я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п©я─п╬я┌п╦п╡ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п╠п╦я┌п╡п╣ п©п╬п╢ п°п╬я│п╨п╡п╬п╧ (1941 пЁп╬п╢) -24 п╢п╣п╨ п■п╣п╫я▄ п╡п╥я▐я┌п╦я▐ я┌я┐я─п╣я├п╨п╬п╧ п╨я─п╣п©п╬я│я┌п╦ п≤п╥п╪п╟п╦п╩ я─я┐я│я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п░.п▓. п║я┐п╡п╬я─п╬п╡п╟ (1790 пЁп╬п╢) +27 я▐п╫п╡. п■п╣п╫я▄ я│п╫я▐я┌п╦я▐ п╠п╩п╬п╨п╟п╢я▀ пЁп╬я─п╬п╢п╟ п⌡п╣п╫п╦п╫пЁя─п╟п╢п╟ (1944 пЁп╬п╢) + 2 я└п╣п╡я─. п■п╣п╫я▄ я─п╟п╥пЁя─п╬п╪п╟ я│п╬п╡п╣я┌я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п║я┌п╟п╩п╦п╫пЁя─п╟п╢я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1943 пЁп╬п╢) +23 я└п╣п╡я─. п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ п я─п╟я│п╫п╬п╧ п░я─п╪п╦п╦ п╫п╟п╢ п╨п╟п╧п╥п╣я─п╬п╡я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п⌠п╣я─п╪п╟п╫п╦п╦ (1918 пЁп╬п╢) +18 п╟п©я─. п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╦я┘ п╡п╬п╦п╫п╬п╡ п╨п╫я▐п╥я▐ п░п╩п╣п╨я│п╟п╫п╢я─п╟ п²п╣п╡я│п╨п╬пЁп╬ п╫п╟п╢ п╫п╣п╪п╣я├п╨п╦п╪п╦ я─я▀я├п╟я─я▐п╪п╦ п╫п╟ п╖я┐п╢я│п╨п╬п╪ п╬п╥п╣я─п╣ (п⌡п╣п╢п╬п╡п╬п╣ п©п╬п╠п╬п╦я┴п╣, 1242 пЁп╬п╢) +10 п╦я▌п╩я▐ п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ п╟я─п╪п╦п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷п╣я┌я─п╟ п÷п╣я─п╡п╬пЁп╬ п╫п╟п╢ я┬п╡п╣п╢п╟п╪п╦ п╡ п÷п╬п╩я┌п╟п╡я│п╨п╬п╪ я│я─п╟п╤п╣п╫п╦п╦ (1709 пЁп╬п╢) + 9 п╟п╡пЁ. п■п╣п╫я▄ п©п╣я─п╡п╬п╧ п╡ я─п╬я│я│п╦п╧я│п╨п╬п╧ п╦я│я┌п╬я─п╦п╦ п╪п╬я─я│п╨п╬п╧ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬пЁп╬ я└п╩п╬я┌п╟ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷п╣я┌я─п╟ п÷п╣я─п╡п╬пЁп╬ п╫п╟п╢ я┬п╡п╣п╢п╟п╪п╦ я┐ п╪я▀я│п╟ п⌠п╟п╫пЁя┐я┌ (1714 пЁп╬п╢) +23 п╟п╡пЁ. п■п╣п╫я▄ я─п╟п╥пЁя─п╬п╪п╟ я│п╬п╡п╣я┌я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п я┐я─я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1943 пЁп╬п╢) + 2 я│п╣п╫я┌. п■п╣п╫я▄ п╬п╨п╬п╫я┤п╟п╫п╦я▐ п▓я┌п╬я─п╬п╧ п╪п╦я─п╬п╡п╬п╧ п╡п╬п╧п╫я▀ (1945 пЁп╬п╢) + 8 я│п╣п╫я┌. п■п╣п╫я▄ п▒п╬я─п╬п╢п╦п╫я│п╨п╬пЁп╬ я│я─п╟п╤п╣п╫п╦я▐ я─я┐я│я│п╨п╬п╧ п╟я─п╪п╦п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п°.п≤. п я┐я┌я┐п╥п╬п╡п╟ я│ я└я─п╟п╫я├я┐п╥я│п╨п╬п╧ п╟я─п╪п╦п╣п╧ (1812 пЁп╬п╢) +11 я│п╣п╫я┌. п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ я█я│п╨п╟п╢я─я▀ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п╓.п╓. пёя┬п╟п╨п╬п╡п╟ п╫п╟п╢ я┌я┐я─п╣я├п╨п╬п╧ я█я│п╨п╟п╢я─п╬п╧ я┐ п╪я▀я│п╟ п╒п╣п╫п╢я─п╟ (1790 пЁп╬п╢) +21 я│п╣п╫я┌. п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╦я┘ п©п╬п╩п╨п╬п╡ п╡п╬ пЁп╩п╟п╡п╣ я│ п╡п╣п╩п╦п╨п╦п╪ п╨п╫я▐п╥п╣п╪ п■п╪п╦я┌я─п╦п╣п╪ п■п╬п╫я│п╨п╦п╪ п╫п╟п╢ п╪п╬п╫пЁп╬п╩п╬-я┌п╟я┌п╟я─я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п╡ п я┐п╩п╦п╨п╬п╡я│п╨п╬п╧ п╠п╦я┌п╡п╣ (1380 пЁп╬п╢) + 7 п╫п╬я▐п╠. п■п╣п╫я▄ п╬я│п╡п╬п╠п╬п╤п╢п╣п╫п╦я▐ п°п╬я│п╨п╡я▀ я│п╦п╩п╟п╪п╦ п╫п╟я─п╬п╢п╫п╬пЁп╬ п╬п©п╬п╩я┤п╣п╫п╦я▐ п©п╬п╢ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬п╪ п я┐п╥я▄п╪я▀ п°п╦п╫п╦п╫п╟ п╦ п■п╪п╦я┌я─п╦я▐ п÷п╬п╤п╟я─я│п╨п╬пЁп╬ п╬я┌ п©п╬п╩я▄я│п╨п╦я┘ п╦п╫я┌п╣я─п╡п╣п╫я┌п╬п╡ (1612 пЁп╬п╢) + 1 п╢п╣п╨. п■п╣п╫я▄ п©п╬п╠п╣п╢я▀ я─я┐я│я│п╨п╬п╧ я█я│п╨п╟п╢я─я▀ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п÷.п║. п²п╟я┘п╦п╪п╬п╡п╟ п╫п╟п╢ я┌я┐я─п╣я├п╨п╬п╧ я█я│п╨п╟п╢я─п╬п╧ я┐ п╪я▀я│п╟ п║п╦п╫п╬п© (1853 пЁп╬п╢) + 5 п╢п╣п╨. п■п╣п╫я▄ п╫п╟я┤п╟п╩п╟ п╨п╬п╫я┌я─п╫п╟я│я┌я┐п©п╩п╣п╫п╦я▐ я│п╬п╡п╣я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п©я─п╬я┌п╦п╡ п╫п╣п╪п╣я├п╨п╬-я└п╟я┬п╦я│я┌я│п╨п╦я┘ п╡п╬п╧я│п╨ п╡ п╠п╦я┌п╡п╣ п©п╬п╢ п°п╬я│п╨п╡п╬п╧ (1941 пЁп╬п╢) +24 п╢п╣п╨. п■п╣п╫я▄ п╡п╥я▐я┌п╦я▐ я┌я┐я─п╣я├п╨п╬п╧ п╨я─п╣п©п╬я│я┌п╦ п≤п╥п╪п╟п╦п╩ я─я┐я│я│п╨п╦п╪п╦ п╡п╬п╧я│п╨п╟п╪п╦ п©п╬п╢ п╨п╬п╪п╟п╫п╢п╬п╡п╟п╫п╦п╣п╪ п░.п▓. п║я┐п╡п╬я─п╬п╡п╟ (1790 пЁп╬п╢) #endif /* !_ru_RU_UTF_8_military_ */ Modified: stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox ============================================================================== --- stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox Tue Aug 2 13:57:20 2016 (r303658) +++ stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox Tue Aug 2 14:14:36 2016 (r303659) @@ -10,14 +10,14 @@ LANG=ru_RU.UTF-8 Paskha=п÷п╟я│я┘п╟ -21 я│п╣п╫ п═п╬п╤п╢п╣я│я┌п╡п╬ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ -27 я│п╣п╫ п▓п╬п╥п╢п╡п╦п╤п╣п╫п╦п╣ п я─п╣я│я┌п╟ п⌠п╬я│п©п╬п╢п╫я▐ -14 п╬п╨я┌ п÷п╬п╨я─п╬п╡ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ - 4 п╢п╣п╨ п▓п╡п╣п╢п╣п╫п╦п╣ п╡п╬ я┘я─п╟п╪ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ - 7 я▐п╫п╡ п═п╬п╤п╢п╣я│я┌п╡п╬ п╔я─п╦я│я┌п╬п╡п╬ -14 я▐п╫п╡ п·п╠я─п╣п╥п╟п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ -19 я▐п╫п╡ п▒п╬пЁп╬я▐п╡п╩п╣п╫п╦п╣ п╦п╩п╦ п я─п╣я┴п╣п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ -15 я└п╣п╡ п║я─п╣я┌п╣п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ +21 я│п╣п╫я┌. п═п╬п╤п╢п╣я│я┌п╡п╬ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ +27 я│п╣п╫я┌. п▓п╬п╥п╢п╡п╦п╤п╣п╫п╦п╣ п я─п╣я│я┌п╟ п⌠п╬я│п©п╬п╢п╫я▐ +14 п╬п╨я┌. п÷п╬п╨я─п╬п╡ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ + 4 п╢п╣п╨. п▓п╡п╣п╢п╣п╫п╦п╣ п╡п╬ я┘я─п╟п╪ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ + 7 я▐п╫п╡. п═п╬п╤п╢п╣я│я┌п╡п╬ п╔я─п╦я│я┌п╬п╡п╬ +14 я▐п╫п╡. п·п╠я─п╣п╥п╟п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ +19 я▐п╫п╡. п▒п╬пЁп╬я▐п╡п╩п╣п╫п╦п╣ п╦п╩п╦ п я─п╣я┴п╣п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ +15 я└п╣п╡я─. п║я─п╣я┌п╣п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ п÷п╟я│я┘п╟-48 п▓п╣п╩п╦п╨п╦п╧ п÷п╬я│я┌ п÷п╟я│я┘п╟-7 п▓я┘п╬п╢ п⌠п╬я│п©п╬п╢п╣п╫я▄ п╡ п≤п╣я─я┐я│п╟п╩п╦п╪. п▓п╣я─п╠п╫п╬п╣ п▓п╬я│п╨я─п╣я│п╣п╫я▄п╣ п÷п╟я│я┘п╟-3 п▓п╣п╩п╦п╨п╦п╧ п╖п╣я┌п╡п╣я─пЁ @@ -25,12 +25,12 @@ Paskha=п÷п╟я│я┘п╟ п÷п╟я│я┘п╟ п▓п╬я│п╨я─п╣я│п╣п╫п╦п╣ п╔я─п╦я│я┌п╬п╡п╬ п÷п╟я│я┘п╟+39 п▓п╬п╥п╫п╣я│п╣п╫п╦п╣ п÷п╟я│я┘п╟+49 п■п╣п╫я▄ п║п╡я▐я┌п╬п╧ п╒я─п╬п╦я├я▀. п÷я▐я┌п╦п╢п╣я│я▐я┌п╫п╦я├п╟ - 7 п╟п©я─ п▒п╩п╟пЁп╬п╡п╣я┴п╣п╫п╦п╣ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ - 7 п╦я▌п╩ п═п╬п╤п╢п╣я│я┌п╡п╬ п≤п╬п╟п╫п╫п╟ п÷я─п╣п╢я┌п╣я┤п╦ -12 п╦я▌п╩ п■п╣п╫я▄ я│п╡я▐я┌я▀я┘ п©п╣я─п╡п╬п╡п╣я─я┘п╬п╡п╫я▀я┘ п╟п©п╬я│я┌п╬п╩п╬п╡ п÷п╣я┌я─п╟ п╦ п÷п╟п╡п╩п╟ -19 п╟п╡пЁ п÷я─п╣п╬п╠я─п╟п╤п╣п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ -28 п╟п╡пЁ пёя│п©п╣п╫п╦п╣ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ -11 я│п╣п╫ пёя│п╣п╨п╫п╬п╡п╣п╫п╦п╣ пЁп╩п╟п╡я▀ п≤п╬п╟п╫п╫п╟ п÷я─п╣п╢я┌п╣я┤п╦ + 7 п╟п©я─. п▒п╩п╟пЁп╬п╡п╣я┴п╣п╫п╦п╣ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ + 7 п╦я▌п╩я▐ п═п╬п╤п╢п╣я│я┌п╡п╬ п≤п╬п╟п╫п╫п╟ п÷я─п╣п╢я┌п╣я┤п╦ +12 п╦я▌п╩я▐ п■п╣п╫я▄ я│п╡я▐я┌я▀я┘ п©п╣я─п╡п╬п╡п╣я─я┘п╬п╡п╫я▀я┘ п╟п©п╬я│я┌п╬п╩п╬п╡ п÷п╣я┌я─п╟ п╦ п÷п╟п╡п╩п╟ +19 п╟п╡пЁ. п÷я─п╣п╬п╠я─п╟п╤п╣п╫п╦п╣ п⌠п╬я│п©п╬п╢п╫п╣ +28 п╟п╡пЁ. пёя│п©п╣п╫п╦п╣ п÷я─п╣я│п╡я▐я┌п╬п╧ п▒п╬пЁп╬я─п╬п╢п╦я├я▀ +11 я│п╣п╫я┌. пёя│п╣п╨п╫п╬п╡п╣п╫п╦п╣ пЁп╩п╟п╡я▀ п≤п╬п╟п╫п╫п╟ п÷я─п╣п╢я┌п╣я┤п╦ #endif /* !_ru_RU_UTF_8_orthodox_ */ Modified: stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan ============================================================================== --- stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan Tue Aug 2 13:57:20 2016 (r303658) +++ stable/11/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan Tue Aug 2 14:14:36 2016 (r303659) @@ -10,33 +10,33 @@ LANG=ru_RU.UTF-8 Paskha=п÷п╟я│я┘п╟ -21 п╢п╣п╨* п≈п╦п╪п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣ -25 п╢п╣п╨ п п╬п╩я▐п╢п╟ (я│п╢п╡п╦п╫я┐я┌п╬п╣ п╥п╦п╪п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣) - 6 я▐п╫п╡ п■п╣п╫я▄ п п╟я┴п╣я▐ п╦ п▓п╣п╩п╣я│п╟ -24 я└п╣п╡ п■п╣п╫я▄ п▓п╣п╩п╣я│п╟ -29 я└п╣п╡ п■п╣п╫я▄ п п╟я┴п╣я▐ - 1 п╪п╟я─ п■п╣п╫я▄ п°п╟я─п╣п╫я▀ -14 п╪п╟я─ п²п╬п╡я▀п╧ п⌠п╬п╢, п·п╡я│п╣п╫я▄ п╪п╟п╩я▀п╧ +21 п╢п╣п╨.* п≈п╦п╪п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣ +25 п╢п╣п╨. п п╬п╩я▐п╢п╟ (я│п╢п╡п╦п╫я┐я┌п╬п╣ п╥п╦п╪п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣) + 6 я▐п╫п╡. п■п╣п╫я▄ п п╟я┴п╣я▐ п╦ п▓п╣п╩п╣я│п╟ +24 я└п╣п╡я─. п■п╣п╫я▄ п▓п╣п╩п╣я│п╟ +29 я└п╣п╡я─. п■п╣п╫я▄ п п╟я┴п╣я▐ + 1 п╪п╟я─я┌п╟ п■п╣п╫я▄ п°п╟я─п╣п╫я▀ +14 п╪п╟я─я┌п╟ п²п╬п╡я▀п╧ п⌠п╬п╢, п·п╡я│п╣п╫я▄ п╪п╟п╩я▀п╧ п÷п╟я│я┘п╟-55 п°п╟я│п╩п╣п╫п╦я├п╟ п÷п╟я│я┘п╟+7 п я─п╟я│п╫п╟я▐ п⌠п╬я─п╨п╟ п÷п╟я│я┘п╟+16 п═п╟п╢я┐п╫п╦я├п╟ -20 п╪п╟я─* п▓п╣я│п╣п╫п╫п╦п╣ я─п╟п╡п╫п╬п╢п╣п╫я│я┌п╡п╦п╣ - 7 п╟п©я─ п■п╣п╫я▄ п°п╟я─п╣п╫я▀ (я│п╢п╡п╦п╫я┐я┌п╬п╣ п╡п╣я│п╣п╫п╫п╣п╣ я─п╟п╡п╫п╬п╢п╣п╫я│я┌п╡п╦п╣) - 6 п╪п╟п╧ п■п╣п╫я▄ п■п╟п╤я▄п╠п╬пЁп╟, п·п╡я│п╣п╫я▄ п╠п╬п╩я▄я┬п╬п╧ -22 п╪п╟п╧ п╞я─п╦п╩п╦п╫ п■п╣п╫я▄ -15 п╦я▌п╫ п■п╣п╫я▄ п╒я─п╦пЁп╩п╟п╡п╟ -21 п╦я▌п╫* п⌡п╣я┌п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣ - 1 п╦я▌п╩ п═я┐я│п╟п╩я▄п╫п╟я▐ п²п╣п╢п╣п╩я▐ - 7 п╦я▌п╩ п я┐п©п╟п╩п╟ (я│п╢п╡п╦п╫я┐я┌п╬п╣ п╩п╣я┌п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣) -27 п╦я▌п╩ п·я┌п╠п╬я─ п╤п╣я─я┌п╡ п÷п╣я─я┐п╫я┐, я─я┐я│п╟п╩п╦п╦ - 2 п╟п╡пЁ п÷п╣я─я┐п╫п╬п╡ п■п╣п╫я▄ -21 п╟п╡пЁ п■п╣п╫я▄ п║я┌я─п╦п╠п╬пЁп╟ -28 п╟п╡пЁ пёя│п©п╣п╫п╦п╣ п≈п╩п╟я┌п╬пЁп╬я─п╨п╦ -14 я│п╣п╫ п■п╣п╫я▄ п▓п╬п╩я┘п╟ п≈п╪п╣п╣п╡п╦я┤п╟ -22 я│п╣п╫* п÷п╬п╡п╬я─п╬я┌ п╨ п╥п╦п╪п╣ (п╬я│п╣п╫п╫п╣п╣ я─п╟п╡п╫п╬п╢п╣п╫я│я┌п╡п╦п╣) -10 п╫п╬я▐ п■п╣п╫я▄ п°п╟п╨п╬я┬п╦ -21 п╫п╬я▐ п■п╣п╫я▄ п║п╡п╟я─п╬пЁп╟ п╦ п║п╣п╪п╟я─пЁп╩п╟ - 9 п╢п╣п╨ п■п╣п╫я▄ п■п╟п╤я▄п╠п╬пЁп╟ п╦ п°п╟я─п╣п╫я▀ +20 п╪п╟я─я┌п╟* п▓п╣я│п╣п╫п╫п╣п╣ я─п╟п╡п╫п╬п╢п╣п╫я│я┌п╡п╦п╣ + 7 п╟п©я─. п■п╣п╫я▄ п°п╟я─п╣п╫я▀ (я│п╢п╡п╦п╫я┐я┌п╬п╣ п╡п╣я│п╣п╫п╫п╣п╣ я─п╟п╡п╫п╬п╢п╣п╫я│я┌п╡п╦п╣) + 6 п╪п╟я▐ п■п╣п╫я▄ п■п╟п╤я▄п╠п╬пЁп╟, п·п╡я│п╣п╫я▄ п╠п╬п╩я▄я┬п╬п╧ +22 п╪п╟я▐ п╞я─п╦п╩п╦п╫ п■п╣п╫я▄ +15 п╦я▌п╫я▐ п■п╣п╫я▄ п╒я─п╦пЁп╩п╟п╡п╟ +21 п╦я▌п╫я▐* п⌡п╣я┌п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣ + 1 п╦я▌п╩я▐ п═я┐я│п╟п╩я▄п╫п╟я▐ п²п╣п╢п╣п╩я▐ + 7 п╦я▌п╩я▐ п я┐п©п╟п╩п╟ (я│п╢п╡п╦п╫я┐я┌п╬п╣ п╩п╣я┌п╫п╣п╣ я│п╬п╩п╫я├п╣я│я┌п╬я▐п╫п╦п╣) +27 п╦я▌п╩я▐ п·я┌п╠п╬я─ п╤п╣я─я┌п╡ п÷п╣я─я┐п╫я┐, я─я┐я│п╟п╩п╦п╦ + 2 п╟п╡пЁ. п÷п╣я─я┐п╫п╬п╡ п■п╣п╫я▄ +21 п╟п╡пЁ. п■п╣п╫я▄ п║я┌я─п╦п╠п╬пЁп╟ +28 п╟п╡пЁ. пёя│п©п╣п╫п╦п╣ п≈п╩п╟я┌п╬пЁп╬я─п╨п╦ +14 я│п╣п╫я┌. п■п╣п╫я▄ п▓п╬п╩я┘п╟ п≈п╪п╣п╣п╡п╦я┤п╟ +22 я│п╣п╫я┌.* п÷п╬п╡п╬я─п╬я┌ п╨ п╥п╦п╪п╣ (п╬я│п╣п╫п╫п╣п╣ я─п╟п╡п╫п╬п╢п╣п╫я│я┌п╡п╦п╣) +10 п╫п╬я▐п╠. п■п╣п╫я▄ п°п╟п╨п╬я┬п╦ +21 п╫п╬я▐п╠. п■п╣п╫я▄ п║п╡п╟я─п╬пЁп╟ п╦ п║п╣п╪п╟я─я┌п╟пЁп╩п╟ + 9 п╢п╣п╨. п■п╣п╫я▄ п■п╟п╤я▄п╠п╬пЁп╟ п╦ п°п╟я─п╣п╫я▀ #endif /* !_ru_RU_UTF_8_pagan_ */ From owner-svn-src-stable@freebsd.org Tue Aug 2 15:43:19 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB7F0BACF7F; Tue, 2 Aug 2016 15:43:19 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DDEB11ED; Tue, 2 Aug 2016 15:43:19 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72FhIDO002886; Tue, 2 Aug 2016 15:43:18 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72FhIuD002885; Tue, 2 Aug 2016 15:43:18 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201608021543.u72FhIuD002885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 2 Aug 2016 15:43:18 +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: r303664 - stable/11/sys/dev/e1000 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 15:43:19 -0000 Author: sbruno Date: Tue Aug 2 15:43:18 2016 New Revision: 303664 URL: https://svnweb.freebsd.org/changeset/base/303664 Log: MFC r303638 Unbreak NETMAP usage with em(4) broken in r293331. Approved by: re (gjb) Modified: stable/11/sys/dev/e1000/if_em.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/e1000/if_em.c ============================================================================== --- stable/11/sys/dev/e1000/if_em.c Tue Aug 2 15:41:42 2016 (r303663) +++ stable/11/sys/dev/e1000/if_em.c Tue Aug 2 15:43:18 2016 (r303664) @@ -4392,6 +4392,7 @@ em_setup_receive_ring(struct rx_ring *rx addr = PNMB(na, slot + si, &paddr); netmap_load_map(na, rxr->rxtag, rxbuf->map, addr); + rxbuf->paddr = paddr; em_setup_rxdesc(&rxr->rx_base[j], rxbuf); continue; } From owner-svn-src-stable@freebsd.org Tue Aug 2 15:44:50 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54E97BACFF5; Tue, 2 Aug 2016 15:44:50 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 275B61385; Tue, 2 Aug 2016 15:44:50 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72Finp7003016; Tue, 2 Aug 2016 15:44:49 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72FinBE003015; Tue, 2 Aug 2016 15:44:49 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201608021544.u72FinBE003015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 2 Aug 2016 15:44:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303665 - stable/10/sys/dev/e1000 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 15:44:50 -0000 Author: sbruno Date: Tue Aug 2 15:44:49 2016 New Revision: 303665 URL: https://svnweb.freebsd.org/changeset/base/303665 Log: MFC r303638 Unbreak NETMAP usage with em(4) broken in r293331. Modified: stable/10/sys/dev/e1000/if_em.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/e1000/if_em.c ============================================================================== --- stable/10/sys/dev/e1000/if_em.c Tue Aug 2 15:43:18 2016 (r303664) +++ stable/10/sys/dev/e1000/if_em.c Tue Aug 2 15:44:49 2016 (r303665) @@ -4437,6 +4437,7 @@ em_setup_receive_ring(struct rx_ring *rx addr = PNMB(na, slot + si, &paddr); netmap_load_map(na, rxr->rxtag, rxbuf->map, addr); + rxbuf->paddr = paddr; em_setup_rxdesc(&rxr->rx_base[j], rxbuf); continue; } From owner-svn-src-stable@freebsd.org Tue Aug 2 18:46:12 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6710ABACB48; Tue, 2 Aug 2016 18:46:12 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36FE6133B; Tue, 2 Aug 2016 18:46:12 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72IkBkm070287; Tue, 2 Aug 2016 18:46:11 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72IkBNJ070286; Tue, 2 Aug 2016 18:46:11 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201608021846.u72IkBNJ070286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 2 Aug 2016 18:46:11 +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: r303671 - stable/11/sys/netinet/cc X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 18:46:12 -0000 Author: brd (doc,ports committer) Date: Tue Aug 2 18:46:11 2016 New Revision: 303671 URL: https://svnweb.freebsd.org/changeset/base/303671 Log: MFC r303343: Fix the case for some sysctl descriptions. Approved by: re (gjb) Modified: stable/11/sys/netinet/cc/cc.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet/cc/cc.c ============================================================================== --- stable/11/sys/netinet/cc/cc.c Tue Aug 2 18:42:32 2016 (r303670) +++ stable/11/sys/netinet/cc/cc.c Tue Aug 2 18:46:11 2016 (r303671) @@ -316,12 +316,12 @@ SYSINIT(cc, SI_SUB_PROTO_IFATTACHDOMAIN, /* Declare sysctl tree and populate it. */ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, cc, CTLFLAG_RW, NULL, - "congestion control related settings"); + "Congestion control related settings"); SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, algorithm, CTLFLAG_VNET | CTLTYPE_STRING | CTLFLAG_RW, - NULL, 0, cc_default_algo, "A", "default congestion control algorithm"); + NULL, 0, cc_default_algo, "A", "Default congestion control algorithm"); SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, available, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, cc_list_available, "A", - "list available congestion control algorithms"); + "List available congestion control algorithms"); From owner-svn-src-stable@freebsd.org Tue Aug 2 19:41:55 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58C92BACE86; Tue, 2 Aug 2016 19:41:55 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 251DD1230; Tue, 2 Aug 2016 19:41:55 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72Jfsto091766; Tue, 2 Aug 2016 19:41:54 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72JfsR2091765; Tue, 2 Aug 2016 19:41:54 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608021941.u72JfsR2091765@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 2 Aug 2016 19:41:54 +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: r303672 - stable/11/share/man/man3 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 19:41:55 -0000 Author: bdrewery Date: Tue Aug 2 19:41:54 2016 New Revision: 303672 URL: https://svnweb.freebsd.org/changeset/base/303672 Log: MFC r303328: Add links for bit_ffc_at(3) and bit_ffs_at(3). Approved by: re (kib) Modified: stable/11/share/man/man3/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man3/Makefile ============================================================================== --- stable/11/share/man/man3/Makefile Tue Aug 2 18:46:11 2016 (r303671) +++ stable/11/share/man/man3/Makefile Tue Aug 2 19:41:54 2016 (r303672) @@ -49,7 +49,9 @@ MLINKS+= bitstring.3 bit_alloc.3 \ bitstring.3 bit_clear.3 \ bitstring.3 bit_decl.3 \ bitstring.3 bit_ffc.3 \ + bitstring.3 bit_ffc_at.3 \ bitstring.3 bit_ffs.3 \ + bitstring.3 bit_ffs_at.3 \ bitstring.3 bit_nclear.3 \ bitstring.3 bit_nset.3 \ bitstring.3 bit_set.3 \ From owner-svn-src-stable@freebsd.org Tue Aug 2 20:18:44 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6EBCBAD9AC; Tue, 2 Aug 2016 20:18:44 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9639F1EA2; Tue, 2 Aug 2016 20:18:44 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72KIhdT003265; Tue, 2 Aug 2016 20:18:43 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72KIhoT003263; Tue, 2 Aug 2016 20:18:43 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608022018.u72KIhoT003263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 2 Aug 2016 20:18:43 +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: r303675 - in stable/11/usr.sbin: . pmcstudy X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 20:18:44 -0000 Author: bdrewery Date: Tue Aug 2 20:18:43 2016 New Revision: 303675 URL: https://svnweb.freebsd.org/changeset/base/303675 Log: MFC r303410,r303419: r303410: Reconnect pmcstudy, lost in r291021 r303419: Fix non-amd64 build from r292043 after reconnecting in r303410. Approved by: re (kib) Modified: stable/11/usr.sbin/Makefile stable/11/usr.sbin/pmcstudy/pmcstudy.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/Makefile ============================================================================== --- stable/11/usr.sbin/Makefile Tue Aug 2 20:11:04 2016 (r303674) +++ stable/11/usr.sbin/Makefile Tue Aug 2 20:18:43 2016 (r303675) @@ -181,6 +181,7 @@ SUBDIR.${MK_PKGBOOTSTRAP}+= pkg SUBDIR.${MK_PMC}+= pmcannotate SUBDIR.${MK_PMC}+= pmccontrol SUBDIR.${MK_PMC}+= pmcstat +SUBDIR.${MK_PMC}+= pmcstudy SUBDIR.${MK_PORTSNAP}+= portsnap SUBDIR.${MK_PPP}+= ppp SUBDIR.${MK_QUOTAS}+= edquota Modified: stable/11/usr.sbin/pmcstudy/pmcstudy.c ============================================================================== --- stable/11/usr.sbin/pmcstudy/pmcstudy.c Tue Aug 2 20:11:04 2016 (r303674) +++ stable/11/usr.sbin/pmcstudy/pmcstudy.c Tue Aug 2 20:18:43 2016 (r303675) @@ -2322,11 +2322,7 @@ do_cpuid(u_int ax, u_int cx, u_int *p) #else #define cpuid(in, a, b, c, d) -static __inline void -do_cpuid(u_int ax, u_int cx, u_int *p) -{ -} - +#define do_cpuid(ax, cx, p) #endif static void From owner-svn-src-stable@freebsd.org Tue Aug 2 20:56:02 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F297BAD46C; Tue, 2 Aug 2016 20:56:02 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A7F81D61; Tue, 2 Aug 2016 20:56:02 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72Ku1Sf018278; Tue, 2 Aug 2016 20:56:01 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72Ku1A6018273; Tue, 2 Aug 2016 20:56:01 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608022056.u72Ku1A6018273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 2 Aug 2016 20:56:01 +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: r303679 - in stable/11/sys/modules: hyperv/vmbus ixl ixlv linux64 mlx5 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 20:56:02 -0000 Author: bdrewery Date: Tue Aug 2 20:56:00 2016 New Revision: 303679 URL: https://svnweb.freebsd.org/changeset/base/303679 Log: MFC r303414,r303415,r303417: r303414: opt_random.h was removed in r287558 for opt_global.h r303415: opt_apic.h is only used on i386. r303417: opt_bdg.h was removed in r150636. Approved by: re (gjb) Modified: stable/11/sys/modules/hyperv/vmbus/Makefile stable/11/sys/modules/ixl/Makefile stable/11/sys/modules/ixlv/Makefile stable/11/sys/modules/linux64/Makefile stable/11/sys/modules/mlx5/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/modules/hyperv/vmbus/Makefile ============================================================================== --- stable/11/sys/modules/hyperv/vmbus/Makefile Tue Aug 2 20:32:02 2016 (r303678) +++ stable/11/sys/modules/hyperv/vmbus/Makefile Tue Aug 2 20:56:00 2016 (r303679) @@ -16,7 +16,10 @@ SRCS= hv_channel.c \ SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h # XXX: for assym.s -SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h opt_compat.h +SRCS+= opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h opt_compat.h +.if ${MACHINE_CPUARCH} == "i386" +SRCS+= opt_apic.h +.endif SRCS+= assym.s \ vmbus_vector.S Modified: stable/11/sys/modules/ixl/Makefile ============================================================================== --- stable/11/sys/modules/ixl/Makefile Tue Aug 2 20:32:02 2016 (r303678) +++ stable/11/sys/modules/ixl/Makefile Tue Aug 2 20:56:00 2016 (r303679) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../dev/ixl KMOD = if_ixl -SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h opt_bdg.h +SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h SRCS += opt_inet.h opt_inet6.h opt_rss.h SRCS += if_ixl.c ixl_txrx.c i40e_osdep.c Modified: stable/11/sys/modules/ixlv/Makefile ============================================================================== --- stable/11/sys/modules/ixlv/Makefile Tue Aug 2 20:32:02 2016 (r303678) +++ stable/11/sys/modules/ixlv/Makefile Tue Aug 2 20:56:00 2016 (r303679) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../dev/ixl KMOD = if_ixlv -SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h opt_bdg.h +SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h SRCS += opt_inet.h opt_inet6.h opt_rss.h SRCS += if_ixlv.c ixlvc.c ixl_txrx.c i40e_osdep.c Modified: stable/11/sys/modules/linux64/Makefile ============================================================================== --- stable/11/sys/modules/linux64/Makefile Tue Aug 2 20:32:02 2016 (r303678) +++ stable/11/sys/modules/linux64/Makefile Tue Aug 2 20:56:00 2016 (r303679) @@ -16,7 +16,10 @@ SRCS= linux_fork.c linux_dummy.c linux_f DPSRCS= linux_genassym.c # XXX: for assym.s -SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h +SRCS+= opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h +.if ${MACHINE_CPUARCH} == "i386" +SRCS+= opt_apic.h +.endif CLEANFILES= linux_assym.h linux_genassym.o linux_locore.o Modified: stable/11/sys/modules/mlx5/Makefile ============================================================================== --- stable/11/sys/modules/mlx5/Makefile Tue Aug 2 20:32:02 2016 (r303678) +++ stable/11/sys/modules/mlx5/Makefile Tue Aug 2 20:56:00 2016 (r303679) @@ -25,7 +25,7 @@ mlx5_uar.c \ mlx5_vport.c \ mlx5_wq.c \ device_if.h bus_if.h vnode_if.h pci_if.h \ - opt_inet.h opt_inet6.h opt_random.h opt_rss.h + opt_inet.h opt_inet6.h opt_rss.h CFLAGS+= -I${.CURDIR}/../../ofed/include CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include From owner-svn-src-stable@freebsd.org Tue Aug 2 21:17:35 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E714BAD269; Tue, 2 Aug 2016 21:17:35 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71142181E; Tue, 2 Aug 2016 21:17:35 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72LHYBZ025880; Tue, 2 Aug 2016 21:17:34 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72LHYII025879; Tue, 2 Aug 2016 21:17:34 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201608022117.u72LHYII025879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 2 Aug 2016 21:17:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303680 - stable/10/lib/libc/gen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 21:17:35 -0000 Author: markj Date: Tue Aug 2 21:17:34 2016 New Revision: 303680 URL: https://svnweb.freebsd.org/changeset/base/303680 Log: MFC r301710: Fix an infinite loop in setnetgrent(3) with NIS netgroups. Modified: stable/10/lib/libc/gen/getnetgrent.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/getnetgrent.c ============================================================================== --- stable/10/lib/libc/gen/getnetgrent.c Tue Aug 2 20:56:00 2016 (r303679) +++ stable/10/lib/libc/gen/getnetgrent.c Tue Aug 2 21:17:34 2016 (r303680) @@ -559,6 +559,10 @@ read_for_group(const char *group) continue; } } + if (strlen(result) == 0) { + free(result); + return (NULL); + } snprintf(line, LINSIZ, "%s %s", group, result); free(result); } From owner-svn-src-stable@freebsd.org Tue Aug 2 21:18:00 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A340BAD2E1; Tue, 2 Aug 2016 21:18:00 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A48A19AB; Tue, 2 Aug 2016 21:18:00 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72LHxhG025938; Tue, 2 Aug 2016 21:17:59 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72LHxsR025937; Tue, 2 Aug 2016 21:17:59 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201608022117.u72LHxsR025937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 2 Aug 2016 21:17:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r303681 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 21:18:00 -0000 Author: markj Date: Tue Aug 2 21:17:59 2016 New Revision: 303681 URL: https://svnweb.freebsd.org/changeset/base/303681 Log: MFC r301710: Fix an infinite loop in setnetgrent(3) with NIS netgroups. Modified: stable/9/lib/libc/gen/getnetgrent.c Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/getnetgrent.c ============================================================================== --- stable/9/lib/libc/gen/getnetgrent.c Tue Aug 2 21:17:34 2016 (r303680) +++ stable/9/lib/libc/gen/getnetgrent.c Tue Aug 2 21:17:59 2016 (r303681) @@ -559,6 +559,10 @@ read_for_group(const char *group) continue; } } + if (strlen(result) == 0) { + free(result); + return (NULL); + } snprintf(line, LINSIZ, "%s %s", group, result); free(result); } From owner-svn-src-stable@freebsd.org Tue Aug 2 22:33:31 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DF9BBABA63; Tue, 2 Aug 2016 22:33:31 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFE8E1572; Tue, 2 Aug 2016 22:33:30 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72MXU96055073; Tue, 2 Aug 2016 22:33:30 GMT (envelope-from mr@FreeBSD.org) Received: (from mr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72MXT6c055066; Tue, 2 Aug 2016 22:33:29 GMT (envelope-from mr@FreeBSD.org) Message-Id: <201608022233.u72MXT6c055066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org using -f From: Michael Reifenberger Date: Tue, 2 Aug 2016 22:33:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303684 - stable/10/usr.bin/systat X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 22:33:31 -0000 Author: mr Date: Tue Aug 2 22:33:29 2016 New Revision: 303684 URL: https://svnweb.freebsd.org/changeset/base/303684 Log: MFC r288306 Add support to systat to display zfs arc cache status/info Added: stable/10/usr.bin/systat/zarc.c - copied unchanged from r288306, head/usr.bin/systat/zarc.c Modified: stable/10/usr.bin/systat/Makefile stable/10/usr.bin/systat/cmdtab.c stable/10/usr.bin/systat/extern.h stable/10/usr.bin/systat/main.c stable/10/usr.bin/systat/systat.1 stable/10/usr.bin/systat/systat.h Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/systat/Makefile ============================================================================== --- stable/10/usr.bin/systat/Makefile Tue Aug 2 21:55:23 2016 (r303683) +++ stable/10/usr.bin/systat/Makefile Tue Aug 2 22:33:29 2016 (r303684) @@ -6,7 +6,7 @@ PROG= systat SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \ netcmds.c netstat.c pigs.c swap.c icmp.c \ - mode.c ip.c sctp.c tcp.c \ + mode.c ip.c sctp.c tcp.c zarc.c \ vmstat.c convtbl.c ifcmds.c ifstat.c .if ${MK_INET6_SUPPORT} != "no" Modified: stable/10/usr.bin/systat/cmdtab.c ============================================================================== --- stable/10/usr.bin/systat/cmdtab.c Tue Aug 2 21:55:23 2016 (r303683) +++ stable/10/usr.bin/systat/cmdtab.c Tue Aug 2 22:33:29 2016 (r303684) @@ -78,6 +78,9 @@ struct cmdtab cmdtab[] = { { "ifstat", showifstat, fetchifstat, labelifstat, initifstat, openifstat, closeifstat, cmdifstat, 0, CF_LOADAV }, + { "zarc", showzarc, fetchzarc, labelzarc, + initzarc, openzarc, closezarc, 0, + resetzarc, CF_ZFSARC }, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0 } }; struct cmdtab *curcmd = &cmdtab[0]; Modified: stable/10/usr.bin/systat/extern.h ============================================================================== --- stable/10/usr.bin/systat/extern.h Tue Aug 2 21:55:23 2016 (r303683) +++ stable/10/usr.bin/systat/extern.h Tue Aug 2 22:33:29 2016 (r303684) @@ -173,4 +173,5 @@ char *sysctl_dynread(const char *, size_ void reset ## name(void); \ void show ## name(void) +SYSTAT_CMD( zarc ); SYSTAT_CMD ( sctp ); Modified: stable/10/usr.bin/systat/main.c ============================================================================== --- stable/10/usr.bin/systat/main.c Tue Aug 2 21:55:23 2016 (r303683) +++ stable/10/usr.bin/systat/main.c Tue Aug 2 22:33:29 2016 (r303684) @@ -188,6 +188,11 @@ labels(void) "/0 /1 /2 /3 /4 /5 /6 /7 /8 /9 /10"); mvaddstr(1, 5, "Load Average"); } + if (curcmd->c_flags & CF_ZFSARC) { + mvaddstr(0, 20, + " Total MFU MRU Anon Hdr L2Hdr Other"); + mvaddstr(1, 5, "ZFS ARC "); + } (*curcmd->c_label)(); #ifdef notdef mvprintw(21, 25, "CPU usage on %s", hostname); @@ -221,8 +226,33 @@ display(void) if (j > 50) wprintw(wload, " %4.1f", avenrun[0]); } + if (curcmd->c_flags & CF_ZFSARC) { + uint64_t arc[7] = {}; + size_t size = sizeof(arc[0]); + if (sysctlbyname("kstat.zfs.misc.arcstats.size", + &arc[0], &size, NULL, 0) == 0 ) { + GETSYSCTL("vfs.zfs.mfu_size", arc[1]); + GETSYSCTL("vfs.zfs.mru_size", arc[2]); + GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); + GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); + GETSYSCTL("kstat.zfs.misc.arcstats.other_size", arc[6]); + wmove(wload, 0, 0); wclrtoeol(wload); + for (i = 0 ; i < sizeof(arc) / sizeof(arc[0]) ; i++) { + if (arc[i] > 10llu * 1024 * 1024 * 1024 ) { + wprintw(wload, "%7lluG", arc[i] >> 30); + } + else if (arc[i] > 10 * 1024 * 1024 ) { + wprintw(wload, "%7lluM", arc[i] >> 20); + } + else { + wprintw(wload, "%7lluK", arc[i] >> 10); + } + } + } + } (*curcmd->c_refresh)(); - if (curcmd->c_flags & CF_LOADAV) + if (curcmd->c_flags & (CF_LOADAV |CF_ZFSARC)) wrefresh(wload); wrefresh(wnd); move(CMDLINE, col); Modified: stable/10/usr.bin/systat/systat.1 ============================================================================== --- stable/10/usr.bin/systat/systat.1 Tue Aug 2 21:55:23 2016 (r303683) +++ stable/10/usr.bin/systat/systat.1 Tue Aug 2 22:33:29 2016 (r303684) @@ -98,8 +98,9 @@ to be one of: .Ic sctp , .Ic swap , .Ic tcp , +.Ic vmstat , or -.Ic vmstat . +.Ic zarc , These displays can also be requested interactively (without the .Dq Fl ) and are described in @@ -430,6 +431,8 @@ Display statistics averaged over the ref .It Cm zero Reset running statistics to zero. .El +.It Ic zarc +display arc cache usage and hit/miss statistics. .It Ic netstat Display, in the lower window, network connections. By default, Modified: stable/10/usr.bin/systat/systat.h ============================================================================== --- stable/10/usr.bin/systat/systat.h Tue Aug 2 21:55:23 2016 (r303683) +++ stable/10/usr.bin/systat/systat.h Tue Aug 2 22:33:29 2016 (r303684) @@ -54,6 +54,7 @@ extern int use_kvm; #define CF_INIT 0x1 /* been initialized */ #define CF_LOADAV 0x2 /* display w/ load average */ +#define CF_ZFSARC 0x4 /* display w/ ZFS cache usage */ #define TCP 0x1 #define UDP 0x2 Copied: stable/10/usr.bin/systat/zarc.c (from r288306, head/usr.bin/systat/zarc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/usr.bin/systat/zarc.c Tue Aug 2 22:33:29 2016 (r303684, copy of r288306, head/usr.bin/systat/zarc.c) @@ -0,0 +1,221 @@ +/*- + * Copyright (c) 2014 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#include + +#include "systat.h" +#include "extern.h" + +struct zfield{ + uint64_t arcstats; + uint64_t arcstats_demand_data; + uint64_t arcstats_demand_metadata; + uint64_t arcstats_prefetch_data; + uint64_t arcstats_prefetch_metadata; + uint64_t zfetchstats; + uint64_t arcstats_l2; + uint64_t vdev_cache_stats; +}; + +static struct zarcstats { + struct zfield hits; + struct zfield misses; +} curstat, initstat, oldstat; + +static void +getinfo(struct zarcstats *ls); + +WINDOW * +openzarc(void) +{ + return (subwin(stdscr, LINES-3-1, 0, MAINWIN_ROW, 0)); +} + +void +closezarc(WINDOW *w) +{ + if (w == NULL) + return; + wclear(w); + wrefresh(w); + delwin(w); +} + +void +labelzarc(void) +{ + wmove(wnd, 0, 0); wclrtoeol(wnd); + mvwprintw(wnd, 0, 31+1, "%4.4s %7.7s %7.7s %12.12s %12.12s", + "rate", "hits", "misses", "total hits", "total misses"); +#define L(row, str) mvwprintw(wnd, row, 5, str); \ + mvwprintw(wnd, row, 31, ":"); \ + mvwprintw(wnd, row, 31+4, "%%") + L(1, "arcstats"); + L(2, "arcstats.demand_data"); + L(3, "arcstats.demand_metadata"); + L(4, "arcstats.prefetch_data"); + L(5, "arcstats.prefetch_metadata"); + L(6, "zfetchstats"); + L(7, "arcstats.l2"); + L(8, "vdev_cache_stats"); +#undef L +} + +static int calc(uint64_t hits, uint64_t misses) +{ + if( hits ) + return 100 * hits / ( hits + misses ); + else + return 0; +} + +static void +domode(struct zarcstats *delta, struct zarcstats *rate) +{ +#define DO(stat) \ + delta->hits.stat = (curstat.hits.stat - oldstat.hits.stat); \ + delta->misses.stat = (curstat.misses.stat - oldstat.misses.stat); \ + rate->hits.stat = calc(delta->hits.stat, delta->misses.stat) + DO(arcstats); + DO(arcstats_demand_data); + DO(arcstats_demand_metadata); + DO(arcstats_prefetch_data); + DO(arcstats_prefetch_metadata); + DO(zfetchstats); + DO(arcstats_l2); + DO(vdev_cache_stats); + DO(arcstats); + DO(arcstats_demand_data); + DO(arcstats_demand_metadata); + DO(arcstats_prefetch_data); + DO(arcstats_prefetch_metadata); + DO(zfetchstats); + DO(arcstats_l2); + DO(vdev_cache_stats); +#undef DO +} + +void +showzarc(void) +{ + struct zarcstats delta, rate; + + memset(&delta, 0, sizeof delta); + memset(&rate, 0, sizeof rate); + + domode(&delta, &rate); + +#define DO(stat, row, col, fmt) \ + mvwprintw(wnd, row, col, fmt, stat) +#define R(row, stat) DO(rate.hits.stat, row, 31+1, "%3lu") +#define H(row, stat) DO(delta.hits.stat, row, 31+1+5, "%7lu"); \ + DO(curstat.hits.stat, row, 31+1+5+8+8, "%12lu") +#define M(row, stat) DO(delta.misses.stat, row, 31+1+5+8, "%7lu"); \ + DO(curstat.misses.stat, row, 31+1+5+8+8+13, "%12lu") +#define E(row, stat) R(row, stat); H(row, stat); M(row, stat); + E(1, arcstats); + E(2, arcstats_demand_data); + E(3, arcstats_demand_metadata); + E(4, arcstats_prefetch_data); + E(5, arcstats_prefetch_metadata); + E(6, zfetchstats); + E(7, arcstats_l2); + E(8, vdev_cache_stats); +#undef DO +#undef E +#undef M +#undef H +#undef R +} + +int +initzarc(void) +{ + getinfo(&initstat); + curstat = oldstat = initstat; + return 1; +} + +void +resetzarc(void) +{ + initzarc(); +} + +static void +getinfo(struct zarcstats *ls) +{ + size_t size = sizeof( ls->hits.arcstats ); + if ( sysctlbyname("kstat.zfs.misc.arcstats.hits", + &ls->hits.arcstats, &size, NULL, 0 ) != 0 ) + return; + GETSYSCTL("kstat.zfs.misc.arcstats.misses", + ls->misses.arcstats); + GETSYSCTL("kstat.zfs.misc.arcstats.demand_data_hits", + ls->hits.arcstats_demand_data); + GETSYSCTL("kstat.zfs.misc.arcstats.demand_data_misses", + ls->misses.arcstats_demand_data); + GETSYSCTL("kstat.zfs.misc.arcstats.demand_metadata_hits", + ls->hits.arcstats_demand_metadata); + GETSYSCTL("kstat.zfs.misc.arcstats.demand_metadata_misses", + ls->misses.arcstats_demand_metadata); + GETSYSCTL("kstat.zfs.misc.arcstats.prefetch_data_hits", + ls->hits.arcstats_prefetch_data); + GETSYSCTL("kstat.zfs.misc.arcstats.prefetch_data_misses", + ls->misses.arcstats_prefetch_data); + GETSYSCTL("kstat.zfs.misc.arcstats.prefetch_metadata_hits", + ls->hits.arcstats_prefetch_metadata); + GETSYSCTL("kstat.zfs.misc.arcstats.prefetch_metadata_misses", + ls->misses.arcstats_prefetch_metadata); + GETSYSCTL("kstat.zfs.misc.zfetchstats.hits", + ls->hits.zfetchstats); + GETSYSCTL("kstat.zfs.misc.zfetchstats.misses", + ls->misses.zfetchstats); + GETSYSCTL("kstat.zfs.misc.arcstats.l2_hits", + ls->hits.arcstats_l2); + GETSYSCTL("kstat.zfs.misc.arcstats.l2_misses", + ls->misses.arcstats_l2); + GETSYSCTL("kstat.zfs.misc.vdev_cache_stats.hits", + ls->hits.vdev_cache_stats); + GETSYSCTL("kstat.zfs.misc.vdev_cache_stats.misses", + ls->misses.vdev_cache_stats); +} + +void +fetchzarc(void) +{ + oldstat = curstat; + getinfo(&curstat); +} From owner-svn-src-stable@freebsd.org Tue Aug 2 23:35:00 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3F1DBACD36; Tue, 2 Aug 2016 23:35:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B66CD16B5; Tue, 2 Aug 2016 23:35:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72NYxUA077430; Tue, 2 Aug 2016 23:34:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72NYxUN077429; Tue, 2 Aug 2016 23:34:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608022334.u72NYxUN077429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Aug 2016 23:34: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: r303686 - stable/11/sys/dev/cxgbe/tom X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 23:35:01 -0000 Author: ngie Date: Tue Aug 2 23:34:59 2016 New Revision: 303686 URL: https://svnweb.freebsd.org/changeset/base/303686 Log: MFC r302581: Remove redundant declaration for tcp_dooptions, similar to r302576 netinet/tcp_var.h already defines this function Approved by: re (gjb) PR: 209920 Modified: stable/11/sys/dev/cxgbe/tom/t4_listen.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/cxgbe/tom/t4_listen.c ============================================================================== --- stable/11/sys/dev/cxgbe/tom/t4_listen.c Tue Aug 2 22:47:06 2016 (r303685) +++ stable/11/sys/dev/cxgbe/tom/t4_listen.c Tue Aug 2 23:34:59 2016 (r303686) @@ -665,9 +665,6 @@ t4_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t4_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { From owner-svn-src-stable@freebsd.org Wed Aug 3 00:03:04 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95071BAD816; Wed, 3 Aug 2016 00:03:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 730B11A14; Wed, 3 Aug 2016 00:03:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u73033Zp088563; Wed, 3 Aug 2016 00:03:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73033mu088560; Wed, 3 Aug 2016 00:03:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608030003.u73033mu088560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Aug 2016 00:03:03 +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: r303689 - in stable/11/sys/dev/drm2: . i915 radeon X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 00:03:04 -0000 Author: ngie Date: Wed Aug 3 00:03:03 2016 New Revision: 303689 URL: https://svnweb.freebsd.org/changeset/base/303689 Log: MFC r302571,r302572,r302577,r302841: Approved by: re (gjb) r302571: Remove redundant declaration for radeon_pm_acpi_event_handler(..) to fix -Wredundant-decls warning PR: 209924 Tested with: devel/amd64-gcc (5.3.0) r302572: Remove redundant declarations for intel_fbc_enabled(..) and i915_gem_dump_object(..) to fix -Wredundant-decls warning PR: 209924 Tested with: devel/amd64-gcc (5.3.0) r302577: Add missing default case to capable(..) function definition By definition (enum __drm_capabilities), cases other than CAP_SYS_ADMIN aren't possible. Add in a KASSERT safety belt and return false in !INVARIANTS case if an invalid value is passed in, as it would be a programmer error. This fixes a -Wreturn-type error with gcc 5.3.0. r302841: Always panic if an invalid capability is passed to `capable(..)` instead of just with INVARIANTS rwatson's point was valid in the sense that if the data passed at runtime is invalid, it should always trip the invariant, not just in the debug case. This is a deterrent against malicious input, or input caused by hardware errors. Requested by: rwatson Modified: stable/11/sys/dev/drm2/drm_os_freebsd.h stable/11/sys/dev/drm2/i915/i915_drv.h stable/11/sys/dev/drm2/radeon/radeon_acpi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/drm2/drm_os_freebsd.h ============================================================================== --- stable/11/sys/dev/drm2/drm_os_freebsd.h Tue Aug 2 23:54:21 2016 (r303688) +++ stable/11/sys/dev/drm2/drm_os_freebsd.h Wed Aug 3 00:03:03 2016 (r303689) @@ -438,6 +438,9 @@ capable(enum __drm_capabilities cap) switch (cap) { case CAP_SYS_ADMIN: return DRM_SUSER(curthread); + default: + panic("%s: unhandled capability: %0x", __func__, cap); + return (false); } } Modified: stable/11/sys/dev/drm2/i915/i915_drv.h ============================================================================== --- stable/11/sys/dev/drm2/i915/i915_drv.h Tue Aug 2 23:54:21 2016 (r303688) +++ stable/11/sys/dev/drm2/i915/i915_drv.h Wed Aug 3 00:03:03 2016 (r303689) @@ -1618,8 +1618,6 @@ int i915_verify_lists(struct drm_device #endif void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle); -void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len, - const char *where, uint32_t mark); /* i915_suspend.c */ extern int i915_save_state(struct drm_device *dev); @@ -1673,7 +1671,6 @@ extern void intel_modeset_cleanup(struct extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern void intel_modeset_setup_hw_state(struct drm_device *dev, bool force_restore); -extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_disable_fbc(struct drm_device *dev); extern bool ironlake_set_drps(struct drm_device *dev, u8 val); extern void intel_init_pch_refclk(struct drm_device *dev); Modified: stable/11/sys/dev/drm2/radeon/radeon_acpi.c ============================================================================== --- stable/11/sys/dev/drm2/radeon/radeon_acpi.c Tue Aug 2 23:54:21 2016 (r303688) +++ stable/11/sys/dev/drm2/radeon/radeon_acpi.c Wed Aug 3 00:03:03 2016 (r303689) @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #define ACPI_AC_CLASS "ac_adapter" -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version; /* version */ From owner-svn-src-stable@freebsd.org Wed Aug 3 00:19:53 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52E4CBADC92; Wed, 3 Aug 2016 00:19:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F0501206; Wed, 3 Aug 2016 00:19:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u730JqZx092592; Wed, 3 Aug 2016 00:19:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u730Jqqq092591; Wed, 3 Aug 2016 00:19:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608030019.u730Jqqq092591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Aug 2016 00:19:52 +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: r303690 - stable/11/sys/dev/cxgb/ulp/tom X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 00:19:53 -0000 Author: ngie Date: Wed Aug 3 00:19:52 2016 New Revision: 303690 URL: https://svnweb.freebsd.org/changeset/base/303690 Log: MFC r302576: Approved by: re (gjb) r302576: (Re-do r302574 with corrected commit message..) Remove redundant declaration for tcp_dooptions netinet/tcp_var.h already defines this function PR: 209920 Tested with: clang 3.8.0, gcc 4.2.1, gcc 5.3.0 Modified: stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.c ============================================================================== --- stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.c Wed Aug 3 00:03:03 2016 (r303689) +++ stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.c Wed Aug 3 00:19:52 2016 (r303690) @@ -922,9 +922,6 @@ t3_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { From owner-svn-src-stable@freebsd.org Wed Aug 3 01:06:53 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B810BA58CB; Wed, 3 Aug 2016 01:06:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAF50163B; Wed, 3 Aug 2016 01:06:52 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7316q4P011062; Wed, 3 Aug 2016 01:06:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7316p5i011058; Wed, 3 Aug 2016 01:06:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608030106.u7316p5i011058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Aug 2016 01:06: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: r303691 - stable/11/sys/rpc X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 01:06:53 -0000 Author: ngie Date: Wed Aug 3 01:06:51 2016 New Revision: 303691 URL: https://svnweb.freebsd.org/changeset/base/303691 Log: MFC r302550,r302551,r302552,r302553: Approved by: re (gjb) r302550: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 1007033, 1007344 r302551: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. CID: 1007342 r302552: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes r302553: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). CID: 1007341 Modified: stable/11/sys/rpc/clnt_dg.c stable/11/sys/rpc/clnt_vc.c stable/11/sys/rpc/svc.c stable/11/sys/rpc/svc_dg.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/rpc/clnt_dg.c ============================================================================== --- stable/11/sys/rpc/clnt_dg.c Wed Aug 3 00:19:52 2016 (r303690) +++ stable/11/sys/rpc/clnt_dg.c Wed Aug 3 01:06:51 2016 (r303691) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } Modified: stable/11/sys/rpc/clnt_vc.c ============================================================================== --- stable/11/sys/rpc/clnt_vc.c Wed Aug 3 00:19:52 2016 (r303690) +++ stable/11/sys/rpc/clnt_vc.c Wed Aug 3 01:06:51 2016 (r303691) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(&ct->ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(&ct->ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } Modified: stable/11/sys/rpc/svc.c ============================================================================== --- stable/11/sys/rpc/svc.c Wed Aug 3 00:19:52 2016 (r303690) +++ stable/11/sys/rpc/svc.c Wed Aug 3 01:06:51 2016 (r303691) @@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -858,8 +858,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); Modified: stable/11/sys/rpc/svc_dg.c ============================================================================== --- stable/11/sys/rpc/svc_dg.c Wed Aug 3 00:19:52 2016 (r303690) +++ stable/11/sys/rpc/svc_dg.c Wed Aug 3 01:06:51 2016 (r303691) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } From owner-svn-src-stable@freebsd.org Wed Aug 3 01:19:12 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BC5BBA5DEC; Wed, 3 Aug 2016 01:19:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E792D1BEB; Wed, 3 Aug 2016 01:19:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u731JBGr014930; Wed, 3 Aug 2016 01:19:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u731JApj014926; Wed, 3 Aug 2016 01:19:10 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608030119.u731JApj014926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Aug 2016 01:19:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303692 - stable/10/sys/rpc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 01:19:12 -0000 Author: ngie Date: Wed Aug 3 01:19:10 2016 New Revision: 303692 URL: https://svnweb.freebsd.org/changeset/base/303692 Log: MFstable/11 r303691: MFC r302550,r302551,r302552,r302553: r302550: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 1007033, 1007344 r302551: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. CID: 1007342 r302552: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes r302553: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). CID: 1007341 Modified: stable/10/sys/rpc/clnt_dg.c stable/10/sys/rpc/clnt_vc.c stable/10/sys/rpc/svc.c stable/10/sys/rpc/svc_dg.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/rpc/clnt_dg.c ============================================================================== --- stable/10/sys/rpc/clnt_dg.c Wed Aug 3 01:06:51 2016 (r303691) +++ stable/10/sys/rpc/clnt_dg.c Wed Aug 3 01:19:10 2016 (r303692) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } Modified: stable/10/sys/rpc/clnt_vc.c ============================================================================== --- stable/10/sys/rpc/clnt_vc.c Wed Aug 3 01:06:51 2016 (r303691) +++ stable/10/sys/rpc/clnt_vc.c Wed Aug 3 01:19:10 2016 (r303692) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(&ct->ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(&ct->ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } Modified: stable/10/sys/rpc/svc.c ============================================================================== --- stable/10/sys/rpc/svc.c Wed Aug 3 01:06:51 2016 (r303691) +++ stable/10/sys/rpc/svc.c Wed Aug 3 01:19:10 2016 (r303692) @@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -858,8 +858,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); Modified: stable/10/sys/rpc/svc_dg.c ============================================================================== --- stable/10/sys/rpc/svc_dg.c Wed Aug 3 01:06:51 2016 (r303691) +++ stable/10/sys/rpc/svc_dg.c Wed Aug 3 01:19:10 2016 (r303692) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } From owner-svn-src-stable@freebsd.org Wed Aug 3 01:25:46 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1ADE1BAC0D4; Wed, 3 Aug 2016 01:25:46 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDEA1131A; Wed, 3 Aug 2016 01:25:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u731PjhJ018645; Wed, 3 Aug 2016 01:25:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u731PjpA018644; Wed, 3 Aug 2016 01:25:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608030125.u731PjpA018644@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Aug 2016 01:25:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303694 - stable/10/tools/build/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 01:25:46 -0000 Author: ngie Date: Wed Aug 3 01:25:44 2016 New Revision: 303694 URL: https://svnweb.freebsd.org/changeset/base/303694 Log: MFC r302330: Remove ftp(1) related files when MK_FTP == no Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Aug 3 01:22:11 2016 (r303693) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Aug 3 01:25:44 2016 (r303694) @@ -873,6 +873,20 @@ OLD_FILES+=usr/sbin/fmtree OLD_FILES+=usr/share/man/man8/fmtree.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=etc/ftpusers +OLD_FILES+=etc/rc.d/ftpd +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GNUCXX} == no OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/include/c++/4.2/algorithm From owner-svn-src-stable@freebsd.org Wed Aug 3 01:26:03 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98143BAC125; Wed, 3 Aug 2016 01:26:03 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7443B14C8; Wed, 3 Aug 2016 01:26:03 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u731Q2iG018705; Wed, 3 Aug 2016 01:26:02 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u731Q2Hg018701; Wed, 3 Aug 2016 01:26:02 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608030126.u731Q2Hg018701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Aug 2016 01:26:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r303695 - stable/9/sys/rpc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 01:26:03 -0000 Author: ngie Date: Wed Aug 3 01:26:02 2016 New Revision: 303695 URL: https://svnweb.freebsd.org/changeset/base/303695 Log: MFstable/10 r303692: MFstable/11 r303691: MFC r302550,r302551,r302552,r302553: r302550: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 1007033, 1007344 r302551: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. CID: 1007342 r302552: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes r302553: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). CID: 1007341 Modified: stable/9/sys/rpc/clnt_dg.c stable/9/sys/rpc/clnt_vc.c stable/9/sys/rpc/svc.c stable/9/sys/rpc/svc_dg.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sys/rpc/clnt_dg.c ============================================================================== --- stable/9/sys/rpc/clnt_dg.c Wed Aug 3 01:25:44 2016 (r303694) +++ stable/9/sys/rpc/clnt_dg.c Wed Aug 3 01:26:02 2016 (r303695) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } Modified: stable/9/sys/rpc/clnt_vc.c ============================================================================== --- stable/9/sys/rpc/clnt_vc.c Wed Aug 3 01:25:44 2016 (r303694) +++ stable/9/sys/rpc/clnt_vc.c Wed Aug 3 01:26:02 2016 (r303695) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(&ct->ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(&ct->ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } Modified: stable/9/sys/rpc/svc.c ============================================================================== --- stable/9/sys/rpc/svc.c Wed Aug 3 01:25:44 2016 (r303694) +++ stable/9/sys/rpc/svc.c Wed Aug 3 01:26:02 2016 (r303695) @@ -842,7 +842,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -859,8 +859,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); Modified: stable/9/sys/rpc/svc_dg.c ============================================================================== --- stable/9/sys/rpc/svc_dg.c Wed Aug 3 01:25:44 2016 (r303694) +++ stable/9/sys/rpc/svc_dg.c Wed Aug 3 01:26:02 2016 (r303695) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } From owner-svn-src-stable@freebsd.org Wed Aug 3 06:32:45 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0697BAB473; Wed, 3 Aug 2016 06:32:45 +0000 (UTC) (envelope-from karels@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A20441A4F; Wed, 3 Aug 2016 06:32:45 +0000 (UTC) (envelope-from karels@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u736WiJ3032726; Wed, 3 Aug 2016 06:32:44 GMT (envelope-from karels@FreeBSD.org) Received: (from karels@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u736Wim6032724; Wed, 3 Aug 2016 06:32:44 GMT (envelope-from karels@FreeBSD.org) Message-Id: <201608030632.u736Wim6032724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: karels set sender to karels@FreeBSD.org using -f From: Mike Karels Date: Wed, 3 Aug 2016 06:32:44 +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: r303698 - in stable/11/sys: netinet netinet6 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 06:32:46 -0000 Author: karels Date: Wed Aug 3 06:32:44 2016 New Revision: 303698 URL: https://svnweb.freebsd.org/changeset/base/303698 Log: MFC r303171: Fix per-connection L2 caching in fast path r301217 re-added per-connection L2 caching from a previous change, but it omitted caching in the fast path. Add it. Reviewed By: gallatin Approved by: gnn (mentor) Approved by: re (kostikbel) Differential Revision: https://reviews.freebsd.org/D7239 Modified: stable/11/sys/netinet/if_ether.c stable/11/sys/netinet6/nd6.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet/if_ether.c ============================================================================== --- stable/11/sys/netinet/if_ether.c Wed Aug 3 03:49:42 2016 (r303697) +++ stable/11/sys/netinet/if_ether.c Wed Aug 3 06:32:44 2016 (r303698) @@ -607,7 +607,7 @@ arpresolve(struct ifnet *ifp, int is_gw, } IF_AFDATA_RLOCK(ifp); - la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, dst); + la = lla_lookup(LLTABLE(ifp), plle ? LLE_EXCLUSIVE : LLE_UNLOCKED, dst); if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { /* Entry found, let's copy lle info */ bcopy(la->r_linkdata, desten, la->r_hdrlen); @@ -619,9 +619,16 @@ arpresolve(struct ifnet *ifp, int is_gw, la->r_skip_req = 0; /* Notify that entry was used */ LLE_REQ_UNLOCK(la); } + if (plle) { + LLE_ADDREF(la); + *plle = la; + LLE_WUNLOCK(la); + } IF_AFDATA_RUNLOCK(ifp); return (0); } + if (plle && la) + LLE_WUNLOCK(la); IF_AFDATA_RUNLOCK(ifp); return (arpresolve_full(ifp, is_gw, la == NULL ? LLE_CREATE : 0, m, dst, Modified: stable/11/sys/netinet6/nd6.c ============================================================================== --- stable/11/sys/netinet6/nd6.c Wed Aug 3 03:49:42 2016 (r303697) +++ stable/11/sys/netinet6/nd6.c Wed Aug 3 06:32:44 2016 (r303698) @@ -2222,7 +2222,8 @@ nd6_resolve(struct ifnet *ifp, int is_gw } IF_AFDATA_RLOCK(ifp); - ln = nd6_lookup(&dst6->sin6_addr, LLE_UNLOCKED, ifp); + ln = nd6_lookup(&dst6->sin6_addr, plle ? LLE_EXCLUSIVE : LLE_UNLOCKED, + ifp); if (ln != NULL && (ln->r_flags & RLLE_VALID) != 0) { /* Entry found, let's copy lle info */ bcopy(ln->r_linkdata, desten, ln->r_hdrlen); @@ -2235,9 +2236,15 @@ nd6_resolve(struct ifnet *ifp, int is_gw ln->lle_hittime = time_uptime; LLE_REQ_UNLOCK(ln); } + if (plle) { + LLE_ADDREF(ln); + *plle = ln; + LLE_WUNLOCK(ln); + } IF_AFDATA_RUNLOCK(ifp); return (0); - } + } else if (plle && ln) + LLE_WUNLOCK(ln); IF_AFDATA_RUNLOCK(ifp); return (nd6_resolve_slow(ifp, 0, m, dst6, desten, pflags, plle)); From owner-svn-src-stable@freebsd.org Wed Aug 3 10:18:54 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21692BABFBE; Wed, 3 Aug 2016 10:18:54 +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 mx1.freebsd.org (Postfix) with ESMTPS id C8BDF18DD; Wed, 3 Aug 2016 10:18:53 +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 u73AIql2015535; Wed, 3 Aug 2016 10:18:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73AIqv1015532; Wed, 3 Aug 2016 10:18:52 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608031018.u73AIqv1015532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 3 Aug 2016 10:18:52 +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: r303708 - stable/11/lib/libthr/thread X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 10:18:54 -0000 Author: kib Date: Wed Aug 3 10:18:52 2016 New Revision: 303708 URL: https://svnweb.freebsd.org/changeset/base/303708 Log: MFC r303393: Remove empty initializer for the once facility. Approved by: re (gjb) Modified: stable/11/lib/libthr/thread/thr_init.c stable/11/lib/libthr/thread/thr_once.c stable/11/lib/libthr/thread/thr_private.h Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libthr/thread/thr_init.c ============================================================================== --- stable/11/lib/libthr/thread/thr_init.c Wed Aug 3 09:15:10 2016 (r303707) +++ stable/11/lib/libthr/thread/thr_init.c Wed Aug 3 10:18:52 2016 (r303708) @@ -447,7 +447,6 @@ init_private(void) _thr_urwlock_init(&_thr_atfork_lock); _thr_umutex_init(&_thr_event_lock); _thr_umutex_init(&_suspend_all_lock); - _thr_once_init(); _thr_spinlock_init(); _thr_list_init(); _thr_wake_addr_init(); Modified: stable/11/lib/libthr/thread/thr_once.c ============================================================================== --- stable/11/lib/libthr/thread/thr_once.c Wed Aug 3 09:15:10 2016 (r303707) +++ stable/11/lib/libthr/thread/thr_once.c Wed Aug 3 10:18:52 2016 (r303708) @@ -101,8 +101,3 @@ _pthread_once(pthread_once_t *once_contr _thr_umtx_wake(&once_control->state, INT_MAX, 0); return (0); } - -void -_thr_once_init(void) -{ -} Modified: stable/11/lib/libthr/thread/thr_private.h ============================================================================== --- stable/11/lib/libthr/thread/thr_private.h Wed Aug 3 09:15:10 2016 (r303707) +++ stable/11/lib/libthr/thread/thr_private.h Wed Aug 3 10:18:52 2016 (r303708) @@ -811,7 +811,6 @@ void _thr_link(struct pthread *, struct void _thr_unlink(struct pthread *, struct pthread *) __hidden; void _thr_assert_lock_level(void) __hidden __dead2; void _thr_ast(struct pthread *) __hidden; -void _thr_once_init(void) __hidden; void _thr_report_creation(struct pthread *curthread, struct pthread *newthread) __hidden; void _thr_report_death(struct pthread *curthread) __hidden; From owner-svn-src-stable@freebsd.org Wed Aug 3 10:23:43 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D38DDBAD160; Wed, 3 Aug 2016 10:23:43 +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 mx1.freebsd.org (Postfix) with ESMTPS id 82B231CE0; Wed, 3 Aug 2016 10:23:43 +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 u73ANgiL019090; Wed, 3 Aug 2016 10:23:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73ANgdF019087; Wed, 3 Aug 2016 10:23:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608031023.u73ANgdF019087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 3 Aug 2016 10:23:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303709 - stable/10/lib/libthr/thread X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 10:23:44 -0000 Author: kib Date: Wed Aug 3 10:23:42 2016 New Revision: 303709 URL: https://svnweb.freebsd.org/changeset/base/303709 Log: MFC r303393: Remove empty initializer for the once facility. Modified: stable/10/lib/libthr/thread/thr_init.c stable/10/lib/libthr/thread/thr_once.c stable/10/lib/libthr/thread/thr_private.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libthr/thread/thr_init.c ============================================================================== --- stable/10/lib/libthr/thread/thr_init.c Wed Aug 3 10:18:52 2016 (r303708) +++ stable/10/lib/libthr/thread/thr_init.c Wed Aug 3 10:23:42 2016 (r303709) @@ -438,7 +438,6 @@ init_private(void) _thr_urwlock_init(&_thr_atfork_lock); _thr_umutex_init(&_thr_event_lock); _thr_umutex_init(&_suspend_all_lock); - _thr_once_init(); _thr_spinlock_init(); _thr_list_init(); _thr_wake_addr_init(); Modified: stable/10/lib/libthr/thread/thr_once.c ============================================================================== --- stable/10/lib/libthr/thread/thr_once.c Wed Aug 3 10:18:52 2016 (r303708) +++ stable/10/lib/libthr/thread/thr_once.c Wed Aug 3 10:23:42 2016 (r303709) @@ -92,8 +92,3 @@ _pthread_once(pthread_once_t *once_contr _thr_umtx_wake(&once_control->state, INT_MAX, 0); return (0); } - -void -_thr_once_init() -{ -} Modified: stable/10/lib/libthr/thread/thr_private.h ============================================================================== --- stable/10/lib/libthr/thread/thr_private.h Wed Aug 3 10:18:52 2016 (r303708) +++ stable/10/lib/libthr/thread/thr_private.h Wed Aug 3 10:23:42 2016 (r303709) @@ -773,7 +773,6 @@ void _thr_link(struct pthread *, struct void _thr_unlink(struct pthread *, struct pthread *) __hidden; void _thr_assert_lock_level(void) __hidden __dead2; void _thr_ast(struct pthread *) __hidden; -void _thr_once_init(void) __hidden; void _thr_report_creation(struct pthread *curthread, struct pthread *newthread) __hidden; void _thr_report_death(struct pthread *curthread) __hidden; From owner-svn-src-stable@freebsd.org Wed Aug 3 13:19:59 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4EABBAC3FD; Wed, 3 Aug 2016 13:19:59 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B03351989; Wed, 3 Aug 2016 13:19:59 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u73DJwbR091476; Wed, 3 Aug 2016 13:19:58 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73DJw6N091474; Wed, 3 Aug 2016 13:19:58 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201608031319.u73DJw6N091474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Wed, 3 Aug 2016 13:19: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: r303711 - in stable/11/sys/x86: x86 xen X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 13:19:59 -0000 Author: royger Date: Wed Aug 3 13:19:58 2016 New Revision: 303711 URL: https://svnweb.freebsd.org/changeset/base/303711 Log: MFC r303490, r303491: xen-intr: fix removal of event channels during resume Revert r291022: x86/intr: allow mutex recursion in intr_remove_handler Approved by: re (kib) Modified: stable/11/sys/x86/x86/intr_machdep.c stable/11/sys/x86/xen/xen_intr.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/x86/intr_machdep.c ============================================================================== --- stable/11/sys/x86/x86/intr_machdep.c Wed Aug 3 11:49:17 2016 (r303710) +++ stable/11/sys/x86/x86/intr_machdep.c Wed Aug 3 13:19:58 2016 (r303711) @@ -197,28 +197,19 @@ int intr_remove_handler(void *cookie) { struct intsrc *isrc; - int error, mtx_owned; + int error; isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); if (error == 0) { - /* - * Recursion is needed here so PICs can remove interrupts - * while resuming. It was previously not possible due to - * intr_resume holding the intr_table_lock and - * intr_remove_handler recursing on it. - */ - mtx_owned = mtx_owned(&intr_table_lock); - if (mtx_owned == 0) - mtx_lock(&intr_table_lock); + mtx_lock(&intr_table_lock); isrc->is_handlers--; if (isrc->is_handlers == 0) { isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI); isrc->is_pic->pic_disable_intr(isrc); } intrcnt_updatename(isrc); - if (mtx_owned == 0) - mtx_unlock(&intr_table_lock); + mtx_unlock(&intr_table_lock); } return (error); } Modified: stable/11/sys/x86/xen/xen_intr.c ============================================================================== --- stable/11/sys/x86/xen/xen_intr.c Wed Aug 3 11:49:17 2016 (r303710) +++ stable/11/sys/x86/xen/xen_intr.c Wed Aug 3 13:19:58 2016 (r303711) @@ -130,8 +130,6 @@ struct xenisrc { u_int xi_masked:1; }; -#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) - static void xen_intr_suspend(struct pic *); static void xen_intr_resume(struct pic *, bool suspend_cancelled); static void xen_intr_enable_source(struct intsrc *isrc); @@ -422,7 +420,7 @@ xen_intr_bind_isrc(struct xenisrc **isrc mtx_unlock(&xen_intr_isrc_lock); /* Assign the opaque handler (the event channel port) */ - *port_handlep = &isrc->xi_port; + *port_handlep = &isrc->xi_vector; #ifdef SMP if (type == EVTCHN_TYPE_PORT) { @@ -468,16 +466,17 @@ xen_intr_bind_isrc(struct xenisrc **isrc static struct xenisrc * xen_intr_isrc(xen_intr_handle_t handle) { - evtchn_port_t port; + int vector; if (handle == NULL) return (NULL); - port = *(evtchn_port_t *)handle; - if (!is_valid_evtchn(port) || port >= NR_EVENT_CHANNELS) - return (NULL); + vector = *(int *)handle; + KASSERT(vector >= FIRST_EVTCHN_INT && + vector < (FIRST_EVTCHN_INT + xen_intr_auto_vector_count), + ("Xen interrupt vector is out of range")); - return (xen_intr_port_to_isrc[port]); + return ((struct xenisrc *)intr_lookup_source(vector)); } /** @@ -780,10 +779,6 @@ xen_intr_resume(struct pic *unused, bool xen_rebind_virq(isrc); break; default: - intr_remove_handler(isrc->xi_cookie); - isrc->xi_cpu = 0; - isrc->xi_type = EVTCHN_TYPE_UNBOUND; - isrc->xi_cookie = NULL; break; } } From owner-svn-src-stable@freebsd.org Wed Aug 3 15:39:59 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F5E6BAED81; Wed, 3 Aug 2016 15:39:59 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F771199B; Wed, 3 Aug 2016 15:39:58 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u73FdwHk045046; Wed, 3 Aug 2016 15:39:58 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73FdwCE045045; Wed, 3 Aug 2016 15:39:58 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201608031539.u73FdwCE045045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 3 Aug 2016 15:39: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: r303714 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 15:39:59 -0000 Author: brooks Date: Wed Aug 3 15:39:58 2016 New Revision: 303714 URL: https://svnweb.freebsd.org/changeset/base/303714 Log: MFC r303103: Minor wording improvements to the note about pipe(2) removal. Approved by: re (gjb) Sponsored by: DARPA, AFRL Modified: stable/11/UPDATING Directory Properties: stable/11/ (props changed) Modified: stable/11/UPDATING ============================================================================== --- stable/11/UPDATING Wed Aug 3 15:20:10 2016 (r303713) +++ stable/11/UPDATING Wed Aug 3 15:39:58 2016 (r303714) @@ -18,11 +18,12 @@ from older version of current across the 20160622: The libc stub for the pipe(2) system call has been replaced with - a wrapper which calls the pipe2(2) system call and the pipe(2) is now - only implemented by the kernels which include "options - COMPAT_FREEBSD10" in their config file (this is the default). - Users should ensure that this option is enabled in their kernel - or upgrade userspace to r302092 before upgrading their kernel. + a wrapper that calls the pipe2(2) system call and the pipe(2) + system call is now only implemented by the kernels that include + "options COMPAT_FREEBSD10" in their config file (this is the + default). Users should ensure that this option is enabled in + their kernel or upgrade userspace to r302092 before upgrading their + kernel. 20160527: CAM will now strip leading spaces from SCSI disks' serial numbers. From owner-svn-src-stable@freebsd.org Wed Aug 3 16:10:54 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4216EBADC33; Wed, 3 Aug 2016 16:10:54 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 149BE14AB; Wed, 3 Aug 2016 16:10:54 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u73GArwW056053; Wed, 3 Aug 2016 16:10:53 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73GArc9056052; Wed, 3 Aug 2016 16:10:53 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201608031610.u73GArc9056052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 3 Aug 2016 16:10:53 +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: r303717 - stable/11/lib/libc/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2016 16:10:54 -0000 Author: brooks Date: Wed Aug 3 16:10:53 2016 New Revision: 303717 URL: https://svnweb.freebsd.org/changeset/base/303717 Log: MFC r303104, r303106: Update to reflect the fact that pipe() is a wrapper around the pipe2() system call. Reviewed by: jhb, wblock Sponsored by: DAPRA, AFRL Change wording to use function rather than system call in the description as well. Authored by: zeising Reviewed by: brooks Approved by: re (gjb) Sponsored by: DAPRA, AFRL Modified: stable/11/lib/libc/sys/pipe.2 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/sys/pipe.2 ============================================================================== --- stable/11/lib/libc/sys/pipe.2 Wed Aug 3 16:08:21 2016 (r303716) +++ stable/11/lib/libc/sys/pipe.2 Wed Aug 3 16:10:53 2016 (r303717) @@ -28,7 +28,7 @@ .\" @(#)pipe.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 22, 2016 +.Dd July 20, 2016 .Dt PIPE 2 .Os .Sh NAME @@ -46,7 +46,7 @@ .Sh DESCRIPTION The .Fn pipe -system call +function creates a .Em pipe , which is an object allowing @@ -109,6 +109,18 @@ The bidirectional nature of this impleme portable to older systems, so it is recommended to use the convention for using the endpoints in the traditional manner when using a pipe in one direction. +.Sh IMPLEMENTATION NOTES +The +.Fn pipe +function calls the +.Fn pipe2 +system call. +As a result, system call traces such as those captured by +.Xr dtrace 1 +or +.Xr ktrace 1 +will show calls to +.Fn pipe2 . .Sh RETURN VALUES .Rv -std pipe .Sh ERRORS @@ -157,3 +169,10 @@ The .Fn pipe2 function appeared in .Fx 10.0 . +.Pp +The +.Fn pipe +function became a wrapper around +.Fn pipe2 +in +.Fx 11.0 . From owner-svn-src-stable@freebsd.org Thu Aug 4 11:26:54 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F68FBAE1F4; Thu, 4 Aug 2016 11:26:54 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDA801C33; Thu, 4 Aug 2016 11:26:53 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u74BQrIa092405; Thu, 4 Aug 2016 11:26:53 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74BQre9092404; Thu, 4 Aug 2016 11:26:53 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201608041126.u74BQre9092404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 4 Aug 2016 11:26:53 +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: r303741 - stable/11/sbin/ipfw X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2016 11:26:54 -0000 Author: ae Date: Thu Aug 4 11:26:52 2016 New Revision: 303741 URL: https://svnweb.freebsd.org/changeset/base/303741 Log: MFC r303615: An old tables implementation had all tables preallocated, so when user did `ipfw table N flush` it always worked, but now when table N doesn't exist the kernel returns ESRCH error. This isn't fatal error for flush and destroy commands. Do not call err(3) when errno is equal to ESRCH. Also warn only when quiet mode isn't enabled. This fixes a regression in behavior, when old rules are loaded from file. Also use correct value for switch in the table_swap(). Reported by: Kevin Oberman Approved by: re (kib) Modified: stable/11/sbin/ipfw/tables.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/ipfw/tables.c ============================================================================== --- stable/11/sbin/ipfw/tables.c Thu Aug 4 11:22:51 2016 (r303740) +++ stable/11/sbin/ipfw/tables.c Thu Aug 4 11:26:52 2016 (r303741) @@ -225,18 +225,30 @@ ipfw_table_handler(int ac, char *av[]) table_modify(&oh, ac, av); break; case TOK_DESTROY: - if (table_destroy(&oh) != 0) + if (table_destroy(&oh) == 0) + break; + if (errno != ESRCH) err(EX_OSERR, "failed to destroy table %s", tablename); + /* ESRCH isn't fatal, warn if not quiet mode */ + if (co.do_quiet == 0) + warn("failed to destroy table %s", tablename); break; case TOK_FLUSH: if (is_all == 0) { - if ((error = table_flush(&oh)) != 0) + if ((error = table_flush(&oh)) == 0) + break; + if (errno != ESRCH) err(EX_OSERR, "failed to flush table %s info", tablename); + /* ESRCH isn't fatal, warn if not quiet mode */ + if (co.do_quiet == 0) + warn("failed to flush table %s info", + tablename); } else { error = tables_foreach(table_flush_one, &oh, 1); if (error != 0) err(EX_OSERR, "failed to flush tables list"); + /* XXX: we ignore errors here */ } break; case TOK_SWAP: @@ -593,14 +605,14 @@ table_do_swap(ipfw_obj_header *oh, char static int table_swap(ipfw_obj_header *oh, char *second) { - int error; if (table_check_name(second) != 0) errx(EX_USAGE, "table name %s is invalid", second); - error = table_do_swap(oh, second); + if (table_do_swap(oh, second) == 0) + return (0); - switch (error) { + switch (errno) { case EINVAL: errx(EX_USAGE, "Unable to swap table: check types"); case EFBIG: From owner-svn-src-stable@freebsd.org Thu Aug 4 14:34:34 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26BBCBAF453; Thu, 4 Aug 2016 14:34:34 +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 mx1.freebsd.org (Postfix) with ESMTPS id ED85C13B5; Thu, 4 Aug 2016 14:34:33 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u74EYXEx063339; Thu, 4 Aug 2016 14:34:33 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74EYXO0063338; Thu, 4 Aug 2016 14:34:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608041434.u74EYXO0063338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 4 Aug 2016 14:34:33 +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: r303745 - stable/11/sys/vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2016 14:34:34 -0000 Author: kib Date: Thu Aug 4 14:34:33 2016 New Revision: 303745 URL: https://svnweb.freebsd.org/changeset/base/303745 Log: MFC r303446: Fix style and typo. Approved by: re (gjb) Modified: stable/11/sys/vm/swap_pager.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/swap_pager.c ============================================================================== --- stable/11/sys/vm/swap_pager.c Thu Aug 4 13:49:36 2016 (r303744) +++ stable/11/sys/vm/swap_pager.c Thu Aug 4 14:34:33 2016 (r303745) @@ -390,8 +390,8 @@ static int dmmax; static int nswap_lowat = 128; /* in pages, swap_pager_almost_full warn */ static int nswap_hiwat = 512; /* in pages, swap_pager_almost_full warn */ -SYSCTL_INT(_vm, OID_AUTO, dmmax, - CTLFLAG_RD, &dmmax, 0, "Maximum size of a swap block"); +SYSCTL_INT(_vm, OID_AUTO, dmmax, CTLFLAG_RD, &dmmax, 0, + "Maximum size of a swap block"); static void swp_sizecheck(void); static void swp_pager_async_iodone(struct buf *bp); @@ -2432,7 +2432,7 @@ swapgeom_acquire(struct g_consumer *cp) /* * Remove a reference from the g_consumer. Post a close event if - * all referneces go away. + * all references go away. */ static void swapgeom_release(struct g_consumer *cp, struct swdevt *sp) @@ -2598,7 +2598,7 @@ swapongeom_ev(void *arg, int flags) if (gp == NULL) gp = g_new_geomf(&g_swap_class, "swap"); cp = g_new_consumer(gp); - cp->index = 1; /* Number of active I/Os, plus one for being active. */ + cp->index = 1; /* Number of active I/Os, plus one for being active. */ cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; g_attach(cp, pp); /* From owner-svn-src-stable@freebsd.org Thu Aug 4 17:26:34 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B56ABAFF87; Thu, 4 Aug 2016 17:26:34 +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 mx1.freebsd.org (Postfix) with ESMTPS id E1E401464; Thu, 4 Aug 2016 17:26:33 +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 u74HQXFW028189; Thu, 4 Aug 2016 17:26:33 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74HQXrs028188; Thu, 4 Aug 2016 17:26:33 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201608041726.u74HQXrs028188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 4 Aug 2016 17:26:33 +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: r303749 - stable/11/usr.sbin/bsdinstall/scripts X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2016 17:26:34 -0000 Author: dim Date: Thu Aug 4 17:26:32 2016 New Revision: 303749 URL: https://svnweb.freebsd.org/changeset/base/303749 Log: MFC r303631: Fix non-functional bsdinstall services dialog. The most recent version of bsdinstall does not seem to respect any of the checkboxes in the "Choose the services you would like to be started at boot" dialog. None of the chosen services end up in the rc.conf file that is installed onto the target system. This is caused by the bsdinstall/scripts/hardening script, which implements the new hardening options dialog. The script starts by overwriting the previously written rc.conf.services file: echo -n > $BSDINSTALL_TMPETC/rc.conf.services which is obviously incorrect. It should clear out rc.conf.hardening instead. Approved by: re (kib) Reviewed by: allanjude PR: 211506 Differential Revision: https://reviews.freebsd.org/D7387 Modified: stable/11/usr.sbin/bsdinstall/scripts/hardening Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/scripts/hardening ============================================================================== --- stable/11/usr.sbin/bsdinstall/scripts/hardening Thu Aug 4 16:36:00 2016 (r303748) +++ stable/11/usr.sbin/bsdinstall/scripts/hardening Thu Aug 4 17:26:32 2016 (r303749) @@ -28,7 +28,7 @@ : ${DIALOG_OK=0} -echo -n > $BSDINSTALL_TMPETC/rc.conf.services +echo -n > $BSDINSTALL_TMPETC/rc.conf.hardening exec 3>&1 FEATURES=$( dialog --backtitle "FreeBSD Installer" \ From owner-svn-src-stable@freebsd.org Fri Aug 5 00:00:04 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 219EABAFD31; Fri, 5 Aug 2016 00:00:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4D4415DE; Fri, 5 Aug 2016 00:00:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75003N5075758; Fri, 5 Aug 2016 00:00:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75003Kf075757; Fri, 5 Aug 2016 00:00:03 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201608050000.u75003Kf075757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 5 Aug 2016 00:00:03 +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: r303759 - stable/11/sys/conf X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 00:00:04 -0000 Author: gjb Date: Fri Aug 5 00:00:02 2016 New Revision: 303759 URL: https://svnweb.freebsd.org/changeset/base/303759 Log: Update stable/11 to BETA4 as part of the 11.0-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/conf/newvers.sh Modified: stable/11/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Thu Aug 4 19:24:44 2016 (r303758) +++ stable/11/sys/conf/newvers.sh Fri Aug 5 00:00:02 2016 (r303759) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="BETA3" +BRANCH="BETA4" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable@freebsd.org Fri Aug 5 05:50:28 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCDCFBAD7F8; Fri, 5 Aug 2016 05:50:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92BE81720; Fri, 5 Aug 2016 05:50:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u755oR6n004689; Fri, 5 Aug 2016 05:50:27 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u755oRX1004687; Fri, 5 Aug 2016 05:50:27 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201608050550.u755oRX1004687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Fri, 5 Aug 2016 05:50: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: r303762 - stable/11/lib/libc/gen X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 05:50:29 -0000 Author: ed Date: Fri Aug 5 05:50:27 2016 New Revision: 303762 URL: https://svnweb.freebsd.org/changeset/base/303762 Log: MFC r303486: Mention that basename(3) and dirname(3) will change in the future. Update the existing manual pages for basename(3) and dirname(3) to mention that in future versions of FreeBSD, these functions will no longer use internal buffers for storing the results. Approved by: re@ Modified: stable/11/lib/libc/gen/basename.3 stable/11/lib/libc/gen/dirname.3 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/gen/basename.3 ============================================================================== --- stable/11/lib/libc/gen/basename.3 Fri Aug 5 02:56:31 2016 (r303761) +++ stable/11/lib/libc/gen/basename.3 Fri Aug 5 05:50:27 2016 (r303762) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 31, 2010 +.Dd July 29, 2016 .Dt BASENAME 3 .Os .Sh NAME @@ -61,8 +61,16 @@ function returns a pointer to internal storage space allocated on the first call that will be overwritten by subsequent calls. +.Pp +Other vendor implementations of +.Fn basename +may store their result in the input buffer, +making it safe to use in multithreaded applications. +Future versions of +.Fx +will follow this approach as well. .Fn basename_r -is therefore preferred for threaded applications. +will then become obsolete. .Sh RETURN VALUES On successful completion, .Fn basename Modified: stable/11/lib/libc/gen/dirname.3 ============================================================================== --- stable/11/lib/libc/gen/dirname.3 Fri Aug 5 02:56:31 2016 (r303761) +++ stable/11/lib/libc/gen/dirname.3 Fri Aug 5 05:50:27 2016 (r303762) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 12, 2006 +.Dd July 29, 2016 .Dt DIRNAME 3 .Os .Sh NAME @@ -56,10 +56,11 @@ by subsequent calls. .Pp Other vendor implementations of .Fn dirname -may modify the contents of the string passed to -.Fn dirname ; -this should be taken into account when writing code which calls this function -if portability is desired. +may store their result in the input buffer, +making it safe to use in multithreaded applications. +Future versions of +.Fx +will follow this approach as well. .Sh RETURN VALUES On successful completion, .Fn dirname From owner-svn-src-stable@freebsd.org Fri Aug 5 15:12:30 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80F6FBAFE09; Fri, 5 Aug 2016 15:12:30 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CF70193F; Fri, 5 Aug 2016 15:12:30 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75FCTMs015347; Fri, 5 Aug 2016 15:12:29 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75FCT4D015346; Fri, 5 Aug 2016 15:12:29 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201608051512.u75FCT4D015346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 5 Aug 2016 15:12:29 +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: r303768 - stable/11/sys/netinet6 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 15:12:30 -0000 Author: ae Date: Fri Aug 5 15:12:29 2016 New Revision: 303768 URL: https://svnweb.freebsd.org/changeset/base/303768 Log: MFC r303657: Fix NULL pointer dereference. ro pointer can be NULL when IPSec consumes mbuf. PR: 211486 Approved by: re (gjb) Modified: stable/11/sys/netinet6/ip6_output.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet6/ip6_output.c ============================================================================== --- stable/11/sys/netinet6/ip6_output.c Fri Aug 5 13:53:28 2016 (r303767) +++ stable/11/sys/netinet6/ip6_output.c Fri Aug 5 15:12:29 2016 (r303768) @@ -1057,7 +1057,8 @@ done: * Release the route if using our private route, or if * (with flowtable) we don't have our own reference. */ - if (ro == &ip6route || ro->ro_flags & RT_NORTREF) + if (ro == &ip6route || + (ro != NULL && ro->ro_flags & RT_NORTREF)) RO_RTFREE(ro); return (error); From owner-svn-src-stable@freebsd.org Fri Aug 5 15:30:06 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4514CBB01D2; Fri, 5 Aug 2016 15:30:06 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A8F312E7; Fri, 5 Aug 2016 15:30:05 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75FU5Ch019396; Fri, 5 Aug 2016 15:30:05 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75FU5FI019395; Fri, 5 Aug 2016 15:30:05 GMT (envelope-from des@FreeBSD.org) Message-Id: <201608051530.u75FU5FI019395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 5 Aug 2016 15:30:05 +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: r303769 - stable/11/sbin/geom/class/part X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 15:30:06 -0000 Author: des Date: Fri Aug 5 15:30:05 2016 New Revision: 303769 URL: https://svnweb.freebsd.org/changeset/base/303769 Log: MFH (r303289): update example section PR: 211361 Approved by: re (gjb) Modified: stable/11/sbin/geom/class/part/gpart.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/geom/class/part/gpart.8 ============================================================================== --- stable/11/sbin/geom/class/part/gpart.8 Fri Aug 5 15:12:29 2016 (r303768) +++ stable/11/sbin/geom/class/part/gpart.8 Fri Aug 5 15:30:05 2016 (r303769) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 10, 2015 +.Dd July 25, 2016 .Dt GPART 8 .Os .Sh NAME @@ -1193,86 +1193,112 @@ Otherwise the values will be left unchan .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails. .Sh EXAMPLES -Create a GPT scheme on -.Pa ada0 : +The examples below assume that the disk's logical block size is 512 +bytes, regardless of its physical block size. +.Ss GPT +In this example, we will format +.Pa ada0 +with the GPT scheme and create boot, swap and root partitions. +First, we need to create the partition table: .Bd -literal -offset indent /sbin/gpart create -s GPT ada0 .Ed .Pp -Embed GPT bootstrap code into a protective MBR: +Next, we install a protective MBR with the first-stage bootstrap code. +The protective MBR lists a single, bootable partition spanning the +entire disk, thus allowing non-GPT-aware BIOSes to boot from the disk +and preventing tools which do not understand the GPT scheme from +considering the disk to be unformatted. .Bd -literal -offset indent /sbin/gpart bootcode -b /boot/pmbr ada0 .Ed .Pp -Create a dedicated +We then create a dedicated .Cm freebsd-boot -partition that can boot +partition to hold the second-stage boot loader, which will load the .Fx -from a -.Cm freebsd-ufs -partition, and install bootstrap code into it. +kernel and modules from a UFS or ZFS filesystem. This partition must be larger than the bootstrap code .Po -usually either +either .Pa /boot/gptboot -or +for UFS or .Pa /boot/gptzfsboot +for ZFS .Pc , but smaller than 545 kB since the first-stage loader will load the entire partition into memory during boot, regardless of how much data it actually contains. -This example uses 88 blocks (44 kB) so the next partition will be -aligned on a 64 kB boundary without the need to specify an explicit -offset or alignment. -The boot partition itself is aligned on a 4 kB boundary. +We create a 472-block (236 kB) boot partition at offset 40, which is +the size of the partition table (34 blocks or 17 kB) rounded up to the +nearest 4 kB boundary. .Bd -literal -offset indent -/sbin/gpart add -b 40 -s 88 -t freebsd-boot ada0 +/sbin/gpart add -b 40 -s 472 -t freebsd-boot ada0 /sbin/gpart bootcode -p /boot/gptboot -i 1 ada0 .Ed .Pp -Create a 512MB-sized +We now create a 4 GB swap partition at the first available offset, +which is 40 + 472 = 512 blocks (256 kB). +.Bd -literal -offset indent +/sbin/gpart add -s 4G -t freebsd-swap ada0 +.Ed +.Pp +Aligning the swap partition and all subsequent partitions on a 256 kB +boundary ensures optimal performance on a wide range of media, from +plain old disks with 512-byte blocks, through modern +.Dq advanced format +disks with 4096-byte physical blocks, to RAID volumes with stripe +sizes of up to 256 kB. +.Pp +Finally, we create and format an 8 GB .Cm freebsd-ufs -partition to contain a UFS filesystem from which the system can boot. +partition for the root filesystem, leaving the rest of the slice free +for additional filesystems: .Bd -literal -offset indent -/sbin/gpart add -s 512M -t freebsd-ufs ada0 +/sbin/gpart add -s 8G -t freebsd-ufs ada0 +/sbin/newfs -Uj /dev/ada0p3 .Ed +.Ss MBR +In this example, we will format +.Pa ada0 +with the MBR scheme and create a single partition which we subdivide +using a traditional +.Bx +disklabel. .Pp -Create an MBR scheme on -.Pa ada0 , -then create a 30GB-sized -.Fx -slice, mark it active and -install the -.Nm boot0 -boot manager: +First, we create the partition table and a single 64 GB partition, +then we mark that partition active (bootable) and install the +first-stage boot loader: .Bd -literal -offset indent /sbin/gpart create -s MBR ada0 -/sbin/gpart add -t freebsd -s 30G ada0 +/sbin/gpart add -t freebsd -s 64G ada0 /sbin/gpart set -a active -i 1 ada0 /sbin/gpart bootcode -b /boot/boot0 ada0 .Ed .Pp -Now create a -.Bx -scheme -.Pf ( Bx -label) with space for up to 20 partitions: +Next, we create a disklabel in that partition +.Po +.Dq slice +in disklabel terminology +.Pc +with room for up to 20 partitions: .Bd -literal -offset indent /sbin/gpart create -s BSD -n 20 ada0s1 .Ed .Pp -Create a 1GB-sized UFS partition and a 4GB-sized swap partition: +We then create an 8 GB root partition and a 4 GB swap partition: .Bd -literal -offset indent -/sbin/gpart add -t freebsd-ufs -s 1G ada0s1 +/sbin/gpart add -t freebsd-ufs -s 8G ada0s1 /sbin/gpart add -t freebsd-swap -s 4G ada0s1 .Ed .Pp -Install bootstrap code for the +Finally, we install the appropriate boot loader for the .Bx label: .Bd -literal -offset indent /sbin/gpart bootcode -b /boot/boot ada0s1 .Ed +.Ss VTOC8 .Pp Create a VTOC8 scheme on .Pa da0 : @@ -1298,6 +1324,7 @@ After creating all required partitions, .Bd -literal -offset indent /sbin/gpart bootcode -p /boot/boot1 da0 .Ed +.Ss Backup and Restore .Pp Create a backup of the partition table from .Pa da0 : From owner-svn-src-stable@freebsd.org Fri Aug 5 15:32:37 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C39ABB0373; Fri, 5 Aug 2016 15:32:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F4221773; Fri, 5 Aug 2016 15:32:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75FWa3m022855; Fri, 5 Aug 2016 15:32:36 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75FWZvc022847; Fri, 5 Aug 2016 15:32:35 GMT (envelope-from des@FreeBSD.org) Message-Id: <201608051532.u75FWZvc022847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 5 Aug 2016 15:32: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: r303770 - in stable/11: crypto/openssh etc/rc.d X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 15:32:37 -0000 Author: des Date: Fri Aug 5 15:32:35 2016 New Revision: 303770 URL: https://svnweb.freebsd.org/changeset/base/303770 Log: MFH (r303716, r303719): drop SSH1 support, disable DSA by default PR: 208254 Approved by: re (gjb) Relnotes: yes Modified: stable/11/crypto/openssh/FREEBSD-upgrade stable/11/crypto/openssh/config.h stable/11/crypto/openssh/configure.ac stable/11/crypto/openssh/myproposal.h stable/11/crypto/openssh/servconf.c stable/11/crypto/openssh/ssh_config.5 stable/11/crypto/openssh/sshd_config.5 stable/11/etc/rc.d/sshd Directory Properties: stable/11/ (props changed) Modified: stable/11/crypto/openssh/FREEBSD-upgrade ============================================================================== --- stable/11/crypto/openssh/FREEBSD-upgrade Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/FREEBSD-upgrade Fri Aug 5 15:32:35 2016 (r303770) @@ -142,30 +142,25 @@ Support for TCP wrappers was removed in upstream 6.7p1. We've added it back by porting the 6.6p1 code forward. -6) DSA keys - - DSA keys were disabled by default in upstream 6.9p1. We've added - them back. - -7) Agent client reference counting +6) Agent client reference counting We've added code to ssh-agent.c to implement client reference counting; the agent will automatically exit when the last client disconnects. -8) Class-based login restrictions +7) Class-based login restrictions We've added code to auth2.c to enforce the host.allow, host.deny, times.allow and times.deny login class capabilities. -9) HPN +8) HPN We no longer have the HPN patches (adaptive buffer size for increased throughput on high-BxD links), but we recognize and ignore HPN-related configuration options to avoid breaking existing configurations. -A) AES-CBC +9) AES-CBC The AES-CBC ciphers were removed from the server-side proposal list in 6.7p1 due to theoretical weaknesses and the availability of Modified: stable/11/crypto/openssh/config.h ============================================================================== --- stable/11/crypto/openssh/config.h Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/config.h Fri Aug 5 15:32:35 2016 (r303770) @@ -1701,7 +1701,7 @@ /* #undef WITH_SELINUX */ /* include SSH protocol version 1 support */ -#define WITH_SSH1 1 +/* #undef WITH_SSH1 */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ Modified: stable/11/crypto/openssh/configure.ac ============================================================================== --- stable/11/crypto/openssh/configure.ac Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/configure.ac Fri Aug 5 15:32:35 2016 (r303770) @@ -123,7 +123,7 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [ha ]) openssl=yes -ssh1=yes +ssh1=no AC_ARG_WITH([openssl], [ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ], [ if test "x$withval" = "xno" ; then Modified: stable/11/crypto/openssh/myproposal.h ============================================================================== --- stable/11/crypto/openssh/myproposal.h Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/myproposal.h Fri Aug 5 15:32:35 2016 (r303770) @@ -100,13 +100,11 @@ HOSTKEY_ECDSA_CERT_METHODS \ "ssh-ed25519-cert-v01@openssh.com," \ "ssh-rsa-cert-v01@openssh.com," \ - "ssh-dss-cert-v01@openssh.com," \ HOSTKEY_ECDSA_METHODS \ "ssh-ed25519," \ "rsa-sha2-512," \ "rsa-sha2-256," \ - "ssh-rsa," \ - "ssh-dss" + "ssh-rsa" /* the actual algorithms */ Modified: stable/11/crypto/openssh/servconf.c ============================================================================== --- stable/11/crypto/openssh/servconf.c Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/servconf.c Fri Aug 5 15:32:35 2016 (r303770) @@ -206,8 +206,6 @@ fill_default_server_options(ServerOption /* Standard Options */ if (options->protocol == SSH_PROTO_UNKNOWN) options->protocol = SSH_PROTO_2; - if (options->protocol & SSH_PROTO_1) - error("WARNING: SSH protocol version 1 enabled"); if (options->num_host_key_files == 0) { /* fill default hostkeys for protocols */ if (options->protocol & SSH_PROTO_1) Modified: stable/11/crypto/openssh/ssh_config.5 ============================================================================== --- stable/11/crypto/openssh/ssh_config.5 Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/ssh_config.5 Fri Aug 5 15:32:35 2016 (r303770) @@ -871,10 +871,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The @@ -896,10 +894,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp If hostkeys are known for the destination host then this default is modified @@ -1336,10 +1332,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The Modified: stable/11/crypto/openssh/sshd_config.5 ============================================================================== --- stable/11/crypto/openssh/sshd_config.5 Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/crypto/openssh/sshd_config.5 Fri Aug 5 15:32:35 2016 (r303770) @@ -659,10 +659,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The @@ -753,10 +751,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The list of available key types may also be obtained using the @@ -1372,10 +1368,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The Modified: stable/11/etc/rc.d/sshd ============================================================================== --- stable/11/etc/rc.d/sshd Fri Aug 5 15:30:05 2016 (r303769) +++ stable/11/etc/rc.d/sshd Fri Aug 5 15:32:35 2016 (r303770) @@ -23,7 +23,7 @@ extra_commands="configtest keygen reload : ${sshd_rsa1_enable:="no"} : ${sshd_rsa_enable:="yes"} -: ${sshd_dsa_enable:="yes"} +: ${sshd_dsa_enable:="no"} : ${sshd_ecdsa_enable:="yes"} : ${sshd_ed25519_enable:="yes"} From owner-svn-src-stable@freebsd.org Fri Aug 5 16:32:11 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25B80BB041D; Fri, 5 Aug 2016 16:32:11 +0000 (UTC) (envelope-from loos@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E658913A6; Fri, 5 Aug 2016 16:32:10 +0000 (UTC) (envelope-from loos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75GWANh043736; Fri, 5 Aug 2016 16:32:10 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75GWAmk043735; Fri, 5 Aug 2016 16:32:10 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201608051632.u75GWAmk043735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Fri, 5 Aug 2016 16:32:10 +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: r303772 - stable/11/sys/arm/ti/am335x X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 16:32:11 -0000 Author: loos Date: Fri Aug 5 16:32:09 2016 New Revision: 303772 URL: https://svnweb.freebsd.org/changeset/base/303772 Log: MFC r302988: Fix a random memory overwrite at boot time, simplebus_init() and simplebus_add_device() expect a simplebus_softc structure associated with the device. Add the simplebus_softc as first member in am335x_pwmss_softc structure. Sponsored by: Rubicon Communications (Netgate) Approved by: re (gjb) Modified: stable/11/sys/arm/ti/am335x/am335x_pwmss.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/ti/am335x/am335x_pwmss.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_pwmss.c Fri Aug 5 15:48:56 2016 (r303771) +++ stable/11/sys/arm/ti/am335x/am335x_pwmss.c Fri Aug 5 16:32:09 2016 (r303772) @@ -65,6 +65,7 @@ static device_attach_t am335x_pwmss_atta static device_detach_t am335x_pwmss_detach; struct am335x_pwmss_softc { + struct simplebus_softc sc_simplebus; device_t sc_dev; clk_ident_t sc_clk; }; From owner-svn-src-stable@freebsd.org Fri Aug 5 17:13:27 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F741BB0EA8; Fri, 5 Aug 2016 17:13:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36E901BA6; Fri, 5 Aug 2016 17:13:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75HDQYw060413; Fri, 5 Aug 2016 17:13:26 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75HDQe8060409; Fri, 5 Aug 2016 17:13:26 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608051713.u75HDQe8060409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 5 Aug 2016 17:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303776 - in stable/10/sys: amd64/include i386/include x86/x86 x86/xen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 17:13:27 -0000 Author: jhb Date: Fri Aug 5 17:13:25 2016 New Revision: 303776 URL: https://svnweb.freebsd.org/changeset/base/303776 Log: MFC 302181,302635: Disable MSI-X migration on older Xen hypervisors. 302181: Add a tunable to disable migration of MSI-X interrupts. The new 'machdep.disable_msix_migration' tunable can be set to 1 to disable migration of MSI-X interrupts. Xen versions prior to 4.6.0 do not properly handle updates to MSI-X table entries after the initial write. In particular, the operation to unmask a table entry after updating it during migration is not propagated to the "real" table for passthrough devices causing the interrupt to remain masked. At least some systems in EC2 are affected by this bug when using SRIOV. The tunable can be set in loader.conf as a workaround. 302635: xen: automatically disable MSI-X interrupt migration If the hypervisor version is smaller than 4.6.0. Xen commits 74fd00 and 70a3cb are required on the hypervisor side for this to be fixed, and those are only included in 4.6.0, so stay on the safe side and disable MSI-X interrupt migration on anything older than 4.6.0. It should not cause major performance degradation unless a lot of MSI-X interrupts are allocated. Modified: stable/10/sys/amd64/include/intr_machdep.h stable/10/sys/i386/include/intr_machdep.h stable/10/sys/x86/x86/msi.c stable/10/sys/x86/xen/hvm.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/include/intr_machdep.h ============================================================================== --- stable/10/sys/amd64/include/intr_machdep.h Fri Aug 5 16:53:24 2016 (r303775) +++ stable/10/sys/amd64/include/intr_machdep.h Fri Aug 5 17:13:25 2016 (r303776) @@ -144,6 +144,8 @@ struct nmi_pcpu { extern struct mtx icu_lock; extern int elcr_found; +extern int msix_disable_migration; + #ifndef DEV_ATPIC void atpic_reset(void); #endif Modified: stable/10/sys/i386/include/intr_machdep.h ============================================================================== --- stable/10/sys/i386/include/intr_machdep.h Fri Aug 5 16:53:24 2016 (r303775) +++ stable/10/sys/i386/include/intr_machdep.h Fri Aug 5 17:13:25 2016 (r303776) @@ -141,6 +141,8 @@ struct trapframe; extern struct mtx icu_lock; extern int elcr_found; +extern int msix_disable_migration; + #ifndef DEV_ATPIC void atpic_reset(void); #endif Modified: stable/10/sys/x86/x86/msi.c ============================================================================== --- stable/10/sys/x86/x86/msi.c Fri Aug 5 16:53:24 2016 (r303775) +++ stable/10/sys/x86/x86/msi.c Fri Aug 5 17:13:25 2016 (r303776) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -134,6 +135,20 @@ struct pic msi_pic = { msi_enable_source msi_source_pending, NULL, NULL, msi_config_intr, msi_assign_cpu }; +/** + * Xen hypervisors prior to 4.6.0 do not properly handle updates to + * enabled MSI-X table entries. Allow migration of MSI-X interrupts + * to be disabled via a tunable. Values have the following meaning: + * + * -1: automatic detection by FreeBSD + * 0: enable migration + * 1: disable migration + */ +int msix_disable_migration = -1; +SYSCTL_INT(_machdep, OID_AUTO, disable_msix_migration, CTLFLAG_RDTUN, + &msix_disable_migration, 0, + "Disable migration of MSI-X interrupts between CPUs"); + static int msi_enabled; static int msi_last_irq; static struct mtx msi_lock; @@ -212,6 +227,9 @@ msi_assign_cpu(struct intsrc *isrc, u_in if (msi->msi_first != msi) return (EINVAL); + if (msix_disable_migration && msi->msi_msix) + return (EINVAL); + /* Store information to free existing irq. */ old_vector = msi->msi_vector; old_id = msi->msi_cpu; @@ -284,6 +302,11 @@ msi_init(void) return; } + if (msix_disable_migration == -1) { + /* The default is to allow migration of MSI-X interrupts. */ + msix_disable_migration = 0; + } + msi_enabled = 1; intr_register_pic(&msi_pic); mtx_init(&msi_lock, "msi", NULL, MTX_DEF); Modified: stable/10/sys/x86/xen/hvm.c ============================================================================== --- stable/10/sys/x86/xen/hvm.c Fri Aug 5 16:53:24 2016 (r303775) +++ stable/10/sys/x86/xen/hvm.c Fri Aug 5 17:13:25 2016 (r303776) @@ -385,9 +385,29 @@ xen_hvm_init_hypercall_stubs(void) return (ENXIO); if (hypercall_stubs == NULL) { + int major, minor; + do_cpuid(base + 1, regs); - printf("XEN: Hypervisor version %d.%d detected.\n", - regs[0] >> 16, regs[0] & 0xffff); + + major = regs[0] >> 16; + minor = regs[0] & 0xffff; + printf("XEN: Hypervisor version %d.%d detected.\n", major, + minor); + + if (((major < 4) || (major == 4 && minor <= 5)) && + msix_disable_migration == -1) { + /* + * Xen hypervisors prior to 4.6.0 do not properly + * handle updates to enabled MSI-X table entries, + * so disable MSI-X interrupt migration in that + * case. + */ + if (bootverbose) + printf( +"Disabling MSI-X interrupt migration due to Xen hypervisor bug.\n" +"Set machdep.msix_disable_migration=0 to forcefully enable it.\n"); + msix_disable_migration = 1; + } } /* From owner-svn-src-stable@freebsd.org Fri Aug 5 17:14:47 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29AC2BB0F1B; Fri, 5 Aug 2016 17:14:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D465A1D15; Fri, 5 Aug 2016 17:14:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75HEktv060496; Fri, 5 Aug 2016 17:14:46 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75HEkKd060495; Fri, 5 Aug 2016 17:14:46 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608051714.u75HEkKd060495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 5 Aug 2016 17:14:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r303777 - stable/9/sys/x86/x86 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 17:14:47 -0000 Author: jhb Date: Fri Aug 5 17:14:45 2016 New Revision: 303777 URL: https://svnweb.freebsd.org/changeset/base/303777 Log: MFC 302181: Add a tunable to disable migration of MSI-X interrupts. The new 'machdep.disable_msix_migration' tunable can be set to 1 to disable migration of MSI-X interrupts. Xen versions prior to 4.6.0 do not properly handle updates to MSI-X table entries after the initial write. In particular, the operation to unmask a table entry after updating it during migration is not propagated to the "real" table for passthrough devices causing the interrupt to remain masked. At least some systems in EC2 are affected by this bug when using SRIOV. The tunable can be set in loader.conf as a workaround. Modified: stable/9/sys/x86/x86/msi.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/x86/x86/msi.c ============================================================================== --- stable/9/sys/x86/x86/msi.c Fri Aug 5 17:13:25 2016 (r303776) +++ stable/9/sys/x86/x86/msi.c Fri Aug 5 17:14:45 2016 (r303777) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -134,6 +135,16 @@ struct pic msi_pic = { msi_enable_source msi_source_pending, NULL, NULL, msi_config_intr, msi_assign_cpu }; +/* + * Xen hypervisors prior to 4.6.0 do not properly handle updates to + * enabled MSI-X table entries. Allow migration of MSI-X interrupts + * to be disabled via a tunable. + */ +static int msix_disable_migration = 0; +SYSCTL_INT(_machdep, OID_AUTO, disable_msix_migration, CTLFLAG_RDTUN, + &msix_disable_migration, 0, + "Disable migration of MSI-X interrupts between CPUs"); + static int msi_enabled; static int msi_last_irq; static struct mtx msi_lock; @@ -212,6 +223,9 @@ msi_assign_cpu(struct intsrc *isrc, u_in if (msi->msi_first != msi) return (EINVAL); + if (msix_disable_migration && msi->msi_msix) + return (EINVAL); + /* Store information to free existing irq. */ old_vector = msi->msi_vector; old_id = msi->msi_cpu; From owner-svn-src-stable@freebsd.org Fri Aug 5 17:49:14 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3835BAF8F6; Fri, 5 Aug 2016 17:49:14 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7601E15C4; Fri, 5 Aug 2016 17:49:14 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75HnDlT072110; Fri, 5 Aug 2016 17:49:13 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75HnDGv072109; Fri, 5 Aug 2016 17:49:13 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201608051749.u75HnDGv072109@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Fri, 5 Aug 2016 17:49:13 +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: r303780 - stable/11/sys/vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 17:49:14 -0000 Author: alc Date: Fri Aug 5 17:49:13 2016 New Revision: 303780 URL: https://svnweb.freebsd.org/changeset/base/303780 Log: MFC r303492 Remove a probe declaration that has been unused since r292469, when vm_pageout_grow_cache() was replaced. Approved by: re (gjb) Modified: stable/11/sys/vm/vm_pageout.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/vm_pageout.c ============================================================================== --- stable/11/sys/vm/vm_pageout.c Fri Aug 5 17:17:36 2016 (r303779) +++ stable/11/sys/vm/vm_pageout.c Fri Aug 5 17:49:13 2016 (r303780) @@ -139,7 +139,6 @@ SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, &page_kp); SDT_PROVIDER_DEFINE(vm); -SDT_PROBE_DEFINE(vm, , , vm__lowmem_cache); SDT_PROBE_DEFINE(vm, , , vm__lowmem_scan); #if !defined(NO_SWAPPING) From owner-svn-src-stable@freebsd.org Fri Aug 5 18:41:52 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5AEBBB0759; Fri, 5 Aug 2016 18:41:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 942961784; Fri, 5 Aug 2016 18:41:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75Ifp69093874; Fri, 5 Aug 2016 18:41:51 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75Ifp6M093873; Fri, 5 Aug 2016 18:41:51 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608051841.u75Ifp6M093873@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 5 Aug 2016 18: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: r303781 - stable/11/sys/dev/pci X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 18:41:52 -0000 Author: jhb Date: Fri Aug 5 18:41:51 2016 New Revision: 303781 URL: https://svnweb.freebsd.org/changeset/base/303781 Log: MFC 303497,303559,303645: Disable PCI-e hotplug on bridges with power controllers. 303497: Add a loader tunable (hw.pci.enable_pcie_hp) to disable PCI-e HotPlug. Some systems and/or devices (such as riser cards) do not include a non-compliant implementation of PCI-e HotPlug that can result in devices not being attached (e.g. the HotPlug code might assume that a card is being unplugged and will power the slot off and detach it). This tunable can be set to 0 to disable support for PCI-e HotPlug ignoring the incorrect HotPlug state on these slots. 303559: Try to declare _hw_pci for all sysctl cases needed after r303497. 303645: Disable PCI hotplug support for slots with power controllers. After further review of the spec, I do not think the current HotPlug code handles slots with power controllers correctly. In particular, the power state of the slot is to be inferred from other events, not from examining the state of the power control bit in SLOT_CTL. For now, disable PCI hotplug support on such slots. PR: 211081 Approved by: re (gjb) Modified: stable/11/sys/dev/pci/pci_pci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/pci/pci_pci.c ============================================================================== --- stable/11/sys/dev/pci/pci_pci.c Fri Aug 5 17:49:13 2016 (r303780) +++ stable/11/sys/dev/pci/pci_pci.c Fri Aug 5 18:41:51 2016 (r303781) @@ -128,9 +128,11 @@ static devclass_t pcib_devclass; DEFINE_CLASS_0(pcib, pcib_driver, pcib_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, NULL, NULL); -#ifdef NEW_PCIB +#if defined(NEW_PCIB) || defined(PCI_HP) SYSCTL_DECL(_hw_pci); +#endif +#ifdef NEW_PCIB static int pci_clear_pcib; SYSCTL_INT(_hw_pci, OID_AUTO, clear_pcib, CTLFLAG_RDTUN, &pci_clear_pcib, 0, "Clear firmware-assigned resources for PCI-PCI bridge I/O windows."); @@ -907,11 +909,19 @@ pcib_set_mem_decode(struct pcib_softc *s /* * PCI-express HotPlug support. */ +static int pci_enable_pcie_hp = 1; +SYSCTL_INT(_hw_pci, OID_AUTO, enable_pcie_hp, CTLFLAG_RDTUN, + &pci_enable_pcie_hp, 0, + "Enable support for native PCI-express HotPlug."); + static void pcib_probe_hotplug(struct pcib_softc *sc) { device_t dev; + if (!pci_enable_pcie_hp) + return; + dev = sc->dev; if (pci_find_cap(dev, PCIY_EXPRESS, NULL) != 0) return; @@ -922,6 +932,13 @@ pcib_probe_hotplug(struct pcib_softc *sc sc->pcie_link_cap = pcie_read_config(dev, PCIER_LINK_CAP, 4); sc->pcie_slot_cap = pcie_read_config(dev, PCIER_SLOT_CAP, 4); + /* + * XXX: Handling of slots with a power controller needs to be + * reexamined. Ignore hotplug on such slots for now. + */ + if (sc->pcie_slot_cap & PCIEM_SLOT_CAP_PCP) + return; + if (sc->pcie_slot_cap & PCIEM_SLOT_CAP_HPC) sc->flags |= PCIB_HOTPLUG; } From owner-svn-src-stable@freebsd.org Fri Aug 5 22:23:05 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B649BB0F16; Fri, 5 Aug 2016 22:23:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 735551484; Fri, 5 Aug 2016 22:23:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75MN4hN076984; Fri, 5 Aug 2016 22:23:04 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75MN4co076982; Fri, 5 Aug 2016 22:23:04 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608052223.u75MN4co076982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 5 Aug 2016 22:23:04 +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: r303787 - in stable/11: sys/kern tests/sys/aio X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 22:23:05 -0000 Author: jhb Date: Fri Aug 5 22:23:04 2016 New Revision: 303787 URL: https://svnweb.freebsd.org/changeset/base/303787 Log: MFC 303406,303501: Fix panic when using aio_fsync(). 303406: Adjust tests in fsync job scheduling loop to reduce indentation. 303501: Fix locking issues with aio_fsync(). - Use correct lock in aio_cancel_sync when dequeueing job. - Add _locked variants of aio_set/clear_cancel_function and use those to avoid lock recursion when adding and removing fsync jobs to the per-process sync queue. - While here, add a basic test for aio_fsync(). PR: 211390 Approved by: re (kib) Modified: stable/11/sys/kern/vfs_aio.c stable/11/tests/sys/aio/aio_test.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/vfs_aio.c ============================================================================== --- stable/11/sys/kern/vfs_aio.c Fri Aug 5 21:34:09 2016 (r303786) +++ stable/11/sys/kern/vfs_aio.c Fri Aug 5 22:23:04 2016 (r303787) @@ -311,6 +311,7 @@ static void aio_proc_rundown_exec(void * static int aio_qphysio(struct proc *p, struct kaiocb *job); static void aio_daemon(void *param); static void aio_bio_done_notify(struct proc *userp, struct kaiocb *job); +static bool aio_clear_cancel_function_locked(struct kaiocb *job); static int aio_kick(struct proc *userp); static void aio_kick_nowait(struct proc *userp); static void aio_kick_helper(void *context, int pending); @@ -913,18 +914,16 @@ notification_done: if (job->jobflags & KAIOCB_CHECKSYNC) { schedule_fsync = false; TAILQ_FOREACH_SAFE(sjob, &ki->kaio_syncqueue, list, sjobn) { - if (job->fd_file == sjob->fd_file && - job->seqno < sjob->seqno) { - if (--sjob->pending == 0) { - TAILQ_REMOVE(&ki->kaio_syncqueue, sjob, - list); - if (!aio_clear_cancel_function(sjob)) - continue; - TAILQ_INSERT_TAIL(&ki->kaio_syncready, - sjob, list); - schedule_fsync = true; - } - } + if (job->fd_file != sjob->fd_file || + job->seqno >= sjob->seqno) + continue; + if (--sjob->pending > 0) + continue; + TAILQ_REMOVE(&ki->kaio_syncqueue, sjob, list); + if (!aio_clear_cancel_function_locked(sjob)) + continue; + TAILQ_INSERT_TAIL(&ki->kaio_syncready, sjob, list); + schedule_fsync = true; } if (schedule_fsync) taskqueue_enqueue(taskqueue_aiod_kick, @@ -969,40 +968,57 @@ aio_cancel_cleared(struct kaiocb *job) return ((job->jobflags & KAIOCB_CLEARED) != 0); } -bool -aio_clear_cancel_function(struct kaiocb *job) +static bool +aio_clear_cancel_function_locked(struct kaiocb *job) { - struct kaioinfo *ki; - ki = job->userproc->p_aioinfo; - AIO_LOCK(ki); + AIO_LOCK_ASSERT(job->userproc->p_aioinfo, MA_OWNED); MPASS(job->cancel_fn != NULL); if (job->jobflags & KAIOCB_CANCELLING) { job->jobflags |= KAIOCB_CLEARED; - AIO_UNLOCK(ki); return (false); } job->cancel_fn = NULL; - AIO_UNLOCK(ki); return (true); } bool -aio_set_cancel_function(struct kaiocb *job, aio_cancel_fn_t *func) +aio_clear_cancel_function(struct kaiocb *job) { struct kaioinfo *ki; + bool ret; ki = job->userproc->p_aioinfo; AIO_LOCK(ki); - if (job->jobflags & KAIOCB_CANCELLED) { - AIO_UNLOCK(ki); + ret = aio_clear_cancel_function_locked(job); + AIO_UNLOCK(ki); + return (ret); +} + +static bool +aio_set_cancel_function_locked(struct kaiocb *job, aio_cancel_fn_t *func) +{ + + AIO_LOCK_ASSERT(job->userproc->p_aioinfo, MA_OWNED); + if (job->jobflags & KAIOCB_CANCELLED) return (false); - } job->cancel_fn = func; - AIO_UNLOCK(ki); return (true); } +bool +aio_set_cancel_function(struct kaiocb *job, aio_cancel_fn_t *func) +{ + struct kaioinfo *ki; + bool ret; + + ki = job->userproc->p_aioinfo; + AIO_LOCK(ki); + ret = aio_set_cancel_function_locked(job, func); + AIO_UNLOCK(ki); + return (ret); +} + void aio_complete(struct kaiocb *job, long status, int error) { @@ -1657,10 +1673,10 @@ aio_cancel_sync(struct kaiocb *job) struct kaioinfo *ki; ki = job->userproc->p_aioinfo; - mtx_lock(&aio_job_mtx); + AIO_LOCK(ki); if (!aio_cancel_cleared(job)) TAILQ_REMOVE(&ki->kaio_syncqueue, job, list); - mtx_unlock(&aio_job_mtx); + AIO_UNLOCK(ki); aio_cancel(job); } @@ -1720,7 +1736,8 @@ queueit: } } if (job->pending != 0) { - if (!aio_set_cancel_function(job, aio_cancel_sync)) { + if (!aio_set_cancel_function_locked(job, + aio_cancel_sync)) { AIO_UNLOCK(ki); aio_cancel(job); return (0); Modified: stable/11/tests/sys/aio/aio_test.c ============================================================================== --- stable/11/tests/sys/aio/aio_test.c Fri Aug 5 21:34:09 2016 (r303786) +++ stable/11/tests/sys/aio/aio_test.c Fri Aug 5 22:23:04 2016 (r303787) @@ -924,6 +924,88 @@ ATF_TC_BODY(aio_socket_short_write_cance close(s[0]); } +/* + * This test just performs a basic test of aio_fsync(). + */ +ATF_TC_WITHOUT_HEAD(aio_fsync_test); +ATF_TC_BODY(aio_fsync_test, tc) +{ + struct aiocb synccb, *iocbp; + struct { + struct aiocb iocb; + bool done; + char *buffer; + } buffers[16]; + struct stat sb; + char pathname[PATH_MAX]; + ssize_t rval; + unsigned i; + int fd; + + ATF_REQUIRE_KERNEL_MODULE("aio"); + ATF_REQUIRE_UNSAFE_AIO(); + + strcpy(pathname, PATH_TEMPLATE); + fd = mkstemp(pathname); + ATF_REQUIRE_MSG(fd != -1, "mkstemp failed: %s", strerror(errno)); + unlink(pathname); + + ATF_REQUIRE(fstat(fd, &sb) == 0); + ATF_REQUIRE(sb.st_blksize != 0); + ATF_REQUIRE(ftruncate(fd, sb.st_blksize * nitems(buffers)) == 0); + + /* + * Queue several asynchronous write requests. Hopefully this + * forces the aio_fsync() request to be deferred. There is no + * reliable way to guarantee that however. + */ + srandomdev(); + for (i = 0; i < nitems(buffers); i++) { + buffers[i].done = false; + memset(&buffers[i].iocb, 0, sizeof(buffers[i].iocb)); + buffers[i].buffer = malloc(sb.st_blksize); + aio_fill_buffer(buffers[i].buffer, sb.st_blksize, random()); + buffers[i].iocb.aio_fildes = fd; + buffers[i].iocb.aio_buf = buffers[i].buffer; + buffers[i].iocb.aio_nbytes = sb.st_blksize; + buffers[i].iocb.aio_offset = sb.st_blksize * i; + ATF_REQUIRE(aio_write(&buffers[i].iocb) == 0); + } + + /* Queue the aio_fsync request. */ + memset(&synccb, 0, sizeof(synccb)); + synccb.aio_fildes = fd; + ATF_REQUIRE(aio_fsync(O_SYNC, &synccb) == 0); + + /* Wait for requests to complete. */ + for (;;) { + next: + rval = aio_waitcomplete(&iocbp, NULL); + ATF_REQUIRE(iocbp != NULL); + if (iocbp == &synccb) { + ATF_REQUIRE(rval == 0); + break; + } + + for (i = 0; i < nitems(buffers); i++) { + if (iocbp == &buffers[i].iocb) { + ATF_REQUIRE(buffers[i].done == false); + ATF_REQUIRE(rval == sb.st_blksize); + buffers[i].done = true; + goto next; + } + } + + ATF_REQUIRE_MSG(false, "unmatched AIO request"); + } + + for (i = 0; i < nitems(buffers); i++) + ATF_REQUIRE_MSG(buffers[i].done, + "AIO request %u did not complete", i); + + close(fd); +} + ATF_TP_ADD_TCS(tp) { @@ -937,6 +1019,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, aio_socket_two_reads); ATF_TP_ADD_TC(tp, aio_socket_blocking_short_write); ATF_TP_ADD_TC(tp, aio_socket_short_write_cancel); + ATF_TP_ADD_TC(tp, aio_fsync_test); return (atf_no_error()); } From owner-svn-src-stable@freebsd.org Sat Aug 6 08:20:59 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64851BB060B; Sat, 6 Aug 2016 08:20:59 +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 mx1.freebsd.org (Postfix) with ESMTPS id 303501168; Sat, 6 Aug 2016 08:20:59 +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 u768KwYl096718; Sat, 6 Aug 2016 08:20:58 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u768KwsP096717; Sat, 6 Aug 2016 08:20:58 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608060820.u768KwsP096717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 6 Aug 2016 08:20: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: r303789 - stable/11/sys/kern X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 08:20:59 -0000 Author: kib Date: Sat Aug 6 08:20:58 2016 New Revision: 303789 URL: https://svnweb.freebsd.org/changeset/base/303789 Log: MFC r303702: Remove mention of Giant from the fork_return() description. Approved by: re (gjb) Modified: stable/11/sys/kern/kern_fork.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/kern_fork.c ============================================================================== --- stable/11/sys/kern/kern_fork.c Fri Aug 5 23:23:48 2016 (r303788) +++ stable/11/sys/kern/kern_fork.c Sat Aug 6 08:20:58 2016 (r303789) @@ -1055,9 +1055,9 @@ fork_exit(void (*callout)(void *, struct /* * Simplified back end of syscall(), used when returning from fork() - * directly into user mode. Giant is not held on entry, and must not - * be held on return. This function is passed in to fork_exit() as the - * first parameter and is called when returning to a new userland process. + * directly into user mode. This function is passed in to fork_exit() + * as the first parameter and is called when returning to a new + * userland process. */ void fork_return(struct thread *td, struct trapframe *frame) From owner-svn-src-stable@freebsd.org Sat Aug 6 08:23:37 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39C10BB070F; Sat, 6 Aug 2016 08:23:37 +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 mx1.freebsd.org (Postfix) with ESMTPS id 0C219150C; Sat, 6 Aug 2016 08:23:36 +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 u768Naj4000309; Sat, 6 Aug 2016 08:23:36 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u768NabA000308; Sat, 6 Aug 2016 08:23:36 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608060823.u768NabA000308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 6 Aug 2016 08:23:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303790 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 08:23:37 -0000 Author: kib Date: Sat Aug 6 08:23:36 2016 New Revision: 303790 URL: https://svnweb.freebsd.org/changeset/base/303790 Log: MFC r303702: Remove mention of Giant from the fork_return() description. Modified: stable/10/sys/kern/kern_fork.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_fork.c ============================================================================== --- stable/10/sys/kern/kern_fork.c Sat Aug 6 08:20:58 2016 (r303789) +++ stable/10/sys/kern/kern_fork.c Sat Aug 6 08:23:36 2016 (r303790) @@ -1044,9 +1044,9 @@ fork_exit(void (*callout)(void *, struct /* * Simplified back end of syscall(), used when returning from fork() - * directly into user mode. Giant is not held on entry, and must not - * be held on return. This function is passed in to fork_exit() as the - * first parameter and is called when returning to a new userland process. + * directly into user mode. This function is passed in to fork_exit() + * as the first parameter and is called when returning to a new + * userland process. */ void fork_return(struct thread *td, struct trapframe *frame) From owner-svn-src-stable@freebsd.org Sat Aug 6 23:52:10 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB995BB0B7D; Sat, 6 Aug 2016 23:52:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71D761718; Sat, 6 Aug 2016 23:52:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u76Nq9v9044733; Sat, 6 Aug 2016 23:52:09 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u76Nq9aN044732; Sat, 6 Aug 2016 23:52:09 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608062352.u76Nq9aN044732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sat, 6 Aug 2016 23:52:09 +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: r303807 - stable/11/sys/dev/fb X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 23:52:10 -0000 Author: jhb Date: Sat Aug 6 23:52:09 2016 New Revision: 303807 URL: https://svnweb.freebsd.org/changeset/base/303807 Log: MFC 303076,303225: Use MTX_SYSINIT for the VESA lock. 303076: vesa: fix panic on suspend Fix the following panic seen when migrating a FreeBSD guest on Xen: panic: mtx_lock() of destroyed mutex @ /usr/src/sys/dev/fb/vesa.c:541 cpuid = 0 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe001d2fa4f0 vpanic() at vpanic+0x182/frame 0xfffffe001d2fa570 kassert_panic() at kassert_panic+0x126/frame 0xfffffe001d2fa5e0 __mtx_lock_flags() at __mtx_lock_flags+0x15b/frame 0xfffffe001d2fa630 vesa_bios_save_restore() at vesa_bios_save_restore+0x78/frame 0xfffffe001d2fa680 vga_suspend() at vga_suspend+0xa3/frame 0xfffffe001d2fa6b0 isavga_suspend() at isavga_suspend+0x1d/frame 0xfffffe001d2fa6d0 bus_generic_suspend_child() at bus_generic_suspend_child+0x44/frame [...] This is caused because vga_sub_configure (which is called if the VGA adapter is attached after VESA tried to initialize), points to vesa_configure, which doesn't initialize the VESA mutex. In order to fix it, make sure vga_sub_configure points to vesa_load, so that all the needed vesa components are properly initialized. 303225: Use MTX_SYSINIT for the VESA lock. vesa_init_done isn't a reliable guard for the mutex init. If vesa_configure() doesn't find valid VESA info it will not set vesa_init_done, but the lock will remain initialized. Revert r303076 and use MTX_SYSINIT to deterministically init the lock. PR: 209203 Approved by: re (gjb) Modified: stable/11/sys/dev/fb/vesa.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/fb/vesa.c ============================================================================== --- stable/11/sys/dev/fb/vesa.c Sat Aug 6 20:27:12 2016 (r303806) +++ stable/11/sys/dev/fb/vesa.c Sat Aug 6 23:52:09 2016 (r303807) @@ -79,6 +79,7 @@ struct adp_state { typedef struct adp_state adp_state_t; static struct mtx vesa_lock; +MTX_SYSINIT(vesa_lock, &vesa_lock, "VESA lock", MTX_DEF); static int vesa_state; static void *vesa_state_buf; @@ -1914,8 +1915,6 @@ vesa_load(void) if (vesa_init_done) return (0); - mtx_init(&vesa_lock, "VESA lock", NULL, MTX_DEF); - /* locate a VGA adapter */ vesa_adp = NULL; error = vesa_configure(0); @@ -1954,7 +1953,6 @@ vesa_unload(void) } vesa_bios_uninit(); - mtx_destroy(&vesa_lock); return (error); } From owner-svn-src-stable@freebsd.org Sat Aug 6 23:53:35 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78D86BB0C42; Sat, 6 Aug 2016 23:53:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 316C619F1; Sat, 6 Aug 2016 23:53:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u76NrYnW044838; Sat, 6 Aug 2016 23:53:34 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u76NrY3a044837; Sat, 6 Aug 2016 23:53:34 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608062353.u76NrY3a044837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sat, 6 Aug 2016 23:53:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r303808 - in stable: 10/sys/dev/fb 9/sys/dev/fb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 23:53:35 -0000 Author: jhb Date: Sat Aug 6 23:53:33 2016 New Revision: 303808 URL: https://svnweb.freebsd.org/changeset/base/303808 Log: MFC 303076,303225: Use MTX_SYSINIT for the VESA lock. 303076: vesa: fix panic on suspend Fix the following panic seen when migrating a FreeBSD guest on Xen: panic: mtx_lock() of destroyed mutex @ /usr/src/sys/dev/fb/vesa.c:541 cpuid = 0 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe001d2fa4f0 vpanic() at vpanic+0x182/frame 0xfffffe001d2fa570 kassert_panic() at kassert_panic+0x126/frame 0xfffffe001d2fa5e0 __mtx_lock_flags() at __mtx_lock_flags+0x15b/frame 0xfffffe001d2fa630 vesa_bios_save_restore() at vesa_bios_save_restore+0x78/frame 0xfffffe001d2fa680 vga_suspend() at vga_suspend+0xa3/frame 0xfffffe001d2fa6b0 isavga_suspend() at isavga_suspend+0x1d/frame 0xfffffe001d2fa6d0 bus_generic_suspend_child() at bus_generic_suspend_child+0x44/frame [...] This is caused because vga_sub_configure (which is called if the VGA adapter is attached after VESA tried to initialize), points to vesa_configure, which doesn't initialize the VESA mutex. In order to fix it, make sure vga_sub_configure points to vesa_load, so that all the needed vesa components are properly initialized. 303225: Use MTX_SYSINIT for the VESA lock. vesa_init_done isn't a reliable guard for the mutex init. If vesa_configure() doesn't find valid VESA info it will not set vesa_init_done, but the lock will remain initialized. Revert r303076 and use MTX_SYSINIT to deterministically init the lock. PR: 209203 Modified: stable/9/sys/dev/fb/vesa.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/fb/vesa.c Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/dev/fb/vesa.c ============================================================================== --- stable/9/sys/dev/fb/vesa.c Sat Aug 6 23:52:09 2016 (r303807) +++ stable/9/sys/dev/fb/vesa.c Sat Aug 6 23:53:33 2016 (r303808) @@ -79,6 +79,7 @@ struct adp_state { typedef struct adp_state adp_state_t; static struct mtx vesa_lock; +MTX_SYSINIT(vesa_lock, &vesa_lock, "VESA lock", MTX_DEF); static int vesa_state; static void *vesa_state_buf; @@ -1903,8 +1904,6 @@ vesa_load(void) if (vesa_init_done) return (0); - mtx_init(&vesa_lock, "VESA lock", NULL, MTX_DEF); - /* locate a VGA adapter */ vesa_adp = NULL; error = vesa_configure(0); @@ -1943,7 +1942,6 @@ vesa_unload(void) } vesa_bios_uninit(); - mtx_destroy(&vesa_lock); return (error); } From owner-svn-src-stable@freebsd.org Sat Aug 6 23:53:35 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DE3FBB0C3B; Sat, 6 Aug 2016 23:53:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E74AE19F0; Sat, 6 Aug 2016 23:53:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u76NrYLr044832; Sat, 6 Aug 2016 23:53:34 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u76NrY6k044831; Sat, 6 Aug 2016 23:53:34 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608062353.u76NrY6k044831@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sat, 6 Aug 2016 23:53:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r303808 - in stable: 10/sys/dev/fb 9/sys/dev/fb X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 23:53:35 -0000 Author: jhb Date: Sat Aug 6 23:53:33 2016 New Revision: 303808 URL: https://svnweb.freebsd.org/changeset/base/303808 Log: MFC 303076,303225: Use MTX_SYSINIT for the VESA lock. 303076: vesa: fix panic on suspend Fix the following panic seen when migrating a FreeBSD guest on Xen: panic: mtx_lock() of destroyed mutex @ /usr/src/sys/dev/fb/vesa.c:541 cpuid = 0 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe001d2fa4f0 vpanic() at vpanic+0x182/frame 0xfffffe001d2fa570 kassert_panic() at kassert_panic+0x126/frame 0xfffffe001d2fa5e0 __mtx_lock_flags() at __mtx_lock_flags+0x15b/frame 0xfffffe001d2fa630 vesa_bios_save_restore() at vesa_bios_save_restore+0x78/frame 0xfffffe001d2fa680 vga_suspend() at vga_suspend+0xa3/frame 0xfffffe001d2fa6b0 isavga_suspend() at isavga_suspend+0x1d/frame 0xfffffe001d2fa6d0 bus_generic_suspend_child() at bus_generic_suspend_child+0x44/frame [...] This is caused because vga_sub_configure (which is called if the VGA adapter is attached after VESA tried to initialize), points to vesa_configure, which doesn't initialize the VESA mutex. In order to fix it, make sure vga_sub_configure points to vesa_load, so that all the needed vesa components are properly initialized. 303225: Use MTX_SYSINIT for the VESA lock. vesa_init_done isn't a reliable guard for the mutex init. If vesa_configure() doesn't find valid VESA info it will not set vesa_init_done, but the lock will remain initialized. Revert r303076 and use MTX_SYSINIT to deterministically init the lock. PR: 209203 Modified: stable/10/sys/dev/fb/vesa.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/dev/fb/vesa.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/10/sys/dev/fb/vesa.c ============================================================================== --- stable/10/sys/dev/fb/vesa.c Sat Aug 6 23:52:09 2016 (r303807) +++ stable/10/sys/dev/fb/vesa.c Sat Aug 6 23:53:33 2016 (r303808) @@ -79,6 +79,7 @@ struct adp_state { typedef struct adp_state adp_state_t; static struct mtx vesa_lock; +MTX_SYSINIT(vesa_lock, &vesa_lock, "VESA lock", MTX_DEF); static int vesa_state; static void *vesa_state_buf; @@ -1915,8 +1916,6 @@ vesa_load(void) if (vesa_init_done) return (0); - mtx_init(&vesa_lock, "VESA lock", NULL, MTX_DEF); - /* locate a VGA adapter */ vesa_adp = NULL; error = vesa_configure(0); @@ -1955,7 +1954,6 @@ vesa_unload(void) } vesa_bios_uninit(); - mtx_destroy(&vesa_lock); return (error); }