From owner-svn-src-stable-10@freebsd.org Mon May 1 06:03:46 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14343D58EBA; Mon, 1 May 2017 06:03:46 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDB7D16BF; Mon, 1 May 2017 06:03:45 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4163i0T089497; Mon, 1 May 2017 06:03:44 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4163iiD089496; Mon, 1 May 2017 06:03:44 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201705010603.v4163iiD089496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 1 May 2017 06:03:44 +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: r317634 - stable/10/lib/libc/gen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 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, 01 May 2017 06:03:46 -0000 Author: mav Date: Mon May 1 06:03:44 2017 New Revision: 317634 URL: https://svnweb.freebsd.org/changeset/base/317634 Log: MFC r317064: Optimize pathologic case of telldir() for Samba. When application reads large directory, calling telldir() for each entry, like Samba does, it creates exponential performance drop as number of entries reach tenths to hundreds of thousands. It is caused by full search through the internal list, that never finds matches in that scenario, but creates O(n^2) delays. This patch optimizes that search, limiting it to entries of the same buffer, turning time closer to O(n) in case of linear directory scan. Modified: stable/10/lib/libc/gen/telldir.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/telldir.c ============================================================================== --- stable/10/lib/libc/gen/telldir.c Mon May 1 06:03:07 2017 (r317633) +++ stable/10/lib/libc/gen/telldir.c Mon May 1 06:03:44 2017 (r317634) @@ -53,15 +53,22 @@ long telldir(dirp) DIR *dirp; { - struct ddloc *lp; + struct ddloc *lp, *flp; long idx; if (__isthreaded) _pthread_mutex_lock(&dirp->dd_lock); + flp = NULL; LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) { - if (lp->loc_seek == dirp->dd_seek && - lp->loc_loc == dirp->dd_loc) + if (lp->loc_seek == dirp->dd_seek) { + if (flp == NULL) + flp = lp; + if (lp->loc_loc == dirp->dd_loc) + break; + } else if (flp != NULL) { + lp = NULL; break; + } } if (lp == NULL) { lp = malloc(sizeof(struct ddloc)); @@ -73,7 +80,10 @@ telldir(dirp) lp->loc_index = dirp->dd_td->td_loccnt++; lp->loc_seek = dirp->dd_seek; lp->loc_loc = dirp->dd_loc; - LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe); + if (flp != NULL) + LIST_INSERT_BEFORE(flp, lp, loc_lqe); + else + LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe); } idx = lp->loc_index; if (__isthreaded) From owner-svn-src-stable-10@freebsd.org Mon May 1 06:05:05 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0CA1D5B04A; Mon, 1 May 2017 06:05:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0E5218B2; Mon, 1 May 2017 06:05:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v41654gJ089661; Mon, 1 May 2017 06:05:04 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v41654sm089660; Mon, 1 May 2017 06:05:04 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201705010605.v41654sm089660@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 1 May 2017 06:05:04 +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: r317636 - stable/10/sys/dev/isp 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.23 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, 01 May 2017 06:05:06 -0000 Author: mav Date: Mon May 1 06:05:04 2017 New Revision: 317636 URL: https://svnweb.freebsd.org/changeset/base/317636 Log: MFC r317356: Switch isp_reset to scratchpad not requiring ISP_MBOXDMASETUP. Modified: stable/10/sys/dev/isp/isp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/isp/isp.c ============================================================================== --- stable/10/sys/dev/isp/isp.c Mon May 1 06:04:34 2017 (r317635) +++ stable/10/sys/dev/isp/isp.c Mon May 1 06:05:04 2017 (r317636) @@ -1012,7 +1012,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d fwt = isp->isp_fwattr; if (IS_24XX(isp)) { - buf = FCPARAM(isp, 0)->isp_scratch; + buf = FCPARAM(isp, 0)->isp_scanscratch; ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "Attributes:"); if (fwt & ISP2400_FW_ATTR_CLASS2) { fwt ^=ISP2400_FW_ATTR_CLASS2; @@ -1101,7 +1101,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d } isp_prt(isp, ISP_LOGCONFIG, "%s", buf); } else if (IS_FC(isp)) { - buf = FCPARAM(isp, 0)->isp_scratch; + buf = FCPARAM(isp, 0)->isp_scanscratch; ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "Attributes:"); if (fwt & ISP_FW_ATTR_TMODE) { fwt ^=ISP_FW_ATTR_TMODE; From owner-svn-src-stable-10@freebsd.org Tue May 2 22:57:28 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACDB8D5B740; Tue, 2 May 2017 22:57:28 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89A0787C; Tue, 2 May 2017 22:57:28 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v42MvRS8014212; Tue, 2 May 2017 22:57:27 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42MvRvo014209; Tue, 2 May 2017 22:57:27 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201705022257.v42MvRvo014209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Tue, 2 May 2017 22:57: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: r317711 - stable/10/sys/dev/ixgbe 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.23 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, 02 May 2017 22:57:28 -0000 Author: erj Date: Tue May 2 22:57:27 2017 New Revision: 317711 URL: https://svnweb.freebsd.org/changeset/base/317711 Log: ixgbe(4): Fix build issue when compiling with netmap enabled Sponsored by: Intel Corporation Modified: stable/10/sys/dev/ixgbe/if_ixv.c stable/10/sys/dev/ixgbe/ixv_netmap.c stable/10/sys/dev/ixgbe/ixv_netmap.h Modified: stable/10/sys/dev/ixgbe/if_ixv.c ============================================================================== --- stable/10/sys/dev/ixgbe/if_ixv.c Tue May 2 22:14:55 2017 (r317710) +++ stable/10/sys/dev/ixgbe/if_ixv.c Tue May 2 22:57:27 2017 (r317711) @@ -484,7 +484,7 @@ ixv_attach(device_t dev) ixv_add_stats_sysctls(adapter); if (adapter->feat_en & IXGBE_FEATURE_NETMAP) - ixgbe_netmap_attach(adapter); + ixv_netmap_attach(adapter); INIT_DEBUGOUT("ixv_attach: end"); Modified: stable/10/sys/dev/ixgbe/ixv_netmap.c ============================================================================== --- stable/10/sys/dev/ixgbe/ixv_netmap.c Tue May 2 22:14:55 2017 (r317710) +++ stable/10/sys/dev/ixgbe/ixv_netmap.c Tue May 2 22:57:27 2017 (r317711) @@ -83,23 +83,23 @@ /* * device-specific sysctl variables: * - * ix_crcstrip: 0: keep CRC in rx frames (default), 1: strip it. + * ixv_crcstrip: 0: keep CRC in rx frames (default), 1: strip it. * During regular operations the CRC is stripped, but on some * hardware reception of frames not multiple of 64 is slower, * so using crcstrip=0 helps in benchmarks. * - * ix_rx_miss, ix_rx_miss_bufs: + * ixv_rx_miss, ixv_rx_miss_bufs: * count packets that might be missed due to lost interrupts. */ SYSCTL_DECL(_dev_netmap); -static int ix_rx_miss, ix_rx_miss_bufs; -int ix_crcstrip; -SYSCTL_INT(_dev_netmap, OID_AUTO, ix_crcstrip, - CTLFLAG_RW, &ix_crcstrip, 0, "strip CRC on rx frames"); -SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss, - CTLFLAG_RW, &ix_rx_miss, 0, "potentially missed rx intr"); -SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss_bufs, - CTLFLAG_RW, &ix_rx_miss_bufs, 0, "potentially missed rx intr bufs"); +static int ixv_rx_miss, ixv_rx_miss_bufs; +int ixv_crcstrip; +SYSCTL_INT(_dev_netmap, OID_AUTO, ixv_crcstrip, + CTLFLAG_RW, &ixv_crcstrip, 0, "strip CRC on rx frames"); +SYSCTL_INT(_dev_netmap, OID_AUTO, ixv_rx_miss, + CTLFLAG_RW, &ixv_rx_miss, 0, "potentially missed rx intr"); +SYSCTL_INT(_dev_netmap, OID_AUTO, ixv_rx_miss_bufs, + CTLFLAG_RW, &ixv_rx_miss_bufs, 0, "potentially missed rx intr bufs"); static void @@ -123,7 +123,7 @@ set_crcstrip(struct ixgbe_hw *hw, int on /* hw requirements ... */ rxc &= ~IXGBE_RDRXCTL_RSCFRSTSIZE; rxc |= IXGBE_RDRXCTL_RSCACKC; - if (onoff && !ix_crcstrip) { + if (onoff && !ixv_crcstrip) { /* keep the crc. Fast rx */ hl &= ~IXGBE_HLREG0_RXCRCSTRP; rxc &= ~IXGBE_RDRXCTL_CRCSTRIP; @@ -145,7 +145,7 @@ set_crcstrip(struct ixgbe_hw *hw, int on * Only called on the first register or the last unregister. */ static int -ixgbe_netmap_reg(struct netmap_adapter *na, int onoff) +ixv_netmap_reg(struct netmap_adapter *na, int onoff) { struct ifnet *ifp = na->ifp; struct adapter *adapter = ifp->if_softc; @@ -182,7 +182,7 @@ ixgbe_netmap_reg(struct netmap_adapter * * methods should be handled by the individual drivers. */ static int -ixgbe_netmap_txsync(struct netmap_kring *kring, int flags) +ixv_netmap_txsync(struct netmap_kring *kring, int flags) { struct netmap_adapter *na = kring->na; struct ifnet *ifp = na->ifp; @@ -368,7 +368,7 @@ ixgbe_netmap_txsync(struct netmap_kring * of whether or not we received an interrupt. */ static int -ixgbe_netmap_rxsync(struct netmap_kring *kring, int flags) +ixv_netmap_rxsync(struct netmap_kring *kring, int flags) { struct netmap_adapter *na = kring->na; struct ifnet *ifp = na->ifp; @@ -407,7 +407,7 @@ ixgbe_netmap_rxsync(struct netmap_kring * rxr->next_to_check is set to 0 on a ring reinit */ if (netmap_no_pendintr || force_update) { - int crclen = (ix_crcstrip) ? 0 : 4; + int crclen = (ixv_crcstrip) ? 0 : 4; uint16_t slot_flags = kring->nkr_slot_flags; nic_i = rxr->next_to_check; // or also k2n(kring->nr_hwtail) @@ -429,8 +429,8 @@ ixgbe_netmap_rxsync(struct netmap_kring if (n) { /* update the state variables */ if (netmap_no_pendintr && !force_update) { /* diagnostics */ - ix_rx_miss ++; - ix_rx_miss_bufs += n; + ixv_rx_miss ++; + ixv_rx_miss_bufs += n; } rxr->next_to_check = nic_i; kring->nr_hwtail = nm_i; @@ -499,7 +499,7 @@ ring_reset: * operate in standard mode. */ void -ixgbe_netmap_attach(struct adapter *adapter) +ixv_netmap_attach(struct adapter *adapter) { struct netmap_adapter na; @@ -509,9 +509,9 @@ ixgbe_netmap_attach(struct adapter *adap na.na_flags = NAF_BDG_MAYSLEEP; na.num_tx_desc = adapter->num_tx_desc; na.num_rx_desc = adapter->num_rx_desc; - na.nm_txsync = ixgbe_netmap_txsync; - na.nm_rxsync = ixgbe_netmap_rxsync; - na.nm_register = ixgbe_netmap_reg; + na.nm_txsync = ixv_netmap_txsync; + na.nm_rxsync = ixv_netmap_rxsync; + na.nm_register = ixv_netmap_reg; na.num_tx_rings = na.num_rx_rings = adapter->num_queues; netmap_attach(&na); } Modified: stable/10/sys/dev/ixgbe/ixv_netmap.h ============================================================================== --- stable/10/sys/dev/ixgbe/ixv_netmap.h Tue May 2 22:14:55 2017 (r317710) +++ stable/10/sys/dev/ixgbe/ixv_netmap.h Tue May 2 22:57:27 2017 (r317711) @@ -33,8 +33,8 @@ /*$FreeBSD$*/ -#ifndef _IXGBE_NETMAP_H_ -#define _IXGBE_NETMAP_H_ +#ifndef _IXV_NETMAP_H_ +#define _IXV_NETMAP_H_ #ifdef DEV_NETMAP @@ -42,18 +42,18 @@ #include #include -extern int ix_crcstrip; +extern int ixv_crcstrip; /* * ixgbe_netmap.c contains functions for netmap * support that extend the standard driver. See additional * comments in ixgbe_netmap.c. */ -void ixgbe_netmap_attach(struct adapter *adapter); +void ixv_netmap_attach(struct adapter *adapter); #else -#define ixgbe_netmap_attach(a) +#define ixv_netmap_attach(a) #define netmap_detach(a) #endif /* DEV_NETMAP */ -#endif /* _IXGBE_NETMAP_H_ */ +#endif /* _IXV_NETMAP_H_ */ From owner-svn-src-stable-10@freebsd.org Tue May 2 22:58:42 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91410D5B7E5; Tue, 2 May 2017 22:58:42 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: from mail-oi0-f43.google.com (mail-oi0-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C07A9F8; Tue, 2 May 2017 22:58:41 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: by mail-oi0-f43.google.com with SMTP id b204so3902195oii.1; Tue, 02 May 2017 15:58:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eWrtCfgh66ncfUnX7bKFXXfmcysliwDHXMRh3/wAjQE=; b=ZgsVP11k1v97sTbEJW/yjI0U01EtH4clEmaIsQLZ0v687llkQhvmkAiGtaobcJPPfh PXfjV+ckLasFDYeh7FMbujH4o7VSjFTFfDaNvUzf/TkF7pO3bPkK2csw8fIYrgb4MnuI SIWeFKMUdzlErvq5OmdCQsMHH36tXXeTOMnR9RBJjR1dRMLP6+7NMJNLhGFEt04uNvVo lIGfqFGZRZYvJm67r+aMk/xASIHxzjxtS23ueUnQ4M4Rjab1VxUuMjGV2AnMWIFzc+v7 6urkyEnXq+XOjSlH6+bqpCHOrdUFL3f+7iMdbkeZwfBqtLT6x/Ftxbn3QXiW0HWGfAgd mseg== X-Gm-Message-State: AN3rC/4aopk2bNhoATSphgqB05nKXoiqn8DJ3yn0PrgaLSy04RGfd1ay Y2vRYGPTbUGEE44RTPs= X-Received: by 10.157.35.69 with SMTP id k5mr12164467otd.49.1493765915627; Tue, 02 May 2017 15:58:35 -0700 (PDT) Received: from mail-oi0-f52.google.com (mail-oi0-f52.google.com. [209.85.218.52]) by smtp.gmail.com with ESMTPSA id c126sm8919470oia.5.2017.05.02.15.58.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2017 15:58:35 -0700 (PDT) Received: by mail-oi0-f52.google.com with SMTP id w10so15892252oif.0; Tue, 02 May 2017 15:58:34 -0700 (PDT) X-Received: by 10.157.24.86 with SMTP id t22mr6859692ott.145.1493765914832; Tue, 02 May 2017 15:58:34 -0700 (PDT) MIME-Version: 1.0 References: <201703152120.v2FLKHUs052999@repo.freebsd.org> In-Reply-To: From: Eric Joyner Date: Tue, 02 May 2017 22:58:24 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r315333 - in stable/10/sys: conf dev/ixgbe modules/ix modules/ixv To: Ngie Cooper , Ed Maste Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable@freebsd.org" , "svn-src-stable-10@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 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, 02 May 2017 22:58:42 -0000 I fixed the netmap build for amd64 at least with r317711. I'm running a tinderbox build on it now, though, so I'll see if that fixes it. On Fri, Apr 28, 2017 at 1:40 PM Eric Joyner wrote: > I notified Jeb (the original patch submitter) about that netmap symbol > issue, but we've both been distracted with other development. I'll work on > updating it. > > - Eric > > On Thu, Apr 27, 2017 at 3:06 PM Ngie Cooper wrote: > >> On Thu, Apr 27, 2017 at 1:07 PM, Ed Maste wrote: >> > On 15 March 2017 at 17:20, Eric Joyner wrote: >> >> Author: erj >> >> Date: Wed Mar 15 21:20:17 2017 >> >> New Revision: 315333 >> >> URL: https://svnweb.freebsd.org/changeset/base/315333 >> >> >> >> Log: >> >> ixgbe(4): Update to 3.2.11-k >> > >> > This broke tinderbox on many architectures: >> > >> > ia64 GENERIC and powerpc GENERIC64: >> > >> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixv_osdep.c:39: warning: no >> > previous prototype for 'ixv_read_pci_cfg' [-Wmissing-prototypes] >> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixv_osdep.c:45: warning: no >> > previous prototype for 'ixv_write_pci_cfg' [-Wmissing-prototypes] >> > >> > sparc64 LINT: >> > >> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ix_txrx.c:43: warning: >> > redundant redeclaration of 'ix_crcstrip' [-Wredundant-decls] >> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixgbe_netmap.h:45: warning: >> > previous declaration of 'ix_crcstrip' was here >> > >> > amd64 LINT: >> > >> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixv_netmap.c:(.text+0x0): >> > multiple definition of `ixgbe_netmap_attach' >> > >> ixgbe_netmap.o:/scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixgbe_netmap.c:(.text+0x0): >> > first defined here >> >> Hi Ed, >> >> It has to do with netmap(4) refactoring on head not being backported, >> in combination with ixgbe/ix being MFCed in a refactored state back to >> ^/stable/10 (it wasn't easy to backport due to PCI-IOV only being on >> ^/stable/10 -- I tried starting this work and failed because I lacked >> the hardware to test this out with). >> >> This has been known to be broken for almost two months -- a surgical >> fix should probably be applied to do what's required to make the >> symbol appear in the appropriate places, since this basically was a >> direct commit to ^/stable/10 in some regards. >> >> Thanks, >> -Ngie >> > From owner-svn-src-stable-10@freebsd.org Wed May 3 09:54:38 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F8CAD5B363; Wed, 3 May 2017 09:54:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C36D88C; Wed, 3 May 2017 09:54:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v439sbxm085151; Wed, 3 May 2017 09:54:37 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v439sb5D085150; Wed, 3 May 2017 09:54:37 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201705030954.v439sb5D085150@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 3 May 2017 09:54:37 +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: r317735 - stable/10/lib/libc/gen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 03 May 2017 09:54:38 -0000 Author: kib Date: Wed May 3 09:54:37 2017 New Revision: 317735 URL: https://svnweb.freebsd.org/changeset/base/317735 Log: MFC r317436: getpagesize(3) cannot fail. Modified: stable/10/lib/libc/gen/getpagesize.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/getpagesize.c ============================================================================== --- stable/10/lib/libc/gen/getpagesize.c Wed May 3 09:52:11 2017 (r317734) +++ stable/10/lib/libc/gen/getpagesize.c Wed May 3 09:54:37 2017 (r317735) @@ -69,7 +69,7 @@ getpagesize() mib[1] = HW_PAGESIZE; size = sizeof value; if (sysctl(mib, nitems(mib), &value, &size, NULL, 0) == -1) - return (-1); + return (PAGE_SIZE); return (value); } From owner-svn-src-stable-10@freebsd.org Wed May 3 17:12:55 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C051BD5CE78; Wed, 3 May 2017 17:12:55 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: from mail-io0-f178.google.com (mail-io0-f178.google.com [209.85.223.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 930A9E74; Wed, 3 May 2017 17:12:55 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: by mail-io0-f178.google.com with SMTP id p24so12276642ioi.0; Wed, 03 May 2017 10:12:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EGquDYSRZV3OYwfeOTix+w7Dl12CHaDep/FE23O4LcU=; b=RoxNM01FXe4CIFJhX0yRdXPp/uBuCBAEVcv5JKvo6zzQgK+g/sTZh6cj75RjteXhPs sNcAbQ2a/5vMg7xFt5c2AVq0ZNdRI0tLsGgaNZJoVAec5RbdodENZSBRw1TYcvqd5zso AlEcI3Ax/MnTA4a/8YTKpezFAKT7fPurFIlLVgu52YrmaLiDSKeY1uNwkTswypBR16Oc mQG1/W6RS47zMl0z+XSPs98X3r/wclzjNN19J2SwSA5r+VkovCosORSR90GhSIcd3/Z1 J1BzYtVaYm3CVMqipbnVgWan/8K89W28tAhZdVVoLl2RiIYlKZMxSuNCgaQQ0ppUPfDe Wdvg== X-Gm-Message-State: AN3rC/46pU5O4GKXjRP5Ecu/6v8Qc1+cJYW6mWmEbzYtP+h9Q554qWTl bOP3yHoktedTbeJqLuOwLQ== X-Received: by 10.107.192.71 with SMTP id q68mr19264654iof.119.1493831569323; Wed, 03 May 2017 10:12:49 -0700 (PDT) Received: from mail-it0-f54.google.com (mail-it0-f54.google.com. [209.85.214.54]) by smtp.gmail.com with ESMTPSA id z85sm3104438ita.3.2017.05.03.10.12.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 May 2017 10:12:49 -0700 (PDT) Received: by mail-it0-f54.google.com with SMTP id c15so74301706ith.0; Wed, 03 May 2017 10:12:48 -0700 (PDT) X-Received: by 10.202.220.213 with SMTP id t204mr12458633oig.193.1493831568395; Wed, 03 May 2017 10:12:48 -0700 (PDT) MIME-Version: 1.0 References: <201703152120.v2FLKHUs052999@repo.freebsd.org> In-Reply-To: From: Eric Joyner Date: Wed, 03 May 2017 17:12:37 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r315333 - in stable/10/sys: conf dev/ixgbe modules/ix modules/ixv To: Ngie Cooper , Ed Maste Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable@freebsd.org" , "svn-src-stable-10@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 03 May 2017 17:12:55 -0000 This fixes the amd64 LINT build error, but not the others. I'm looking at fixing the others now. On Tue, May 2, 2017 at 3:58 PM Eric Joyner wrote: > I fixed the netmap build for amd64 at least with r317711. I'm running a > tinderbox build on it now, though, so I'll see if that fixes it. > > On Fri, Apr 28, 2017 at 1:40 PM Eric Joyner wrote: > >> I notified Jeb (the original patch submitter) about that netmap symbol >> issue, but we've both been distracted with other development. I'll work on >> updating it. >> >> - Eric >> >> On Thu, Apr 27, 2017 at 3:06 PM Ngie Cooper >> wrote: >> >>> On Thu, Apr 27, 2017 at 1:07 PM, Ed Maste wrote: >>> > On 15 March 2017 at 17:20, Eric Joyner wrote: >>> >> Author: erj >>> >> Date: Wed Mar 15 21:20:17 2017 >>> >> New Revision: 315333 >>> >> URL: https://svnweb.freebsd.org/changeset/base/315333 >>> >> >>> >> Log: >>> >> ixgbe(4): Update to 3.2.11-k >>> > >>> > This broke tinderbox on many architectures: >>> > >>> > ia64 GENERIC and powerpc GENERIC64: >>> > >>> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixv_osdep.c:39: warning: no >>> > previous prototype for 'ixv_read_pci_cfg' [-Wmissing-prototypes] >>> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixv_osdep.c:45: warning: no >>> > previous prototype for 'ixv_write_pci_cfg' [-Wmissing-prototypes] >>> > >>> > sparc64 LINT: >>> > >>> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ix_txrx.c:43: warning: >>> > redundant redeclaration of 'ix_crcstrip' [-Wredundant-decls] >>> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixgbe_netmap.h:45: warning: >>> > previous declaration of 'ix_crcstrip' was here >>> > >>> > amd64 LINT: >>> > >>> > /scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixv_netmap.c:(.text+0x0): >>> > multiple definition of `ixgbe_netmap_attach' >>> > >>> ixgbe_netmap.o:/scratch/tmp/emaste/freebsd/sys/dev/ixgbe/ixgbe_netmap.c:(.text+0x0): >>> > first defined here >>> >>> Hi Ed, >>> >>> It has to do with netmap(4) refactoring on head not being backported, >>> in combination with ixgbe/ix being MFCed in a refactored state back to >>> ^/stable/10 (it wasn't easy to backport due to PCI-IOV only being on >>> ^/stable/10 -- I tried starting this work and failed because I lacked >>> the hardware to test this out with). >>> >>> This has been known to be broken for almost two months -- a surgical >>> fix should probably be applied to do what's required to make the >>> symbol appear in the appropriate places, since this basically was a >>> direct commit to ^/stable/10 in some regards. >>> >>> Thanks, >>> -Ngie >>> >> From owner-svn-src-stable-10@freebsd.org Thu May 4 14:50:27 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 267D9D5DBA3; Thu, 4 May 2017 14:50:27 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CCF30E34; Thu, 4 May 2017 14:50:26 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v44EoPBx007523; Thu, 4 May 2017 14:50:25 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44EoPKi007521; Thu, 4 May 2017 14:50:25 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201705041450.v44EoPKi007521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 4 May 2017 14:50: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: r317794 - in stable/10: sys/dev/sound/pcm usr.bin/unexpand 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.23 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, 04 May 2017 14:50:27 -0000 Author: pfg Date: Thu May 4 14:50:25 2017 New Revision: 317794 URL: https://svnweb.freebsd.org/changeset/base/317794 Log: MFC r317583: Fix some cases where an index was used before its limits check. Obtained from: DragonFlyBSD (git 799ba435) Modified: stable/10/sys/dev/sound/pcm/feeder_matrix.c stable/10/usr.bin/unexpand/unexpand.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sound/pcm/feeder_matrix.c ============================================================================== --- stable/10/sys/dev/sound/pcm/feeder_matrix.c Thu May 4 14:48:57 2017 (r317793) +++ stable/10/sys/dev/sound/pcm/feeder_matrix.c Thu May 4 14:50:25 2017 (r317794) @@ -750,8 +750,8 @@ feeder_matrix_oss_get_channel_order(stru tmpmap = 0x0000000000000000ULL; - for (i = 0; m->map[i].type != SND_CHN_T_MAX && - i < SND_CHN_OSS_MAX; i++) { + for (i = 0; i < SND_CHN_OSS_MAX && m->map[i].type != SND_CHN_T_MAX; + i++) { if ((1 << m->map[i].type) & ~SND_CHN_OSS_VALIDMASK) return (EINVAL); tmpmap |= Modified: stable/10/usr.bin/unexpand/unexpand.c ============================================================================== --- stable/10/usr.bin/unexpand/unexpand.c Thu May 4 14:48:57 2017 (r317793) +++ stable/10/usr.bin/unexpand/unexpand.c Thu May 4 14:50:25 2017 (r317794) @@ -132,8 +132,8 @@ tabify(const char *curfile) tabstops[0]; continue; } else { - for (n = 0; tabstops[n] - 1 < dcol && - n < nstops; n++) + for (n = 0; n < nstops && + tabstops[n] - 1 < dcol; n++) ; if (n < nstops - 1 && tabstops[n] - 1 < limit) { dcol = tabstops[n]; @@ -154,7 +154,7 @@ tabify(const char *curfile) tabstops[0]; } } else { - for (n = 0; tabstops[n] - 1 < ocol && n < nstops; n++) + for (n = 0; n < nstops && tabstops[n] - 1 < ocol; n++) ; while (ocol < dcol && n < nstops && ocol < limit) { putwchar('\t'); From owner-svn-src-stable-10@freebsd.org Thu May 4 14:55:08 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 976D2D5DF84; Thu, 4 May 2017 14:55:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6792016BD; Thu, 4 May 2017 14:55:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v44Et79R011427; Thu, 4 May 2017 14:55:07 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44Et7nn011426; Thu, 4 May 2017 14:55:07 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201705041455.v44Et7nn011426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 4 May 2017 14:55:07 +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: r317796 - stable/10/usr.sbin/mixer 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.23 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, 04 May 2017 14:55:08 -0000 Author: pfg Date: Thu May 4 14:55:07 2017 New Revision: 317796 URL: https://svnweb.freebsd.org/changeset/base/317796 Log: MFC r317596: mixer(8): Prevent possible sscanf() overflow. Fix %s buffer sizes in sscanf(). Obtained from: DragonflyBSD (git dab952e2) Modified: stable/10/usr.sbin/mixer/mixer.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/mixer/mixer.c ============================================================================== --- stable/10/usr.sbin/mixer/mixer.c Thu May 4 14:54:22 2017 (r317795) +++ stable/10/usr.sbin/mixer/mixer.c Thu May 4 14:55:07 2017 (r317796) @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) { char mixer[PATH_MAX] = "/dev/mixer"; - char lstr[5], rstr[5]; + char lstr[8], rstr[8]; char *name, *eptr; int devmask = 0, recmask = 0, recsrc = 0, orecsrc; int dusage = 0, drecsrc = 0, sflag = 0, Sflag = 0; From owner-svn-src-stable-10@freebsd.org Fri May 5 06:00:33 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7E26D5D254; Fri, 5 May 2017 06:00:33 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9797AEA6; Fri, 5 May 2017 06:00:33 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4560WYJ086031; Fri, 5 May 2017 06:00:32 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4560WWG086030; Fri, 5 May 2017 06:00:32 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201705050600.v4560WWG086030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Fri, 5 May 2017 06:00:32 +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: r317823 - stable/10/sys/dev/hyperv/input 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.23 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, 05 May 2017 06:00:33 -0000 Author: sephe Date: Fri May 5 06:00:32 2017 New Revision: 317823 URL: https://svnweb.freebsd.org/changeset/base/317823 Log: MFC 317821 hyperv/kbd: Channel read expects non-NULL channel argument. Sponsored by: Microsoft Modified: stable/10/sys/dev/hyperv/input/hv_kbd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/hyperv/input/hv_kbd.c ============================================================================== --- stable/10/sys/dev/hyperv/input/hv_kbd.c Fri May 5 03:38:41 2017 (r317822) +++ stable/10/sys/dev/hyperv/input/hv_kbd.c Fri May 5 06:00:32 2017 (r317823) @@ -198,7 +198,7 @@ static void hvkbd_do_poll(hv_kbd_sc *sc, uint8_t wait) { while (!hv_kbd_prod_is_ready(sc)) { - hv_kbd_read_channel(NULL, sc); + hv_kbd_read_channel(sc->hs_chan, sc); if (!wait) break; } From owner-svn-src-stable-10@freebsd.org Fri May 5 13:23:24 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EA6CD542A1; Fri, 5 May 2017 13:23:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1DC1DB1; Fri, 5 May 2017 13:23:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45DNNBp066293; Fri, 5 May 2017 13:23:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45DNNVT066292; Fri, 5 May 2017 13:23:23 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201705051323.v45DNNVT066292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 5 May 2017 13:23: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: r317826 - stable/10/sys/dev/mlx5/mlx5_en 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.23 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, 05 May 2017 13:23:24 -0000 Author: hselasky Date: Fri May 5 13:23:23 2017 New Revision: 317826 URL: https://svnweb.freebsd.org/changeset/base/317826 Log: MFC r317568: Improve sysadmin visibility of physical port error counters in the mlx5en driver. Sponsored by: Mellanox Technologies Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c ============================================================================== --- stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri May 5 13:21:11 2017 (r317825) +++ stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri May 5 13:23:23 2017 (r317826) @@ -541,19 +541,33 @@ mlx5e_update_stats_work(struct work_stru s->tx_csum_offload = s->tx_packets - tx_offload_none; s->rx_csum_good = s->rx_packets - s->rx_csum_none; - /* Update per port counters */ + /* Get physical port counters */ mlx5e_update_pport_counters(priv); #if (__FreeBSD_version < 1100000) /* no get_counters interface in fbsd 10 */ ifp->if_ipackets = s->rx_packets; - ifp->if_ierrors = s->rx_error_packets; + ifp->if_ierrors = s->rx_error_packets + + priv->stats.pport.alignment_err + + priv->stats.pport.check_seq_err + + priv->stats.pport.crc_align_errors + + priv->stats.pport.drop_events + + priv->stats.pport.in_range_len_errors + + priv->stats.pport.jabbers + + priv->stats.pport.out_of_range_len + + priv->stats.pport.oversize_pkts + + priv->stats.pport.symbol_err + + priv->stats.pport.too_long_errors + + priv->stats.pport.undersize_pkts + + priv->stats.pport.unsupported_op_rx; ifp->if_iqdrops = s->rx_out_of_buffer; ifp->if_opackets = s->tx_packets; ifp->if_oerrors = s->tx_error_packets; ifp->if_snd.ifq_drops = s->tx_queue_dropped; ifp->if_ibytes = s->rx_bytes; ifp->if_obytes = s->tx_bytes; + ifp->if_collisions = + priv->stats.pport.collisions; #endif free_out: @@ -2366,7 +2380,19 @@ mlx5e_get_counter(struct ifnet *ifp, ift retval = priv->stats.vport.rx_packets; break; case IFCOUNTER_IERRORS: - retval = priv->stats.vport.rx_error_packets; + retval = priv->stats.vport.rx_error_packets + + priv->stats.pport.alignment_err + + priv->stats.pport.check_seq_err + + priv->stats.pport.crc_align_errors + + priv->stats.pport.drop_events + + priv->stats.pport.in_range_len_errors + + priv->stats.pport.jabbers + + priv->stats.pport.out_of_range_len + + priv->stats.pport.oversize_pkts + + priv->stats.pport.symbol_err + + priv->stats.pport.too_long_errors + + priv->stats.pport.undersize_pkts + + priv->stats.pport.unsupported_op_rx; break; case IFCOUNTER_IQDROPS: retval = priv->stats.vport.rx_out_of_buffer; @@ -2392,6 +2418,9 @@ mlx5e_get_counter(struct ifnet *ifp, ift case IFCOUNTER_OQDROPS: retval = priv->stats.vport.tx_queue_dropped; break; + case IFCOUNTER_COLLISIONS: + retval = priv->stats.pport.collisions; + break; default: retval = if_get_counter_default(ifp, cnt); break; From owner-svn-src-stable-10@freebsd.org Fri May 5 16:24:36 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7029D5F8B0; Fri, 5 May 2017 16:24:36 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BB0C9F8; Fri, 5 May 2017 16:24:36 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45GOZBT044778; Fri, 5 May 2017 16:24:35 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45GOZfN044777; Fri, 5 May 2017 16:24:35 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201705051624.v45GOZfN044777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 5 May 2017 16:24:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r317834 - stable/10/tests/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 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, 05 May 2017 16:24:37 -0000 Author: brooks Date: Fri May 5 16:24:35 2017 New Revision: 317834 URL: https://svnweb.freebsd.org/changeset/base/317834 Log: MFC r317566: Don't pass size_t arguments to setsockopt(SO_SNDBUF/SO_RCVBUF). These commands take an int. The tests work by accident on little-endian, 64-bit systems. PR: 218919 Tested with: qemu-cheri and CheriBSD built for mips64 Reviewed by: asomers, ngie Obtained from: CheriBSD Sponsored by: DARPA, AFRL Modified: stable/10/tests/sys/kern/unix_seqpacket_test.c Directory Properties: stable/10/ (props changed) Modified: stable/10/tests/sys/kern/unix_seqpacket_test.c ============================================================================== --- stable/10/tests/sys/kern/unix_seqpacket_test.c Fri May 5 16:19:54 2017 (r317833) +++ stable/10/tests/sys/kern/unix_seqpacket_test.c Fri May 5 16:24:35 2017 (r317834) @@ -127,7 +127,7 @@ shutdown_send_sigpipe_handler(int __unus * Parameterized test function bodies */ static void -test_eagain(size_t sndbufsize, size_t rcvbufsize) +test_eagain(int sndbufsize, int rcvbufsize) { int i; int sv[2]; @@ -165,7 +165,7 @@ test_eagain(size_t sndbufsize, size_t rc } static void -test_sendrecv_symmetric_buffers(size_t bufsize, int blocking) { +test_sendrecv_symmetric_buffers(int bufsize, int blocking) { int s; int sv[2]; const ssize_t pktsize = bufsize / 2; @@ -209,7 +209,7 @@ test_sendrecv_symmetric_buffers(size_t b } static void -test_pipe_simulator(size_t sndbufsize, size_t rcvbufsize) +test_pipe_simulator(int sndbufsize, int rcvbufsize) { int num_sent, num_received; int sv[2]; @@ -341,7 +341,7 @@ test_pipe_reader(void* args) static void -test_pipe(size_t sndbufsize, size_t rcvbufsize) +test_pipe(int sndbufsize, int rcvbufsize) { test_pipe_thread_data_t writer_data, reader_data; pthread_t writer, reader; @@ -825,8 +825,8 @@ ATF_TC_WITHOUT_HEAD(emsgsize); ATF_TC_BODY(emsgsize, tc) { int sv[2]; - const size_t sndbufsize = 8192; - const size_t rcvbufsize = 8192; + const int sndbufsize = 8192; + const int rcvbufsize = 8192; const size_t pktsize = (sndbufsize + rcvbufsize) * 2; char sndbuf[pktsize]; ssize_t ssize; @@ -854,8 +854,8 @@ ATF_TC_WITHOUT_HEAD(emsgsize_nonblocking ATF_TC_BODY(emsgsize_nonblocking, tc) { int sv[2]; - const size_t sndbufsize = 8192; - const size_t rcvbufsize = 8192; + const int sndbufsize = 8192; + const int rcvbufsize = 8192; const size_t pktsize = (sndbufsize + rcvbufsize) * 2; char sndbuf[pktsize]; ssize_t ssize; @@ -912,8 +912,8 @@ ATF_TC_BODY(rcvbuf_oversized, tc) int i; int sv[2]; const ssize_t pktsize = 1024; - const size_t sndbufsize = 8192; - const size_t rcvbufsize = 131072; + const int sndbufsize = 8192; + const int rcvbufsize = 131072; const size_t geometric_mean_bufsize = 32768; const int numpkts = geometric_mean_bufsize / pktsize; char sndbuf[pktsize]; From owner-svn-src-stable-10@freebsd.org Fri May 5 17:28:50 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAE11D5FDF8; Fri, 5 May 2017 17:28:50 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A9E71391; Fri, 5 May 2017 17:28:50 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45HSnl2069631; Fri, 5 May 2017 17:28:49 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45HSnUQ069630; Fri, 5 May 2017 17:28:49 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201705051728.v45HSnUQ069630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 5 May 2017 17:28:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r317841 - stable/10/usr.sbin/ntp/sntp 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.23 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, 05 May 2017 17:28:50 -0000 Author: brooks Date: Fri May 5 17:28:49 2017 New Revision: 317841 URL: https://svnweb.freebsd.org/changeset/base/317841 Log: MFC r317388: Use the approved syntax to build no man pages. Sponsored by: DARPA, AFRL Modified: stable/10/usr.sbin/ntp/sntp/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ntp/sntp/Makefile ============================================================================== --- stable/10/usr.sbin/ntp/sntp/Makefile Fri May 5 17:23:57 2017 (r317840) +++ stable/10/usr.sbin/ntp/sntp/Makefile Fri May 5 17:28:49 2017 (r317841) @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/sntp PROG= sntp -MK_MAN= no +MAN= SRCS= crypto.c kod_management.c log.c main.c networking.c \ sntp-opts.c sntp.c utilities.c From owner-svn-src-stable-10@freebsd.org Fri May 5 20:25:32 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85787D5F45E; Fri, 5 May 2017 20:25:32 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5720C18D7; Fri, 5 May 2017 20:25:32 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45KPVGl043030; Fri, 5 May 2017 20:25:31 GMT (envelope-from ken@FreeBSD.org) Received: (from ken@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45KPV5W043029; Fri, 5 May 2017 20:25:31 GMT (envelope-from ken@FreeBSD.org) Message-Id: <201705052025.v45KPV5W043029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ken set sender to ken@FreeBSD.org using -f From: "Kenneth D. Merry" Date: Fri, 5 May 2017 20:25:31 +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: r317851 - stable/10/sys/cam/scsi 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.23 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, 05 May 2017 20:25:32 -0000 Author: ken Date: Fri May 5 20:25:31 2017 New Revision: 317851 URL: https://svnweb.freebsd.org/changeset/base/317851 Log: MFC r317680: Add the SCSI SSC Manufacturer assigned serial number VPD page. This is current as of SSC-5r03. Submitted by: Sam Klopsch Sponsored by: Spectra Logic Modified: stable/10/sys/cam/scsi/scsi_sa.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/scsi/scsi_sa.h ============================================================================== --- stable/10/sys/cam/scsi/scsi_sa.h Fri May 5 20:21:13 2017 (r317850) +++ stable/10/sys/cam/scsi/scsi_sa.h Fri May 5 20:25:31 2017 (r317851) @@ -487,6 +487,19 @@ struct scsi_medium_type_data { }; /* + * Manufacturer-assigned Serial Number VPD page. + * Current as of SSC-5r03, 28 September 2016. + */ +struct scsi_vpd_mfg_serial_number +{ + u_int8_t device; + u_int8_t page_code; +#define SVPD_MFG_SERIAL_NUMBER_PAGE_CODE 0xB1 + u_int8_t page_length[2]; + u_int8_t mfg_serial_num[]; +}; + +/* * Security Protocol Specific values for the Tape Data Encryption protocol * (0x20) used with SECURITY PROTOCOL IN. See below for values used with * SECURITY PROTOCOL OUT. Current as of SSC4r03.