Date: Mon, 31 Oct 2011 11:43:22 +0330 From: Hooman Fazaeli <hoomanfazaeli@gmail.com> To: Jason Wolfe <nitroboost@gmail.com> Cc: pyunyh@gmail.com, freebsd-net@freebsd.org, Jack Vogel <jfvogel@gmail.com>, Emil Muratov <gpm@hotplug.ru> Subject: Re: Intel 82574L interface wedging on em 7.1.9/7.2.3 when MSIX enabled Message-ID: <4EAE58A2.9040803@gmail.com> In-Reply-To: <CAAAm0r3qm=nQQuAmZDD4k4X8K-xW6_kM9TukRT=1GoG9dYR3zw@mail.gmail.com> References: <CAAAm0r0RXEJo4UiKS=Ui0e5OQTg6sg-xcYf3mYB5%2Bvk8i8557w@mail.gmail.com> <4E8F157A.40702@sentex.net> <CAAAm0r2JH43Rct7UxQK2duH1p43Nepnj5mpb6bXo==DPayhJLg@mail.gmail.com> <4E8F51D4.1060509@sentex.net> <CACqU3MVwLaepFymZJkaVk6p=SpykGhqs=VYFjLh9fP9S=AxDhg@mail.gmail.com> <CAAAm0r1DKvoL9=Ket9up=4%2B5xiCzTTZJK99FhF9jcCA28B0M%2BA@mail.gmail.com> <CAAAm0r3XdsMHZh%2BP_NF-txZasdExzwZ8ymmGQgGhJQds0fOiBQ@mail.gmail.com> <CAAAm0r1iS3z-7CBJ=xYDf%2BJOA1Q2nU0O54Twbyb7FjvgWHjKVw@mail.gmail.com> <4EA7E203.3020306@sepehrs.com> <CAAAm0r3Nr2t8cCetPkFnLQ-3KwqHw_0SpqbtvYPRUkSP=9n8CA@mail.gmail.com> <4EA80818.3030504@sentex.net> <4EA80F88.4000400@hotplug.ru> <4EA82715.2000404@gmail.com> <4EA8FA40.7010504@hotplug.ru> <4EA91836.2040508@gmail.com> <4EA959EE.2070806@hotplug.ru> <4EAD116A.8090006@gmail.com> <CAAAm0r3qm=nQQuAmZDD4k4X8K-xW6_kM9TukRT=1GoG9dYR3zw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040503030709030405090900 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 10/31/2011 7:33 AM, Jason Wolfe wrote: > > > Thanks for looking into this. I'd be happy to test any patch thrown my way, but keep in mind my issue is only tickled when MSI-X is enabled. My interfaces aren't bouncing, though it might be > possible some unique path in the MSI-X code is causing a throughput hang akin to connectivity loss? > > Jack is the delta your speaking to the 7.2.4 code? I did manage to get the code from Intel compiled with a couple minutes of work, but haven't loaded it up yet as I didn't see anything that caught > my untrained eye in the diffs. I'll wait until its ported over and would be happy to test if needed. > > Conveniently enough I just received another report from my test boxes with a pretty stock loader.conf. I had forgotten to remove the advanced options from the interfaces after I cycled them to pick > up the fc_setting=0. Fixed that up just meow. > > hw.em.fc_setting="0" > cc_cubic_load="YES" > > I bounced em0 because dropped packets incremented 368756 to 369124 and the interface is not incrementing packets out. > > 5:35PM up 2 days, 17:45, 0 users, load averages: 0.34, 0.45, 0.48 > > em0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 > options=219b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4,WOL_MAGIC> > ether X > inet6 X%em0 prefixlen 64 scopeid 0x1 > nd6 options=1<PERFORMNUD> > media: Ethernet autoselect (1000baseT <full-duplex>) > status: active > > em1: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 > options=219b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4,WOL_MAGIC> > ether X > inet6 X%em1 prefixlen 64 scopeid 0x2 > inet6 X prefixlen 64 autoconf > nd6 options=3<PERFORMNUD,ACCEPT_RTADV> > media: Ethernet autoselect (1000baseT <full-duplex>) > status: active > > ipfw0: flags=8801<UP,SIMPLEX,MULTICAST> metric 0 mtu 65536 > > lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> metric 0 mtu 16384 > options=3<RXCSUM,TXCSUM> > inet 127.0.0.1 netmask 0xff000000 > inet6 ::1 prefixlen 128 > inet6 fe80::1%lo0 prefixlen 64 scopeid 0x4 > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > inet X.X.X.X netmask 0xffffffff > nd6 options=3<PERFORMNUD,ACCEPT_RTADV> > > lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 > options=219b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4,WOL_MAGIC> > ether X > inet X.X.X.X netmask 0xffffff00 broadcast X.X.X.X > inet6 X%lagg0 prefixlen 64 scopeid 0x5 > nd6 options=3<PERFORMNUD,ACCEPT_RTADV> > media: Ethernet autoselect > status: active > laggproto loadbalance > laggport: em0 flags=4<ACTIVE> > laggport: em1 flags=4<ACTIVE> > > interrupt total rate > irq3: uart1 3456 0 > cpu0: timer 473404250 2000 > irq256: em0:rx 0 24614350 103 > irq257: em0:tx 0 1220810972 5157 > irq258: em0:link 1 0 > irq259: em1:rx 0 1533295149 6477 > irq260: em1:tx 0 1194032538 5044 > irq261: em1:link 3272 0 > irq262: mps0 189602667 801 > cpu3: timer 473396089 2000 > cpu1: timer 473396089 2000 > cpu2: timer 473396081 2000 > Total 6055954914 25585 > > 32999/8476/41475 mbufs in use (current/cache/total) > 4064/3398/7462/5872038 mbuf clusters in use (current/cache/total/max) > 4064/800 mbuf+clusters out of packet secondary zone in use (current/cache) > 24900/669/25569/2936019 4k (page size) jumbo clusters in use (current/cache/total/max) > 0/0/0/6400 9k jumbo clusters in use (current/cache/total/max) > 0/0/0/3200 16k jumbo clusters in use (current/cache/total/max) > 115977K/11591K/127568K bytes allocated to network (current/cache/total) > 0/0/0 requests for mbufs denied (mbufs/clusters/mbuf+clusters) > 0/0/0 requests for jumbo clusters denied (4k/9k/16k) > 0/0/0 sfbufs in use (current/peak/max) > 0 requests for sfbufs denied > 0 requests for sfbufs delayed > 61 requests for I/O initiated by sendfile > 0 calls to protocol drain routines > > Name Mtu Network Address Ipkts Ierrs Idrop Opkts Oerrs Coll Drop > em0 1500 <Link#1> 00:25:90:2a:a2:d7 24946787 0 0 5734180355 0 0 369844 > em0 1500 fe80:1::225:9 fe80:1::225:90ff: 0 - - 2 - - - > em1 1500 <Link#2> 00:25:90:2a:a2:d7 5220869518 15996 0 5429971995 0 0 37009 > em1 1500 fe80:2::225:9 fe80:2::225:90ff: 0 - - 1 - - - > em1 1500 2607:f4e8:310 2607:f4e8:310:12: 0 - - 0 - - - > lagg0 1500 <Link#5> 00:25:90:2a:a2:d7 5245767782 0 0 11162877037 406853 0 0 > lagg0 1500 69.164.38.0/2 <http://69.164.38.0/2>; 69.164.38.69 4776881809 - - 11164303625 - - - > lagg0 1500 fe80:5::225:9 fe80:5::225:90ff: 0 - - 3 - - - > > kern.msgbuf: > > Oct 30 17:08:38 cds1019 kernel: ifa_add_loopback_route: insertion failed > Oct 30 17:12:10 cds1019 kernel: ifa_add_loopback_route: insertion failed > Oct 30 17:20:20 cds1019 last message repeated 3 times > Oct 30 17:32:13 cds1019 last message repeated 4 times > Oct 30 17:34:27 cds1019 kernel: ifa_add_loopback_route: insertion failed > Oct 30 17:35:03 cds1019 kernel: Interface is RUNNING and INACTIVE > Oct 30 17:35:03 cds1019 kernel: em0: hw tdh = 818, hw tdt = 818 > Oct 30 17:35:03 cds1019 kernel: em0: hw rdh = 99, hw rdt = 98 > Oct 30 17:35:03 cds1019 kernel: em0: Tx Queue Status = 0 > Oct 30 17:35:03 cds1019 kernel: em0: TX descriptors avail = 1024 > Oct 30 17:35:03 cds1019 kernel: em0: Tx Descriptors avail failure = 0 > Oct 30 17:35:03 cds1019 kernel: em0: RX discarded packets = 0 > Oct 30 17:35:03 cds1019 kernel: em0: RX Next to Check = 110 > Oct 30 17:35:03 cds1019 kernel: em0: RX Next to Refresh = 109 > Oct 30 17:35:03 cds1019 kernel: em0: Link state: active > Oct 30 17:35:03 cds1019 kernel: Interface is RUNNING and INACTIVE > Oct 30 17:35:03 cds1019 kernel: em1: hw tdh = 688, hw tdt = 688 > Oct 30 17:35:03 cds1019 kernel: em1: hw rdh = 861, hw rdt = 860 > Oct 30 17:35:03 cds1019 kernel: em1: Tx Queue Status = 1 > Oct 30 17:35:03 cds1019 kernel: em1: TX descriptors avail = 1024 > Oct 30 17:35:03 cds1019 kernel: em1: Tx Descriptors avail failure = 0 > Oct 30 17:35:03 cds1019 kernel: em1: RX discarded packets = 0 > Oct 30 17:35:03 cds1019 kernel: em1: RX Next to Check = 19 > Oct 30 17:35:03 cds1019 kernel: em1: RX Next to Refresh = 85 > Oct 30 17:35:03 cds1019 kernel: em1: Link state: active > > net.inet.ip.intr_queue_maxlen: 512 > net.inet.ip.intr_queue_drops: 0 > dev.em.0.%desc: Intel(R) PRO/1000 Network Connection 7.2.3 > dev.em.0.%driver: em > dev.em.0.%location: slot=0 function=0 > dev.em.0.%pnpinfo: vendor=0x8086 device=0x10d3 subvendor=0x15d9 subdevice=0x10d3 class=0x020000 > dev.em.0.%parent: pci1 > dev.em.0.nvm: -1 > dev.em.0.debug: -1 > dev.em.0.rx_int_delay: 0 > dev.em.0.tx_int_delay: 66 > dev.em.0.rx_abs_int_delay: 66 > dev.em.0.tx_abs_int_delay: 66 > dev.em.0.rx_processing_limit: 100 > dev.em.0.flow_control: 0 > dev.em.0.eee_control: 0 > dev.em.0.link_irq: 1 > dev.em.0.mbuf_alloc_fail: 0 > dev.em.0.cluster_alloc_fail: 0 > dev.em.0.dropped: 0 > dev.em.0.tx_dma_fail: 0 > dev.em.0.rx_overruns: 0 > dev.em.0.watchdog_timeouts: 0 > dev.em.0.device_control: 1074790984 > dev.em.0.rx_control: 67141634 > dev.em.0.fc_high_water: 18432 > dev.em.0.fc_low_water: 16932 > dev.em.0.queue0.txd_head: 818 > dev.em.0.queue0.txd_tail: 818 > dev.em.0.queue0.tx_irq: 1220810942 > dev.em.0.queue0.no_desc_avail: 0 > dev.em.0.queue0.rxd_head: 314 > dev.em.0.queue0.rxd_tail: 313 > dev.em.0.queue0.rx_irq: 24614539 > dev.em.0.mac_stats.excess_coll: 0 > dev.em.0.mac_stats.single_coll: 0 > dev.em.0.mac_stats.multiple_coll: 0 > dev.em.0.mac_stats.late_coll: 0 > dev.em.0.mac_stats.collision_count: 0 > dev.em.0.mac_stats.symbol_errors: 0 > dev.em.0.mac_stats.sequence_errors: 0 > dev.em.0.mac_stats.defer_count: 0 > dev.em.0.mac_stats.missed_packets: 0 > dev.em.0.mac_stats.recv_no_buff: 0 > dev.em.0.mac_stats.recv_undersize: 0 > dev.em.0.mac_stats.recv_fragmented: 0 > dev.em.0.mac_stats.recv_oversize: 0 > dev.em.0.mac_stats.recv_jabber: 0 > dev.em.0.mac_stats.recv_errs: 0 > dev.em.0.mac_stats.crc_errs: 0 > dev.em.0.mac_stats.alignment_errs: 0 > dev.em.0.mac_stats.coll_ext_errs: 0 > dev.em.0.mac_stats.xon_recvd: 0 > dev.em.0.mac_stats.xon_txd: 0 > dev.em.0.mac_stats.xoff_recvd: 0 > dev.em.0.mac_stats.xoff_txd: 0 > dev.em.0.mac_stats.total_pkts_recvd: 24955229 > dev.em.0.mac_stats.good_pkts_recvd: 24955229 > dev.em.0.mac_stats.bcast_pkts_recvd: 24945466 > dev.em.0.mac_stats.mcast_pkts_recvd: 1377 > dev.em.0.mac_stats.rx_frames_64: 24945502 > dev.em.0.mac_stats.rx_frames_65_127: 1606 > dev.em.0.mac_stats.rx_frames_128_255: 7963 > dev.em.0.mac_stats.rx_frames_256_511: 157 > dev.em.0.mac_stats.rx_frames_512_1023: 1 > dev.em.0.mac_stats.rx_frames_1024_1522: 0 > dev.em.0.mac_stats.good_octets_recvd: 1597800626 > dev.em.0.mac_stats.good_octets_txd: 7770925595880 > dev.em.0.mac_stats.total_pkts_txd: 5734191501 > dev.em.0.mac_stats.good_pkts_txd: 5734191501 > dev.em.0.mac_stats.bcast_pkts_txd: 4 > dev.em.0.mac_stats.mcast_pkts_txd: 1584 > dev.em.0.mac_stats.tx_frames_64: 25504167 > dev.em.0.mac_stats.tx_frames_65_127: 485744914 > dev.em.0.mac_stats.tx_frames_128_255: 5963478 > dev.em.0.mac_stats.tx_frames_256_511: 9021090 > dev.em.0.mac_stats.tx_frames_512_1023: 55803019 > dev.em.0.mac_stats.tx_frames_1024_1522: 5152154833 > dev.em.0.mac_stats.tso_txd: 0 > dev.em.0.mac_stats.tso_ctx_fail: 0 > dev.em.0.interrupts.asserts: 3 > dev.em.0.interrupts.rx_pkt_timer: 0 > dev.em.0.interrupts.rx_abs_timer: 0 > dev.em.0.interrupts.tx_pkt_timer: 0 > dev.em.0.interrupts.tx_abs_timer: 0 > dev.em.0.interrupts.tx_queue_empty: 0 > dev.em.0.interrupts.tx_queue_min_thresh: 0 > dev.em.0.interrupts.rx_desc_min_thresh: 0 > dev.em.0.interrupts.rx_overrun: 0 > dev.em.1.%desc: Intel(R) PRO/1000 Network Connection 7.2.3 > dev.em.1.%driver: em > dev.em.1.%location: slot=0 function=0 > dev.em.1.%pnpinfo: vendor=0x8086 device=0x10d3 subvendor=0x15d9 subdevice=0x10d3 class=0x020000 > dev.em.1.%parent: pci2 > dev.em.1.nvm: -1 > dev.em.1.debug: -1 > dev.em.1.rx_int_delay: 0 > dev.em.1.tx_int_delay: 66 > dev.em.1.rx_abs_int_delay: 66 > dev.em.1.tx_abs_int_delay: 66 > dev.em.1.rx_processing_limit: 100 > dev.em.1.flow_control: 0 > dev.em.1.eee_control: 0 > dev.em.1.link_irq: 3272 > dev.em.1.mbuf_alloc_fail: 0 > dev.em.1.cluster_alloc_fail: 0 > dev.em.1.dropped: 0 > dev.em.1.tx_dma_fail: 0 > dev.em.1.rx_overruns: 0 > dev.em.1.watchdog_timeouts: 0 > dev.em.1.device_control: 1074790984 > dev.em.1.rx_control: 67141634 > dev.em.1.fc_high_water: 18432 > dev.em.1.fc_low_water: 16932 > dev.em.1.queue0.txd_head: 9 > dev.em.1.queue0.txd_tail: 14 > dev.em.1.queue0.tx_irq: 1194045687 > dev.em.1.queue0.no_desc_avail: 0 > dev.em.1.queue0.rxd_head: 317 > dev.em.1.queue0.rxd_tail: 315 > dev.em.1.queue0.rx_irq: 1528821076 > dev.em.1.mac_stats.excess_coll: 0 > dev.em.1.mac_stats.single_coll: 0 > dev.em.1.mac_stats.multiple_coll: 0 > dev.em.1.mac_stats.late_coll: 0 > dev.em.1.mac_stats.collision_count: 0 > dev.em.1.mac_stats.symbol_errors: 0 > dev.em.1.mac_stats.sequence_errors: 0 > dev.em.1.mac_stats.defer_count: 0 > dev.em.1.mac_stats.missed_packets: 15996 > dev.em.1.mac_stats.recv_no_buff: 1035 > dev.em.1.mac_stats.recv_undersize: 0 > dev.em.1.mac_stats.recv_fragmented: 0 > dev.em.1.mac_stats.recv_oversize: 0 > dev.em.1.mac_stats.recv_jabber: 0 > dev.em.1.mac_stats.recv_errs: 0 > dev.em.1.mac_stats.crc_errs: 0 > dev.em.1.mac_stats.alignment_errs: 0 > dev.em.1.mac_stats.coll_ext_errs: 0 > dev.em.1.mac_stats.xon_recvd: 0 > dev.em.1.mac_stats.xon_txd: 0 > dev.em.1.mac_stats.xoff_recvd: 0 > dev.em.1.mac_stats.xoff_txd: 0 > dev.em.1.mac_stats.total_pkts_recvd: 5220907923 > dev.em.1.mac_stats.good_pkts_recvd: 5220891927 > dev.em.1.mac_stats.bcast_pkts_recvd: 24943828 > dev.em.1.mac_stats.mcast_pkts_recvd: 1375 > dev.em.1.mac_stats.rx_frames_64: 1897964107 > dev.em.1.mac_stats.rx_frames_65_127: 2457591621 > dev.em.1.mac_stats.rx_frames_128_255: 5971619 > dev.em.1.mac_stats.rx_frames_256_511: 11235726 > dev.em.1.mac_stats.rx_frames_512_1023: 32267871 > dev.em.1.mac_stats.rx_frames_1024_1522: 815860983 > dev.em.1.mac_stats.good_octets_recvd: 1562681996232 > dev.em.1.mac_stats.good_octets_txd: 7334946827215 > dev.em.1.mac_stats.total_pkts_txd: 5430018684 > dev.em.1.mac_stats.good_pkts_txd: 5430018682 > dev.em.1.mac_stats.bcast_pkts_txd: 940 > dev.em.1.mac_stats.mcast_pkts_txd: 12 > dev.em.1.mac_stats.tx_frames_64: 24843579 > dev.em.1.mac_stats.tx_frames_65_127: 483343565 > dev.em.1.mac_stats.tx_frames_128_255: 5819327 > dev.em.1.mac_stats.tx_frames_256_511: 7998506 > dev.em.1.mac_stats.tx_frames_512_1023: 44787728 > dev.em.1.mac_stats.tx_frames_1024_1522: 4863225979 > dev.em.1.mac_stats.tso_txd: 0 > dev.em.1.mac_stats.tso_ctx_fail: 0 > dev.em.1.interrupts.asserts: 2398 > dev.em.1.interrupts.rx_pkt_timer: 1 > dev.em.1.interrupts.rx_abs_timer: 0 > dev.em.1.interrupts.tx_pkt_timer: 0 > dev.em.1.interrupts.tx_abs_timer: 0 > dev.em.1.interrupts.tx_queue_empty: 0 > dev.em.1.interrupts.tx_queue_min_thresh: 0 > dev.em.1.interrupts.rx_desc_min_thresh: 0 > dev.em.1.interrupts.rx_overrun: 2 > hw.em.eee_setting: 0 > hw.em.fc_setting: 0 > hw.em.rx_process_limit: 100 > hw.em.enable_msix: 1 > hw.em.sbp: 0 > hw.em.smart_pwr_down: 0 > hw.em.txd: 1024 > hw.em.rxd: 1024 > hw.em.rx_abs_int_delay: 66 > hw.em.tx_abs_int_delay: 66 > hw.em.rx_int_delay: 0 > hw.em.tx_int_delay: 66 > > Jason Jason Attached is a patch for if_em.c. It flushes interface queue when it is full and link is not active. Please note that when this happens, drops are increasing on interface and this will trigger your scripts as before. You need to change a little the scripts as follows: check interface TX status if (interface TX seems hung) { sleep 5 check interface TX status if (interface TX seems hung) { reset the interface. } } For MULTIQUEUE, it just disables the check for link status (which is not good). so pls. test in non-MULTIQUEUE mode. The patch also contains some minor fixups to compile on 7 plus a fix from r1.69 which addressed RX hang problem (the fix was later removed in r1.70). I included it for Emil to give it a try. Pls. let me know if you have any problems with patch. --------------040503030709030405090900 Content-Type: text/plain; name="if_em.c.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="if_em.c.patch" --- if_em.c.orig 2011-10-31 11:43:35.000000000 +0330 +++ if_em.c 2011-10-31 11:43:35.000000000 +0330 @@ -85,6 +85,14 @@ #include "e1000_82571.h" #include "if_em.h" +#if !defined(DISABLE_FIXUPS) && __FreeBSD_version < 800000 +static __inline int +pci_find_cap(device_t dev, int capability, int *capreg) +{ + return (PCI_FIND_EXTCAP(device_get_parent(dev), dev, capability, capreg)); +} +#endif + /********************************************************************* * Set this to one to display debug statistics *********************************************************************/ @@ -93,7 +101,11 @@ /********************************************************************* * Driver version: *********************************************************************/ +#ifdef PKG_VERSION +char em_driver_version[] = "version 7.2.3 (ifdrivers-" PKG_VERSION ")"; +#else char em_driver_version[] = "7.2.3"; +#endif /********************************************************************* * PCI Device ID Table @@ -399,6 +411,12 @@ /* Global used in WOL setup with multiport cards */ static int global_quad_port_a = 0; +#ifndef DISABLE_FIXUPS +static int em_rx_hang_fixup = 0; +SYSCTL_INT(_hw_em, OID_AUTO, rx_hang_fixup, CTLFLAG_RW, &em_rx_hang_fixup, 0, + "Enable/disable r1.69 RX hang fixup code"); +#endif + /********************************************************************* * Device identification routine * @@ -411,7 +429,11 @@ static int em_probe(device_t dev) { +#ifdef PKG_VERSION + char adapter_name[sizeof(em_driver_version) + 60]; +#else char adapter_name[60]; +#endif u16 pci_vendor_id = 0; u16 pci_device_id = 0; u16 pci_subvendor_id = 0; @@ -864,7 +886,11 @@ int err = 0, enq = 0; if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != +#ifndef DISABLE_FIXUPS IFF_DRV_RUNNING || adapter->link_active == 0) { +#else + IFF_DRV_RUNNING) { +#endif if (m != NULL) err = drbr_enqueue(ifp, txr->br, m); return (err); @@ -963,8 +989,17 @@ IFF_DRV_RUNNING) return; - if (!adapter->link_active) + if (!adapter->link_active) { +#ifndef DISABLE_FIXUPS + IF_LOCK(&ifp->if_snd); + if (_IF_QFULL(&ifp->if_snd)) { + ifp->if_snd.ifq_drops += _IF_QLEN(&ifp->if_snd); + _IF_DRAIN(&ifp->if_snd); + } + IF_UNLOCK(&ifp->if_snd); +#endif return; + } while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { /* Call cleanup if number of TX descriptors low */ @@ -1414,7 +1449,11 @@ * Legacy polling routine: note this only works with single queue * *********************************************************************/ +#if !defined(DISABLE_FIXUPS) && __FreeBSD_version < 800000 +static void +#else static int +#endif em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct adapter *adapter = ifp->if_softc; @@ -1426,7 +1465,11 @@ EM_CORE_LOCK(adapter); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { EM_CORE_UNLOCK(adapter); +#if !defined(DISABLE_FIXUPS) && __FreeBSD_version < 800000 + return; +#else return (0); +#endif } if (cmd == POLL_AND_CHECK_STATUS) { @@ -1452,8 +1495,11 @@ em_start_locked(ifp, txr); #endif EM_TX_UNLOCK(txr); - +#if !defined(DISABLE_FIXUPS) && __FreeBSD_version < 800000 + return; +#else return (rx_done); +#endif } #endif /* DEVICE_POLLING */ @@ -2213,6 +2259,16 @@ e1000_get_laa_state_82571(&adapter->hw)) e1000_rar_set(&adapter->hw, adapter->hw.mac.addr, 0); +#ifndef DISABLE_FIXUPS + if (em_rx_hang_fixup) { + /* trigger tq to refill rx ring queue if it is empty */ + for (int i = 0; i < adapter->num_queues; i++, rxr++) { + if (rxr->next_to_check == rxr->next_to_refresh) { + taskqueue_enqueue(rxr->tq, &rxr->rx_task); + } + } + } +#endif /* Mask to use in the irq trigger */ if (adapter->msix_mem) trigger = rxr->ims; /* RX for 82574 */ @@ -2311,6 +2367,9 @@ ((adapter->link_duplex == FULL_DUPLEX) ? "Full Duplex" : "Half Duplex")); adapter->link_active = 1; +#ifndef DISABLE_FIXUPS + adapter->link_toggles++; +#endif adapter->smartspeed = 0; ifp->if_baudrate = adapter->link_speed * 1000000; if_link_state_change(ifp, LINK_STATE_UP); @@ -2320,6 +2379,9 @@ if (bootverbose) device_printf(dev, "Link is Down\n"); adapter->link_active = 0; +#ifndef DISABLE_FIXUPS + adapter->link_toggles++; +#endif /* Link down, disable watchdog */ for (int i = 0; i < adapter->num_queues; i++, txr++) txr->queue_status = EM_QUEUE_IDLE; @@ -3766,7 +3828,7 @@ * If we have a minimum free, clear IFF_DRV_OACTIVE * to tell the stack that it is OK to send packets. */ - if (txr->tx_avail > EM_MAX_SCATTER) + if (txr->tx_avail >= EM_MAX_SCATTER) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* Disable watchdog if all clean */ @@ -5131,7 +5193,12 @@ SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_timeouts", CTLFLAG_RD, &adapter->watchdog_events, "Watchdog timeouts"); - +#ifndef DISABLE_FIXUPS + SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_toggles", + CTLFLAG_RD, &adapter->link_toggles, + "Number of link status changes"); +#endif + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "device_control", CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_CTRL, em_sysctl_reg_handler, "IU", @@ -5553,4 +5620,8 @@ rxr->rx_discarded); device_printf(dev, "RX Next to Check = %d\n", rxr->next_to_check); device_printf(dev, "RX Next to Refresh = %d\n", rxr->next_to_refresh); +#ifndef DISABLE_FIXUPS + device_printf(dev, "Link state: %s\n", + adapter->link_active? "active": "inactive"); +#endif } --------------040503030709030405090900 Content-Type: text/plain; name="if_em.h.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="if_em.h.patch" --- if_em.h.orig 2011-10-31 11:43:34.000000000 +0330 +++ if_em.h 2011-10-31 11:43:35.000000000 +0330 @@ -438,7 +438,9 @@ unsigned long rx_overruns; unsigned long watchdog_events; unsigned long link_irq; - +#ifndef DISABLE_FIXUPS + unsigned long link_toggles; +#endif struct e1000_hw_stats stats; }; --------------040503030709030405090900--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4EAE58A2.9040803>