From owner-p4-projects@FreeBSD.ORG Thu Jul 29 14:43:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 262A1106576E; Thu, 29 Jul 2010 14:43:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B63B106574D for ; Thu, 29 Jul 2010 14:43:40 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68A928FC21 for ; Thu, 29 Jul 2010 14:43:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TEhe0T079599 for ; Thu, 29 Jul 2010 14:43:40 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TEhe23079597 for perforce@freebsd.org; Thu, 29 Jul 2010 14:43:40 GMT (envelope-from afiveg@FreeBSD.org) Date: Thu, 29 Jul 2010 14:43:40 GMT Message-Id: <201007291443.o6TEhe23079597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2010 14:43:41 -0000 http://p4web.freebsd.org/@@181557?ac=10 Change 181557 by afiveg@ringmap-2 on 2010/07/29 14:43:22 Related to the previously submit Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#26 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#11 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#10 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#9 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#10 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#40 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#40 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#10 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#21 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#22 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#16 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#9 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#9 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#11 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#11 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#11 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#9 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#26 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#11 (text+ko) ==== @@ -1418,13 +1418,6 @@ ++que->irqs; -#ifdef RINGMAP - struct capt_object *co = NULL; - IXGBE_RX_LOCK(que->rxr); - adapter->rm->funcs->delayed_isr(que); - IXGBE_RX_UNLOCK(que->rxr); -#endif - more_rx = ixgbe_rxeof(que, adapter->rx_process_limit); IXGBE_TX_LOCK(txr); @@ -1433,19 +1426,6 @@ more_rx = ixgbe_rxeof(que, adapter->rx_process_limit); -#ifdef RINGMAP - IXGBE_RX_LOCK(que->rxr); - adapter->rm->funcs->sync_head(que); - - /* TODO: Only our co not all */ - SLIST_FOREACH(co, &adapter->rm->object_list, objects) { - if (RING_NOT_EMPTY(co->ring)){ - wakeup(co->ring); - } - } - IXGBE_RX_UNLOCK(que->rxr); -#endif - /* Do AIM now? */ if (ixgbe_enable_aim == FALSE) @@ -3788,12 +3768,6 @@ /* Update descriptor */ rxr->rx_base[j].read.pkt_addr = htole64(pseg[0].ds_addr); -//#ifdef RINGMAP -//#if (__RINGMAP_DEB) -// printf("[%s] pkt phys addr [%d] : 0x%llX\n", -// __func__, j, htole64(pseg[0].ds_addr)); -//#endif -//#endif } @@ -3966,6 +3940,7 @@ reta = (reta << 8) | (j * 0x11); #else #ifdef DEFAULT_QUEUE + /* Here we will set default queue for all incomming pckts */ reta = (reta << 8) | (DEFAULT_QUEUE * 0x11); #else reta = (reta << 8) | (j * 0x11); ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#40 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#40 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#21 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#22 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#16 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#11 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#11 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#11 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#9 (text+ko) ====