Date: Sat, 9 Mar 2013 13:12:12 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248100 - in user/attilio/vmc-playground: . lib/libncp lib/libprocstat share/examples/nwclient sys/dev/ath sys/fs/nwfs sys/kern sys/modules/ncp sys/modules/nwfs sys/net80211 sys/netncp ... Message-ID: <201303091312.r29DCCWK062886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Mar 9 13:12:12 2013 New Revision: 248100 URL: http://svnweb.freebsd.org/changeset/base/248100 Log: Merge from vmcontention Deleted: user/attilio/vmc-playground/lib/libncp/ user/attilio/vmc-playground/lib/libprocstat/nwfs.c user/attilio/vmc-playground/share/examples/nwclient/ user/attilio/vmc-playground/sys/fs/nwfs/ user/attilio/vmc-playground/sys/modules/ncp/ user/attilio/vmc-playground/sys/modules/nwfs/ user/attilio/vmc-playground/sys/netncp/ user/attilio/vmc-playground/usr.bin/ncplist/ user/attilio/vmc-playground/usr.bin/ncplogin/ user/attilio/vmc-playground/usr.sbin/mount_nwfs/ Modified: user/attilio/vmc-playground/ObsoleteFiles.inc user/attilio/vmc-playground/sys/dev/ath/if_ath.c user/attilio/vmc-playground/sys/dev/ath/if_ath_tx.c user/attilio/vmc-playground/sys/kern/kern_event.c user/attilio/vmc-playground/sys/kern/subr_witness.c user/attilio/vmc-playground/sys/kern/sys_generic.c user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c Directory Properties: user/attilio/vmc-playground/ (props changed) user/attilio/vmc-playground/sys/ (props changed) Modified: user/attilio/vmc-playground/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmc-playground/ObsoleteFiles.inc Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/ObsoleteFiles.inc Sat Mar 9 13:12:12 2013 (r248100) @@ -38,6 +38,43 @@ # xargs -n1 | sort | uniq -d; # done +# 20130902: NWFS and NCP supports removed +OLD_FILES+=usr/bin/ncplist +OLD_FILES+=usr/bin/ncplogin +OLD_FILES+=usr/bin/ncplogout +OLD_FILES+=usr/include/fs/nwfs/nwfs.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h +OLD_DIRS+=usr/include/fs/nwfs +OLD_FILES+=usr/include/netncp/ncp.h +OLD_FILES+=usr/include/netncp/ncp_cfg.h +OLD_FILES+=usr/include/netncp/ncp_conn.h +OLD_FILES+=usr/include/netncp/ncp_file.h +OLD_FILES+=usr/include/netncp/ncp_lib.h +OLD_FILES+=usr/include/netncp/ncp_ncp.h +OLD_FILES+=usr/include/netncp/ncp_nls.h +OLD_FILES+=usr/include/netncp/ncp_rcfile.h +OLD_FILES+=usr/include/netncp/ncp_rq.h +OLD_FILES+=usr/include/netncp/ncp_sock.h +OLD_FILES+=usr/include/netncp/ncp_subr.h +OLD_FILES+=usr/include/netncp/ncp_user.h +OLD_FILES+=usr/include/netncp/ncpio.h +OLD_FILES+=usr/include/netncp/nwerror.h +OLD_DIRS+=usr/include/netncp +OLD_FILES+=usr/lib/libncp.a +OLD_FILES+=usr/lib/libncp.so +OLD_LIBS+=usr/lib/libncp.so.4 +OLD_FILES+=usr/lib/libncp_p.a +OLD_FILES+=usr/lib32/libncp.a +OLD_FILES+=usr/lib32/libncp.so +OLD_LIBS+=usr/lib32/libncp.so.4 +OLD_FILES+=usr/lib32/libncp_p.a +OLD_FILES+=usr/sbin/mount_nwfs +OLD_FILES+=usr/share/man/man1/ncplist.1.gz +OLD_FILES+=usr/share/man/man1/ncplogin.1.gz +OLD_FILES+=usr/share/man/man1/ncplogout.1.gz +OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz # 20130302: NTFS support removed OLD_FILES+=rescue/mount_ntfs OLD_FILES+=sbin/mount_ntfs Modified: user/attilio/vmc-playground/sys/dev/ath/if_ath.c ============================================================================== --- user/attilio/vmc-playground/sys/dev/ath/if_ath.c Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/sys/dev/ath/if_ath.c Sat Mar 9 13:12:12 2013 (r248100) @@ -4342,9 +4342,12 @@ ath_tx_stopdma(struct ath_softc *sc, str { struct ath_hal *ah = sc->sc_ah; - DPRINTF(sc, ATH_DEBUG_RESET, "%s: tx queue [%u] %p, link %p\n", - __func__, txq->axq_qnum, + DPRINTF(sc, ATH_DEBUG_RESET, + "%s: tx queue [%u] %p, flags 0x%08x, link %p\n", + __func__, + txq->axq_qnum, (caddr_t)(uintptr_t) ath_hal_gettxbuf(ah, txq->axq_qnum), + txq->axq_flags, txq->axq_link); (void) ath_hal_stoptxdma(ah, txq->axq_qnum); } Modified: user/attilio/vmc-playground/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/attilio/vmc-playground/sys/dev/ath/if_ath_tx.c Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/sys/dev/ath/if_ath_tx.c Sat Mar 9 13:12:12 2013 (r248100) @@ -4340,12 +4340,23 @@ ath_tx_aggr_comp_aggr(struct ath_softc * __func__, tap->txa_start, tx_ok, ts.ts_status, ts.ts_flags, isaggr, seq_st, hasba, ba[0], ba[1]); + /* + * The reference driver doesn't do this; it simply ignores + * this check in its entirety. + * + * I've seen this occur when using iperf to send traffic + * out tid 1 - the aggregate frames are all marked as TID 1, + * but the TXSTATUS has TID=0. So, let's just ignore this + * check. + */ +#if 0 /* Occasionally, the MAC sends a tx status for the wrong TID. */ if (tid != ts.ts_tid) { device_printf(sc->sc_dev, "%s: tid %d != hw tid %d\n", __func__, tid, ts.ts_tid); tx_ok = 0; } +#endif /* AR5416 BA bug; this requires an interface reset */ if (isaggr && tx_ok && (! hasba)) { Modified: user/attilio/vmc-playground/sys/kern/kern_event.c ============================================================================== --- user/attilio/vmc-playground/sys/kern/kern_event.c Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/sys/kern/kern_event.c Sat Mar 9 13:12:12 2013 (r248100) @@ -1329,12 +1329,13 @@ kqueue_scan(struct kqueue *kq, int maxev goto done_nl; } if (timespecisset(tsp)) { - if (tsp->tv_sec < INT32_MAX) { + if (tsp->tv_sec <= INT32_MAX) { rsbt = tstosbt(*tsp); if (TIMESEL(&asbt, rsbt)) asbt += tc_tick_sbt; - asbt += rsbt; - if (asbt < rsbt) + if (asbt <= INT64_MAX - rsbt) + asbt += rsbt; + else asbt = 0; rsbt >>= tc_precexp; } else Modified: user/attilio/vmc-playground/sys/kern/subr_witness.c ============================================================================== --- user/attilio/vmc-playground/sys/kern/subr_witness.c Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/sys/kern/subr_witness.c Sat Mar 9 13:12:12 2013 (r248100) @@ -602,7 +602,7 @@ static struct witness_order_list_entry o * VM */ { "vm map (user)", &lock_class_sx }, - { "vm object", &lock_class_mtx_sleep }, + { "vm object", &lock_class_rw }, { "vm page", &lock_class_mtx_sleep }, { "vm page queue", &lock_class_mtx_sleep }, { "pmap pv global", &lock_class_rw }, Modified: user/attilio/vmc-playground/sys/kern/sys_generic.c ============================================================================== --- user/attilio/vmc-playground/sys/kern/sys_generic.c Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/sys/kern/sys_generic.c Sat Mar 9 13:12:12 2013 (r248100) @@ -1051,16 +1051,17 @@ kern_select(struct thread *td, int nd, f error = EINVAL; goto done; } - if (rtv.tv_sec == 0 && rtv.tv_usec == 0) + if (!timevalisset(&rtv)) asbt = 0; - else if (rtv.tv_sec < INT32_MAX) { + else if (rtv.tv_sec <= INT32_MAX) { rsbt = tvtosbt(rtv); precision = rsbt; precision >>= tc_precexp; if (TIMESEL(&asbt, rsbt)) asbt += tc_tick_sbt; - asbt += rsbt; - if (asbt < rsbt) + if (asbt <= INT64_MAX - rsbt) + asbt += rsbt; + else asbt = -1; } else asbt = -1; Modified: user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c ============================================================================== --- user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c Sat Mar 9 13:05:21 2013 (r248099) +++ user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c Sat Mar 9 13:12:12 2013 (r248100) @@ -1480,7 +1480,7 @@ mesh_recv_indiv_data_to_fwrd(struct ieee struct ieee80211com *ic = vap->iv_ic; /* This is called from the RX path - don't hold this lock */ - IEEE80211_TX_UNLOCK_ASSERT(ic); + IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic); qwh = (struct ieee80211_qosframe_addr4 *)wh; @@ -1540,7 +1540,7 @@ mesh_recv_indiv_data_to_me(struct ieee80 int ae; /* This is called from the RX path - don't hold this lock */ - IEEE80211_TX_UNLOCK_ASSERT(ic); + IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic); qwh = (struct ieee80211_qosframe_addr4 *)wh; mc10 = (const struct ieee80211_meshcntl_ae10 *)mc; @@ -1606,7 +1606,7 @@ mesh_recv_group_data(struct ieee80211vap struct ieee80211com *ic = vap->iv_ic; /* This is called from the RX path - don't hold this lock */ - IEEE80211_TX_UNLOCK_ASSERT(ic); + IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic); mesh_forward(vap, m, mc);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303091312.r29DCCWK062886>