From owner-svn-src-stable-10@FreeBSD.ORG Mon Nov 11 09:47:52 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6B1AAD44; Mon, 11 Nov 2013 09:47:52 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3EA9527C1; Mon, 11 Nov 2013 09:47:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB9lqMi083957; Mon, 11 Nov 2013 09:47:52 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB9lpXb083955; Mon, 11 Nov 2013 09:47:51 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311110947.rAB9lpXb083955@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Mon, 11 Nov 2013 09:47:51 +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: r257956 - stable/10/sys/net 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-10@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 09:47:52 -0000 Author: ae Date: Mon Nov 11 09:47:51 2013 New Revision: 257956 URL: http://svnweb.freebsd.org/changeset/base/257956 Log: MFC r256689: Use the same actor key for media types of the same speed. PR: 176097 MFC r256832: Add a note that lacp_compose_key() should be updated, when new media types will be added. Submitted by: melifaro Approved by: re (hrs) Modified: stable/10/sys/net/ieee8023ad_lacp.c stable/10/sys/net/if_media.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/net/ieee8023ad_lacp.c ============================================================================== --- stable/10/sys/net/ieee8023ad_lacp.c Mon Nov 11 09:47:33 2013 (r257955) +++ stable/10/sys/net/ieee8023ad_lacp.c Mon Nov 11 09:47:51 2013 (r257956) @@ -1089,8 +1089,45 @@ lacp_compose_key(struct lacp_port *lp) KASSERT(IFM_TYPE(media) == IFM_ETHER, ("invalid media type")); KASSERT((media & IFM_FDX) != 0, ("aggregating HDX interface")); - /* bit 0..4: IFM_SUBTYPE */ - key = subtype; + /* bit 0..4: IFM_SUBTYPE modulo speed */ + switch (subtype) { + case IFM_10_T: + case IFM_10_2: + case IFM_10_5: + case IFM_10_STP: + case IFM_10_FL: + key = IFM_10_T; + break; + case IFM_100_TX: + case IFM_100_FX: + case IFM_100_T4: + case IFM_100_VG: + case IFM_100_T2: + key = IFM_100_TX; + break; + case IFM_1000_SX: + case IFM_1000_LX: + case IFM_1000_CX: + case IFM_1000_T: + key = IFM_1000_SX; + break; + case IFM_10G_LR: + case IFM_10G_SR: + case IFM_10G_CX4: + case IFM_10G_TWINAX: + case IFM_10G_TWINAX_LONG: + case IFM_10G_LRM: + case IFM_10G_T: + key = IFM_10G_LR; + break; + case IFM_40G_CR4: + case IFM_40G_SR4: + case IFM_40G_LR4: + key = IFM_40G_CR4; + break; + default: + key = subtype; + } /* bit 5..14: (some bits of) if_index of lagg device */ key |= 0x7fe0 & ((sc->sc_ifp->if_index) << 5); /* bit 15: 0 */ Modified: stable/10/sys/net/if_media.h ============================================================================== --- stable/10/sys/net/if_media.h Mon Nov 11 09:47:33 2013 (r257955) +++ stable/10/sys/net/if_media.h Mon Nov 11 09:47:51 2013 (r257956) @@ -153,7 +153,10 @@ uint64_t ifmedia_baudrate(int); #define IFM_40G_CR4 27 /* 40GBase-CR4 */ #define IFM_40G_SR4 28 /* 40GBase-SR4 */ #define IFM_40G_LR4 29 /* 40GBase-LR4 */ - +/* + * Please update ieee8023ad_lacp.c:lacp_compose_key() + * after adding new Ethernet media types. + */ /* note 31 is the max! */ #define IFM_ETH_MASTER 0x00000100 /* master mode (1000baseT) */ From owner-svn-src-stable-10@FreeBSD.ORG Mon Nov 11 10:43:40 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7D060BB4; Mon, 11 Nov 2013 10:43:40 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A4002ADD; Mon, 11 Nov 2013 10:43:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABAhe0s004104; Mon, 11 Nov 2013 10:43:40 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABAheAc004102; Mon, 11 Nov 2013 10:43:40 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311111043.rABAheAc004102@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Mon, 11 Nov 2013 10:43:40 +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: r257961 - stable/10/sys/netinet6 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-10@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 10:43:40 -0000 Author: ae Date: Mon Nov 11 10:43:39 2013 New Revision: 257961 URL: http://svnweb.freebsd.org/changeset/base/257961 Log: MFC r257084: Initialize inc_fibnum for properly handling ICMP6_PACKET_TOO_BIG errors in multifib environment. PR: 183265 Approved by: re (hrs) Modified: stable/10/sys/netinet6/icmp6.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/netinet6/icmp6.c ============================================================================== --- stable/10/sys/netinet6/icmp6.c Mon Nov 11 10:38:37 2013 (r257960) +++ stable/10/sys/netinet6/icmp6.c Mon Nov 11 10:43:39 2013 (r257961) @@ -1227,6 +1227,7 @@ icmp6_mtudisc_update(struct ip6ctlparam mtu = IPV6_MMTU - 8; bzero(&inc, sizeof(inc)); + inc.inc_fibnum = M_GETFIB(m); inc.inc_flags |= INC_ISIPV6; inc.inc6_faddr = *dst; if (in6_setscope(&inc.inc6_faddr, m->m_pkthdr.rcvif, NULL)) From owner-svn-src-stable-10@FreeBSD.ORG Mon Nov 11 14:04:26 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9B183A13; Mon, 11 Nov 2013 14:04:26 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88207296A; Mon, 11 Nov 2013 14:04:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABE4Q1S074502; Mon, 11 Nov 2013 14:04:26 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABE4QVe074501; Mon, 11 Nov 2013 14:04:26 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201311111404.rABE4QVe074501@svn.freebsd.org> From: Christian Brueffer Date: Mon, 11 Nov 2013 14:04: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: r257989 - stable/10/bin/df 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-10@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 14:04:26 -0000 Author: brueffer Date: Mon Nov 11 14:04:26 2013 New Revision: 257989 URL: http://svnweb.freebsd.org/changeset/base/257989 Log: MFC: r257288 Clean up a spurious "." in SEE ALSO. Approved by: re (glebius) Modified: stable/10/bin/df/df.1 Directory Properties: stable/10/bin/df/ (props changed) Modified: stable/10/bin/df/df.1 ============================================================================== --- stable/10/bin/df/df.1 Mon Nov 11 13:25:49 2013 (r257988) +++ stable/10/bin/df/df.1 Mon Nov 11 14:04:26 2013 (r257989) @@ -198,7 +198,7 @@ If the value is outside, it will be set .Xr mount 8 , .Xr pstat 8 , .Xr quot 8 , -.Xr swapinfo 8 . +.Xr swapinfo 8 .Sh STANDARDS With the exception of most options, the From owner-svn-src-stable-10@FreeBSD.ORG Mon Nov 11 14:08:25 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EC4ACD34; Mon, 11 Nov 2013 14:08:25 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF7EE298D; Mon, 11 Nov 2013 14:08:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABE8P5R075799; Mon, 11 Nov 2013 14:08:25 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABE8PtD075798; Mon, 11 Nov 2013 14:08:25 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201311111408.rABE8PtD075798@svn.freebsd.org> From: Christian Brueffer Date: Mon, 11 Nov 2013 14:08:25 +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: r257990 - stable/10/share/man/man4 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-10@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 14:08:26 -0000 Author: brueffer Date: Mon Nov 11 14:08:25 2013 New Revision: 257990 URL: http://svnweb.freebsd.org/changeset/base/257990 Log: MFC: r257287 New sentence -> new line and some mdoc cleanup. Approved by: re (glebius) Modified: stable/10/share/man/man4/bpf.4 Directory Properties: stable/10/share/man/man4/ (props changed) Modified: stable/10/share/man/man4/bpf.4 ============================================================================== --- stable/10/share/man/man4/bpf.4 Mon Nov 11 14:04:26 2013 (r257989) +++ stable/10/share/man/man4/bpf.4 Mon Nov 11 14:08:25 2013 (r257990) @@ -697,9 +697,11 @@ is used when the time stamp is set to .Dv BPF_T_MICROTIME_MONOTONIC_FAST , or .Dv BPF_T_NONE -for backward compatibility reasons. Otherwise, +for backward compatibility reasons. +Otherwise, .Vt bpf_xhdr -is used. However, +is used. +However, .Vt bpf_hdr may be deprecated in the near future. Suitable precautions @@ -962,19 +964,23 @@ subsystem .It Va net.bpf.optimize_writers: No 0 Various programs use BPF to send (but not receive) raw packets (cdpd, lldpd, dhcpd, dhcp relays, etc. are good examples of such programs). -They do not need incoming packets to be send to them. Turning this option on +They do not need incoming packets to be send to them. +Turning this option on makes new BPF users to be attached to write-only interface list until program explicitly specifies read filter via -.Cm pcap_set_filter() . +.Fn pcap_set_filter . This removes any performance degradation for high-speed interfaces. .It Va net.bpf.stats: Binary interface for retrieving general statistics. .It Va net.bpf.zerocopy_enable: No 0 -Permits zero-copy to be used with net BPF readers. Use with caution. +Permits zero-copy to be used with net BPF readers. +Use with caution. .It Va net.bpf.maxinsns: No 512 -Maximum number of instructions that BPF program can contain. Use +Maximum number of instructions that BPF program can contain. +Use .Xr tcpdump 1 --d option to determine approximate number of instruction for any filter. +.Fl d +option to determine approximate number of instruction for any filter. .It Va net.bpf.maxbufsize: No 524288 Maximum buffer size to allocate for packets buffer. .It Va net.bpf.bufsize: No 4096 From owner-svn-src-stable-10@FreeBSD.ORG Mon Nov 11 20:57:05 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 89F8C1F2; Mon, 11 Nov 2013 20:57:05 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 76DFB26D3; Mon, 11 Nov 2013 20:57:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABKv5LK013659; Mon, 11 Nov 2013 20:57:05 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABKv5Xq013658; Mon, 11 Nov 2013 20:57:05 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201311112057.rABKv5Xq013658@svn.freebsd.org> From: Dimitry Andric Date: Mon, 11 Nov 2013 20:57:05 +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: r258011 - stable/10/lib/libc/iconv 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-10@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 20:57:05 -0000 Author: dim Date: Mon Nov 11 20:57:04 2013 New Revision: 258011 URL: http://svnweb.freebsd.org/changeset/base/258011 Log: MFC r257859: Fix typo in include guard, found by clang 3.4. Approved by: re (hrs) Modified: stable/10/lib/libc/iconv/citrus_csmapper.h Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/iconv/citrus_csmapper.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_csmapper.h Mon Nov 11 20:51:01 2013 (r258010) +++ stable/10/lib/libc/iconv/citrus_csmapper.h Mon Nov 11 20:57:04 2013 (r258011) @@ -28,7 +28,7 @@ */ #ifndef _CITRUS_CSMAPPER_H_ -#define _CITRUS_CSMAPPER_H +#define _CITRUS_CSMAPPER_H_ #define _citrus_csmapper _citrus_mapper #define _citrus_csmapper_close _citrus_mapper_close From owner-svn-src-stable-10@FreeBSD.ORG Tue Nov 12 08:01:59 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 902A5DFC; Tue, 12 Nov 2013 08:01:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F8B7277D; Tue, 12 Nov 2013 08:01:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAC81xkU038813; Tue, 12 Nov 2013 08:01:59 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAC81xUB038812; Tue, 12 Nov 2013 08:01:59 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201311120801.rAC81xUB038812@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 12 Nov 2013 08:01:59 +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: r258037 - stable/10/sys/vm 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 08:01:59 -0000 Author: kib Date: Tue Nov 12 08:01:58 2013 New Revision: 258037 URL: http://svnweb.freebsd.org/changeset/base/258037 Log: MFC r257680: Do not coalesce if the swap object belongs to tmpfs vnode. Approved by: re (glebius) Modified: stable/10/sys/vm/vm_object.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/vm/vm_object.c ============================================================================== --- stable/10/sys/vm/vm_object.c Tue Nov 12 06:14:12 2013 (r258036) +++ stable/10/sys/vm/vm_object.c Tue Nov 12 08:01:58 2013 (r258037) @@ -2099,8 +2099,9 @@ vm_object_coalesce(vm_object_t prev_obje if (prev_object == NULL) return (TRUE); VM_OBJECT_WLOCK(prev_object); - if (prev_object->type != OBJT_DEFAULT && - prev_object->type != OBJT_SWAP) { + if ((prev_object->type != OBJT_DEFAULT && + prev_object->type != OBJT_SWAP) || + (prev_object->flags & OBJ_TMPFS) != 0) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } From owner-svn-src-stable-10@FreeBSD.ORG Tue Nov 12 19:10:29 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 381595FE; Tue, 12 Nov 2013 19:10:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 26A7A2DB1; Tue, 12 Nov 2013 19:10:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACJATav066886; Tue, 12 Nov 2013 19:10:29 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACJASHU066884; Tue, 12 Nov 2013 19:10:28 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201311121910.rACJASHU066884@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Tue, 12 Nov 2013 19:10:28 +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: r258062 - in stable/10/sys/dev/drm2: . radeon 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 19:10:29 -0000 Author: dumbbell Date: Tue Nov 12 19:10:28 2013 New Revision: 258062 URL: http://svnweb.freebsd.org/changeset/base/258062 Log: MFC r257869: drm: Initialize "handle" to 0 before calling drm_gem_handle_create() This is variable is being checked in drm_gem_name_create() before being set. Approved by: re (delphij) Modified: stable/10/sys/dev/drm2/drm_crtc.c stable/10/sys/dev/drm2/radeon/radeon_gem.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/drm2/drm_crtc.c ============================================================================== --- stable/10/sys/dev/drm2/drm_crtc.c Tue Nov 12 18:59:23 2013 (r258061) +++ stable/10/sys/dev/drm2/drm_crtc.c Tue Nov 12 19:10:28 2013 (r258062) @@ -2317,6 +2317,7 @@ int drm_mode_getfb(struct drm_device *de r->depth = fb->depth; r->bpp = fb->bits_per_pixel; r->pitch = fb->pitches[0]; + r->handle = 0; fb->funcs->create_handle(fb, file_priv, &r->handle); out: Modified: stable/10/sys/dev/drm2/radeon/radeon_gem.c ============================================================================== --- stable/10/sys/dev/drm2/radeon/radeon_gem.c Tue Nov 12 18:59:23 2013 (r258061) +++ stable/10/sys/dev/drm2/radeon/radeon_gem.c Tue Nov 12 19:10:28 2013 (r258062) @@ -567,6 +567,7 @@ int radeon_mode_dumb_create(struct drm_f if (r) return -ENOMEM; + handle = 0; r = drm_gem_handle_create(file_priv, gobj, &handle); /* drop reference from allocate - handle holds it now */ drm_gem_object_unreference_unlocked(gobj); From owner-svn-src-stable-10@FreeBSD.ORG Tue Nov 12 20:00:51 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97E3A8A5; Tue, 12 Nov 2013 20:00:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86B2921BC; Tue, 12 Nov 2013 20:00:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACK0pGi085967; Tue, 12 Nov 2013 20:00:51 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACK0p05085966; Tue, 12 Nov 2013 20:00:51 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201311122000.rACK0p05085966@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Tue, 12 Nov 2013 20:00:51 +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: r258068 - stable/10/sys/dev/drm2/radeon 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 20:00:51 -0000 Author: dumbbell Date: Tue Nov 12 20:00:51 2013 New Revision: 258068 URL: http://svnweb.freebsd.org/changeset/base/258068 Log: MFC r257870: drm/radeon: Wake up userland after page flip For instance, this caused issues in KDE, such as stuttered animations (with desktop effects enabled). Approved by: re (kib) Modified: stable/10/sys/dev/drm2/radeon/radeon_display.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/drm2/radeon/radeon_display.c ============================================================================== --- stable/10/sys/dev/drm2/radeon/radeon_display.c Tue Nov 12 19:44:45 2013 (r258067) +++ stable/10/sys/dev/drm2/radeon/radeon_display.c Tue Nov 12 20:00:51 2013 (r258068) @@ -336,9 +336,7 @@ void radeon_crtc_handle_flip(struct rade e->event.tv_sec = now.tv_sec; e->event.tv_usec = now.tv_usec; list_add_tail(&e->base.link, &e->base.file_priv->event_list); -#ifdef DUMBBELL_WIP - wake_up_interruptible(&e->base.file_priv->event_wait); -#endif /* DUMBBELL_WIP */ + drm_event_wakeup(&e->base); } DRM_SPINUNLOCK_IRQRESTORE(&rdev->ddev->event_lock, flags); From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 09:11:54 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DEB436D8; Thu, 14 Nov 2013 09:11:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CE845293A; Thu, 14 Nov 2013 09:11:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9BsME039803; Thu, 14 Nov 2013 09:11:54 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9BsWk039802; Thu, 14 Nov 2013 09:11:54 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311140911.rAE9BsWk039802@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 14 Nov 2013 09:11:54 +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: r258120 - stable/10/sys/dev/ipmi 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:11:55 -0000 Author: glebius Date: Thu Nov 14 09:11:54 2013 New Revision: 258120 URL: http://svnweb.freebsd.org/changeset/base/258120 Log: Merge r257421 from head: Provide a crutch that prevents watchdog to interrupt dumping on a box with IPMI enabled. Approved by: re (kib) Modified: stable/10/sys/dev/ipmi/ipmi.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/ipmi/ipmi.c ============================================================================== --- stable/10/sys/dev/ipmi/ipmi.c Thu Nov 14 07:41:52 2013 (r258119) +++ stable/10/sys/dev/ipmi/ipmi.c Thu Nov 14 09:11:54 2013 (r258120) @@ -647,6 +647,9 @@ ipmi_wd_event(void *arg, unsigned int cm unsigned int timeout; int e; + if (dumping) + return; + cmd &= WD_INTERVAL; if (cmd > 0 && cmd <= 63) { timeout = ((uint64_t)1 << cmd) / 1000000000; From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 09:14:35 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D39F484D; Thu, 14 Nov 2013 09:14:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B5431295B; Thu, 14 Nov 2013 09:14:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9EZfT040227; Thu, 14 Nov 2013 09:14:35 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9EYVP040220; Thu, 14 Nov 2013 09:14:34 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311140914.rAE9EYVP040220@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 14 Nov 2013 09:14: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: r258121 - in stable/10/etc: . defaults namedb periodic/daily rc.d 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:14:35 -0000 Author: glebius Date: Thu Nov 14 09:14:33 2013 New Revision: 258121 URL: http://svnweb.freebsd.org/changeset/base/258121 Log: Merge r257694 from head: Remove remnants of BIND from /etc, since there is no BIND in base now. Sorry, that would break users running head and BIND from ports, since ports rely on these scripts. The ports will be fixed soon. Approved by: re (kib) Deleted: stable/10/etc/namedb/ stable/10/etc/periodic/daily/470.status-named stable/10/etc/rc.d/named Modified: stable/10/etc/defaults/periodic.conf stable/10/etc/defaults/rc.conf stable/10/etc/freebsd-update.conf stable/10/etc/rc.d/Makefile stable/10/etc/rc.d/ntpdate stable/10/etc/rc.d/rpcbind stable/10/etc/rc.d/syslogd Directory Properties: stable/10/etc/ (props changed) stable/10/etc/rc.d/ (props changed) Modified: stable/10/etc/defaults/periodic.conf ============================================================================== --- stable/10/etc/defaults/periodic.conf Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/defaults/periodic.conf Thu Nov 14 09:14:33 2013 (r258121) @@ -137,10 +137,6 @@ daily_status_mail_rejects_enable="YES" daily_status_mail_rejects_logs=3 # How many logs to check daily_status_mail_rejects_shorten="NO" # Shorten output -# 470.status-named -daily_status_named_enable="YES" -daily_status_named_usedns="YES" # DNS lookups are ok - # 480.status-ntpd daily_status_ntpd_enable="NO" # Check NTP status Modified: stable/10/etc/defaults/rc.conf ============================================================================== --- stable/10/etc/defaults/rc.conf Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/defaults/rc.conf Thu Nov 14 09:14:33 2013 (r258121) @@ -260,6 +260,7 @@ hostapd_enable="NO" # Run hostap daemon syslogd_enable="YES" # Run syslog daemon (or NO). syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one. syslogd_flags="-s" # Flags to syslogd (if enabled). +altlog_proglist="" # List of chrooted applicatioins in /var inetd_enable="NO" # Run the network daemon dispatcher (YES/NO). inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one. inetd_flags="-wW -C 60" # Optional flags to inetd @@ -271,23 +272,6 @@ hastd_program="/sbin/hastd" # path to ha hastd_flags="" # Optional flags to hastd. ctld_enable="NO" # CAM Target Layer / iSCSI target daemon. local_unbound_enable="NO" # local caching resolver -# -# named. It may be possible to run named in a sandbox, man security for -# details. -# -named_enable="NO" # Run named, the DNS server (or NO). -named_program="/usr/sbin/named" # Path to named, if you want a different one. -named_conf="/etc/namedb/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_chrootdir="/var/named" # Chroot directory (or "" not to auto-chroot it) -named_chroot_autoupdate="YES" # Automatically install/update chrooted - # components of named. See /etc/rc.d/named. -named_symlink_enable="YES" # Symlink the chrooted pid file -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" # # kerberos. Do not run the admin daemons on slave servers Modified: stable/10/etc/freebsd-update.conf ============================================================================== --- stable/10/etc/freebsd-update.conf Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/freebsd-update.conf Thu Nov 14 09:14:33 2013 (r258121) @@ -35,7 +35,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /. # When upgrading to a new FreeBSD release, files which match MergeChanges # will have any local changes merged into the version from the new release. -MergeChanges /etc/ /var/named/etc/ /boot/device.hints +MergeChanges /etc/ /boot/device.hints ### Default configuration options: Modified: stable/10/etc/rc.d/Makefile ============================================================================== --- stable/10/etc/rc.d/Makefile Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/rc.d/Makefile Thu Nov 14 09:14:33 2013 (r258121) @@ -90,7 +90,6 @@ FILES= DAEMON \ mroute6d \ mrouted \ msgs \ - named \ natd \ netif \ netoptions \ Modified: stable/10/etc/rc.d/ntpdate ============================================================================== --- stable/10/etc/rc.d/ntpdate Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/rc.d/ntpdate Thu Nov 14 09:14:33 2013 (r258121) @@ -4,7 +4,7 @@ # # PROVIDE: ntpdate -# REQUIRE: NETWORKING syslogd named +# REQUIRE: NETWORKING syslogd # KEYWORD: nojail . /etc/rc.subr Modified: stable/10/etc/rc.d/rpcbind ============================================================================== --- stable/10/etc/rc.d/rpcbind Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/rc.d/rpcbind Thu Nov 14 09:14:33 2013 (r258121) @@ -4,7 +4,7 @@ # # PROVIDE: rpcbind -# REQUIRE: NETWORKING ntpdate syslogd named +# REQUIRE: NETWORKING ntpdate syslogd # KEYWORD: shutdown . /etc/rc.subr Modified: stable/10/etc/rc.d/syslogd ============================================================================== --- stable/10/etc/rc.d/syslogd Thu Nov 14 09:11:54 2013 (r258120) +++ stable/10/etc/rc.d/syslogd Thu Nov 14 09:14:33 2013 (r258121) @@ -21,7 +21,6 @@ extra_commands="reload" sockfile="/var/run/syslogd.sockets" evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\"" -altlog_proglist="named" syslogd_precmd() { From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 09:19:50 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D669CC23; Thu, 14 Nov 2013 09:19:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C60C3299D; Thu, 14 Nov 2013 09:19:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9Jopo040989; Thu, 14 Nov 2013 09:19:50 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9Jok2040988; Thu, 14 Nov 2013 09:19:50 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311140919.rAE9Jok2040988@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 14 Nov 2013 09:19:50 +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: r258123 - stable/10/sys/netsmb 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:19:50 -0000 Author: glebius Date: Thu Nov 14 09:19:50 2013 New Revision: 258123 URL: http://svnweb.freebsd.org/changeset/base/258123 Log: Merge r257841 from head: Catch up with sb_timeo type change in r255138. This fixes smbfs operation. PR: kern/182963 Approved by: re (kib) Modified: stable/10/sys/netsmb/smb_trantcp.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/netsmb/smb_trantcp.c ============================================================================== --- stable/10/sys/netsmb/smb_trantcp.c Thu Nov 14 09:17:27 2013 (r258122) +++ stable/10/sys/netsmb/smb_trantcp.c Thu Nov 14 09:19:50 2013 (r258123) @@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct SOCKBUF_LOCK(&so->so_rcv); soupcall_set(so, SO_RCV, nb_upcall, nbp); SOCKBUF_UNLOCK(&so->so_rcv); - so->so_rcv.sb_timeo = (5 * hz); - so->so_snd.sb_timeo = (5 * hz); + so->so_rcv.sb_timeo = (5 * SBT_1S); + so->so_snd.sb_timeo = (5 * SBT_1S); error = soreserve(so, nbp->nbp_sndbuf, nbp->nbp_rcvbuf); if (error) goto bad; From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 09:25:30 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA884EED; Thu, 14 Nov 2013 09:25:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9968629EA; Thu, 14 Nov 2013 09:25:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9PUNL043846; Thu, 14 Nov 2013 09:25:30 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9PUf2043842; Thu, 14 Nov 2013 09:25:30 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311140925.rAE9PUf2043842@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 14 Nov 2013 09:25:30 +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: r258125 - in stable/10: contrib/smbfs/lib/smb lib/libsmb usr.sbin/mount_smbfs 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:25:30 -0000 Author: glebius Date: Thu Nov 14 09:25:29 2013 New Revision: 258125 URL: http://svnweb.freebsd.org/changeset/base/258125 Log: Merge r257888, r258049 from head: - Use system libiconv, instead of trying to dlopen() it. - Just disable recoding support in libsmb if built WITHOUT_ICONV. PR: 183153 Approved by: re (kib) Modified: stable/10/contrib/smbfs/lib/smb/nls.c stable/10/lib/libsmb/Makefile stable/10/usr.sbin/mount_smbfs/Makefile Directory Properties: stable/10/contrib/smbfs/ (props changed) stable/10/lib/libsmb/ (props changed) stable/10/usr.sbin/mount_smbfs/ (props changed) Modified: stable/10/contrib/smbfs/lib/smb/nls.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/nls.c Thu Nov 14 09:22:32 2013 (r258124) +++ stable/10/contrib/smbfs/lib/smb/nls.c Thu Nov 14 09:25:29 2013 (r258125) @@ -36,12 +36,8 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include -#ifndef APPLE -#include -#endif #include #include #include @@ -50,21 +46,16 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * prototype iconv* functions - */ -typedef void *iconv_t; - -static iconv_t (*my_iconv_open)(const char *, const char *); -static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *); -static int(*my_iconv_close)(iconv_t); +#ifdef HAVE_ICONV +#include +#endif u_char nls_lower[256]; u_char nls_upper[256]; +#ifdef HAVE_ICONV static iconv_t nls_toext, nls_toloc; -static int iconv_loaded; -static void *iconv_lib; +#endif int nls_setlocale(const char *name) @@ -85,117 +76,107 @@ nls_setlocale(const char *name) int nls_setrecode(const char *local, const char *external) { -#ifdef APPLE - return ENOENT; -#else +#ifdef HAVE_ICONV iconv_t icd; - if (iconv_loaded == 2) - return ENOENT; - else if (iconv_loaded == 0) { - iconv_loaded++; - iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL); - if (iconv_lib == NULL) { - warn("Unable to load iconv library: %s\n", dlerror()); - iconv_loaded++; - return ENOENT; - } - my_iconv_open = dlsym(iconv_lib, "iconv_open"); - my_iconv = dlsym(iconv_lib, "iconv"); - my_iconv_close = dlsym(iconv_lib, "iconv_close"); - } if (nls_toext) - my_iconv_close(nls_toext); + iconv_close(nls_toext); if (nls_toloc) - my_iconv_close(nls_toloc); + iconv_close(nls_toloc); nls_toext = nls_toloc = (iconv_t)0; - icd = my_iconv_open(external, local); + icd = iconv_open(external, local); if (icd == (iconv_t)-1) return errno; nls_toext = icd; - icd = my_iconv_open(local, external); + icd = iconv_open(local, external); if (icd == (iconv_t)-1) { - my_iconv_close(nls_toext); + iconv_close(nls_toext); nls_toext = (iconv_t)0; return errno; } nls_toloc = icd; return 0; +#else + return ENOENT; #endif } char * nls_str_toloc(char *dst, const char *src) { +#ifdef HAVE_ICONV char *p = dst; size_t inlen, outlen; - if (!iconv_loaded) - return strcpy(dst, src); - if (nls_toloc == (iconv_t)0) return strcpy(dst, src); inlen = outlen = strlen(src); - my_iconv(nls_toloc, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) { + iconv(nls_toloc, NULL, NULL, &p, &outlen); + while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) { *p++ = *src++; inlen--; outlen--; } *p = 0; return dst; +#else + return strcpy(dst, src); +#endif } char * nls_str_toext(char *dst, const char *src) { +#ifdef HAVE_ICONV char *p = dst; size_t inlen, outlen; - if (!iconv_loaded) - return strcpy(dst, src); - if (nls_toext == (iconv_t)0) return strcpy(dst, src); inlen = outlen = strlen(src); - my_iconv(nls_toext, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) { + iconv(nls_toext, NULL, NULL, &p, &outlen); + while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) { *p++ = *src++; inlen--; outlen--; } *p = 0; return dst; +#else + return strcpy(dst, src); +#endif } void * nls_mem_toloc(void *dst, const void *src, int size) { +#ifdef HAVE_ICONV char *p = dst; const char *s = src; size_t inlen, outlen; - if (!iconv_loaded) - return memcpy(dst, src, size); - if (size == 0) return NULL; if (nls_toloc == (iconv_t)0) return memcpy(dst, src, size); inlen = outlen = size; - my_iconv(nls_toloc, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) { + iconv(nls_toloc, NULL, NULL, &p, &outlen); + while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) { *p++ = *s++; inlen--; outlen--; } return dst; +#else + return memcpy(dst, src, size); +#endif } void * nls_mem_toext(void *dst, const void *src, int size) { +#ifdef HAVE_ICONV char *p = dst; const char *s = src; size_t inlen, outlen; @@ -203,17 +184,20 @@ nls_mem_toext(void *dst, const void *src if (size == 0) return NULL; - if (!iconv_loaded || nls_toext == (iconv_t)0) + if (nls_toext == (iconv_t)0) return memcpy(dst, src, size); inlen = outlen = size; - my_iconv(nls_toext, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) { + iconv(nls_toext, NULL, NULL, &p, &outlen); + while (iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) { *p++ = *s++; inlen--; outlen--; } return dst; +#else + return memcpy(dst, src, size); +#endif } char * Modified: stable/10/lib/libsmb/Makefile ============================================================================== --- stable/10/lib/libsmb/Makefile Thu Nov 14 09:22:32 2013 (r258124) +++ stable/10/lib/libsmb/Makefile Thu Nov 14 09:25:29 2013 (r258125) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb @@ -16,4 +18,8 @@ SRCS= rcfile.c ctx.c cfopt.c subr.c nls. WARNS?= 1 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 +.endif + .include Modified: stable/10/usr.sbin/mount_smbfs/Makefile ============================================================================== --- stable/10/usr.sbin/mount_smbfs/Makefile Thu Nov 14 09:22:32 2013 (r258124) +++ stable/10/usr.sbin/mount_smbfs/Makefile Thu Nov 14 09:25:29 2013 (r258125) @@ -11,11 +11,6 @@ CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTR LDADD= -lsmb -lkiconv DPADD= ${LIBSMB} ${LIBKICONV} -# Needs to be dynamically linked for optional dlopen() access to -# userland libiconv (see the -E option). -# -NO_SHARED?= NO - .PATH: ${CONTRIBDIR}/mount_smbfs .PATH: ${MOUNTDIR} From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 09:26:52 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E083BA4; Thu, 14 Nov 2013 09:26:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D035629F6; Thu, 14 Nov 2013 09:26:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9QqbZ044028; Thu, 14 Nov 2013 09:26:52 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9QqV0044027; Thu, 14 Nov 2013 09:26:52 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311140926.rAE9QqV0044027@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 14 Nov 2013 09:26:52 +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: r258126 - stable/10/usr.sbin/pkg 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:26:53 -0000 Author: glebius Date: Thu Nov 14 09:26:52 2013 New Revision: 258126 URL: http://svnweb.freebsd.org/changeset/base/258126 Log: Merge r257945 from head: Do not use just freed memory. Approved by: re (kib) Modified: stable/10/usr.sbin/pkg/pkg.c Directory Properties: stable/10/usr.sbin/pkg/ (props changed) Modified: stable/10/usr.sbin/pkg/pkg.c ============================================================================== --- stable/10/usr.sbin/pkg/pkg.c Thu Nov 14 09:25:29 2013 (r258125) +++ stable/10/usr.sbin/pkg/pkg.c Thu Nov 14 09:26:52 2013 (r258126) @@ -326,9 +326,9 @@ parse_fingerprint(yaml_document_t *doc, static void free_fingerprint_list(struct fingerprint_list* list) { - struct fingerprint* fingerprint; + struct fingerprint *fingerprint, *tmp; - STAILQ_FOREACH(fingerprint, list, next) { + STAILQ_FOREACH_SAFE(fingerprint, list, next, tmp) { if (fingerprint->name) free(fingerprint->name); free(fingerprint); From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 09:33:54 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2D4634F; Thu, 14 Nov 2013 09:33:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D24D42A75; Thu, 14 Nov 2013 09:33:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9XsQ6046983; Thu, 14 Nov 2013 09:33:54 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9XsTG046981; Thu, 14 Nov 2013 09:33:54 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201311140933.rAE9XsTG046981@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 14 Nov 2013 09:33:54 +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: r258127 - in stable/10/sys: kern 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:33:55 -0000 Author: pluknet Date: Thu Nov 14 09:33:54 2013 New Revision: 258127 URL: http://svnweb.freebsd.org/changeset/base/258127 Log: Merge r257996,r258001,r258069 from head: fixes for HyperV guest. - Set description string for VM_GUEST_HV (HyperV guest). - Add a brief comment about VM_GUEST and vm_guest_sysctl_names relationship. - CTASSERT that vm_guest range is covered by vm_guest_sysctl_names. Approved by: re (glebius) Modified: stable/10/sys/kern/subr_param.c stable/10/sys/sys/systm.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/kern/subr_param.c ============================================================================== --- stable/10/sys/kern/subr_param.c Thu Nov 14 09:26:52 2013 (r258126) +++ stable/10/sys/kern/subr_param.c Thu Nov 14 09:33:54 2013 (r258127) @@ -153,8 +153,10 @@ static const char *const vm_guest_sysctl "none", "generic", "xen", + "hv", NULL }; +CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST); #ifndef XEN static const char *const vm_bnames[] = { Modified: stable/10/sys/sys/systm.h ============================================================================== --- stable/10/sys/sys/systm.h Thu Nov 14 09:26:52 2013 (r258126) +++ stable/10/sys/sys/systm.h Thu Nov 14 09:33:54 2013 (r258127) @@ -70,8 +70,10 @@ extern int vm_guest; /* Running as virt * Detected virtual machine guest types. The intention is to expand * and/or add to the VM_GUEST_VM type if specific VM functionality is * ever implemented (e.g. vendor-specific paravirtualization features). + * Keep in sync with vm_guest_sysctl_names[]. */ -enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV }; +enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV, + VM_LAST }; #if defined(WITNESS) || defined(INVARIANTS) void kassert_panic(const char *fmt, ...) __printflike(1, 2); From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 12:14:27 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3F13C72; Thu, 14 Nov 2013 12:14:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 93A6B25E4; Thu, 14 Nov 2013 12:14:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAECERDd007181; Thu, 14 Nov 2013 12:14:27 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAECERim007180; Thu, 14 Nov 2013 12:14:27 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201311141214.rAECERim007180@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 14 Nov 2013 12:14: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: r258129 - stable/10/usr.sbin/ctld 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 12:14:27 -0000 Author: trasz Date: Thu Nov 14 12:14:27 2013 New Revision: 258129 URL: http://svnweb.freebsd.org/changeset/base/258129 Log: Fix typo. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/ctld/ctl.conf.5 Directory Properties: stable/10/usr.sbin/ctld/ (props changed) Modified: stable/10/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- stable/10/usr.sbin/ctld/ctl.conf.5 Thu Nov 14 09:45:33 2013 (r258128) +++ stable/10/usr.sbin/ctld/ctl.conf.5 Thu Nov 14 12:14:27 2013 (r258129) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 24, 2013 +.Dd November 10, 2013 .Dt CTL.CONF 5 .Os .Sh NAME @@ -98,7 +98,7 @@ will be forcibly terminated. The default is 60. Setting it to 0 disables the timeout. .El -.Ss auth-grup level +.Ss auth-group level The following statements are available at the auth-group level: .Bl -tag -width indent .It Ic chap Ao Ar user Ac Aq Ar secret From owner-svn-src-stable-10@FreeBSD.ORG Thu Nov 14 13:33:23 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E592284; Thu, 14 Nov 2013 13:33:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3DD282B5D; Thu, 14 Nov 2013 13:33:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAEDXNeQ036086; Thu, 14 Nov 2013 13:33:23 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAEDXNAw036085; Thu, 14 Nov 2013 13:33:23 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201311141333.rAEDXNAw036085@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 14 Nov 2013 13:33:23 +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: r258131 - stable/10/usr.bin/iscsictl 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 13:33:23 -0000 Author: trasz Date: Thu Nov 14 13:33:22 2013 New Revision: 258131 URL: http://svnweb.freebsd.org/changeset/base/258131 Log: MFC r257917: Fix typo in "iscsictl -v". Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.bin/iscsictl/iscsictl.c Directory Properties: stable/10/usr.bin/iscsictl/ (props changed) Modified: stable/10/usr.bin/iscsictl/iscsictl.c ============================================================================== --- stable/10/usr.bin/iscsictl/iscsictl.c Thu Nov 14 13:25:47 2013 (r258130) +++ stable/10/usr.bin/iscsictl/iscsictl.c Thu Nov 14 13:33:22 2013 (r258131) @@ -425,7 +425,7 @@ kernel_list(int iscsi_fd, const struct t printf("Secret: %s\n", conf->isc_secret); printf("Mutual user: %s\n", conf->isc_mutual_user); - printf("Mutual secret : %s\n", + printf("Mutual secret: %s\n", conf->isc_mutual_secret); printf("Session type: %s\n", conf->isc_discovery ? "Discovery" : "Normal"); From owner-svn-src-stable-10@FreeBSD.ORG Fri Nov 15 07:09:24 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2FF780D; Fri, 15 Nov 2013 07:09:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B27A4222D; Fri, 15 Nov 2013 07:09:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAF79O7L091257; Fri, 15 Nov 2013 07:09:24 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAF79OZC091256; Fri, 15 Nov 2013 07:09:24 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201311150709.rAF79OZC091256@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 15 Nov 2013 07:09:24 +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: r258158 - stable/10/sys/i386/i386 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 07:09:24 -0000 Author: kib Date: Fri Nov 15 07:09:24 2013 New Revision: 258158 URL: http://svnweb.freebsd.org/changeset/base/258158 Log: MFC r257858: Fix signal delivery for the iBCS2 binaries. Approved by: re (gjb) Modified: stable/10/sys/i386/i386/machdep.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/i386/i386/machdep.c ============================================================================== --- stable/10/sys/i386/i386/machdep.c Fri Nov 15 03:05:33 2013 (r258157) +++ stable/10/sys/i386/i386/machdep.c Fri Nov 15 07:09:24 2013 (r258158) @@ -757,6 +757,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, regs->tf_esp = (int)sfp; regs->tf_eip = p->p_sysent->sv_sigcode_base; + if (regs->tf_eip == 0) + regs->tf_eip = p->p_sysent->sv_psstrings - szsigcode; regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; From owner-svn-src-stable-10@FreeBSD.ORG Fri Nov 15 07:10:43 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E8BF97E; Fri, 15 Nov 2013 07:10:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5F85F2265; Fri, 15 Nov 2013 07:10:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAF7Ahq5093587; Fri, 15 Nov 2013 07:10:43 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAF7AgX1093583; Fri, 15 Nov 2013 07:10:42 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201311150710.rAF7AgX1093583@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 15 Nov 2013 07:10: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: r258159 - in stable/10/sys: amd64/amd64 i386/i386 x86/include 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 07:10:43 -0000 Author: kib Date: Fri Nov 15 07:10:42 2013 New Revision: 258159 URL: http://svnweb.freebsd.org/changeset/base/258159 Log: MFC r257856: Add bits for the AMD features from CPUID function 0x80000001 ECX, described in the rev. 3.0 of the Kabini BKDG, document 48751.pdf. Approved by: re (gjb) Modified: stable/10/sys/amd64/amd64/identcpu.c stable/10/sys/i386/i386/identcpu.c stable/10/sys/x86/include/specialreg.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/amd64/amd64/identcpu.c ============================================================================== --- stable/10/sys/amd64/amd64/identcpu.c Fri Nov 15 07:09:24 2013 (r258158) +++ stable/10/sys/amd64/amd64/identcpu.c Fri Nov 15 07:10:42 2013 (r258159) @@ -366,18 +366,18 @@ printcpuinfo(void) "\017" "\020LWP" /* Lightweight Profiling */ "\021FMA4" /* 4-operand FMA instructions */ - "\022" + "\022TCE" /* Translation Cache Extension */ "\023" "\024NodeId" /* NodeId MSR support */ "\025" "\026TBM" /* Trailing Bit Manipulation */ "\027Topology" /* Topology Extensions */ - "\030" - "\031" + "\030PCXC" /* Core perf count */ + "\031PNXC" /* NB perf count */ "\032" - "\033" - "\034" - "\035" + "\033DBE" /* Data Breakpoint extension */ + "\034PTSC" /* Performance TSC */ + "\035PL2I" /* L2I perf count */ "\036" "\037" "\040" Modified: stable/10/sys/i386/i386/identcpu.c ============================================================================== --- stable/10/sys/i386/i386/identcpu.c Fri Nov 15 07:09:24 2013 (r258158) +++ stable/10/sys/i386/i386/identcpu.c Fri Nov 15 07:10:42 2013 (r258159) @@ -842,18 +842,18 @@ printcpuinfo(void) "\017" "\020LWP" /* Lightweight Profiling */ "\021FMA4" /* 4-operand FMA instructions */ - "\022" + "\022TCE" /* Translation Cache Extension */ "\023" "\024NodeId" /* NodeId MSR support */ "\025" "\026TBM" /* Trailing Bit Manipulation */ "\027Topology" /* Topology Extensions */ - "\030" - "\031" + "\030PCXC" /* Core perf count */ + "\031PNXC" /* NB perf count */ "\032" - "\033" - "\034" - "\035" + "\033DBE" /* Data Breakpoint extension */ + "\034PTSC" /* Performance TSC */ + "\035PL2I" /* L2I perf count */ "\036" "\037" "\040" Modified: stable/10/sys/x86/include/specialreg.h ============================================================================== --- stable/10/sys/x86/include/specialreg.h Fri Nov 15 07:09:24 2013 (r258158) +++ stable/10/sys/x86/include/specialreg.h Fri Nov 15 07:10:42 2013 (r258159) @@ -201,9 +201,15 @@ #define AMDID2_WDT 0x00002000 #define AMDID2_LWP 0x00008000 #define AMDID2_FMA4 0x00010000 +#define AMDID2_TCE 0x00020000 #define AMDID2_NODE_ID 0x00080000 #define AMDID2_TBM 0x00200000 #define AMDID2_TOPOLOGY 0x00400000 +#define AMDID2_PCXC 0x00800000 +#define AMDID2_PNXC 0x01000000 +#define AMDID2_DBE 0x04000000 +#define AMDID2_PTSC 0x08000000 +#define AMDID2_PTSCEL2I 0x10000000 /* * CPUID instruction 1 eax info From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 16 00:31:35 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11BFE425; Sat, 16 Nov 2013 00:31:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E5D3A2F78; Sat, 16 Nov 2013 00:31:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAG0VYvC052116; Sat, 16 Nov 2013 00:31:34 GMT (envelope-from edavis@svn.freebsd.org) Received: (from edavis@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAG0VX8N052105; Sat, 16 Nov 2013 00:31:33 GMT (envelope-from edavis@svn.freebsd.org) Message-Id: <201311160031.rAG0VX8N052105@svn.freebsd.org> From: Eric Davis Date: Sat, 16 Nov 2013 00:31:33 +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: r258203 - stable/10/sys/dev/bxe 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 00:31:35 -0000 Author: edavis Date: Sat Nov 16 00:31:32 2013 New Revision: 258203 URL: http://svnweb.freebsd.org/changeset/base/258203 Log: Merge r258187 from head. Approved by: re@ (delphij) Approved by: davidch (mentor) Modified: stable/10/sys/dev/bxe/bxe.c stable/10/sys/dev/bxe/bxe.h stable/10/sys/dev/bxe/bxe_elink.c stable/10/sys/dev/bxe/ecore_hsi.h stable/10/sys/dev/bxe/ecore_init.h stable/10/sys/dev/bxe/ecore_reg.h stable/10/sys/dev/bxe/ecore_sp.c stable/10/sys/dev/bxe/ecore_sp.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/bxe/bxe.c ============================================================================== --- stable/10/sys/dev/bxe/bxe.c Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/bxe.c Sat Nov 16 00:31:32 2013 (r258203) @@ -34,7 +34,7 @@ #include __FBSDID("$FreeBSD$"); -#define BXE_DRIVER_VERSION "1.78.18" +#define BXE_DRIVER_VERSION "1.78.75" #include "bxe.h" #include "ecore_sp.h" @@ -303,70 +303,70 @@ static int load_count[2][3] = { {0} }; / SYSCTL_NODE(_hw, OID_AUTO, bxe, CTLFLAG_RD, 0, "bxe driver parameters"); /* Debug */ -uint32_t bxe_debug = 0; -TUNABLE_INT("hw.bxe.debug", &bxe_debug); -SYSCTL_UINT(_hw_bxe, OID_AUTO, debug, (CTLFLAG_RDTUN), - &bxe_debug, 0, "Debug logging mode"); +unsigned long bxe_debug = 0; +TUNABLE_ULONG("hw.bxe.debug", &bxe_debug); +SYSCTL_ULONG(_hw_bxe, OID_AUTO, debug, (CTLFLAG_RDTUN), + &bxe_debug, 0, "Debug logging mode"); /* Interrupt Mode: 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */ static int bxe_interrupt_mode = INTR_MODE_MSIX; TUNABLE_INT("hw.bxe.interrupt_mode", &bxe_interrupt_mode); -SYSCTL_UINT(_hw_bxe, OID_AUTO, interrupt_mode, CTLFLAG_RDTUN, - &bxe_interrupt_mode, 0, "Interrupt (MSI-X/MSI/INTx) mode"); +SYSCTL_INT(_hw_bxe, OID_AUTO, interrupt_mode, CTLFLAG_RDTUN, + &bxe_interrupt_mode, 0, "Interrupt (MSI-X/MSI/INTx) mode"); /* Number of Queues: 0 (Auto) or 1 to 16 (fixed queue number) */ static int bxe_queue_count = 4; TUNABLE_INT("hw.bxe.queue_count", &bxe_queue_count); -SYSCTL_UINT(_hw_bxe, OID_AUTO, queue_count, CTLFLAG_RDTUN, - &bxe_queue_count, 0, "Multi-Queue queue count"); +SYSCTL_INT(_hw_bxe, OID_AUTO, queue_count, CTLFLAG_RDTUN, + &bxe_queue_count, 0, "Multi-Queue queue count"); /* max number of buffers per queue (default RX_BD_USABLE) */ -static uint32_t bxe_max_rx_bufs = 0; +static int bxe_max_rx_bufs = 0; TUNABLE_INT("hw.bxe.max_rx_bufs", &bxe_max_rx_bufs); -SYSCTL_UINT(_hw_bxe, OID_AUTO, max_rx_bufs, CTLFLAG_RDTUN, - &bxe_max_rx_bufs, 0, "Maximum Number of Rx Buffers Per Queue"); +SYSCTL_INT(_hw_bxe, OID_AUTO, max_rx_bufs, CTLFLAG_RDTUN, + &bxe_max_rx_bufs, 0, "Maximum Number of Rx Buffers Per Queue"); /* Host interrupt coalescing RX tick timer (usecs) */ -static uint32_t bxe_hc_rx_ticks = 25; +static int bxe_hc_rx_ticks = 25; TUNABLE_INT("hw.bxe.hc_rx_ticks", &bxe_hc_rx_ticks); -SYSCTL_UINT(_hw_bxe, OID_AUTO, hc_rx_ticks, CTLFLAG_RDTUN, - &bxe_hc_rx_ticks, 0, "Host Coalescing Rx ticks"); +SYSCTL_INT(_hw_bxe, OID_AUTO, hc_rx_ticks, CTLFLAG_RDTUN, + &bxe_hc_rx_ticks, 0, "Host Coalescing Rx ticks"); /* Host interrupt coalescing TX tick timer (usecs) */ -static uint32_t bxe_hc_tx_ticks = 50; +static int bxe_hc_tx_ticks = 50; TUNABLE_INT("hw.bxe.hc_tx_ticks", &bxe_hc_tx_ticks); -SYSCTL_UINT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN, - &bxe_hc_tx_ticks, 0, "Host Coalescing Tx ticks"); +SYSCTL_INT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN, + &bxe_hc_tx_ticks, 0, "Host Coalescing Tx ticks"); /* Maximum number of Rx packets to process at a time */ -static uint32_t bxe_rx_budget = 0xffffffff; +static int bxe_rx_budget = 0xffffffff; TUNABLE_INT("hw.bxe.rx_budget", &bxe_rx_budget); -SYSCTL_UINT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN, - &bxe_rx_budget, 0, "Rx processing budget"); +SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN, + &bxe_rx_budget, 0, "Rx processing budget"); /* Maximum LRO aggregation size */ -static uint32_t bxe_max_aggregation_size = 0; +static int bxe_max_aggregation_size = 0; TUNABLE_INT("hw.bxe.max_aggregation_size", &bxe_max_aggregation_size); -SYSCTL_UINT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN, - &bxe_max_aggregation_size, 0, "max aggregation size"); +SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN, + &bxe_max_aggregation_size, 0, "max aggregation size"); /* PCI MRRS: -1 (Auto), 0 (128B), 1 (256B), 2 (512B), 3 (1KB) */ static int bxe_mrrs = -1; TUNABLE_INT("hw.bxe.mrrs", &bxe_mrrs); -SYSCTL_UINT(_hw_bxe, OID_AUTO, mrrs, CTLFLAG_RDTUN, - &bxe_mrrs, 0, "PCIe maximum read request size"); +SYSCTL_INT(_hw_bxe, OID_AUTO, mrrs, CTLFLAG_RDTUN, + &bxe_mrrs, 0, "PCIe maximum read request size"); /* AutoGrEEEn: 0 (hardware default), 1 (force on), 2 (force off) */ static int bxe_autogreeen = 0; TUNABLE_INT("hw.bxe.autogreeen", &bxe_autogreeen); -SYSCTL_UINT(_hw_bxe, OID_AUTO, autogreeen, CTLFLAG_RDTUN, - &bxe_autogreeen, 0, "AutoGrEEEn support"); +SYSCTL_INT(_hw_bxe, OID_AUTO, autogreeen, CTLFLAG_RDTUN, + &bxe_autogreeen, 0, "AutoGrEEEn support"); /* 4-tuple RSS support for UDP: 0 (disabled), 1 (enabled) */ static int bxe_udp_rss = 0; TUNABLE_INT("hw.bxe.udp_rss", &bxe_udp_rss); -SYSCTL_UINT(_hw_bxe, OID_AUTO, udp_rss, CTLFLAG_RDTUN, - &bxe_udp_rss, 0, "UDP RSS support"); +SYSCTL_INT(_hw_bxe, OID_AUTO, udp_rss, CTLFLAG_RDTUN, + &bxe_udp_rss, 0, "UDP RSS support"); #define STAT_NAME_LEN 32 /* no stat names below can be longer than this */ @@ -3604,10 +3604,10 @@ bxe_watchdog(struct bxe_softc *sc, return (0); } - BXE_FP_TX_UNLOCK(fp); - BLOGE(sc, "TX watchdog timeout on fp[%02d], resetting!\n", fp->index); + BXE_FP_TX_UNLOCK(fp); + atomic_store_rel_long(&sc->chip_tq_flags, CHIP_TQ_REINIT); taskqueue_enqueue(sc->chip_tq, &sc->chip_tq_task); @@ -3652,21 +3652,21 @@ bxe_txeof(struct bxe_softc *sc, tx_bd_avail = bxe_tx_avail(sc, fp); - /* reset the watchdog timer if there are pending transmits */ - if (tx_bd_avail >= BXE_TX_CLEANUP_THRESHOLD) { + if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) { + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + } else { ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + } - if (tx_bd_avail >= (TX_BD_USABLE - 1)) { - /* clear watchdog if the tx chain is empty */ - fp->watchdog_timer = 0; - return (FALSE); - } - - /* reset watchdog if there are pending transmits */ + if (fp->tx_pkt_prod != fp->tx_pkt_cons) { + /* reset the watchdog timer if there are pending transmits */ fp->watchdog_timer = BXE_TX_TIMEOUT; + return (TRUE); + } else { + /* clear watchdog when there are no pending transmits */ + fp->watchdog_timer = 0; + return (FALSE); } - - return (TRUE); } static void @@ -5879,13 +5879,11 @@ bxe_tx_start_locked(struct bxe_softc /* handle any completions if we're running low */ if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) { + /* bxe_txeof will set IFF_DRV_OACTIVE appropriately */ bxe_txeof(sc, fp); - } - - /* close TX if we're still running low */ - if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) { - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - break; + if (ifp->if_drv_flags & IFF_DRV_OACTIVE) { + break; + } } } @@ -6008,13 +6006,11 @@ bxe_tx_mq_start_locked(struct bxe_softc /* handle any completions if we're running low */ if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) { + /* bxe_txeof will set IFF_DRV_OACTIVE appropriately */ bxe_txeof(sc, fp); - } - - /* close TX if we're still running low */ - if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) { - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - break; + if (ifp->if_drv_flags & IFF_DRV_OACTIVE) { + break; + } } next = drbr_dequeue(ifp, tx_br); @@ -14173,7 +14169,7 @@ bxe_get_tunable_params(struct bxe_softc BLOGD(sc, DBG_LOAD, "User Config: " - "debug=0x%x " + "debug=0x%lx " "interrupt_mode=%d " "queue_count=%d " "hc_rx_ticks=%d " Modified: stable/10/sys/dev/bxe/bxe.h ============================================================================== --- stable/10/sys/dev/bxe/bxe.h Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/bxe.h Sat Nov 16 00:31:32 2013 (r258203) @@ -748,6 +748,9 @@ struct bxe_fastpath { #define BXE_VF_ID_INVALID 0xFF #define IS_SRIOV(sc) 0 +#define GET_NUM_VFS_PER_PATH(sc) 0 +#define GET_NUM_VFS_PER_PF(sc) 0 + /* maximum number of fast-path interrupt contexts */ #define FP_SB_MAX_E1x 16 #define FP_SB_MAX_E2 HC_SB_MAX_SB_E2 @@ -1405,7 +1408,7 @@ struct bxe_softc { #define BXE_MF_FUNC_DIS 0x00000800 #define BXE_TX_SWITCHING 0x00001000 - uint32_t debug; /* per-instance debug logging config */ + unsigned long debug; /* per-instance debug logging config */ #define MAX_BARS 5 struct bxe_bar bar[MAX_BARS]; /* map BARs 0, 2, 4 */ @@ -1603,7 +1606,7 @@ struct bxe_softc { int max_rx_bufs; int hc_rx_ticks; int hc_tx_ticks; - uint32_t rx_budget; + int rx_budget; int max_aggregation_size; int mrrs; int autogreeen; Modified: stable/10/sys/dev/bxe/bxe_elink.c ============================================================================== --- stable/10/sys/dev/bxe/bxe_elink.c Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/bxe_elink.c Sat Nov 16 00:31:32 2013 (r258203) @@ -607,6 +607,7 @@ Theotherbitsarereservedandshouldbezero*/ #define MDIO_WC_REG_RX1_PCI_CTRL 0x80ca #define MDIO_WC_REG_RX2_PCI_CTRL 0x80da #define MDIO_WC_REG_RX3_PCI_CTRL 0x80ea +#define MDIO_WC_REG_RXB_ANA_RX_CONTROL_PCI 0x80fa #define MDIO_WC_REG_XGXSBLK2_UNICORE_MODE_10G 0x8104 #define MDIO_WC_REG_XGXS_STATUS3 0x8129 #define MDIO_WC_REG_PAR_DET_10G_STATUS 0x8130 @@ -4632,6 +4633,19 @@ static void elink_warpcore_enable_AN_KR( elink_warpcore_enable_AN_KR2(phy, params, vars); } else { + /* Enable Auto-Detect to support 1G over CL37 as well */ + elink_cl45_write(sc, phy, MDIO_WC_DEVAD, + MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1, 0x10); + + /* Force cl48 sync_status LOW to avoid getting stuck in CL73 + * parallel-detect loop when CL73 and CL37 are enabled. + */ + CL22_WR_OVER_CL45(sc, phy, MDIO_REG_BANK_AER_BLOCK, + MDIO_AER_BLOCK_AER_REG, 0); + elink_cl45_write(sc, phy, MDIO_WC_DEVAD, + MDIO_WC_REG_RXB_ANA_RX_CONTROL_PCI, 0x0800); + elink_set_aer_mmd(params, phy); + elink_disable_kr2(params, vars, phy); } @@ -7317,10 +7331,8 @@ static elink_status_t elink_link_initial (CHIP_IS_E1x(sc) || CHIP_IS_E2(sc))) elink_set_parallel_detection(phy, params); - if (params->phy[ELINK_INT_PHY].config_init) - params->phy[ELINK_INT_PHY].config_init(phy, - params, - vars); + if (params->phy[ELINK_INT_PHY].config_init) + params->phy[ELINK_INT_PHY].config_init(phy, params, vars); } /* Re-read this value in case it was changed inside config_init due to @@ -8904,17 +8916,20 @@ static elink_status_t elink_get_edc_mode *edc_mode = ELINK_EDC_MODE_ACTIVE_DAC; else check_limiting_mode = 1; - } else if (copper_module_type & - ELINK_SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE) { - ELINK_DEBUG_P0(sc, - "Passive Copper cable detected\n"); - *edc_mode = - ELINK_EDC_MODE_PASSIVE_DAC; } else { - ELINK_DEBUG_P1(sc, - "Unknown copper-cable-type 0x%x !!!\n", - copper_module_type); - return ELINK_STATUS_ERROR; + *edc_mode = ELINK_EDC_MODE_PASSIVE_DAC; + /* Even in case PASSIVE_DAC indication is not set, + * treat it as a passive DAC cable, since some cables + * don't have this indication. + */ + if (copper_module_type & + ELINK_SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE) { + ELINK_DEBUG_P0(sc, + "Passive Copper cable detected\n"); + } else { + ELINK_DEBUG_P0(sc, + "Unknown copper-cable-type\n"); + } } break; } @@ -14360,6 +14375,10 @@ static uint8_t elink_analyze_link_error( ELINK_DEBUG_P3(sc, "Link changed:[%x %x]->%x\n", vars->link_up, old_status, status); + /* Do not touch the link in case physical link down */ + if ((vars->phy_flags & PHY_PHYSICAL_LINK_FLAG) == 0) + return 1; + /* a. Update shmem->link_status accordingly * b. Update elink_vars->link_up */ Modified: stable/10/sys/dev/bxe/ecore_hsi.h ============================================================================== --- stable/10/sys/dev/bxe/ecore_hsi.h Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/ecore_hsi.h Sat Nov 16 00:31:32 2013 (r258203) @@ -1057,6 +1057,9 @@ struct port_feat_cfg { /* port 0: 0 #define PORT_FEATURE_MBA_VLAN_TAG_MASK 0x0000FFFF #define PORT_FEATURE_MBA_VLAN_TAG_SHIFT 0 #define PORT_FEATURE_MBA_VLAN_EN 0x00010000 + #define PORT_FEATUTE_BOFM_CFGD_EN 0x00020000 + #define PORT_FEATURE_BOFM_CFGD_FTGT 0x00040000 + #define PORT_FEATURE_BOFM_CFGD_VEN 0x00080000 uint32_t Reserved1; uint32_t smbus_config; @@ -1099,8 +1102,8 @@ struct port_feat_cfg { /* port 0: 0 #define PORT_FEATURE_LINK_SPEED_MASK 0x000F0000 #define PORT_FEATURE_LINK_SPEED_SHIFT 16 #define PORT_FEATURE_LINK_SPEED_AUTO 0x00000000 - #define PORT_FEATURE_LINK_SPEED_10M_FULL 0x00010000 - #define PORT_FEATURE_LINK_SPEED_10M_HALF 0x00020000 + #define PORT_FEATURE_LINK_SPEED_10M_HALF 0x00010000 + #define PORT_FEATURE_LINK_SPEED_10M_FULL 0x00020000 #define PORT_FEATURE_LINK_SPEED_100M_HALF 0x00030000 #define PORT_FEATURE_LINK_SPEED_100M_FULL 0x00040000 #define PORT_FEATURE_LINK_SPEED_1G 0x00050000 @@ -1654,6 +1657,7 @@ struct drv_func_mb { #define DRV_MSG_CODE_LOAD_REQ_FORCE_LFA 0x00002000 #define DRV_MSG_CODE_USR_BLK_IMAGE_REQ 0x00000001 + #define DRV_MSG_CODE_ISCSI_PERS_IMAGE_REQ 0x00000002 uint32_t fw_mb_header; #define FW_MSG_CODE_MASK 0xffff0000 @@ -2558,6 +2562,8 @@ struct shmem2_region { uint32_t drv_func_info_size; /* Offset 0x150 */ uint32_t link_attr_sync[PORT_MAX]; /* Offset 0x154 */ #define LINK_ATTR_SYNC_KR2_ENABLE (1<<0) + + uint32_t ibft_host_addr_hi; /* Initialize by uEFI ROM */ }; Modified: stable/10/sys/dev/bxe/ecore_init.h ============================================================================== --- stable/10/sys/dev/bxe/ecore_init.h Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/ecore_init.h Sat Nov 16 00:31:32 2013 (r258203) @@ -717,23 +717,35 @@ static const struct { * [30] MCP Latched ump_tx_parity * [31] MCP Latched scpad_parity */ -#define MISC_AEU_ENABLE_MCP_PRTY_BITS \ +#define MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS \ (AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \ AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \ - AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \ + AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY) + +#define MISC_AEU_ENABLE_MCP_PRTY_BITS \ + (MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS | \ AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY) /* Below registers control the MCP parity attention output. When * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are * enabled, when cleared - disabled. */ -static const uint32_t mcp_attn_ctl_regs[] = { - MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0, - MISC_REG_AEU_ENABLE4_NIG_0, - MISC_REG_AEU_ENABLE4_PXP_0, - MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0, - MISC_REG_AEU_ENABLE4_NIG_1, - MISC_REG_AEU_ENABLE4_PXP_1 +static const struct { + uint32_t addr; + uint32_t bits; +} mcp_attn_ctl_regs[] = { + { MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0, + MISC_AEU_ENABLE_MCP_PRTY_BITS }, + { MISC_REG_AEU_ENABLE4_NIG_0, + MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }, + { MISC_REG_AEU_ENABLE4_PXP_0, + MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }, + { MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0, + MISC_AEU_ENABLE_MCP_PRTY_BITS }, + { MISC_REG_AEU_ENABLE4_NIG_1, + MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }, + { MISC_REG_AEU_ENABLE4_PXP_1, + MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS } }; static inline void ecore_set_mcp_parity(struct bxe_softc *sc, uint8_t enable) @@ -742,14 +754,14 @@ static inline void ecore_set_mcp_parity( uint32_t reg_val; for (i = 0; i < ARRSIZE(mcp_attn_ctl_regs); i++) { - reg_val = REG_RD(sc, mcp_attn_ctl_regs[i]); + reg_val = REG_RD(sc, mcp_attn_ctl_regs[i].addr); if (enable) - reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS; + reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS; /* Linux is using mcp_attn_ctl_regs[i].bits */ else - reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS; + reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS; /* Linux is using mcp_attn_ctl_regs[i].bits */ - REG_WR(sc, mcp_attn_ctl_regs[i], reg_val); + REG_WR(sc, mcp_attn_ctl_regs[i].addr, reg_val); } } Modified: stable/10/sys/dev/bxe/ecore_reg.h ============================================================================== --- stable/10/sys/dev/bxe/ecore_reg.h Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/ecore_reg.h Sat Nov 16 00:31:32 2013 (r258203) @@ -3384,6 +3384,7 @@ Theotherbitsarereservedandshouldbezero*/ #define MDIO_WC_REG_RX1_PCI_CTRL 0x80ca #define MDIO_WC_REG_RX2_PCI_CTRL 0x80da #define MDIO_WC_REG_RX3_PCI_CTRL 0x80ea +#define MDIO_WC_REG_RXB_ANA_RX_CONTROL_PCI 0x80fa #define MDIO_WC_REG_XGXSBLK2_UNICORE_MODE_10G 0x8104 #define MDIO_WC_REG_XGXS_STATUS3 0x8129 #define MDIO_WC_REG_PAR_DET_10G_STATUS 0x8130 Modified: stable/10/sys/dev/bxe/ecore_sp.c ============================================================================== --- stable/10/sys/dev/bxe/ecore_sp.c Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/ecore_sp.c Sat Nov 16 00:31:32 2013 (r258203) @@ -168,16 +168,6 @@ static inline void __ecore_exe_queue_res } } -static inline void ecore_exe_queue_reset_pending(struct bxe_softc *sc, - struct ecore_exe_queue_obj *o) -{ - ECORE_SPIN_LOCK_BH(&o->lock); - - __ecore_exe_queue_reset_pending(sc, o); - - ECORE_SPIN_UNLOCK_BH(&o->lock); -} - /** * ecore_exe_queue_step - execute one execution chunk atomically * @@ -188,7 +178,6 @@ static inline void ecore_exe_queue_reset * (Should be called while holding the exe_queue->lock). */ static inline int ecore_exe_queue_step(struct bxe_softc *sc, - struct ecore_vlan_mac_obj *vobj, struct ecore_exe_queue_obj *o, unsigned long *ramrod_flags) { @@ -491,7 +480,7 @@ static void __ecore_vlan_mac_h_exec_pend ramrod_flags); o->head_exe_request = FALSE; o->saved_ramrod_flags = 0; - rc = ecore_exe_queue_step(sc, o, &o->exe_queue, &ramrod_flags); + rc = ecore_exe_queue_step(sc, &o->exe_queue, &ramrod_flags); if (rc != ECORE_SUCCESS) { ECORE_ERR("execution of pending commands failed with rc %d\n", rc); @@ -667,7 +656,8 @@ static int ecore_get_n_elements(struct b { struct ecore_vlan_mac_registry_elem *pos; uint8_t *next = base; - int counter = 0, read_lock; + int counter = 0; + int read_lock; ECORE_MSG(sc, "get_n_elements - taking vlan_mac_lock (reader)\n"); read_lock = ecore_vlan_mac_h_read_lock(sc, o); @@ -680,7 +670,7 @@ static int ecore_get_n_elements(struct b if (counter < n) { ECORE_MEMCPY(next, &pos->u, size); counter++; - ECORE_MSG(sc, "copied element number %d to address %p element was:", + ECORE_MSG(sc, "copied element number %d to address %p element was:\n", counter, next); next += stride + size; } @@ -1669,7 +1659,7 @@ static int __ecore_vlan_mac_execute_step */ rc = ECORE_PENDING; } else { - rc = ecore_exe_queue_step(sc, o, &o->exe_queue, ramrod_flags); + rc = ecore_exe_queue_step(sc, &o->exe_queue, ramrod_flags); } ECORE_SPIN_UNLOCK_BH(&o->exe_queue.lock); @@ -1693,12 +1683,19 @@ static int ecore_complete_vlan_mac(struc struct ecore_raw_obj *r = &o->raw; int rc; + /* Clearing the pending list & raw state should be made + * atomically (as execution flow assumes they represent the same) + */ + ECORE_SPIN_LOCK_BH(&o->exe_queue.lock); + /* Reset pending list */ - ecore_exe_queue_reset_pending(sc, &o->exe_queue); + __ecore_exe_queue_reset_pending(sc, &o->exe_queue); /* Clear pending */ r->clear_pending(r); + ECORE_SPIN_UNLOCK_BH(&o->exe_queue.lock); + /* If ramrod failed this is most likely a SW bug */ if (cqe->message.error) return ECORE_INVAL; @@ -1857,6 +1854,7 @@ static int ecore_execute_vlan_mac(struct * and exit. Otherwise send a ramrod to FW. */ if (!drv_only) { + ECORE_DBG_BREAK_IF(r->check_pending(r)); /* Set pending */ r->set_pending(r); @@ -2090,10 +2088,11 @@ static int ecore_vlan_mac_del_all(struct unsigned long *ramrod_flags) { struct ecore_vlan_mac_registry_elem *pos = NULL; - int rc = 0, read_lock; struct ecore_vlan_mac_ramrod_params p; struct ecore_exe_queue_obj *exeq = &o->exe_queue; struct ecore_exeq_elem *exeq_pos, *exeq_pos_n; + int read_lock; + int rc = 0; /* Clear pending commands first */ @@ -2529,7 +2528,8 @@ static int ecore_set_rx_mode_e2(struct b ETH_FILTER_RULES_CMD_TX_CMD; ecore_rx_mode_set_cmd_state_e2(sc, &p->tx_accept_flags, - &(data->rules[rule_idx++]), FALSE); + &(data->rules[rule_idx++]), + FALSE); } /* Rx */ @@ -2541,7 +2541,8 @@ static int ecore_set_rx_mode_e2(struct b ETH_FILTER_RULES_CMD_RX_CMD; ecore_rx_mode_set_cmd_state_e2(sc, &p->rx_accept_flags, - &(data->rules[rule_idx++]), FALSE); + &(data->rules[rule_idx++]), + FALSE); } /* If FCoE Queue configuration has been requested configure the Rx and @@ -2559,10 +2560,10 @@ static int ecore_set_rx_mode_e2(struct b data->rules[rule_idx].cmd_general_data = ETH_FILTER_RULES_CMD_TX_CMD; - ecore_rx_mode_set_cmd_state_e2(sc, - &p->tx_accept_flags, - &(data->rules[rule_idx++]), + ecore_rx_mode_set_cmd_state_e2(sc, &p->tx_accept_flags, + &(data->rules[rule_idx]), TRUE); + rule_idx++; } /* Rx */ @@ -2573,10 +2574,10 @@ static int ecore_set_rx_mode_e2(struct b data->rules[rule_idx].cmd_general_data = ETH_FILTER_RULES_CMD_RX_CMD; - ecore_rx_mode_set_cmd_state_e2(sc, - &p->rx_accept_flags, - &(data->rules[rule_idx++]), + ecore_rx_mode_set_cmd_state_e2(sc, &p->rx_accept_flags, + &(data->rules[rule_idx]), TRUE); + rule_idx++; } } @@ -2718,7 +2719,7 @@ static int ecore_mcast_enqueue_cmd(struc if (!new_cmd) return ECORE_NOMEM; - ECORE_MSG(sc, "About to enqueue a new %d command. macs_list_len=%d\n", \ + ECORE_MSG(sc, "About to enqueue a new %d command. macs_list_len=%d\n", cmd, macs_list_len); ECORE_LIST_INIT(&new_cmd->data.macs_head); @@ -4259,9 +4260,22 @@ void ecore_init_mac_credit_pool(struct b * CAM credit is equaly divided between all active functions * on the PATH. */ - if ((func_num > 0)) { + if ((func_num > 1)) { if (!CHIP_REV_IS_SLOW(sc)) - cam_sz = (MAX_MAC_CREDIT_E2 / func_num); + cam_sz = (MAX_MAC_CREDIT_E2 + - GET_NUM_VFS_PER_PATH(sc)) + / func_num + + GET_NUM_VFS_PER_PF(sc); + else + cam_sz = ECORE_CAM_SIZE_EMUL; + + /* No need for CAM entries handling for 57712 and + * newer. + */ + ecore_init_credit_pool(p, -1, cam_sz); + } else if (func_num == 1) { + if (!CHIP_REV_IS_SLOW(sc)) + cam_sz = MAX_MAC_CREDIT_E2; else cam_sz = ECORE_CAM_SIZE_EMUL; @@ -4332,6 +4346,10 @@ static int ecore_setup_rss(struct bxe_so rss_mode = ETH_RSS_MODE_DISABLED; else if (ECORE_TEST_BIT(ECORE_RSS_MODE_REGULAR, &p->rss_flags)) rss_mode = ETH_RSS_MODE_REGULAR; +#if defined(__VMKLNX__) && (VMWARE_ESX_DDK_VERSION < 55000) /* ! BNX2X_UPSTREAM */ + else if (ECORE_TEST_BIT(ECORE_RSS_MODE_ESX51, &p->rss_flags)) + rss_mode = ETH_RSS_MODE_ESX51; +#endif data->rss_mode = rss_mode; @@ -4456,6 +4474,16 @@ void ecore_init_rss_config_obj(struct bx rss_obj->config_rss = ecore_setup_rss; } +int validate_vlan_mac(struct bxe_softc *sc, + struct ecore_vlan_mac_obj *vlan_mac) +{ + if (!vlan_mac->get_n_elements) { + ECORE_ERR("vlan mac object was not intialized\n"); + return ECORE_INVAL; + } + return 0; +} + /********************** Queue state object ***********************************/ /** Modified: stable/10/sys/dev/bxe/ecore_sp.h ============================================================================== --- stable/10/sys/dev/bxe/ecore_sp.h Fri Nov 15 23:48:51 2013 (r258202) +++ stable/10/sys/dev/bxe/ecore_sp.h Sat Nov 16 00:31:32 2013 (r258203) @@ -1148,6 +1148,9 @@ enum { ECORE_RSS_IPV6_UDP, ECORE_RSS_TUNNELING, +#if defined(__VMKLNX__) && (VMWARE_ESX_DDK_VERSION < 55000) /* ! BNX2X_UPSTREAM */ + ECORE_RSS_MODE_ESX51, +#endif }; struct ecore_config_rss_params { @@ -1857,6 +1860,9 @@ int ecore_config_rss(struct bxe_softc *s void ecore_get_rss_ind_table(struct ecore_rss_config_obj *rss_obj, uint8_t *ind_table); +/* set as inline so printout will show the offending function */ +int validate_vlan_mac(struct bxe_softc *sc, + struct ecore_vlan_mac_obj *vlan_mac); #endif /* ECORE_SP_H */ From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 16 09:01:25 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41578925; Sat, 16 Nov 2013 09:01:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2EA9F2598; Sat, 16 Nov 2013 09:01:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAG91PEi025569; Sat, 16 Nov 2013 09:01:25 GMT (envelope-from jmg@svn.freebsd.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAG91O4g025564; Sat, 16 Nov 2013 09:01:24 GMT (envelope-from jmg@svn.freebsd.org) Message-Id: <201311160901.rAG91O4g025564@svn.freebsd.org> From: John-Mark Gurney Date: Sat, 16 Nov 2013 09:01:24 +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: r258212 - stable/10/sys/crypto/aesni 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 09:01:25 -0000 Author: jmg Date: Sat Nov 16 09:01:24 2013 New Revision: 258212 URL: http://svnweb.freebsd.org/changeset/base/258212 Log: MFC r257757: fix issues w/ AES-NI on unaligned data blocks... Approved by: re (kib) Modified: stable/10/sys/crypto/aesni/aesencdec.h stable/10/sys/crypto/aesni/aesni.h stable/10/sys/crypto/aesni/aesni_wrap.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/crypto/aesni/aesencdec.h ============================================================================== --- stable/10/sys/crypto/aesni/aesencdec.h Sat Nov 16 08:28:14 2013 (r258211) +++ stable/10/sys/crypto/aesni/aesencdec.h Sat Nov 16 09:01:24 2013 (r258212) @@ -30,11 +30,10 @@ #include static inline void -aesni_enc8(int rounds, const uint8_t *key_schedule, __m128i a, +aesni_enc8(int rounds, const __m128i *keysched, __m128i a, __m128i b, __m128i c, __m128i d, __m128i e, __m128i f, __m128i g, __m128i h, __m128i out[8]) { - const __m128i *keysched = (const __m128i *)key_schedule; int i; a ^= keysched[0]; @@ -68,11 +67,10 @@ aesni_enc8(int rounds, const uint8_t *ke } static inline void -aesni_dec8(int rounds, const uint8_t *key_schedule, __m128i a, +aesni_dec8(int rounds, const __m128i *keysched, __m128i a, __m128i b, __m128i c, __m128i d, __m128i e, __m128i f, __m128i g, __m128i h, __m128i out[8]) { - const __m128i *keysched = (const __m128i *)key_schedule; int i; a ^= keysched[0]; @@ -106,10 +104,9 @@ aesni_dec8(int rounds, const uint8_t *ke } static inline __m128i -aesni_enc(int rounds, const uint8_t *key_schedule, const __m128i from) +aesni_enc(int rounds, const __m128i *keysched, const __m128i from) { __m128i tmp; - const __m128i *keysched = (const __m128i *)key_schedule; int i; tmp = from ^ keysched[0]; @@ -121,10 +118,9 @@ aesni_enc(int rounds, const uint8_t *key } static inline __m128i -aesni_dec(int rounds, const uint8_t *key_schedule, const __m128i from) +aesni_dec(int rounds, const __m128i *keysched, const __m128i from) { __m128i tmp; - const __m128i *keysched = (const __m128i *)key_schedule; int i; tmp = from ^ keysched[0]; Modified: stable/10/sys/crypto/aesni/aesni.h ============================================================================== --- stable/10/sys/crypto/aesni/aesni.h Sat Nov 16 08:28:14 2013 (r258211) +++ stable/10/sys/crypto/aesni/aesni.h Sat Nov 16 09:01:24 2013 (r258212) @@ -71,29 +71,30 @@ struct aesni_session { /* * Internal functions, implemented in assembler. */ -void aesni_set_enckey(const uint8_t *userkey, uint8_t *encrypt_schedule, - int number_of_rounds); -void aesni_set_deckey(const uint8_t *encrypt_schedule, - uint8_t *decrypt_schedule, int number_of_rounds); +void aesni_set_enckey(const uint8_t *userkey, + uint8_t *encrypt_schedule /*__aligned(16)*/, int number_of_rounds); +void aesni_set_deckey(const uint8_t *encrypt_schedule /*__aligned(16)*/, + uint8_t *decrypt_schedule /*__aligned(16)*/, int number_of_rounds); /* * Slightly more public interfaces. */ -void aesni_encrypt_cbc(int rounds, const void *key_schedule, size_t len, - const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]); -void aesni_decrypt_cbc(int rounds, const void *key_schedule, size_t len, - uint8_t *buf, const uint8_t iv[AES_BLOCK_LEN]); -void aesni_encrypt_ecb(int rounds, const void *key_schedule, size_t len, - const uint8_t from[AES_BLOCK_LEN], uint8_t to[AES_BLOCK_LEN]); -void aesni_decrypt_ecb(int rounds, const void *key_schedule, size_t len, - const uint8_t from[AES_BLOCK_LEN], uint8_t to[AES_BLOCK_LEN]); - -void aesni_encrypt_xts(int rounds, const void *data_schedule, - const void *tweak_schedule, size_t len, const uint8_t *from, uint8_t *to, - const uint8_t iv[AES_BLOCK_LEN]); -void aesni_decrypt_xts(int rounds, const void *data_schedule, - const void *tweak_schedule, size_t len, const uint8_t *from, uint8_t *to, +void aesni_encrypt_cbc(int rounds, const void *key_schedule /*__aligned(16)*/, + size_t len, const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]); +void aesni_decrypt_cbc(int rounds, const void *key_schedule /*__aligned(16)*/, + size_t len, uint8_t *buf, const uint8_t iv[AES_BLOCK_LEN]); +void aesni_encrypt_ecb(int rounds, const void *key_schedule /*__aligned(16)*/, + size_t len, const uint8_t *from, uint8_t *to); +void aesni_decrypt_ecb(int rounds, const void *key_schedule /*__aligned(16)*/, + size_t len, const uint8_t *from, uint8_t *to); + +void aesni_encrypt_xts(int rounds, const void *data_schedule /*__aligned(16)*/, + const void *tweak_schedule /*__aligned(16)*/, size_t len, + const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]); +void aesni_decrypt_xts(int rounds, const void *data_schedule /*__aligned(16)*/, + const void *tweak_schedule /*__aligned(16)*/, size_t len, + const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]); int aesni_cipher_setup(struct aesni_session *ses, struct cryptoini *encini); @@ -103,4 +104,4 @@ int aesni_cipher_process(struct aesni_se uint8_t *aesni_cipher_alloc(struct cryptodesc *enccrd, struct cryptop *crp, int *allocated); -#endif +#endif /* _AESNI_H_ */ Modified: stable/10/sys/crypto/aesni/aesni_wrap.c ============================================================================== --- stable/10/sys/crypto/aesni/aesni_wrap.c Sat Nov 16 08:28:14 2013 (r258211) +++ stable/10/sys/crypto/aesni/aesni_wrap.c Sat Nov 16 09:01:24 2013 (r258212) @@ -41,6 +41,10 @@ __FBSDID("$FreeBSD$"); MALLOC_DECLARE(M_AESNI); +struct blocks8 { + __m128i blk[8]; +} __packed; + void aesni_encrypt_cbc(int rounds, const void *key_schedule, size_t len, const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]) @@ -65,20 +69,20 @@ aesni_decrypt_cbc(int rounds, const void uint8_t *buf, const uint8_t iv[AES_BLOCK_LEN]) { __m128i blocks[8]; - __m128i *bufs; + struct blocks8 *blks; __m128i ivreg, nextiv; size_t i, j, cnt; ivreg = _mm_loadu_si128((const __m128i *)iv); cnt = len / AES_BLOCK_LEN / 8; for (i = 0; i < cnt; i++) { - bufs = (__m128i *)buf; - aesni_dec8(rounds - 1, key_schedule, bufs[0], bufs[1], - bufs[2], bufs[3], bufs[4], bufs[5], bufs[6], - bufs[7], &blocks[0]); + blks = (struct blocks8 *)buf; + aesni_dec8(rounds - 1, key_schedule, blks->blk[0], blks->blk[1], + blks->blk[2], blks->blk[3], blks->blk[4], blks->blk[5], + blks->blk[6], blks->blk[7], &blocks[0]); for (j = 0; j < 8; j++) { - nextiv = bufs[j]; - bufs[j] = blocks[j] ^ ivreg; + nextiv = blks->blk[j]; + blks->blk[j] = blocks[j] ^ ivreg; ivreg = nextiv; } buf += AES_BLOCK_LEN * 8; @@ -86,9 +90,9 @@ aesni_decrypt_cbc(int rounds, const void i *= 8; cnt = len / AES_BLOCK_LEN; for (; i < cnt; i++) { - bufs = (__m128i *)buf; - nextiv = bufs[0]; - bufs[0] = aesni_dec(rounds - 1, key_schedule, bufs[0]) ^ ivreg; + nextiv = _mm_loadu_si128((void *)buf); + _mm_storeu_si128((void *)buf, + aesni_dec(rounds - 1, key_schedule, nextiv) ^ ivreg); ivreg = nextiv; buf += AES_BLOCK_LEN; } @@ -99,15 +103,26 @@ aesni_encrypt_ecb(int rounds, const void const uint8_t *from, uint8_t *to) { __m128i tot; - const __m128i *blocks; + __m128i tout[8]; + struct blocks8 *top; + const struct blocks8 *blks; size_t i, cnt; cnt = len / AES_BLOCK_LEN / 8; for (i = 0; i < cnt; i++) { - blocks = (const __m128i *)from; - aesni_enc8(rounds - 1, key_schedule, blocks[0], blocks[1], - blocks[2], blocks[3], blocks[4], blocks[5], blocks[6], - blocks[7], (__m128i *)to); + blks = (const struct blocks8 *)from; + top = (struct blocks8 *)to; + aesni_enc8(rounds - 1, key_schedule, blks->blk[0], blks->blk[1], + blks->blk[2], blks->blk[3], blks->blk[4], blks->blk[5], + blks->blk[6], blks->blk[7], tout); + top->blk[0] = tout[0]; + top->blk[1] = tout[1]; + top->blk[2] = tout[2]; + top->blk[3] = tout[3]; + top->blk[4] = tout[4]; + top->blk[5] = tout[5]; + top->blk[6] = tout[6]; + top->blk[7] = tout[7]; from += AES_BLOCK_LEN * 8; to += AES_BLOCK_LEN * 8; } @@ -127,15 +142,26 @@ aesni_decrypt_ecb(int rounds, const void const uint8_t from[AES_BLOCK_LEN], uint8_t to[AES_BLOCK_LEN]) { __m128i tot; - const __m128i *blocks; + __m128i tout[8]; + const struct blocks8 *blks; + struct blocks8 *top; size_t i, cnt; cnt = len / AES_BLOCK_LEN / 8; for (i = 0; i < cnt; i++) { - blocks = (const __m128i *)from; - aesni_dec8(rounds - 1, key_schedule, blocks[0], blocks[1], - blocks[2], blocks[3], blocks[4], blocks[5], blocks[6], - blocks[7], (__m128i *)to); + blks = (const struct blocks8 *)from; + top = (struct blocks8 *)to; + aesni_dec8(rounds - 1, key_schedule, blks->blk[0], blks->blk[1], + blks->blk[2], blks->blk[3], blks->blk[4], blks->blk[5], + blks->blk[6], blks->blk[7], tout); + top->blk[0] = tout[0]; + top->blk[1] = tout[1]; + top->blk[2] = tout[2]; + top->blk[3] = tout[3]; + top->blk[4] = tout[4]; + top->blk[5] = tout[5]; + top->blk[6] = tout[6]; + top->blk[7] = tout[7]; from += AES_BLOCK_LEN * 8; to += AES_BLOCK_LEN * 8; } @@ -173,31 +199,33 @@ xts_crank_lfsr(__m128i inp) } static void -aesni_crypt_xts_block(int rounds, const void *key_schedule, __m128i *tweak, - const __m128i *from, __m128i *to, int do_encrypt) +aesni_crypt_xts_block(int rounds, const __m128i *key_schedule, __m128i *tweak, + const uint8_t *from, uint8_t *to, int do_encrypt) { __m128i block; - block = *from ^ *tweak; + block = _mm_loadu_si128((const __m128i *)from) ^ *tweak; if (do_encrypt) block = aesni_enc(rounds - 1, key_schedule, block); else block = aesni_dec(rounds - 1, key_schedule, block); - *to = block ^ *tweak; + _mm_storeu_si128((__m128i *)to, block ^ *tweak); *tweak = xts_crank_lfsr(*tweak); } static void -aesni_crypt_xts_block8(int rounds, const void *key_schedule, __m128i *tweak, - const __m128i *from, __m128i *to, int do_encrypt) +aesni_crypt_xts_block8(int rounds, const __m128i *key_schedule, __m128i *tweak, + const uint8_t *from, uint8_t *to, int do_encrypt) { __m128i tmptweak; __m128i a, b, c, d, e, f, g, h; __m128i tweaks[8]; __m128i tmp[8]; + __m128i *top; + const __m128i *fromp; tmptweak = *tweak; @@ -205,10 +233,12 @@ aesni_crypt_xts_block8(int rounds, const * unroll the loop. This lets gcc put values directly in the * register and saves memory accesses. */ + fromp = (const __m128i *)from; #define PREPINP(v, pos) \ do { \ tweaks[(pos)] = tmptweak; \ - (v) = from[(pos)] ^ tmptweak; \ + (v) = _mm_loadu_si128(&fromp[pos]) ^ \ + tmptweak; \ tmptweak = xts_crank_lfsr(tmptweak); \ } while (0) PREPINP(a, 0); @@ -228,20 +258,21 @@ aesni_crypt_xts_block8(int rounds, const aesni_dec8(rounds - 1, key_schedule, a, b, c, d, e, f, g, h, tmp); - to[0] = tmp[0] ^ tweaks[0]; - to[1] = tmp[1] ^ tweaks[1]; - to[2] = tmp[2] ^ tweaks[2]; - to[3] = tmp[3] ^ tweaks[3]; - to[4] = tmp[4] ^ tweaks[4]; - to[5] = tmp[5] ^ tweaks[5]; - to[6] = tmp[6] ^ tweaks[6]; - to[7] = tmp[7] ^ tweaks[7]; + top = (__m128i *)to; + _mm_storeu_si128(&top[0], tmp[0] ^ tweaks[0]); + _mm_storeu_si128(&top[1], tmp[1] ^ tweaks[1]); + _mm_storeu_si128(&top[2], tmp[2] ^ tweaks[2]); + _mm_storeu_si128(&top[3], tmp[3] ^ tweaks[3]); + _mm_storeu_si128(&top[4], tmp[4] ^ tweaks[4]); + _mm_storeu_si128(&top[5], tmp[5] ^ tweaks[5]); + _mm_storeu_si128(&top[6], tmp[6] ^ tweaks[6]); + _mm_storeu_si128(&top[7], tmp[7] ^ tweaks[7]); } static void -aesni_crypt_xts(int rounds, const void *data_schedule, - const void *tweak_schedule, size_t len, const uint8_t *from, uint8_t *to, - const uint8_t iv[AES_BLOCK_LEN], int do_encrypt) +aesni_crypt_xts(int rounds, const __m128i *data_schedule, + const __m128i *tweak_schedule, size_t len, const uint8_t *from, + uint8_t *to, const uint8_t iv[AES_BLOCK_LEN], int do_encrypt) { __m128i tweakreg; uint8_t tweak[AES_XTS_BLOCKSIZE] __aligned(16); @@ -264,7 +295,7 @@ aesni_crypt_xts(int rounds, const void * cnt = len / AES_XTS_BLOCKSIZE / 8; for (i = 0; i < cnt; i++) { aesni_crypt_xts_block8(rounds, data_schedule, &tweakreg, - (const __m128i *)from, (__m128i *)to, do_encrypt); + from, to, do_encrypt); from += AES_XTS_BLOCKSIZE * 8; to += AES_XTS_BLOCKSIZE * 8; } @@ -272,7 +303,7 @@ aesni_crypt_xts(int rounds, const void * cnt = len / AES_XTS_BLOCKSIZE; for (; i < cnt; i++) { aesni_crypt_xts_block(rounds, data_schedule, &tweakreg, - (const __m128i *)from, (__m128i *)to, do_encrypt); + from, to, do_encrypt); from += AES_XTS_BLOCKSIZE; to += AES_XTS_BLOCKSIZE; } From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 16 18:40:47 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 30E11B40; Sat, 16 Nov 2013 18:40:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E2732EAB; Sat, 16 Nov 2013 18:40:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGIek92022003; Sat, 16 Nov 2013 18:40:46 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGIejxA021994; Sat, 16 Nov 2013 18:40:45 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311161840.rAGIejxA021994@svn.freebsd.org> From: Glen Barber Date: Sat, 16 Nov 2013 18:40: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: r258230 - in stable/10: . include lib lib/libc/iconv lib/libiconv_compat share/man/man5 share/mk tools/build/mk tools/build/options 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 18:40:47 -0000 Author: gjb Date: Sat Nov 16 18:40:44 2013 New Revision: 258230 URL: http://svnweb.freebsd.org/changeset/base/258230 Log: MFC r257583, r258012, r258013: r257583 (peter): Remove the WITH_LIBICONV_COMPAT hack that seems to do more harm than good. This caused libc to spoof the ports libiconv namespace and provide a colliding libiconv.so.3 to fool rtld. This should have been removed some time ago. r258012: Remove WITH_LIBICONV_COMPAT file to chase after r257583. r258013: Regenerate src.conf.5 after removal of WITH_LIBICONV_COMPAT. Approved by: re (kib) Sponsored by: The FreeBSD Foundation Sponsored by: The FreeBSD Foundation Deleted: stable/10/lib/libiconv_compat/ stable/10/tools/build/options/WITH_LIBICONV_COMPAT Modified: stable/10/ObsoleteFiles.inc (contents, props changed) stable/10/include/Makefile stable/10/include/iconv.h stable/10/lib/Makefile stable/10/lib/libc/iconv/Symbol.map stable/10/lib/libc/iconv/iconv.c stable/10/share/man/man5/src.conf.5 stable/10/share/mk/bsd.own.mk stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/include/ (props changed) stable/10/lib/ (props changed) stable/10/lib/libc/ (props changed) stable/10/share/man/man5/ (props changed) stable/10/share/mk/ (props changed) stable/10/tools/build/ (props changed) stable/10/tools/build/options/ (props changed) Modified: stable/10/ObsoleteFiles.inc ============================================================================== --- stable/10/ObsoleteFiles.inc Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/ObsoleteFiles.inc Sat Nov 16 18:40:44 2013 (r258230) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20131103: WITH_LIBICONV_COMPAT removal +OLD_FILES+=usr/include/_libiconv_compat.h +OLD_FILES+=usr/lib/libiconv.a +OLD_FILES+=usr/lib/libiconv.so +OLD_FILES+=usr/lib/libiconv.so.3 +OLD_FILES+=usr/lib/libiconv_p.a # 20131030: /etc/keys moved to /usr/share/keys OLD_DIRS+=etc/keys OLD_DIRS+=etc/keys/pkg Modified: stable/10/include/Makefile ============================================================================== --- stable/10/include/Makefile Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/include/Makefile Sat Nov 16 18:40:44 2013 (r258230) @@ -83,15 +83,7 @@ _netipx= netipx # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" -CLEANFILES+= _libiconv_compat.h -INCS+= _libiconv_compat.h iconv.h -_libiconv_compat.h: ${.CURDIR}/Makefile - echo "/* Indicate whether libiconv symbols are present */" > _libiconv_compat.h -.if ${MK_LIBICONV_COMPAT} == "yes" - echo "#define __LIBICONV_COMPAT" >> _libiconv_compat.h -.else - echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h -.endif +INCS+= iconv.h .endif Modified: stable/10/include/iconv.h ============================================================================== --- stable/10/include/iconv.h Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/include/iconv.h Sat Nov 16 18:40:44 2013 (r258230) @@ -40,13 +40,6 @@ #include #include -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -#define libiconv_open iconv_open -#define libiconv_close iconv_close -#define libiconv iconv -#define libiconv_t iconv_t -#endif #ifdef __cplusplus typedef bool __iconv_bool; #elif __STDC_VERSION__ >= 199901L @@ -76,22 +69,10 @@ size_t __iconv(iconv_t, const char **, s /* * GNU interfaces for iconv */ -#ifdef __LIBICONV_COMPAT -#define libiconv_open_into iconv_open_into -#define libiconvctl iconvctl -#define libiconvlist iconvlist -#define libiconv_set_relocation_prefix iconv_set_relocation_prefix -#endif - /* We have iconvctl() */ #define _ICONV_VERSION 0x0108 extern int _iconv_version; -#ifdef __LIBICONV_COMPAT -#define _libiconv_version _iconv_version -#define _LIBICONV_VERSION _ICONV_VERSION -#endif - typedef struct { void *spaceholder[64]; } iconv_allocation_t; Modified: stable/10/lib/Makefile ============================================================================== --- stable/10/lib/Makefile Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/lib/Makefile Sat Nov 16 18:40:44 2013 (r258230) @@ -81,7 +81,6 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ - ${_libiconv_compat} \ libipsec \ ${_libipx} \ libjail \ @@ -188,10 +187,6 @@ _libcxxrt= libcxxrt _libcplusplus= libc++ .endif -.if ${MK_LIBICONV_COMPAT} != "no" -_libiconv_compat= libiconv_compat -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif Modified: stable/10/lib/libc/iconv/Symbol.map ============================================================================== --- stable/10/lib/libc/iconv/Symbol.map Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/lib/libc/iconv/Symbol.map Sat Nov 16 18:40:44 2013 (r258230) @@ -6,15 +6,7 @@ FBSD_1.2 { __iconv; __iconv_free_list; __iconv_get_list; - _libiconv_version; iconv_canonicalize; - libiconv; - libiconv_close; - libiconv_open; - libiconv_open_into; - libiconv_set_relocation_prefix; - libiconvctl; - libiconvlist; }; FBSD_1.3 { Modified: stable/10/lib/libc/iconv/iconv.c ============================================================================== --- stable/10/lib/libc/iconv/iconv.c Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/lib/libc/iconv/iconv.c Sat Nov 16 18:40:44 2013 (r258230) @@ -47,18 +47,6 @@ #include "citrus_hash.h" #include "citrus_iconv.h" -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -__weak_reference(iconv, libiconv); -__weak_reference(iconv_open, libiconv_open); -__weak_reference(iconv_open_into, libiconv_open_into); -__weak_reference(iconv_close, libiconv_close); -__weak_reference(iconvlist, libiconvlist); -__weak_reference(iconvctl, libiconvctl); -__weak_reference(iconv_set_relocation_prefix, libiconv_set_relocation_prefix); -__weak_reference(_iconv_version, _libiconv_version); -#endif - #define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) int _iconv_version = _ICONV_VERSION; Modified: stable/10/share/man/man5/src.conf.5 ============================================================================== --- stable/10/share/man/man5/src.conf.5 Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/share/man/man5/src.conf.5 Sat Nov 16 18:40:44 2013 (r258230) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd November 6, 2013 +.Dd November 11, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -471,12 +471,6 @@ Set to not build HTML docs. .It Va WITHOUT_ICONV .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ICONV 254919 2013-08-26 17:15:56Z antoine Set to not build iconv as part of libc. -When set, it also enforces the following options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_LIBICONV_COMPAT -.El .It Va WITHOUT_INET .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_INET 221266 2011-04-30 17:58:28Z bz Set to not build programs and libraries related to IPv4 networking. @@ -633,9 +627,6 @@ runtime linker. .It Va WITHOUT_LIBCPLUSPLUS .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim Set to avoid building libcxxrt and libc++. -.It Va WITH_LIBICONV_COMPAT -.\" from FreeBSD: stable/10/tools/build/options/WITH_LIBICONV_COMPAT 254919 2013-08-26 17:15:56Z antoine -Set to build libiconv API and link time compatibility. .It Va WITHOUT_LIBPTHREAD .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm Set to not build the Modified: stable/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/share/mk/bsd.own.mk Sat Nov 16 18:40:44 2013 (r258230) @@ -368,7 +368,6 @@ __DEFAULT_NO_OPTIONS = \ DEBUG_FILES \ GPL_DTC \ HESIOD \ - LIBICONV_COMPAT \ INSTALL_AS_USER \ LLDB \ NAND \ @@ -491,10 +490,6 @@ MK_${var}:= no MK_LIBTHR:= no .endif -.if ${MK_ICONV} == "no" -MK_LIBICONV_COMPAT:= no -.endif - .if ${MK_LDNS} == "no" MK_LDNS_UTILS:= no MK_UNBOUND:= no Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 16 17:17:23 2013 (r258229) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 16 18:40:44 2013 (r258230) @@ -3190,13 +3190,6 @@ OLD_FILES+=usr/share/man/man1/host.1.gz # to be filled in #.endif -.if ${MK_LIBICONV_COMPAT} == no -OLD_FILES+=usr/lib/libiconv.a -OLD_FILES+=usr/lib/libiconv.so -OLD_FILES+=usr/lib/libiconv.so.3 -OLD_FILES+=usr/lib/libiconv_p.a -.endif - .if ${MK_LIBCPLUSPLUS} == no OLD_LIBS+=lib/libcxxrt.so.1 OLD_FILES+=usr/lib/libc++.a From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 16 19:22:14 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8B2D482; Sat, 16 Nov 2013 19:22:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 954ED20EE; Sat, 16 Nov 2013 19:22:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGJMEd6035923; Sat, 16 Nov 2013 19:22:14 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGJMEdg035919; Sat, 16 Nov 2013 19:22:14 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311161922.rAGJMEdg035919@svn.freebsd.org> From: Glen Barber Date: Sat, 16 Nov 2013 19:22:14 +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: r258231 - in stable/10/contrib/nvi: . common docs/USD.doc/vi.man ex vi 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-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 19:22:14 -0000 Author: gjb Date: Sat Nov 16 19:22:13 2013 New Revision: 258231 URL: http://svnweb.freebsd.org/changeset/base/258231 Log: MFC r257999 (peter): Merge nvi-2.1.1 -> 2.1.2 Approved by: re (???) Sponsored by: The FreeBSD Foundation Modified: stable/10/contrib/nvi/README stable/10/contrib/nvi/common/main.c stable/10/contrib/nvi/docs/USD.doc/vi.man/vi.1 stable/10/contrib/nvi/ex/ex_print.c stable/10/contrib/nvi/ex/version.h stable/10/contrib/nvi/vi/v_txt.c stable/10/contrib/nvi/vi/vs_refresh.c Directory Properties: stable/10/contrib/nvi/ (props changed) Modified: stable/10/contrib/nvi/README ============================================================================== --- stable/10/contrib/nvi/README Sat Nov 16 18:40:44 2013 (r258230) +++ stable/10/contrib/nvi/README Sat Nov 16 19:22:13 2013 (r258231) @@ -1,6 +1,6 @@ -# $Id: README,v 9.0 2012/10/07 09:13:54 zy Exp $ +# $Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $ -This is version 2.1.1 (2012-10-07) of nex/nvi, a reimplementation of the ex/vi +This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. Modified: stable/10/contrib/nvi/common/main.c ============================================================================== --- stable/10/contrib/nvi/common/main.c Sat Nov 16 18:40:44 2013 (r258230) +++ stable/10/contrib/nvi/common/main.c Sat Nov 16 19:22:13 2013 (r258231) @@ -11,9 +11,9 @@ #ifndef lint static const char copyright[] = -"%Z% Copyright (c) 1992, 1993, 1994\n\ +"@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n\ -%Z% Copyright (c) 1992, 1993, 1994, 1995, 1996\n\ +@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996\n\ Keith Bostic. All rights reserved.\n"; #endif /* not lint */ Modified: stable/10/contrib/nvi/docs/USD.doc/vi.man/vi.1 ============================================================================== --- stable/10/contrib/nvi/docs/USD.doc/vi.man/vi.1 Sat Nov 16 18:40:44 2013 (r258230) +++ stable/10/contrib/nvi/docs/USD.doc/vi.man/vi.1 Sat Nov 16 19:22:13 2013 (r258231) @@ -5,1619 +5,2742 @@ .\" Copyright (c) 2011 .\" Zhihao Yuan. All rights reserved. .\" -.\" This document may not be republished without written permission from -.\" Keith Bostic. +.\" The vi program is freely redistributable. +.\" You are welcome to copy, modify and share it with others +.\" under the conditions listed in the LICENSE file. +.\" If any company (not individual!) finds vi sufficiently useful +.\" that you would have purchased it, or if any company wishes to +.\" redistribute it, contributions to the authors would be appreciated. .\" -.\" See the LICENSE file for redistribution information. +.\" $Id: vi.1,v 9.0 2013/11/02 12:11:56 zy Exp $ +.\" $FreeBSD$ .\" -.\" @(#)vi.1 8.51 (Berkeley) 10/10/96 -.\" $FreeBSD$ -.\" $Id: vi.1,v 8.59 2012/02/12 12:56:37 zy Exp $ -.\" -.TH VI 1 "11 February, 2012" -.UC -.SH NAME -ex, vi, view \- text editors -.SH SYNOPSIS -.B ex -[\c -.B -eFRrSsv\c -] [\c -.BI -c " cmd"\c -] [\c -.BI -t " tag"\c -] [\c -.BI -w " size"\c -] [file ...] -.br -.B vi -[\c -.B -eFlRrSv\c -] [\c -.BI -c " cmd"\c -] [\c -.BI -t " tag"\c -] [\c -.BI -w " size"\c -] [file ...] -.br -.B view -[\c -.B -eFRrSv\c -] [\c -.BI -c " cmd"\c -] [\c -.BI -t " tag"\c -] [\c -.BI -w " size"\c -] [file ...] -.SH LICENSE -The vi program is freely redistributable. You are welcome to copy, -modify and share it with others under the conditions listed in the -LICENSE file. If any company (not individual!) finds vi sufficiently -useful that you would have purchased it, or if any company wishes to -redistribute it, contributions to the authors would be appreciated. -.SH DESCRIPTION -.I \&Vi -is a screen oriented text editor. -.I \&Ex +.Dd November 2, 2013 +.Dt VI 1 +.Os +.Sh NAME +.Nm ex , vi , view +.Nd text editors +.Sh SYNOPSIS +.Nm ex +.Op Fl FRrSsv +.Op Fl c Ar cmd +.Op Fl t Ar tag +.Op Fl w Ar size +.Op Ar +.Nm vi\ \& +.Op Fl eFRrS +.Op Fl c Ar cmd +.Op Fl t Ar tag +.Op Fl w Ar size +.Op Ar +.Nm view +.Op Fl eFrS +.Op Fl c Ar cmd +.Op Fl t Ar tag +.Op Fl w Ar size +.Op Ar +.Sh DESCRIPTION +.Nm vi +is a screen-oriented text editor. +.Nm ex is a line-oriented text editor. -.I \&Ex +.Nm ex and -.I \&vi +.Nm vi are different interfaces to the same program, and it is possible to switch back and forth during an edit session. -.I View +.Nm view is the equivalent of using the -.B \-R -(read-only) option of -.IR \&vi . -.PP +.Fl R +.Pq read-only +option of +.Nm vi . +.Pp This manual page is the one provided with the -.I nex/nvi +.Nm nex Ns / Ns Nm nvi versions of the -.I ex/vi +.Nm ex Ns / Ns Nm vi text editors. -.I Nex/nvi +.Nm nex Ns / Ns Nm nvi are intended as bug-for-bug compatible replacements for the original -Fourth Berkeley Software Distribution (4BSD) -.I \&ex +Fourth Berkeley Software Distribution +.Pq 4BSD +.Nm ex and -.I \&vi +.Nm vi programs. For the rest of this manual page, -.I nex/nvi +.Nm nex Ns / Ns Nm nvi is used only when it's necessary to distinguish it from the historic implementations of -.IR ex/vi . -.PP +.Nm ex Ns / Ns Nm vi . +.Pp This manual page is intended for users already familiar with -.IR ex/vi . +.Nm ex Ns / Ns Nm vi . Anyone else should almost certainly read a good tutorial on the editor before this manual page. -If you're in an unfamiliar environment, and you absolutely have to -get work done immediately, read the section after the options -description, entitled ``Fast Startup''. +If you're in an unfamiliar environment, +and you absolutely have to get work done immediately, +read the section after the options description, entitled +.Sx FAST STARTUP . It's probably enough to get you going. -.PP +.Pp The following options are available: -.TP -.B \-c +.Bl -tag -width "-w size " +.It Fl c Ar cmd Execute -.B cmd -immediately after starting the edit session. -Particularly useful for initial positioning in the file, however -.B cmd +.Ar cmd +on the first file loaded. +Particularly useful for initial positioning in the file, although +.Ar cmd is not limited to positioning commands. -This is the POSIX 1003.2 interface for the historic ``+cmd'' syntax. -.I Nex/nvi +This is the POSIX 1003.2 interface for the historic +.Dq +cmd +syntax. +.Nm nex Ns / Ns Nm nvi supports both the old and new syntax. -.TP -.B \-e +.It Fl e Start editing in ex mode, as if the command name were -.IR \&ex . -.TP -.B \-F +.Nm ex . +.It Fl F Don't copy the entire file when first starting to edit. (The default is to make a copy in case someone else modifies the file during your edit session.) -.TP -.B \-l -Start editing with the lisp and showmatch options set. -.TP -.B \-R +.\" .It Fl l +.\" Start editing with the lisp and showmatch options set. +.It Fl R Start editing in read-only mode, as if the command name was -.IR view , +.Nm view , or the -.B readonly +.Cm readonly option was set. -.TP -.B \-r +.It Fl r Recover the specified files, or, if no files are specified, list the files that could be recovered. If no recoverable files by the specified name exist, the file is edited as if the -.B \-r +.Fl r option had not been specified. -.TP -.B \-S +.It Fl S Run with the -.B secure +.Cm secure edit option set, disallowing all access to external programs. -.TP -.B \-s +.It Fl s Enter batch mode; applicable only to -.I \&ex +.Nm ex edit sessions. Batch mode is useful when running -.I \&ex +.Nm ex scripts. -Prompts, informative messages and other user oriented message -are turned off, +Prompts, informative messages and other user oriented messages are turned off, and no startup files or environment variables are read. -This is the POSIX 1003.2 interface for the historic ``\-'' argument. -.I \&Nex/nvi +This is the POSIX 1003.2 interface for the historic +.Dq - +argument. +.Nm nex Ns / Ns Nm nvi supports both the old and new syntax. -.TP -.B \-t -Start editing at the specified tag. -(See -.IR ctags (1)). -.TP -.B \-w -Set the initial window size to the specified number of lines. -.TP -.B \-v +.It Fl t Ar tag +Start editing at the specified +.Ar tag +.Pq see Xr ctags 1 . +.It Fl v Start editing in vi mode, as if the command name was -.I \&vi -or -.IR view . -.PP +.Nm vi . +.It Fl w Ar size +Set the initial window size to the specified number of lines. +.El +.Pp Command input for -.I ex/vi +.Nm ex Ns / Ns Nm vi is read from the standard input. In the -.I \&vi +.Nm vi interface, it is an error if standard input is not a terminal. In the -.I \&ex +.Nm ex interface, if standard input is not a terminal, -.I \&ex -will read commands from it regardless, however, the session will be a +.Nm ex +will read commands from it regardless; however, the session will be a batch mode session, exactly as if the -.B \-s +.Fl s option had been specified. -.PP -.I Ex/vi -exits 0 on success, and greater than 0 if an error occurs. -.SH FAST STARTUP +.Sh FAST STARTUP This section will tell you the minimum amount that you need to do simple editing tasks using -.IR \&vi . -If you've never used any screen editor before, you're likely to have -problems even with this simple introduction. +.Nm vi . +If you've never used any screen editor before, +you're likely to have problems even with this simple introduction. In that case you should find someone that already knows -.I \&vi +.Nm vi and have them walk you through this section. -.PP -.I \&Vi +.Pp +.Nm vi is a screen editor. -This means that it takes up almost the entire screen, displaying part -of the file on each screen line, except for the last line of the screen. +This means that it takes up almost the entire screen, +displaying part of the file on each screen line, +except for the last line of the screen. The last line of the screen is used for you to give commands to -.IR \&vi , +.Nm vi , and for -.I \&vi +.Nm vi to give information to you. -.PP +.Pp The other fact that you need to understand is that -.I \&vi -is a modeful editor, i.e. you are either entering text or you -are executing commands, and you have to be in the right mode -to do one or the other. +.Nm vi +is a modeful editor, +i.e., you are either entering text or you are executing commands, +and you have to be in the right mode to do one or the other. You will be in command mode when you first start editing a file. There are commands that switch you into input mode. There is only one key that takes you out of input mode, -and that is the key. -(Key names are written using less-than and greater-than signs, e.g. - means the ``escape'' key, usually labeled ``esc'' on your -terminal's keyboard.) +and that is the +.Aq escape +key. +.Pp +Key names are written using less-than and greater-than signs, e.g., +.Aq escape +means the +.Dq escape +key, usually labeled +.Dq Esc +on your terminal's keyboard. If you're ever confused as to which mode you're in, -keep entering the key until -.I \&vi +keep entering the +.Aq escape +key until +.Nm vi beeps at you. -(Generally, -.I \&vi +Generally, +.Nm vi will beep at you if you try and do something that's not allowed. -It will also display error messages.) -.PP -To start editing a file, enter the command ``vi file_name''. -The command you should enter as soon as you start editing is -``:set verbose showmode''. +It will also display error messages. +.Pp +To start editing a file, enter the following command: +.Pp +.Dl $ vi file +.Pp +The command you should enter as soon as you start editing is: +.Pp +.Dl :set verbose showmode +.Pp This will make the editor give you verbose error messages and display the current mode at the bottom of the screen. -.PP +.Pp The commands to move around the file are: -.TP -.B h +.Bl -tag -width Ds +.It Cm h Move the cursor left one character. -.TP -.B j +.It Cm j Move the cursor down one line. -.TP -.B k +.It Cm k Move the cursor up one line. -.TP -.B l +.It Cm l Move the cursor right one character. -.TP -.B +.It Aq Cm cursor-arrows The cursor arrow keys should work, too. -.TP -.B /text -Search for the string ``text'' in the file, +.It Cm / Ns text +Search for the string +.Dq text +in the file, and move the cursor to its first character. -.PP +.El +.Pp The commands to enter new text are: -.TP -.B a -Append new text, -.I after -the cursor. -.TP -.B i -Insert new text, -.I before -the cursor. -.TP -.B o -Open a new line below the line the cursor is on, and start -entering text. -.TP -.B O -Open a new line above the line the cursor is on, and start -entering text. -.TP -.B -Once you've entered input mode using the one of the -.BR \&a , -.BR \&i , -.BR \&O -or -.B \&o +.Bl -tag -width "" +.It Cm a +Append new text, after the cursor. +.It Cm i +Insert new text, before the cursor. +.It Cm o +Open a new line below the line the cursor is on, and start entering text. +.It Cm O +Open a new line above the line the cursor is on, and start entering text. +.It Aq Cm escape +Once you've entered input mode using one of the +.Cm a , +.Cm i , +.Cm o +or +.Cm O commands, use -.B +.Aq Cm escape to quit entering text and return to command mode. -.PP +.El +.Pp The commands to copy text are: -.TP -.B yy +.Bl -tag -width Ds +.It Cm yy Copy the line the cursor is on. -.TP -.B p +.It Cm p Append the copied line after the line the cursor is on. -.PP +.El +.Pp The commands to delete text are: -.TP -.B dd +.Bl -tag -width Ds +.It Cm dd Delete the line the cursor is on. -.TP -.B x +.It Cm x Delete the character the cursor is on. -.PP +.El +.Pp The commands to write the file are: -.TP -.B :w +.Bl -tag -width Ds +.It Cm :w Write the file back to the file with the name that you originally used as an argument on the -.I \&vi +.Nm vi command line. -.TP -.B ":w file_name" -Write the file back to the file with the name ``file_name''. -.PP +.It Cm :w Ar file_name +Write the file back to the file with the name +.Ar file_name . +.El +.Pp The commands to quit editing and exit the editor are: -.TP -.B :q -Quit editing and leave vi (if you've modified the file, but not -saved your changes, -.I \&vi +.Bl -tag -width Ds +.It Cm :q +Quit editing and leave +.Nm vi +(if you've modified the file, but not saved your changes, +.Nm vi will refuse to quit). -.TP -.B :q! +.It Cm :q! Quit, discarding any modifications that you may have made. -.PP -One final caution. +.El +.Pp +One final caution: Unusual characters can take up more than one column on the screen, and long lines can take up more than a single screen line. -The above commands work on ``physical'' characters and lines, -i.e. they affect the entire line no matter how many screen lines it -takes up and the entire character no matter how many screen columns -it takes up. -.SH VI COMMANDS +The above commands work on +.Dq physical +characters and lines, +i.e., they affect the entire line no matter how many screen lines it takes up +and the entire character no matter how many screen columns it takes up. +.Sh REGULAR EXPRESSIONS +.Nm ex Ns / Ns Nm vi +supports regular expressions +.Pq REs , +as documented in +.Xr re_format 7 , +for line addresses, as the first part of the +.Nm ex Cm substitute , +.Cm global +and +.Cm v +commands, and in search patterns. +Basic regular expressions +.Pq BREs +are enabled by default; +extended regular expressions +.Pq EREs +are used if the +.Cm extended +option is enabled. +The use of regular expressions can be largely disabled using the +.Cm magic +option. +.Pp +The following strings have special meanings in the +.Nm ex Ns / Ns Nm vi +version of regular expressions: +.Bl -bullet -offset 6u +.It +An empty regular expression is equivalent to the last regular expression used. +.It +.Sq \e\(la +matches the beginning of the word. +.It +.Sq \e\(ra +matches the end of the word. +.It +.Sq \(a~ +matches the replacement part of the last +.Cm substitute +command. +.El +.Sh BUFFERS +A buffer is an area where commands can save changed or deleted text +for later use. +.Nm vi +buffers are named with a single character preceded by a double quote, +for example +.Pf \&" Ns Aq c ; +.Nm ex +buffers are the same, +but without the double quote. +.Nm nex Ns / Ns Nm nvi +permits the use of any character without another meaning in the position where +a buffer name is expected. +.Pp +All buffers are either in +.Em line mode +or +.Em character mode . +Inserting a buffer in line mode into the text creates new lines for each of the +lines it contains, while a buffer in character mode creates new lines for any +lines +.Em other +than the first and last lines it contains. +The first and last lines are inserted at the current cursor position, becoming +part of the current line. +If there is more than one line in the buffer, +the current line itself will be split. +All +.Nm ex +commands which store text into buffers do so in line mode. +The behaviour of +.Nm vi +commands depend on their associated motion command: +.Bl -bullet -offset 6u +.It +.Aq Cm control-A , +.Cm h , +.Cm l , +.Cm ,\& , +.Cm 0 , +.Cm B , +.Cm E , +.Cm F , +.Cm T , +.Cm W , +.Cm ^ , +.Cm b , +.Cm e , +.Cm f +and +.Cm t +make the destination buffer character-oriented. +.It +.Cm j , +.Aq Cm control-M , +.Cm k , +.Cm ' , +.Cm - , +.Cm G , +.Cm H , +.Cm L , +.Cm M , +.Cm _ +and +.Cm |\& +make the destination buffer line-oriented. +.It +.Cm $ , +.Cm % , +.Cm ` , +.Cm (\& , +.Cm )\& , +.Cm / , +.Cm ?\& , +.Cm [[ , +.Cm ]] , +.Cm { +and +.Cm } +make the destination buffer character-oriented, unless the starting and +end positions are the first and last characters on a line. +In that case, the buffer is line-oriented. +.El +.Pp +The +.Nm ex +command +.Cm display buffers +displays the current mode for each buffer. +.Pp +Buffers named +.Sq a +through +.Sq z +may be referred to using their uppercase equivalent, in which case new content +will be appended to the buffer, instead of replacing it. +.Pp +Buffers named +.Sq 1 +through +.Sq 9 +are special. +A region of text modified using the +.Cm c +.Pq change +or +.Cm d +.Pq delete +commands is placed into the numeric buffer +.Sq 1 +if no other buffer is specified and if it meets one of the following conditions: +.Bl -bullet -offset 6u +.It +It includes characters from more than one line. +.It +It is specified using a line-oriented motion. +.It +It is specified using one of the following motion commands: +.Aq Cm control-A , +.Cm ` Ns Aq Cm character , +.Cm n , +.Cm N , +.Cm % , +.Cm / , +.Cm { , +.Cm } , +.Cm \&( , +.Cm \&) , +and +.Cm \&? . +.El +.Pp +Before this copy is done, the previous contents of buffer +.Sq 1 +are moved into buffer +.Sq 2 , +.Sq 2 +into buffer +.Sq 3 , +and so on. +The contents of buffer +.Sq 9 +are discarded. +Note that this rotation occurs +.Em regardless +of the user specifying another buffer. +In +.Nm vi , +text may be explicitly stored into the numeric buffers. +In this case, the buffer rotation occurs before the replacement of the buffer's +contents. +The numeric buffers are only available in +.Nm vi +mode. +.Sh VI COMMANDS The following section describes the commands available in the command mode of the -.I \&vi +.Nm vi editor. -In each entry below, the tag line is a usage synopsis for the command -character. -.PP -.TP -.B "[count] " +The following words have a special meaning in the commands description: +.Pp +.Bl -tag -width bigword -compact -offset 3u +.It Ar bigword +A set of non-whitespace characters. +.It Ar buffer +Temporary area where commands may place text. +If not specified, the default buffer is used. +See also +.Sx BUFFERS , +above. +.It Ar count +A positive number used to specify the desired number of iterations +of a command. +It defaults to 1 if not specified. +.It Ar motion +A cursor movement command which indicates the other end of the affected region +of text, the first being the current cursor position. +Repeating the command character makes it affect the whole current line. +.It Ar word +A sequence of letters, digits or underscores. +.El +.Pp +.Ar buffer +and +.Ar count , +if both present, may be specified in any order. +.Ar motion +and +.Ar count , +if both present, are effectively multiplied together +and considered part of the motion. +.Pp +.Bl -tag -width Ds -compact +.It Xo +.Aq Cm control-A +.Xc Search forward -.I count -times for the current word. -.TP -.B "[count] " +for the word starting at the cursor position. +.Pp +.It Xo +.Op Ar count +.Aq Cm control-B +.Xc Page backwards -.I count +.Ar count screens. -.TP -.B "[count] " +Two lines of overlap are maintained, if possible. +.Pp +.It Xo +.Op Ar count +.Aq Cm control-D +.Xc Scroll forward -.I count +.Ar count lines. -.TP -.B "[count] " +If +.Ar count +is not given, scroll forward the number of lines specified by the last +.Aq Cm control-D +or +.Aq Cm control-U +command. +If this is the first +.Aq Cm control-D +command, scroll half the number of lines in the current screen. +.Pp +.It Xo +.Op Ar count +.Aq Cm control-E +.Xc Scroll forward -.I count +.Ar count lines, leaving the current line and column as is, if possible. -.TP -.B "[count] " +.Pp +.It Xo +.Op Ar count +.Aq Cm control-F +.Xc Page forward -.I count +.Ar count screens. -.TP -.B "" -Display the file information. -.TP -.B "" -.TP -.B "[count] h" +Two lines of overlap are maintained, if possible. +.Pp +.It Aq Cm control-G +Display the following file information: +the file name +.Pq as given to Nm vi ; +whether the file has been modified since it was last written; +if the file is read-only; +the current line number; +the total number of lines in the file; +and the current line number as a percentage of the total lines in the file. +.Pp +.It Xo +.Op Ar count +.Aq Cm control-H +.Xc +.It Xo +.Op Ar count +.Cm h +.Xc Move the cursor back -.I count +.Ar count characters in the current line. -.TP -.B "[count] " -.TP -.B "[count] " -.TP -.B "[count] j" +.Pp +.It Xo +.Op Ar count +.Aq Cm control-J +.Xc +.It Xo +.Op Ar count +.Aq Cm control-N +.Xc +.It Xo +.Op Ar count +.Cm j +.Xc Move the cursor down -.I count +.Ar count lines without changing the current column. -.TP -.B "" -.TP -.B "" +.Pp +.It Aq Cm control-L +.It Aq Cm control-R Repaint the screen. -.TP -.B "[count] " -.TP -.B "[count] +" +.Pp +.It Xo +.Op Ar count +.Aq Cm control-M +.Xc +.It Xo +.Op Ar count +.Cm + +.Xc Move the cursor down -.I count -lines to the first nonblank character of that line. -.TP -.B "[count] " -.TP -.B "[count] k" +.Ar count +lines to the first non-blank character of that line. +.Pp +.It Xo +.Op Ar count +.Aq Cm control-P +.Xc +.It Xo +.Op Ar count +.Cm k +.Xc Move the cursor up -.I count +.Ar count lines, without changing the current column. -.TP -.B "" +.Pp +.It Aq Cm control-T Return to the most recent tag context. -.TP -.B "" +.Pp +.It Xo +.Op Ar count +.Aq Cm control-U +.Xc Scroll backwards -.I count +.Ar count lines. -.TP -.B "" -Switch to the next lower screen in the window, or, to the first -screen if there are no lower screens in the window. -.TP -.B "" +If *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 16 19:23:21 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B25B95BD; Sat, 16 Nov 2013 19:23:21 +0000 (UTC) Received: from mail0.glenbarber.us (mail0.glenbarber.us [IPv6:2607:fc50:1:2300:1001:1001:1001:face]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8736D20F6; Sat, 16 Nov 2013 19:23:21 +0000 (UTC) Received: from glenbarber.us (c-71-224-221-174.hsd1.nj.comcast.net [71.224.221.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id E31689A74; Sat, 16 Nov 2013 19:23:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us E31689A74 Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Sat, 16 Nov 2013 14:23:18 -0500 From: Glen Barber To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r258231 - in stable/10/contrib/nvi: . common docs/USD.doc/vi.man ex vi Message-ID: <20131116192318.GZ1718@glenbarber.us> References: <201311161922.rAGJMEdg035919@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Eldrgvv4EWsIM1sO" Content-Disposition: inline In-Reply-To: <201311161922.rAGJMEdg035919@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 User-Agent: Mutt/1.5.22 (2013-10-16) X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 19:23:21 -0000 --Eldrgvv4EWsIM1sO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 16, 2013 at 07:22:14PM +0000, Glen Barber wrote: > Author: gjb > Date: Sat Nov 16 19:22:13 2013 > New Revision: 258231 > URL: http://svnweb.freebsd.org/changeset/base/258231 >=20 > Log: > MFC r257999 (peter): > Merge nvi-2.1.1 -> 2.1.2 > =20 > Approved by: re (???) > =20 Bah, the commit template was not saved before commit. Approved by: re (kib) Glen --Eldrgvv4EWsIM1sO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSh8YmAAoJELls3eqvi17QoC0QANF8WNs4FE4wRVf2ABvigqRX a6XTN3uxA2zD/VKVP0avKc5JacxoEVv3ocDWTZKM8kV9ARMjnbogiAA/XCe4GZjl Vc/zQ51ofihU3bYvE6NGWag8GrS4npPUbK0AufDnnneBwzaV7kPdtl8OktSUYKM7 4Vvn+CKV9T12oybIQ/YVrhvDi4aibY1ruXeabo1Hl17MNbEkNpqpyCs2AhoeZ3Nq 1EqeaU4/pEScOf5QSoQBicc7V/SopfYBCWYJpo0MeqO1kCUoHV97dbYqyOemhRby u24aPON1hjW84Spmp2JSRABUtGTDUcTk3onwK8DRmNy+NcxbfZ8OLe/9BmnW0wj0 d3T5PB7XVtPB0MV/VLheKtqqH23WmOMNQNce48+8DkoFuPE2UJX2edwKCCAAGogD 4eYy5Kle7rCNefnvkzGySt9E4bEjbwaWvvpLo6KA7CCnygxrrLhFj6pzBBc29xTE 6KyHSDIgDWj2uBXFcjkETSR9I6dePyib4TVJv5pEmCljWKIWrcSHpYNdbDVLJ6Uf j2NPODjn42LoEj8sVWsDouZhJjBGfFXYqO4xP/85DAPpcXwQZTJ+n6CorJwymy3j /K8g8bzyrlG1XOMA1+Ij1smD1FUJPO6sBrTjmB7rQtH/tytHH8ZUKbTNPv4Vq348 zHhHq1HWYVj2ae/OCs7N =J3CB -----END PGP SIGNATURE----- --Eldrgvv4EWsIM1sO--