Date: Sun, 5 Jun 2011 15:30:04 GMT From: Takuya ASADA <syuu@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 194258 for review Message-ID: <201106051530.p55FU4od010651@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@194258?ac=10 Change 194258 by syuu@x200 on 2011/06/05 15:29:08 debug log in bpf_mtap caused panic, commented out Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#4 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#6 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#4 (text+ko) ==== @@ -59,6 +59,7 @@ #include <sys/eventhandler.h> #include <sys/pcpu.h> #include <sys/smp.h> +#include <sys/syslog.h> #include <machine/smp.h> #include <machine/bus.h> #include <machine/resource.h> @@ -4488,6 +4489,11 @@ rxr->fmp->m_pkthdr.ether_vtag = vtag; rxr->fmp->m_flags |= M_VLANTAG; } + const char *rsstype_str[] = {"NONE", "IPV4_TCP", "IPV4", "IPV6_TCP", "IPV6_EX", "IPV6", "IPV6_TCP_EX", "IPV4_UDP", "IPV6_UDP", "IPV6_UDP_EX"}; + u16 pkt = le16toh(cur->wb.lower.lo_dword.hs_rss.pkt_info); + u32 rss = le32toh(cur->wb.lower.hi_dword.rss); + u8 rsstype = (u8)(pkt & E1000_RXDADV_RSSTYPE_MASK); + log(LOG_DEBUG, "[%d]msix:%d rsstype:%s ptype:%u plen:%u hdr_info:%x rss:%x\n", PCPU_GET(cpuid), que->msix, rsstype_str[rsstype], ptype, plen, hdr, rss); #if __FreeBSD_version >= 800000 rxr->fmp->m_pkthdr.flowid = que->msix; rxr->fmp->m_flags |= M_FLOWID; ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#6 (text+ko) ==== @@ -2214,11 +2214,12 @@ BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { if (d->bd_qmask.qm_enabled) { +/* log(LOG_DEBUG, "bpf_mtap rxqid:%x txqid:%x rxqmask:%x txqmask:%x\n", m->m_pkthdr.rxqid, m->m_pkthdr.txqid, d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqid], d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqid]); - +*/ if (m->m_pkthdr.rxqid != (uint32_t)-1 && !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqid]) continue;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106051530.p55FU4od010651>