Date: Thu, 17 Jan 2008 07:20:26 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 133461 for review Message-ID: <200801170720.m0H7KQRP069120@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=133461 Change 133461 by scottl@scottl-ix on 2008/01/17 07:20:20 Fix a few more style problems and change some linux-isms. Affected files ... .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#7 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#7 (text+ko) ==== @@ -749,13 +749,14 @@ id = xennet_rxidx(req_prod + i); - PANIC_IF(sc->xn_cdata.xn_rx_chain[id] != NULL); + KASSERT(sc->xn_cdata.xn_rx_chain[id] == NULL, + ("non-NULL xm_rx_chain")); sc->xn_cdata.xn_rx_chain[id] = m_new; ref = gnttab_claim_grant_reference(&sc->gref_rx_head); - PANIC_IF((signed short)ref < 0); + KASSERT((short)ref >= 0, ("negative ref")); sc->grant_rx_ref[id] = ref; - + vaddr = mtod(m_new, vm_offset_t); pfn = vtophys(vaddr) >> PAGE_SHIFT; req = RING_GET_REQUEST(&sc->rx, req_prod + i); @@ -987,9 +988,9 @@ M_ASSERTVALID(m); if (unlikely(gnttab_query_foreign_access( np->grant_tx_ref[id]) != 0)) { - printk("network_tx_buf_gc: warning " - "-- grant still in use by backend " - "domain.\n"); + printf("network_tx_buf_gc: warning " + "-- grant still in use by backend " + "domain.\n"); goto out; } gnttab_end_foreign_access_ref( @@ -1040,9 +1041,9 @@ if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && - likely(netfront_carrier_ok(np)) && - ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + likely(netfront_carrier_ok(np)) && + ifp->if_drv_flags & IFF_DRV_RUNNING)) + return; if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { XN_TX_LOCK(np); xn_txeof(np); @@ -1054,7 +1055,7 @@ XN_RX_UNLOCK(np); if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) xn_start(ifp); } @@ -1065,7 +1066,7 @@ { int new = xennet_rxidx(np->rx.req_prod_pvt); - PANIC_IF(np->rx_mbufs[new] != NULL); + KASSERT(np->rx_mbufs[new] == NULL, ("rx_mbufs != NULL")); np->rx_mbufs[new] = m; np->grant_rx_ref[new] = ref; RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; @@ -1075,8 +1076,7 @@ static int xennet_get_extras(struct netfront_info *np, - struct netif_extra_info *extras, RING_IDX rp) - + struct netif_extra_info *extras, RING_IDX rp) { struct netif_extra_info *extra; RING_IDX cons = np->rx.rsp_cons; @@ -1182,56 +1182,53 @@ WPRINTK("Unfulfilled rx req " "(id=%d, st=%d).\n", rx->id, rx->status); - xennet_move_rx_slot(np, m, ref); - err = -ENOMEM; - goto next; - } + xennet_move_rx_slot(np, m, ref); + err = -ENOMEM; + goto next; + } + + if (!xen_feature( XENFEAT_auto_translated_physmap)) { + /* Remap the page. */ + void *vaddr = mtod(m, void *); + uint32_t pfn; - if (!xen_feature( - XENFEAT_auto_translated_physmap)) { - /* Remap the page. */ - void *vaddr = mtod(m, void *); - uint32_t pfn; + mcl = np->rx_mcl + pages_flipped; + mmu = np->rx_mmu + pages_flipped; - mcl = np->rx_mcl + pages_flipped; - mmu = np->rx_mmu + pages_flipped; + MULTI_update_va_mapping(mcl, (u_long)vaddr, + (mfn << PAGE_SHIFT) | PG_RW | + PG_V | PG_M | PG_A, 0); + pfn = (uint32_t)m->m_ext.ext_args; + mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) | + MMU_MACHPHYS_UPDATE; + mmu->val = pfn; - MULTI_update_va_mapping(mcl, - (u_long)vaddr, - (mfn << PAGE_SHIFT) | PG_RW | - PG_V | PG_M | PG_A, 0); - pfn = (uint32_t)m->m_ext.ext_args; - mmu->ptr = ((vm_paddr_t)mfn << - PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; - mmu->val = pfn; + set_phys_to_machine(pfn, mfn); + } + pages_flipped++; + } else { + ret = gnttab_end_foreign_access_ref(ref, 0); + KASSERT(ret, ("ret != 0")); + } - set_phys_to_machine(pfn, mfn); - } - pages_flipped++; - } else { - ret = gnttab_end_foreign_access_ref( - ref, 0); - PANIC_IF(!ret); - } + gnttab_release_grant_reference(&np->gref_rx_head, ref); + mbufq_tail(list, m); - gnttab_release_grant_reference(&np->gref_rx_head, ref); - mbufq_tail(list, m); +next: + if (!(rx->flags & NETRXF_more_data)) + break; - next: - if (!(rx->flags & NETRXF_more_data)) + if (cons + frags == rp) { + if (net_ratelimit()) + WPRINTK("Need more frags\n"); + err = -ENOENT; break; + } - if (cons + frags == rp) { - if (net_ratelimit()) - WPRINTK("Need more frags\n"); - err = -ENOENT; - break; - } - - rx = RING_GET_RESPONSE(&np->rx, cons + frags); - m = xennet_get_rx_mbuf(np, cons + frags); - ref = xennet_get_rx_ref(np, cons + frags); - frags++; + rx = RING_GET_RESPONSE(&np->rx, cons + frags); + m = xennet_get_rx_mbuf(np, cons + frags); + ref = xennet_get_rx_ref(np, cons + frags); + frags++; } if (unlikely(frags > max)) { @@ -1312,10 +1309,10 @@ tx = RING_GET_REQUEST(&sc->tx, i); tx->id = id; ref = gnttab_claim_grant_reference(&sc->gref_tx_head); - PANIC_IF((signed short)ref < 0); + KASSERT((short)ref >= 0, ("Negative ref")); mfn = virt_to_mfn(mtod(new_m, vm_offset_t)); - gnttab_grant_foreign_access_ref( - ref, sc->xbdev->otherend_id, mfn, GNTMAP_readonly); + gnttab_grant_foreign_access_ref(ref, sc->xbdev->otherend_id, + mfn, GNTMAP_readonly); tx->gref = sc->grant_tx_ref[id] = ref; tx->size = new_m->m_pkthdr.len; #if 0 @@ -1324,9 +1321,9 @@ tx->flags = 0; new_m->m_next = NULL; new_m->m_nextpkt = NULL; - + m_freem(m_head); - + sc->xn_cdata.xn_tx_chain[id] = new_m; BPF_MTAP(ifp, new_m);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801170720.m0H7KQRP069120>