From owner-svn-src-stable-7@FreeBSD.ORG Mon Jun 28 14:04:20 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93AFA1065670; Mon, 28 Jun 2010 14:04:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 696D48FC1C; Mon, 28 Jun 2010 14:04:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5SE4KHp024417; Mon, 28 Jun 2010 14:04:20 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5SE4JsZ024414; Mon, 28 Jun 2010 14:04:19 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201006281404.o5SE4JsZ024414@svn.freebsd.org> From: John Baldwin Date: Mon, 28 Jun 2010 14:04:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209573 - stable/7/sys/dev/e1000 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 14:04:20 -0000 Author: jhb Date: Mon Jun 28 14:04:19 2010 New Revision: 209573 URL: http://svn.freebsd.org/changeset/base/209573 Log: Remove some gratuitous local diffs. Modified: stable/7/sys/dev/e1000/e1000_regs.h stable/7/sys/dev/e1000/if_em.c Modified: stable/7/sys/dev/e1000/e1000_regs.h ============================================================================== --- stable/7/sys/dev/e1000/e1000_regs.h Mon Jun 28 12:20:36 2010 (r209572) +++ stable/7/sys/dev/e1000/e1000_regs.h Mon Jun 28 14:04:19 2010 (r209573) @@ -236,7 +236,7 @@ #define E1000_PRC64 0x0405C /* Packets Rx (64 bytes) - R/clr */ #define E1000_PRC127 0x04060 /* Packets Rx (65-127 bytes) - R/clr */ #define E1000_PRC255 0x04064 /* Packets Rx (128-255 bytes) - R/clr */ -#define E1000_PRC511 0x04068 /* Packets Rx (255-511 bytes) - R/clr */ +#define E1000_PRC511 0x04068 /* Packets Rx (256-511 bytes) - R/clr */ #define E1000_PRC1023 0x0406C /* Packets Rx (512-1023 bytes) - R/clr */ #define E1000_PRC1522 0x04070 /* Packets Rx (1024-1522 bytes) - R/clr */ #define E1000_GPRC 0x04074 /* Good Packets Rx Count - R/clr */ Modified: stable/7/sys/dev/e1000/if_em.c ============================================================================== --- stable/7/sys/dev/e1000/if_em.c Mon Jun 28 12:20:36 2010 (r209572) +++ stable/7/sys/dev/e1000/if_em.c Mon Jun 28 14:04:19 2010 (r209573) @@ -2057,8 +2057,8 @@ static void em_local_timer(void *arg) { struct adapter *adapter = arg; - struct ifnet *ifp = adapter->ifp; struct tx_ring *txr = adapter->tx_rings; + struct ifnet *ifp = adapter->ifp; EM_CORE_LOCK_ASSERT(adapter); @@ -3817,7 +3817,6 @@ em_setup_receive_ring(struct rx_ring *rx bus_dma_segment_t seg[1]; int rsize, nsegs, error; - /* Clear the ring contents */ EM_RX_LOCK(rxr); rsize = roundup2(adapter->num_rx_desc * @@ -3861,7 +3860,6 @@ em_setup_receive_ring(struct rx_ring *rx rxr->rx_base[j].buffer_addr = htole64(seg[0].ds_addr); } - /* Setup our descriptor indices */ rxr->next_to_check = 0; rxr->next_to_refresh = 0; @@ -3984,6 +3982,7 @@ em_free_receive_buffers(struct rx_ring * * Enable receive unit. * **********************************************************************/ + #define MAX_INTS_PER_SEC 8000 #define DEFAULT_ITR 1000000000/(MAX_INTS_PER_SEC * 256) From owner-svn-src-stable-7@FreeBSD.ORG Mon Jun 28 14:06:45 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 677B3106566B; Mon, 28 Jun 2010 14:06:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D6038FC27; Mon, 28 Jun 2010 14:06:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5SE6j8w024995; Mon, 28 Jun 2010 14:06:45 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5SE6jbN024992; Mon, 28 Jun 2010 14:06:45 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201006281406.o5SE6jbN024992@svn.freebsd.org> From: John Baldwin Date: Mon, 28 Jun 2010 14:06:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209574 - stable/7/sys/dev/e1000 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 14:06:45 -0000 Author: jhb Date: Mon Jun 28 14:06:44 2010 New Revision: 209574 URL: http://svn.freebsd.org/changeset/base/209574 Log: Remove gratuitous whitespace changes accidentally added in the previous commit. Modified: stable/7/sys/dev/e1000/e1000_regs.h stable/7/sys/dev/e1000/if_em.c Modified: stable/7/sys/dev/e1000/e1000_regs.h ============================================================================== --- stable/7/sys/dev/e1000/e1000_regs.h Mon Jun 28 14:04:19 2010 (r209573) +++ stable/7/sys/dev/e1000/e1000_regs.h Mon Jun 28 14:06:44 2010 (r209574) @@ -236,7 +236,7 @@ #define E1000_PRC64 0x0405C /* Packets Rx (64 bytes) - R/clr */ #define E1000_PRC127 0x04060 /* Packets Rx (65-127 bytes) - R/clr */ #define E1000_PRC255 0x04064 /* Packets Rx (128-255 bytes) - R/clr */ -#define E1000_PRC511 0x04068 /* Packets Rx (256-511 bytes) - R/clr */ +#define E1000_PRC511 0x04068 /* Packets Rx (255-511 bytes) - R/clr */ #define E1000_PRC1023 0x0406C /* Packets Rx (512-1023 bytes) - R/clr */ #define E1000_PRC1522 0x04070 /* Packets Rx (1024-1522 bytes) - R/clr */ #define E1000_GPRC 0x04074 /* Good Packets Rx Count - R/clr */ Modified: stable/7/sys/dev/e1000/if_em.c ============================================================================== --- stable/7/sys/dev/e1000/if_em.c Mon Jun 28 14:04:19 2010 (r209573) +++ stable/7/sys/dev/e1000/if_em.c Mon Jun 28 14:06:44 2010 (r209574) @@ -2057,8 +2057,8 @@ static void em_local_timer(void *arg) { struct adapter *adapter = arg; + struct ifnet *ifp = adapter->ifp; struct tx_ring *txr = adapter->tx_rings; - struct ifnet *ifp = adapter->ifp; EM_CORE_LOCK_ASSERT(adapter); @@ -3817,6 +3817,7 @@ em_setup_receive_ring(struct rx_ring *rx bus_dma_segment_t seg[1]; int rsize, nsegs, error; + /* Clear the ring contents */ EM_RX_LOCK(rxr); rsize = roundup2(adapter->num_rx_desc * @@ -3860,6 +3861,7 @@ em_setup_receive_ring(struct rx_ring *rx rxr->rx_base[j].buffer_addr = htole64(seg[0].ds_addr); } + /* Setup our descriptor indices */ rxr->next_to_check = 0; rxr->next_to_refresh = 0; @@ -3982,7 +3984,6 @@ em_free_receive_buffers(struct rx_ring * * Enable receive unit. * **********************************************************************/ - #define MAX_INTS_PER_SEC 8000 #define DEFAULT_ITR 1000000000/(MAX_INTS_PER_SEC * 256) From owner-svn-src-stable-7@FreeBSD.ORG Mon Jun 28 14:12:47 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1360F106564A; Mon, 28 Jun 2010 14:12:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id D93418FC13; Mon, 28 Jun 2010 14:12:46 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 832B246B2E; Mon, 28 Jun 2010 10:12:46 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id A49908A03C; Mon, 28 Jun 2010 10:12:45 -0400 (EDT) From: John Baldwin To: src-committers@freebsd.org Date: Mon, 28 Jun 2010 10:12:36 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201006281406.o5SE6jbN024992@svn.freebsd.org> In-Reply-To: <201006281406.o5SE6jbN024992@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201006281012.36602.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 28 Jun 2010 10:12:45 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r209574 - stable/7/sys/dev/e1000 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 14:12:47 -0000 On Monday 28 June 2010 10:06:45 am John Baldwin wrote: > Author: jhb > Date: Mon Jun 28 14:06:44 2010 > New Revision: 209574 > URL: http://svn.freebsd.org/changeset/base/209574 > > Log: > Remove gratuitous whitespace changes accidentally added in the previous > commit. *sigh* In case it wasn't obvious, my previous commit was a misfire where I was attempting to remove local diffs to this driver but ended up applying the reverse patch and committing it to the wrong tree instead. :( -- John Baldwin From owner-svn-src-stable-7@FreeBSD.ORG Tue Jun 29 08:06:21 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9F7B1065673; Tue, 29 Jun 2010 08:06:21 +0000 (UTC) (envelope-from anders@FreeBSD.org) Received: from fupp.net (totem.fix.no [80.91.36.20]) by mx1.freebsd.org (Postfix) with ESMTP id 1B3568FC08; Tue, 29 Jun 2010 08:06:20 +0000 (UTC) Received: from localhost (totem.fix.no [80.91.36.20]) by fupp.net (Postfix) with ESMTP id 376A747B16; Tue, 29 Jun 2010 09:48:32 +0200 (CEST) Received: from fupp.net ([80.91.36.20]) by localhost (totem.fix.no [80.91.36.20]) (amavisd-new, port 10024) with LMTP id oDDW71m9f73e; Tue, 29 Jun 2010 09:48:31 +0200 (CEST) Received: by fupp.net (Postfix, from userid 1000) id D630147B15; Tue, 29 Jun 2010 09:48:31 +0200 (CEST) Date: Tue, 29 Jun 2010 09:48:31 +0200 From: Anders Nordby To: Pyun YongHyeon Message-ID: <20100629074831.GA75332@fupp.net> References: <201006101804.o5AI4PEX024259@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <201006101804.o5AI4PEX024259@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key: http://anders.fix.no/pgp/ X-PGP-Key-FingerPrint: 1E0F C53C D8DF 6A8F EAAD 19C5 D12A BC9F 0083 5956 Cc: marcel@FreeBSD.org, jdc@parodius.com, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r208995 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2010 08:06:22 -0000 Hi! Is it possible to get this fix into FreeBSD 7.3-RELEASE? Without this fix I have serious issues with my bge NICs: - packet loss around 10%. - transferrate (scp) is 10% of expected, 2 MB/sec instead of 20 when testing. - get "Corrupted MAC on input" while synchronizing large directories using rsync over SSH. It seems we also discussed this matter on -fs, where I had issues on a ZFS+NFS file server. After updating to a newer 8.1 install (which has the fix) the problem went away. If this can not make it into 7.3, I and other people using 7.x have to manually patch this or follow RELENG_7 which not everyone wants to. The bge driver is such a common server driver, I think this should be rolled back into affected releases. Regards, Anders. On Thu, Jun 10, 2010 at 06:04:25PM +0000, Pyun YongHyeon wrote: > Author: yongari > Date: Thu Jun 10 18:04:25 2010 > New Revision: 208995 > URL: http://svn.freebsd.org/changeset/base/208995 > > Log: > MFC r208862: > Fix a bug introduced in r199011. When bge(4) reuses loaded RX > buffers it should also reinitialize RX descriptors otherwise some > stale data could be passed to controller. This could end up with > mbuf double free or unexpected NULL pointer dereference in upper > stack. To fix the issue, save loaded buffer's length and > reinitialize RX descriptors with the saved value whenever bge(4) > reuses the loaded RX buffers. > While I'm here, increase the number of RX buffers to 512 from 256. > This simplifies RX buffer handling as well as giving more RX > buffers. Controller supports just fixed number of RX buffers > (i.e. 512) and bge(4) used to rely on hope that our CPU is fast > enough to keep up with the controller. With this change, bge(4) > will use 1MB for RX buffers but I don't think it would cause > problems in these days. > > Reported by: marcel > Tested by: marcel > > Modified: > stable/7/sys/dev/bge/if_bge.c > stable/7/sys/dev/bge/if_bgereg.h > Directory Properties: > stable/7/sys/ (props changed) > stable/7/sys/cddl/contrib/opensolaris/ (props changed) > stable/7/sys/contrib/dev/acpica/ (props changed) > stable/7/sys/contrib/pf/ (props changed) > > Modified: stable/7/sys/dev/bge/if_bge.c > ============================================================================== > --- stable/7/sys/dev/bge/if_bge.c Thu Jun 10 17:59:47 2010 (r208994) > +++ stable/7/sys/dev/bge/if_bge.c Thu Jun 10 18:04:25 2010 (r208995) > @@ -400,6 +400,8 @@ static void bge_setpromisc(struct bge_so > static void bge_setmulti(struct bge_softc *); > static void bge_setvlan(struct bge_softc *); > > +static __inline void bge_rxreuse_std(struct bge_softc *, int); > +static __inline void bge_rxreuse_jumbo(struct bge_softc *, int); > static int bge_newbuf_std(struct bge_softc *, int); > static int bge_newbuf_jumbo(struct bge_softc *, int); > static int bge_init_rx_ring_std(struct bge_softc *); > @@ -949,6 +951,7 @@ bge_newbuf_std(struct bge_softc *sc, int > sc->bge_cdata.bge_rx_std_dmamap[i] = sc->bge_cdata.bge_rx_std_sparemap; > sc->bge_cdata.bge_rx_std_sparemap = map; > sc->bge_cdata.bge_rx_std_chain[i] = m; > + sc->bge_cdata.bge_rx_std_seglen[i] = segs[0].ds_len; > r = &sc->bge_ldata.bge_rx_std_ring[sc->bge_std]; > r->bge_addr.bge_addr_lo = BGE_ADDR_LO(segs[0].ds_addr); > r->bge_addr.bge_addr_hi = BGE_ADDR_HI(segs[0].ds_addr); > @@ -1006,6 +1009,11 @@ bge_newbuf_jumbo(struct bge_softc *sc, i > sc->bge_cdata.bge_rx_jumbo_sparemap; > sc->bge_cdata.bge_rx_jumbo_sparemap = map; > sc->bge_cdata.bge_rx_jumbo_chain[i] = m; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][0] = 0; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][1] = 0; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][2] = 0; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][3] = 0; > + > /* > * Fill in the extended RX buffer descriptor. > */ > @@ -1018,18 +1026,22 @@ bge_newbuf_jumbo(struct bge_softc *sc, i > r->bge_addr3.bge_addr_lo = BGE_ADDR_LO(segs[3].ds_addr); > r->bge_addr3.bge_addr_hi = BGE_ADDR_HI(segs[3].ds_addr); > r->bge_len3 = segs[3].ds_len; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][3] = segs[3].ds_len; > case 3: > r->bge_addr2.bge_addr_lo = BGE_ADDR_LO(segs[2].ds_addr); > r->bge_addr2.bge_addr_hi = BGE_ADDR_HI(segs[2].ds_addr); > r->bge_len2 = segs[2].ds_len; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][2] = segs[2].ds_len; > case 2: > r->bge_addr1.bge_addr_lo = BGE_ADDR_LO(segs[1].ds_addr); > r->bge_addr1.bge_addr_hi = BGE_ADDR_HI(segs[1].ds_addr); > r->bge_len1 = segs[1].ds_len; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][1] = segs[1].ds_len; > case 1: > r->bge_addr0.bge_addr_lo = BGE_ADDR_LO(segs[0].ds_addr); > r->bge_addr0.bge_addr_hi = BGE_ADDR_HI(segs[0].ds_addr); > r->bge_len0 = segs[0].ds_len; > + sc->bge_cdata.bge_rx_jumbo_seglen[i][0] = segs[0].ds_len; > break; > default: > panic("%s: %d segments\n", __func__, nsegs); > @@ -1041,12 +1053,6 @@ bge_newbuf_jumbo(struct bge_softc *sc, i > return (0); > } > > -/* > - * The standard receive ring has 512 entries in it. At 2K per mbuf cluster, > - * that's 1MB or memory, which is a lot. For now, we fill only the first > - * 256 ring entries and hope that our CPU is fast enough to keep up with > - * the NIC. > - */ > static int > bge_init_rx_ring_std(struct bge_softc *sc) > { > @@ -1054,7 +1060,7 @@ bge_init_rx_ring_std(struct bge_softc *s > > bzero(sc->bge_ldata.bge_rx_std_ring, BGE_STD_RX_RING_SZ); > sc->bge_std = 0; > - for (i = 0; i < BGE_SSLOTS; i++) { > + for (i = 0; i < BGE_STD_RX_RING_CNT; i++) { > if ((error = bge_newbuf_std(sc, i)) != 0) > return (error); > BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT); > @@ -1063,8 +1069,8 @@ bge_init_rx_ring_std(struct bge_softc *s > bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, > sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREWRITE); > > - sc->bge_std = i - 1; > - bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, sc->bge_std); > + sc->bge_std = 0; > + bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, BGE_STD_RX_RING_CNT - 1); > > return (0); > } > @@ -1106,14 +1112,14 @@ bge_init_rx_ring_jumbo(struct bge_softc > bus_dmamap_sync(sc->bge_cdata.bge_rx_jumbo_ring_tag, > sc->bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_PREWRITE); > > - sc->bge_jumbo = i - 1; > + sc->bge_jumbo = 0; > > rcb = &sc->bge_ldata.bge_info.bge_jumbo_rx_rcb; > rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0, > BGE_RCB_FLAG_USE_EXT_RX_BD); > CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); > > - bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, sc->bge_jumbo); > + bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, BGE_JUMBO_RX_RING_CNT - 1); > > return (0); > } > @@ -3299,6 +3305,33 @@ bge_reset(struct bge_softc *sc) > return(0); > } > > +static __inline void > +bge_rxreuse_std(struct bge_softc *sc, int i) > +{ > + struct bge_rx_bd *r; > + > + r = &sc->bge_ldata.bge_rx_std_ring[sc->bge_std]; > + r->bge_flags = BGE_RXBDFLAG_END; > + r->bge_len = sc->bge_cdata.bge_rx_std_seglen[i]; > + r->bge_idx = i; > + BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT); > +} > + > +static __inline void > +bge_rxreuse_jumbo(struct bge_softc *sc, int i) > +{ > + struct bge_extrx_bd *r; > + > + r = &sc->bge_ldata.bge_rx_jumbo_ring[sc->bge_jumbo]; > + r->bge_flags = BGE_RXBDFLAG_JUMBO_RING | BGE_RXBDFLAG_END; > + r->bge_len0 = sc->bge_cdata.bge_rx_jumbo_seglen[i][0]; > + r->bge_len1 = sc->bge_cdata.bge_rx_jumbo_seglen[i][1]; > + r->bge_len2 = sc->bge_cdata.bge_rx_jumbo_seglen[i][2]; > + r->bge_len3 = sc->bge_cdata.bge_rx_jumbo_seglen[i][3]; > + r->bge_idx = i; > + BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT); > +} > + > /* > * Frame reception handling. This is called if there's a frame > * on the receive return list. > @@ -3362,24 +3395,24 @@ bge_rxeof(struct bge_softc *sc, uint16_t > jumbocnt++; > m = sc->bge_cdata.bge_rx_jumbo_chain[rxidx]; > if (cur_rx->bge_flags & BGE_RXBDFLAG_ERROR) { > - BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT); > + bge_rxreuse_jumbo(sc, rxidx); > continue; > } > if (bge_newbuf_jumbo(sc, rxidx) != 0) { > - BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT); > + bge_rxreuse_jumbo(sc, rxidx); > ifp->if_iqdrops++; > continue; > } > BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT); > } else { > stdcnt++; > + m = sc->bge_cdata.bge_rx_std_chain[rxidx]; > if (cur_rx->bge_flags & BGE_RXBDFLAG_ERROR) { > - BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT); > + bge_rxreuse_std(sc, rxidx); > continue; > } > - m = sc->bge_cdata.bge_rx_std_chain[rxidx]; > if (bge_newbuf_std(sc, rxidx) != 0) { > - BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT); > + bge_rxreuse_std(sc, rxidx); > ifp->if_iqdrops++; > continue; > } > > Modified: stable/7/sys/dev/bge/if_bgereg.h > ============================================================================== > --- stable/7/sys/dev/bge/if_bgereg.h Thu Jun 10 17:59:47 2010 (r208994) > +++ stable/7/sys/dev/bge/if_bgereg.h Thu Jun 10 18:04:25 2010 (r208995) > @@ -2561,6 +2561,8 @@ struct bge_chain_data { > struct mbuf *bge_tx_chain[BGE_TX_RING_CNT]; > struct mbuf *bge_rx_std_chain[BGE_STD_RX_RING_CNT]; > struct mbuf *bge_rx_jumbo_chain[BGE_JUMBO_RX_RING_CNT]; > + int bge_rx_std_seglen[BGE_STD_RX_RING_CNT]; > + int bge_rx_jumbo_seglen[BGE_JUMBO_RX_RING_CNT][4]; > }; > > struct bge_dmamap_arg { > _______________________________________________ > svn-src-stable-7@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7 > To unsubscribe, send any mail to "svn-src-stable-7-unsubscribe@freebsd.org" -- Anders. From owner-svn-src-stable-7@FreeBSD.ORG Tue Jun 29 14:13:52 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6242B1065670; Tue, 29 Jun 2010 14:13:52 +0000 (UTC) (envelope-from kensmith@buffalo.edu) Received: from localmailA.acsu.buffalo.edu (localmail.buffalo.edu [128.205.5.196]) by mx1.freebsd.org (Postfix) with ESMTP id 1D69A8FC0C; Tue, 29 Jun 2010 14:13:51 +0000 (UTC) Received: from localmailA.acsu.buffalo.edu (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id D719CB0CD; Tue, 29 Jun 2010 10:13:46 -0400 (EDT) Received: from localmailA.acsu.buffalo.edu (localhost [127.0.0.1]) by localmailA.acsu.buffalo.edu (Postfix) with ESMTP id 483DEB16F; Tue, 29 Jun 2010 10:13:46 -0400 (EDT) Received: from mweb2.acsu.buffalo.edu (mweb2.acsu.buffalo.edu [128.205.5.239]) by localmailA.acsu.buffalo.edu (Prefixe) with ESMTP id 3B594B0CD; Tue, 29 Jun 2010 10:13:46 -0400 (EDT) Received: from [128.205.32.76] (bauer.cse.buffalo.edu [128.205.32.76]) by mweb2.acsu.buffalo.edu (Postfix) with ESMTP id 23678207BD; Tue, 29 Jun 2010 10:13:46 -0400 (EDT) From: Ken Smith To: Anders Nordby In-Reply-To: <20100629074831.GA75332@fupp.net> References: <201006101804.o5AI4PEX024259@svn.freebsd.org> <20100629074831.GA75332@fupp.net> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-njsDQbSSLja+DF9qpdo7" Date: Tue, 29 Jun 2010 10:13:45 -0400 Message-ID: <1277820825.55649.7.camel@bauer.cse.buffalo.edu> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 FreeBSD GNOME Team Port X-PM-EL-Spam-Prob: : 8% Cc: marcel@FreeBSD.org, jdc@parodius.com, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org, Pyun YongHyeon Subject: Re: svn commit: r208995 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2010 14:13:52 -0000 --=-njsDQbSSLja+DF9qpdo7 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable On Tue, 2010-06-29 at 09:48 +0200, Anders Nordby wrote: > Is it possible to get this fix into FreeBSD 7.3-RELEASE? We typically rely on developers to decide if fixes might warrant consideration as an Errata Notice and send email to re@ suggesting it. It's hard for us to judge on our own - factors include things like the individual developers' confidence level in the fix, etc. If someone(s) were to send mail to re@ suggesting this be an Errata Notice given your description here we would definitely consider it seriously. As far as the general process goes that's the first step. --=20 Ken Smith - From there to here, from here to | kensmith@buffalo.edu there, funny things are everywhere. | - Theodore Geisel | --=-njsDQbSSLja+DF9qpdo7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEABECAAYFAkwp/5AACgkQ/G14VSmup/aEEQCeKYLV72/yynQ+hjut+9eLClUW oNoAoJiwzuWUlx8LVLlQSYOgwCoghdqv =QT5l -----END PGP SIGNATURE----- --=-njsDQbSSLja+DF9qpdo7-- From owner-svn-src-stable-7@FreeBSD.ORG Wed Jun 30 07:43:49 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65AA91065670; Wed, 30 Jun 2010 07:43:49 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 558708FC13; Wed, 30 Jun 2010 07:43:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5U7hngA078226; Wed, 30 Jun 2010 07:43:49 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5U7hnUF078224; Wed, 30 Jun 2010 07:43:49 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201006300743.o5U7hnUF078224@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 30 Jun 2010 07:43:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209606 - stable/7/lib/libpmc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2010 07:43:49 -0000 Author: obrien Date: Wed Jun 30 07:43:49 2010 New Revision: 209606 URL: http://svn.freebsd.org/changeset/base/209606 Log: Cleanup svn merge conflict markers. Modified: stable/7/lib/libpmc/pmc.tsc.3 Modified: stable/7/lib/libpmc/pmc.tsc.3 ============================================================================== --- stable/7/lib/libpmc/pmc.tsc.3 Wed Jun 30 04:52:42 2010 (r209605) +++ stable/7/lib/libpmc/pmc.tsc.3 Wed Jun 30 07:43:49 2010 (r209606) @@ -59,13 +59,10 @@ The alias maps to the TSC. .Sh SEE ALSO .Xr pmc 3 , -<<<<<<< current:lib/libpmc/pmc.tsc.3 .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -======= ->>>>>>> patched:lib/libpmc/pmc.tsc.3 .Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.p4 3 , From owner-svn-src-stable-7@FreeBSD.ORG Thu Jul 1 22:19:21 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 571401065676; Thu, 1 Jul 2010 22:19:21 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: from mail-pw0-f54.google.com (mail-pw0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 1C6638FC1B; Thu, 1 Jul 2010 22:19:20 +0000 (UTC) Received: by pwj9 with SMTP id 9so388531pwj.13 for ; Thu, 01 Jul 2010 15:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:date:to:cc :subject:message-id:reply-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=r1u/TYkeqCevVZ4iaSqg34tZFCqzi1xajeY9m3cwusg=; b=HwFrLQ3jWZq3KNGodF9QzVFVqosJjvrcC5EuACSmakIwWJIma2qu1RBBxdwmeWpLyB xSBzC8wVsHlmsRl5LQ1fW43Ck9xVl/LK04UnHAoTuKrrIRC/CbdvtN5cQEk7432zqJQb /CDQ6YbqqreoMck7gwngpQo4N72z/zWH2xxHI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:date:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=N9wihFJSyhl9rfRBQM2Boi6CiRKLRiTkeCzr5VUrRbMNfbcIA+WRlDdI8rSuMRViuU I9nnyX8p+jSlFPxj9LFoZFTL6jjTePPBxWHNGS2yspAQM3SpZJxO5JnwHsqExhrsrUy1 xCT05Oqy7W4vdKSFX2132ZMQnbwzEgOiOlXHg= Received: by 10.142.215.6 with SMTP id n6mr205154wfg.7.1278021166596; Thu, 01 Jul 2010 14:52:46 -0700 (PDT) Received: from pyunyh@gmail.com ([174.35.1.224]) by mx.google.com with ESMTPS id v38sm13453wfh.0.2010.07.01.14.52.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Jul 2010 14:52:45 -0700 (PDT) Received: by pyunyh@gmail.com (sSMTP sendmail emulation); Thu, 1 Jul 2010 14:52:18 -0700 From: Pyun YongHyeon Date: Thu, 1 Jul 2010 14:52:18 -0700 To: Ken Smith Message-ID: <20100701215218.GC7090@michelle.cdnetworks.com> References: <201006101804.o5AI4PEX024259@svn.freebsd.org> <20100629074831.GA75332@fupp.net> <1277820825.55649.7.camel@bauer.cse.buffalo.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1277820825.55649.7.camel@bauer.cse.buffalo.edu> User-Agent: Mutt/1.4.2.3i Cc: Anders Nordby , src-committers@freebsd.org, jdc@parodius.com, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-7@freebsd.org, marcel@freebsd.org, Pyun YongHyeon Subject: Re: svn commit: r208995 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: pyunyh@gmail.com List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2010 22:19:21 -0000 On Tue, Jun 29, 2010 at 10:13:45AM -0400, Ken Smith wrote: > On Tue, 2010-06-29 at 09:48 +0200, Anders Nordby wrote: > > Is it possible to get this fix into FreeBSD 7.3-RELEASE? > > We typically rely on developers to decide if fixes might warrant > consideration as an Errata Notice and send email to re@ suggesting > it. It's hard for us to judge on our own - factors include things > like the individual developers' confidence level in the fix, etc. > Even though I didn't receive positive feedback from jumbo frame users I'm pretty sure the change set will fix regression introduced in r199011. As you might know, the bug was not detected for a very long time(about 6 months) so I think it's better to wait 2 or 3 weeks to get more confidence on the patch. > If someone(s) were to send mail to re@ suggesting this be an > Errata Notice given your description here we would definitely > consider it seriously. As far as the general process goes that's > the first step. > > -- > Ken Smith > - From there to here, from here to | kensmith@buffalo.edu > there, funny things are everywhere. | > - Theodore Geisel | > From owner-svn-src-stable-7@FreeBSD.ORG Fri Jul 2 01:53:04 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 494AB1065670; Fri, 2 Jul 2010 01:53:04 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id BA00B8FC0A; Fri, 2 Jul 2010 01:53:03 +0000 (UTC) Received: by vws6 with SMTP id 6so2488257vws.13 for ; Thu, 01 Jul 2010 18:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=/DMaoxCKeleW8rZSJnZcGIw4e1fQnoMqM8rZPhSGbIM=; b=lBPwMdUkIZ7x97H05cmJVzJmlx1Y1tCtNIOgJ9DfaO0dcMZQ5feTXktLB5ZHtO+/ic G7sh9atGcp3dzWLpVA7+V2CgXxaNPjTlCaNltzh3oEBu5rsAluNJ4F5MQSzV2aeeifIi ug55cWdkXEX5K0BDZJW7RrUKdGLqB5aCgtroQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=AtlGKDVrJvYCaiDOiFHqXB/tqCJtvYuXjvLoPPVh37Psm5rMzAxHmTHoGfgU3cbD4D YczBZUkoh63HdcsFBffuF8jc1UGVVz0gcn6IhcucZICpMC0gbKbB3550rNqPJl6xCZRj NbQymQu+GJ9G5bLUfzomNrUnoF/CshpmJeUvM= MIME-Version: 1.0 Received: by 10.229.241.200 with SMTP id lf8mr5900qcb.53.1278034115719; Thu, 01 Jul 2010 18:28:35 -0700 (PDT) Received: by 10.229.221.83 with HTTP; Thu, 1 Jul 2010 18:28:35 -0700 (PDT) In-Reply-To: <20100701215218.GC7090@michelle.cdnetworks.com> References: <201006101804.o5AI4PEX024259@svn.freebsd.org> <20100629074831.GA75332@fupp.net> <1277820825.55649.7.camel@bauer.cse.buffalo.edu> <20100701215218.GC7090@michelle.cdnetworks.com> Date: Thu, 1 Jul 2010 18:28:35 -0700 Message-ID: From: Garrett Cooper To: pyunyh@gmail.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Fri, 02 Jul 2010 04:39:38 +0000 Cc: Anders Nordby , src-committers@freebsd.org, Ken Smith , jdc@parodius.com, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-7@freebsd.org, marcel@freebsd.org, Pyun YongHyeon Subject: Re: svn commit: r208995 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2010 01:53:04 -0000 On Thu, Jul 1, 2010 at 2:52 PM, Pyun YongHyeon wrote: > On Tue, Jun 29, 2010 at 10:13:45AM -0400, Ken Smith wrote: >> On Tue, 2010-06-29 at 09:48 +0200, Anders Nordby wrote: >> > Is it possible to get this fix into FreeBSD 7.3-RELEASE? >> >> We typically rely on developers to decide if fixes might warrant >> consideration as an Errata Notice and send email to re@ suggesting >> it. =A0It's hard for us to judge on our own - factors include things >> like the individual developers' confidence level in the fix, etc. >> > > Even though I didn't receive positive feedback from jumbo frame > users I'm pretty sure the change set will fix regression introduced > in r199011. As you might know, the bug was not detected for a very > long time(about 6 months) so I think it's better to wait 2 or 3 > weeks to get more confidence on the patch. If you have jumbo packet functional tests, I'll gladly run it on some r200 machines we have in the lab with bge(4) cards sometime in the next couple of weeks. If not, I'll have to produce the tests which will take longer. I'll see whether or not some of the test code in http://wiki.freebsd.org/VictorBilouro/TCP-IP_regression_test_suite addresses this. >> If someone(s) were to send mail to re@ suggesting this be an >> Errata Notice given your description here we would definitely >> consider it seriously. =A0As far as the general process goes that's >> the first step. Thanks! -Garrett From owner-svn-src-stable-7@FreeBSD.ORG Fri Jul 2 01:57:14 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33F7C1065672; Fri, 2 Jul 2010 01:57:14 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id C7F538FC08; Fri, 2 Jul 2010 01:57:13 +0000 (UTC) Received: by pvb32 with SMTP id 32so1163282pvb.13 for ; Thu, 01 Jul 2010 18:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:date:to:cc :subject:message-id:reply-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=iUgvey10AuB9XayWDICG+Ql6ZMZUzes53fW28vKw1e0=; b=UK4UAcIrxt1hOLSxAs1X4YcSka2HepZDP2ErmOIaE8N7IrxKc1Wp/bIv/6kECHWYrY ERTvpo/Th+sPL15HSyC8ci+fxhNLV+A2++Lb9kEqvOiD3C2XPHowjG713eOx0sFc20Tu J0CWhCd/erdvSTyeknc9GH0Ho5DICgSaRSyAs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:date:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=njS42ZtAqMk49Y7dlHEpSQpCCNmPpQaHi7kVyMqcE/XPGr27L2ddnPSggP1+o3kt4M sMX0Qi+F1ggopScWS8l1S0T82VSEq+2FdgJj5sRbSGPiIm+qFwdrND3A4OvQsiu6chbl wzcgy1OC9oNOY/0Jto8TUT8k6IpzTrJw2n1/s= Received: by 10.114.81.11 with SMTP id e11mr18026wab.140.1278035825763; Thu, 01 Jul 2010 18:57:05 -0700 (PDT) Received: from pyunyh@gmail.com ([174.35.1.224]) by mx.google.com with ESMTPS id d38sm1946511wam.8.2010.07.01.18.57.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Jul 2010 18:57:04 -0700 (PDT) Received: by pyunyh@gmail.com (sSMTP sendmail emulation); Thu, 1 Jul 2010 18:56:38 -0700 From: Pyun YongHyeon Date: Thu, 1 Jul 2010 18:56:38 -0700 To: Garrett Cooper Message-ID: <20100702015638.GM7090@michelle.cdnetworks.com> References: <201006101804.o5AI4PEX024259@svn.freebsd.org> <20100629074831.GA75332@fupp.net> <1277820825.55649.7.camel@bauer.cse.buffalo.edu> <20100701215218.GC7090@michelle.cdnetworks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-Mailman-Approved-At: Fri, 02 Jul 2010 04:40:19 +0000 Cc: Anders Nordby , src-committers@freebsd.org, Ken Smith , jdc@parodius.com, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-7@freebsd.org, marcel@freebsd.org, Pyun YongHyeon Subject: Re: svn commit: r208995 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: pyunyh@gmail.com List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2010 01:57:14 -0000 On Thu, Jul 01, 2010 at 06:28:35PM -0700, Garrett Cooper wrote: > On Thu, Jul 1, 2010 at 2:52 PM, Pyun YongHyeon wrote: > > On Tue, Jun 29, 2010 at 10:13:45AM -0400, Ken Smith wrote: > >> On Tue, 2010-06-29 at 09:48 +0200, Anders Nordby wrote: > >> > Is it possible to get this fix into FreeBSD 7.3-RELEASE? > >> > >> We typically rely on developers to decide if fixes might warrant > >> consideration as an Errata Notice and send email to re@ suggesting > >> it. ?It's hard for us to judge on our own - factors include things > >> like the individual developers' confidence level in the fix, etc. > >> > > > > Even though I didn't receive positive feedback from jumbo frame > > users I'm pretty sure the change set will fix regression introduced > > in r199011. As you might know, the bug was not detected for a very > > long time(about 6 months) so I think it's better to wait 2 or 3 > > weeks to get more confidence on the patch. > > If you have jumbo packet functional tests, I'll gladly run it on some > r200 machines we have in the lab with bge(4) cards sometime in the > next couple of weeks. If not, I'll have to produce the tests which > will take longer. I'll see whether or not some of the test code in > http://wiki.freebsd.org/VictorBilouro/TCP-IP_regression_test_suite > addresses this. > To reproduce the issue you should be able to generate very high rate of PPS and make kernel resource shortage condition. It would be hard to trigger the issue with self-clocking protocols like TCP. Alternatively, patching driver to add intentional delays and reducing number of available mbufs may help to trigger the issue. > >> If someone(s) were to send mail to re@ suggesting this be an > >> Errata Notice given your description here we would definitely > >> consider it seriously. ?As far as the general process goes that's > >> the first step. > > Thanks! > -Garrett From owner-svn-src-stable-7@FreeBSD.ORG Fri Jul 2 10:23:07 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AF4A1065676; Fri, 2 Jul 2010 10:23:07 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4ED198FC0C; Fri, 2 Jul 2010 10:23:06 +0000 (UTC) Received: by qyk7 with SMTP id 7so372379qyk.13 for ; Fri, 02 Jul 2010 03:23:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=/DMaoxCKeleW8rZSJnZcGIw4e1fQnoMqM8rZPhSGbIM=; b=lBPwMdUkIZ7x97H05cmJVzJmlx1Y1tCtNIOgJ9DfaO0dcMZQ5feTXktLB5ZHtO+/ic G7sh9atGcp3dzWLpVA7+V2CgXxaNPjTlCaNltzh3oEBu5rsAluNJ4F5MQSzV2aeeifIi ug55cWdkXEX5K0BDZJW7RrUKdGLqB5aCgtroQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=AtlGKDVrJvYCaiDOiFHqXB/tqCJtvYuXjvLoPPVh37Psm5rMzAxHmTHoGfgU3cbD4D YczBZUkoh63HdcsFBffuF8jc1UGVVz0gcn6IhcucZICpMC0gbKbB3550rNqPJl6xCZRj NbQymQu+GJ9G5bLUfzomNrUnoF/CshpmJeUvM= MIME-Version: 1.0 Received: by 10.229.241.200 with SMTP id lf8mr5900qcb.53.1278034115719; Thu, 01 Jul 2010 18:28:35 -0700 (PDT) Received: by 10.229.221.83 with HTTP; Thu, 1 Jul 2010 18:28:35 -0700 (PDT) In-Reply-To: <20100701215218.GC7090@michelle.cdnetworks.com> References: <201006101804.o5AI4PEX024259@svn.freebsd.org> <20100629074831.GA75332@fupp.net> <1277820825.55649.7.camel@bauer.cse.buffalo.edu> <20100701215218.GC7090@michelle.cdnetworks.com> Date: Thu, 1 Jul 2010 18:28:35 -0700 Message-ID: From: Garrett Cooper To: pyunyh@gmail.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Fri, 02 Jul 2010 11:12:34 +0000 Cc: Anders Nordby , src-committers@freebsd.org, Ken Smith , jdc@parodius.com, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-7@freebsd.org, marcel@freebsd.org, Pyun YongHyeon Subject: Re: svn commit: r208995 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2010 10:23:07 -0000 On Thu, Jul 1, 2010 at 2:52 PM, Pyun YongHyeon wrote: > On Tue, Jun 29, 2010 at 10:13:45AM -0400, Ken Smith wrote: >> On Tue, 2010-06-29 at 09:48 +0200, Anders Nordby wrote: >> > Is it possible to get this fix into FreeBSD 7.3-RELEASE? >> >> We typically rely on developers to decide if fixes might warrant >> consideration as an Errata Notice and send email to re@ suggesting >> it. =A0It's hard for us to judge on our own - factors include things >> like the individual developers' confidence level in the fix, etc. >> > > Even though I didn't receive positive feedback from jumbo frame > users I'm pretty sure the change set will fix regression introduced > in r199011. As you might know, the bug was not detected for a very > long time(about 6 months) so I think it's better to wait 2 or 3 > weeks to get more confidence on the patch. If you have jumbo packet functional tests, I'll gladly run it on some r200 machines we have in the lab with bge(4) cards sometime in the next couple of weeks. If not, I'll have to produce the tests which will take longer. I'll see whether or not some of the test code in http://wiki.freebsd.org/VictorBilouro/TCP-IP_regression_test_suite addresses this. >> If someone(s) were to send mail to re@ suggesting this be an >> Errata Notice given your description here we would definitely >> consider it seriously. =A0As far as the general process goes that's >> the first step. Thanks! -Garrett From owner-svn-src-stable-7@FreeBSD.ORG Sat Jul 3 09:47:12 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD58B1065673; Sat, 3 Jul 2010 09:47:12 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBDB28FC1E; Sat, 3 Jul 2010 09:47:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o639lC1R074749; Sat, 3 Jul 2010 09:47:12 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o639lCVc074747; Sat, 3 Jul 2010 09:47:12 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201007030947.o639lCVc074747@svn.freebsd.org> From: Christian Brueffer Date: Sat, 3 Jul 2010 09:47:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209656 - stable/7/contrib/ipfilter/man X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2010 09:47:13 -0000 Author: brueffer Date: Sat Jul 3 09:47:12 2010 New Revision: 209656 URL: http://svn.freebsd.org/changeset/base/209656 Log: MFC: r207945 Comment in the BUGS section header. Matches what's in ipfilter 5.10. Modified: stable/7/contrib/ipfilter/man/ipmon.8 Directory Properties: stable/7/contrib/ipfilter/ (props changed) Modified: stable/7/contrib/ipfilter/man/ipmon.8 ============================================================================== --- stable/7/contrib/ipfilter/man/ipmon.8 Sat Jul 3 09:42:15 2010 (r209655) +++ stable/7/contrib/ipfilter/man/ipmon.8 Sat Jul 3 09:47:12 2010 (r209656) @@ -181,6 +181,6 @@ recorded data. /etc/services .SH SEE ALSO ipl(4), ipf(8), ipfstat(8), ipnat(8) -.\".SH BUGS +.SH BUGS .PP If you find any, please send email to me at darrenr@pobox.com From owner-svn-src-stable-7@FreeBSD.ORG Sat Jul 3 09:54:15 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06F9E1065673; Sat, 3 Jul 2010 09:54:15 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E9FBC8FC2B; Sat, 3 Jul 2010 09:54:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o639sE3f076427; Sat, 3 Jul 2010 09:54:14 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o639sEe8076425; Sat, 3 Jul 2010 09:54:14 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201007030954.o639sEe8076425@svn.freebsd.org> From: Christian Brueffer Date: Sat, 3 Jul 2010 09:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209659 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2010 09:54:15 -0000 Author: brueffer Date: Sat Jul 3 09:54:14 2010 New Revision: 209659 URL: http://svn.freebsd.org/changeset/base/209659 Log: MFC: r207975 IBM ServeRAID M5015 SAS/SATA works. Modified: stable/7/share/man/man4/mfi.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/mfi.4 ============================================================================== --- stable/7/share/man/man4/mfi.4 Sat Jul 3 09:53:35 2010 (r209658) +++ stable/7/share/man/man4/mfi.4 Sat Jul 3 09:54:14 2010 (r209659) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 2, 2010 +.Dd May 12, 2010 .Dt MFI 4 .Os .Sh NAME @@ -91,6 +91,8 @@ Dell PERC5 .It Dell PERC6 .It +IBM ServeRAID M5015 SAS/SATA +.It IBM ServeRAID-MR10i .It Intel RAID Controller SROMBSAS18E From owner-svn-src-stable-7@FreeBSD.ORG Sat Jul 3 21:06:48 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0ABA1065672; Sat, 3 Jul 2010 21:06:48 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AEE358FC13; Sat, 3 Jul 2010 21:06:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o63L6mBp025641; Sat, 3 Jul 2010 21:06:48 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o63L6m8O025638; Sat, 3 Jul 2010 21:06:48 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201007032106.o63L6m8O025638@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 3 Jul 2010 21:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209675 - in stable/7: bin/sh tools/regression/bin/sh/expansion X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2010 21:06:48 -0000 Author: jilles Date: Sat Jul 3 21:06:48 2010 New Revision: 209675 URL: http://svn.freebsd.org/changeset/base/209675 Log: MFC r207944: sh: Fix pathname expansion with quoted slashes like *\/. These are git commits 36f0fa8fcbc8c7b2b194addd29100fb40e73e4e9 and d6d06ff5c2ea0fa44becc5ef4340e5f2f15073e4 in dash. Because this is the first code I'm importing from dash to expand.c, add the Herbert Xu copyright notice which is in dash's expand.c. When pathname expanding *\/, the CTLESC representing the quoted state was erroneously taken as part of the * pathname component. This CTLESC was then seen by the pattern matching code as escaping the '\0' terminating the string. The code is slightly different because dash converts the CTLESC characters to backslashes and removes all the other CTL* characters to allow substituting glob(3). The effect of the bug was also slightly different from dash (where nothing matched at all). Because a CTLESC can escape a '\0' in some way, whether files were included despite the bug depended on memory that should not be read. In particular, on many machines /*\/ expanded to a strict subset of what /*/ expanded to. Example: echo /*"/null" This should print /dev/null, not /*/null. PR: bin/146378 Obtained from: dash Added: stable/7/tools/regression/bin/sh/expansion/ stable/7/tools/regression/bin/sh/expansion/pathname2.0 - copied unchanged from r207944, head/tools/regression/bin/sh/expansion/pathname2.0 Modified: stable/7/bin/sh/expand.c Directory Properties: stable/7/bin/sh/ (props changed) stable/7/tools/regression/bin/sh/ (props changed) Modified: stable/7/bin/sh/expand.c ============================================================================== --- stable/7/bin/sh/expand.c Sat Jul 3 21:02:11 2010 (r209674) +++ stable/7/bin/sh/expand.c Sat Jul 3 21:06:48 2010 (r209675) @@ -1,6 +1,8 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. + * Copyright (c) 1997-2005 + * Herbert Xu . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -1122,10 +1124,11 @@ expmeta(char *enddir, char *name) struct dirent *dp; int atend; int matchdot; + int esc; metaflag = 0; start = name; - for (p = name ; ; p++) { + for (p = name; esc = 0, *p; p += esc + 1) { if (*p == '*' || *p == '?') metaflag = 1; else if (*p == '[') { @@ -1150,12 +1153,14 @@ expmeta(char *enddir, char *name) break; else if (*p == CTLQUOTEMARK) continue; - else if (*p == CTLESC) - p++; - if (*p == '/') { - if (metaflag) - break; - start = p + 1; + else { + if (*p == CTLESC) + esc++; + if (p[esc] == '/') { + if (metaflag) + break; + start = p + esc + 1; + } } } if (metaflag == 0) { /* we've reached the end of the file name */ @@ -1201,7 +1206,8 @@ expmeta(char *enddir, char *name) atend = 1; } else { atend = 0; - *endname++ = '\0'; + *endname = '\0'; + endname += esc + 1; } matchdot = 0; p = start; @@ -1229,7 +1235,7 @@ expmeta(char *enddir, char *name) } closedir(dirp); if (! atend) - endname[-1] = '/'; + endname[-esc - 1] = esc ? CTLESC : '/'; } Copied: stable/7/tools/regression/bin/sh/expansion/pathname2.0 (from r207944, head/tools/regression/bin/sh/expansion/pathname2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/tools/regression/bin/sh/expansion/pathname2.0 Sat Jul 3 21:06:48 2010 (r209675, copy of r207944, head/tools/regression/bin/sh/expansion/pathname2.0) @@ -0,0 +1,31 @@ +# $FreeBSD$ + +failures=0 + +check() { + testcase=$1 + expect=$2 + eval "set -- $testcase" + actual="$*" + if [ "$actual" != "$expect" ]; then + failures=$((failures+1)) + printf '%s\n' "For $testcase, expected $expect actual $actual" + fi +} + +set -e +T=$(mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXX) +trap 'rm -rf $T' 0 +cd -P $T + +mkdir testdir testdir2 'testdir/*' 'testdir/?' testdir/a testdir/b testdir2/b +mkdir testdir2/.c +touch testf 'testdir/*/1' 'testdir/?/1' testdir/a/1 testdir/b/1 testdir2/b/.a + +check '*\/' 'testdir/ testdir2/' +check '"testdir/"*"/1"' 'testdir/*/1 testdir/?/1 testdir/a/1 testdir/b/1' +check '"testdir/"*"/"*' 'testdir/*/1 testdir/?/1 testdir/a/1 testdir/b/1' +check '"testdir/"*\/*' 'testdir/*/1 testdir/?/1 testdir/a/1 testdir/b/1' +check '"testdir"*"/"*"/"*' 'testdir/*/1 testdir/?/1 testdir/a/1 testdir/b/1' + +exit $((failures != 0))