Date: Tue, 12 Mar 2013 12:02:07 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248190 - in user/attilio/vmcontention: . lib/libnetgraph share/examples share/examples/cvsup share/misc sys/arm/at91 sys/arm/include sys/dev/acpica sys/dev/ath/ath_hal/ar9002 sys/dev/i... Message-ID: <201303121202.r2CC27Zn065074@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Tue Mar 12 12:02:06 2013 New Revision: 248190 URL: http://svnweb.freebsd.org/changeset/base/248190 Log: MFC Deleted: user/attilio/vmcontention/share/examples/cvsup/ports-supfile user/attilio/vmcontention/share/examples/cvsup/refuse user/attilio/vmcontention/share/examples/cvsup/refuse.README Modified: user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/lib/libnetgraph/msg.c user/attilio/vmcontention/share/examples/Makefile user/attilio/vmcontention/share/examples/cvsup/README user/attilio/vmcontention/share/examples/cvsup/cvs-supfile user/attilio/vmcontention/share/examples/cvsup/stable-supfile user/attilio/vmcontention/share/misc/organization.dot user/attilio/vmcontention/sys/arm/at91/if_ate.c user/attilio/vmcontention/sys/arm/include/signal.h user/attilio/vmcontention/sys/dev/acpica/acpi_hpet.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c user/attilio/vmcontention/sys/dev/iscsi/initiator/isc_soc.c user/attilio/vmcontention/sys/dev/sound/pci/hda/hdaa_patches.c user/attilio/vmcontention/sys/dev/sound/pci/hda/hdac.h user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c user/attilio/vmcontention/sys/dev/usb/usbdevs user/attilio/vmcontention/sys/fs/nfs/nfsport.h user/attilio/vmcontention/sys/kern/kern_synch.c user/attilio/vmcontention/sys/kern/kern_time.c user/attilio/vmcontention/sys/kern/subr_sleepqueue.c user/attilio/vmcontention/sys/kern/uipc_socket.c user/attilio/vmcontention/sys/kern/uipc_syscalls.c user/attilio/vmcontention/sys/kern/uipc_usrreq.c user/attilio/vmcontention/sys/modules/ath/Makefile user/attilio/vmcontention/sys/net/if_bridge.c user/attilio/vmcontention/sys/netinet/libalias/alias_db.c user/attilio/vmcontention/sys/netinet6/raw_ip6.c user/attilio/vmcontention/sys/xdr/xdr_mbuf.c user/attilio/vmcontention/usr.bin/top/machine.c user/attilio/vmcontention/usr.sbin/bhyve/pci_passthru.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/usr.sbin/bhyve/ (props changed) Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/ObsoleteFiles.inc Tue Mar 12 12:02:06 2013 (r248190) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20130311: Ports are no more available via cvsup +OLD_FILES+=usr/share/examples/cvsup/ports-supfile +OLD_FILES+=usr/share/examples/cvsup/refuse +OLD_FILES+=usr/share/examples/cvsup/refuse.README # 20130309: NWFS and NCP supports removed OLD_FILES+=usr/bin/ncplist OLD_FILES+=usr/bin/ncplogin Modified: user/attilio/vmcontention/lib/libnetgraph/msg.c ============================================================================== --- user/attilio/vmcontention/lib/libnetgraph/msg.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/lib/libnetgraph/msg.c Tue Mar 12 12:02:06 2013 (r248190) @@ -234,7 +234,7 @@ NgDeliverMsg(int cs, const char *path, } /* Wait for reply if there should be one. */ - if (msg->header.cmd & NGM_HASREPLY) { + if (msg->header.cmd & NGM_HASREPLY && !(msg->header.flags & NGF_RESP)) { struct pollfd rfds; int n; Modified: user/attilio/vmcontention/share/examples/Makefile ============================================================================== --- user/attilio/vmcontention/share/examples/Makefile Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/share/examples/Makefile Tue Mar 12 12:02:06 2013 (r248190) @@ -52,9 +52,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ csh/dot.cshrc \ cvsup/README \ cvsup/cvs-supfile \ - cvsup/ports-supfile \ - cvsup/refuse \ - cvsup/refuse.README \ cvsup/stable-supfile \ cvsup/standard-supfile \ diskless/ME \ Modified: user/attilio/vmcontention/share/examples/cvsup/README ============================================================================== --- user/attilio/vmcontention/share/examples/cvsup/README Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/share/examples/cvsup/README Tue Mar 12 12:02:06 2013 (r248190) @@ -19,8 +19,6 @@ To maintain the sources for the FreeBSD- standard-supfile Main source tree - ports-supfile Ports collection - To maintain the sources for the FreeBSD-stable release, use: stable-supfile Main source tree @@ -28,7 +26,7 @@ To maintain the sources for the FreeBSD- To maintain a copy of the CVS repository containing all versions of FreeBSD, use: - cvs-supfile Main source tree and ports collection + cvs-supfile Main source tree collection IMPORTANT: Before you use any of the supfiles in this directory, you will need to edit in an appropriate "host" setting. See: Modified: user/attilio/vmcontention/share/examples/cvsup/cvs-supfile ============================================================================== --- user/attilio/vmcontention/share/examples/cvsup/cvs-supfile Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/share/examples/cvsup/cvs-supfile Tue Mar 12 12:02:06 2013 (r248190) @@ -43,9 +43,8 @@ # prefix=/home/ncvs # This specifies where to place the requested files. A # setting of "/home/ncvs" will place all of the files -# requested in /home/ncvs (e.g., "/home/ncvs/src/bin", -# "/home/ncvs/ports/archivers"). The prefix directory -# must exist in order to run CVSup. +# requested in /home/ncvs (e.g., "/home/ncvs/src/bin"). +# The prefix directory must exist in order to run CVSup. # Defaults that apply to all the collections # @@ -68,13 +67,6 @@ # mega-collection. It includes all of the individual "src-*" collections. src-all -## Ports Collection. -# -# The easiest way to get the ports tree is to use the "ports-all" -# mega-collection. It includes all of the individual "ports-*" -# collections, -ports-all - ## Projects # # This collection retrieves the projects tree of the FreeBSD Modified: user/attilio/vmcontention/share/examples/cvsup/stable-supfile ============================================================================== --- user/attilio/vmcontention/share/examples/cvsup/stable-supfile Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/share/examples/cvsup/stable-supfile Tue Mar 12 12:02:06 2013 (r248190) @@ -46,21 +46,6 @@ # in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib"). # The prefix directory must exist in order to run CVSup. # -############################################################################### -# -# DANGER! WARNING! LOOK OUT! VORSICHT! -# -# If you add any of the ports collections to this file, be sure to -# specify them with a "tag" value set to ".", like this: -# -# ports-all tag=. -# -# If you leave out the "tag=." portion, CVSup will delete all of -# the files in your ports. That is because the ports -# collections do not use the same tags as the main part of the FreeBSD -# source tree. -# -############################################################################### # Defaults that apply to all the collections # Modified: user/attilio/vmcontention/share/misc/organization.dot ============================================================================== --- user/attilio/vmcontention/share/misc/organization.dot Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/share/misc/organization.dot Tue Mar 12 12:02:06 2013 (r248190) @@ -30,7 +30,7 @@ coresecretary [label="Core Team Secretar doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\ntabthorpe, marcus, bapt, beat,\nerwin, linimon, pav,\nitetcu, miwi"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\ntabthorpe, marcus, bapt, \nerwin, pav,\nitetcu, miwi"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\ntabthorpe"] re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"] secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"] @@ -43,13 +43,12 @@ srccommitters [label="Src Committers\nsr accounts [label="Accounts Team\naccounts@FreeBSD.org\nmarkm, simon, kensmith,\ndhw"] backups [label="Backup Administrators\nbackups@FreeBSD.org\nsimon, kensmith,\ndhw"] -bugmeister [label="Bugmeister Team\nbugmeister@FreeBSD.org\neadler, gavin, gonzo, linimon"] +bugmeister [label="Bugmeister Team\nbugmeister@FreeBSD.org\neadler, gavin, gonzo"] clusteradm [label="Cluster Administrators\nclusteradm@FreeBSD.org\nbrd, simon, ps,\nkensmith, peter"] cvsupmaster [label="CVSup Mirror Site Coordinators\ncvsup-master@FreeBSD.org\nkuriyama, jdp,\nkensmith"] dnsadm [label="DNS Administrators\ndnsadm@FreeBSD.org\nbillf, dg, ps,\nkensmith, peter"] mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-admin@FreeBSD.org\nkuriyama, kensmith"] ncvs [label="CVS src Repository Managers\nncvs@FreeBSD.org\njoe, kuriyama, markm,\nsimon, peter"] -pcvs [label="CVS ports Repository Managers\npcvs@FreeBSD.org\nmarcus, joe, kuriyama,\nmarkm, simon"] perforceadmin [label="Perforce Repository Administrators\nperforce-admin@FreeBSD.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\njmb, brd, sahil, dhw"] refadm [label="Reference Systems Administrators\nrefadm@FreeBSD.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] @@ -70,8 +69,6 @@ _admin -> backups _admin -> bugmeister _admin -> clusteradm _admin -> ncvs -_admin -> pcvs -_admin -> dcvs _admin -> cvsupmaster _admin -> dnsadm _admin -> mirroradmin Modified: user/attilio/vmcontention/sys/arm/at91/if_ate.c ============================================================================== --- user/attilio/vmcontention/sys/arm/at91/if_ate.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/arm/at91/if_ate.c Tue Mar 12 12:02:06 2013 (r248190) @@ -899,12 +899,9 @@ ate_intr(void *xsc) /* FCS is not coppied into mbuf. */ remain = (sc->rx_descs[idx].status & ETH_LEN_MASK) - 4; - /* Get an appropriately sized mbuf */ - if (remain + ETHER_ALIGN >= MINCLSIZE) - mb = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - else - MGETHDR(mb, M_NOWAIT, MT_DATA); - + /* Get an appropriately sized mbuf. */ + mb = m_get2(M_NOWAIT, MT_DATA, M_PKTHDR, + remain + ETHER_ALIGN); if (mb == NULL) { sc->ifp->if_iqdrops++; rxdhead->status = 0; Modified: user/attilio/vmcontention/sys/arm/include/signal.h ============================================================================== --- user/attilio/vmcontention/sys/arm/include/signal.h Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/arm/include/signal.h Tue Mar 12 12:02:06 2013 (r248190) @@ -42,6 +42,7 @@ typedef long sig_atomic_t; #if __BSD_VISIBLE struct sigcontext { + int _dummy; }; #endif Modified: user/attilio/vmcontention/sys/dev/acpica/acpi_hpet.c ============================================================================== --- user/attilio/vmcontention/sys/dev/acpica/acpi_hpet.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/acpica/acpi_hpet.c Tue Mar 12 12:02:06 2013 (r248190) @@ -675,7 +675,8 @@ hpet_attach(device_t dev) if (t->pcpu_master >= 0) { t->et.et_flags |= ET_FLAGS_PERCPU; t->et.et_quality += 100; - } + } else if (mp_ncpus >= 8) + t->et.et_quality -= 100; if ((t->caps & HPET_TCAP_PER_INT) == 0) t->et.et_quality -= 10; t->et.et_frequency = sc->freq; Modified: user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c ============================================================================== --- user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c Tue Mar 12 12:02:06 2013 (r248190) @@ -50,7 +50,7 @@ ar9285BTCoexAntennaDiversity(struct ath_ if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && - (AH5212(ah)->ah_diversity == HAL_ANT_VARIABLE)) { + (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { /* Enable antenna diversity */ ant_div_control1 = HAL_BT_COEX_ANTDIV_CONTROL1_ENABLE; ant_div_control2 = HAL_BT_COEX_ANTDIV_CONTROL2_ENABLE; @@ -63,7 +63,7 @@ ar9285BTCoexAntennaDiversity(struct ath_ OS_REG_WRITE(ah, AR_PHY_SWITCH_COM, HAL_BT_COEX_ANT_DIV_SWITCH_COM); OS_REG_RMW(ah, AR_PHY_SWITCH_CHAIN_0, 0, 0xf0000000); - } else if (AH5212(ah)->ah_diversity == HAL_ANT_FIXED_B) { + } else if (AH5212(ah)->ah_antControl == HAL_ANT_FIXED_B) { /* Disable antenna diversity. Use antenna B(LNA2) only. */ ant_div_control1 = HAL_BT_COEX_ANTDIV_CONTROL1_FIXED_B; ant_div_control2 = HAL_BT_COEX_ANTDIV_CONTROL2_FIXED_B; Modified: user/attilio/vmcontention/sys/dev/iscsi/initiator/isc_soc.c ============================================================================== --- user/attilio/vmcontention/sys/dev/iscsi/initiator/isc_soc.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/iscsi/initiator/isc_soc.c Tue Mar 12 12:02:06 2013 (r248190) @@ -91,7 +91,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *p /* | mbuf for the iSCSI header */ - MGETHDR(mh, M_TRYWAIT, MT_DATA); + MGETHDR(mh, M_WAITOK, MT_DATA); mh->m_pkthdr.rcvif = NULL; mh->m_next = NULL; mh->m_len = sizeof(union ipdu_u); @@ -132,7 +132,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *p while(len > 0) { int l; - MGET(md, M_TRYWAIT, MT_DATA); + MGET(md, M_WAITOK, MT_DATA); md->m_ext.ref_cnt = &ou_refcnt; l = min(MCLBYTES, len); debug(4, "setting ext_free(arg=%p len/l=%d/%d)", pq->buf, len, l); @@ -150,7 +150,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *p off += l; } if(((pp->ds_len & 03) != 0) || ISOK2DIG(sp->dataDigest, pp)) { - MGET(md, M_TRYWAIT, MT_DATA); + MGET(md, M_WAITOK, MT_DATA); if(pp->ds_len & 03) len = 4 - (pp->ds_len & 03); else Modified: user/attilio/vmcontention/sys/dev/sound/pci/hda/hdaa_patches.c ============================================================================== --- user/attilio/vmcontention/sys/dev/sound/pci/hda/hdaa_patches.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/sound/pci/hda/hdaa_patches.c Tue Mar 12 12:02:06 2013 (r248190) @@ -344,7 +344,9 @@ hdac_pin_patch(struct hdaa_widget *w) break; } } else if (id == HDA_CODEC_ALC269 && - subid == LENOVO_X1CRBN_SUBVENDOR) { + (subid == LENOVO_X1CRBN_SUBVENDOR || + subid == LENOVO_T430_SUBVENDOR || + subid == LENOVO_T430S_SUBVENDOR)) { switch (nid) { case 21: patch = "as=1 seq=15"; Modified: user/attilio/vmcontention/sys/dev/sound/pci/hda/hdac.h ============================================================================== --- user/attilio/vmcontention/sys/dev/sound/pci/hda/hdac.h Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/sound/pci/hda/hdac.h Tue Mar 12 12:02:06 2013 (r248190) @@ -225,6 +225,8 @@ #define LENOVO_X220_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21da) #define LENOVO_X300_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x20ac) #define LENOVO_T420_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21ce) +#define LENOVO_T430_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21f3) +#define LENOVO_T430S_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21fb) #define LENOVO_T520_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21cf) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) Modified: user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c ============================================================================== --- user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c Tue Mar 12 12:02:06 2013 (r248190) @@ -753,6 +753,8 @@ static const STRUCT_USB_HOST_ID uftdi_de UFTDI_DEV(MOBILITY, USB_SERIAL, UFTDI_TYPE_AUTO), UFTDI_DEV(OLIMEX, ARM_USB_OCD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), UFTDI_DEV(OLIMEX, ARM_USB_OCD_H, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), + UFTDI_DEV(OPTO, CRD7734, UFTDI_TYPE_AUTO), + UFTDI_DEV(OPTO, CRD7734_1, UFTDI_TYPE_AUTO), UFTDI_DEV(PAPOUCH, AD4USB, UFTDI_TYPE_AUTO), UFTDI_DEV(PAPOUCH, AP485, UFTDI_TYPE_AUTO), UFTDI_DEV(PAPOUCH, AP485_2, UFTDI_TYPE_AUTO), Modified: user/attilio/vmcontention/sys/dev/usb/usbdevs ============================================================================== --- user/attilio/vmcontention/sys/dev/usb/usbdevs Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/dev/usb/usbdevs Tue Mar 12 12:02:06 2013 (r248190) @@ -323,6 +323,7 @@ vendor GUNZE 0x0637 Gunze Electronics U vendor AVISION 0x0638 Avision vendor TEAC 0x0644 TEAC vendor ACTON 0x0647 Acton Research Corp. +vendor OPTO 0x065a Optoelectronics Co., Ltd vendor SGI 0x065e Silicon Graphics vendor SANWASUPPLY 0x0663 Sanwa Supply vendor MEGATEC 0x0665 Megatec @@ -3150,6 +3151,13 @@ product OPTION ICON321 0xd031 Globetrot product OPTION ICON505 0xd055 Globetrotter iCON 505 product OPTION ICON452 0x7901 Globetrotter iCON 452 +/* Optoelectronics Co., Ltd */ +product OPTO BARCODE 0x0001 Barcode Reader +product OPTO OPTICONCODE 0x0009 Opticon Code Reader +product OPTO BARCODE_1 0xa002 Barcode Reader +product OPTO CRD7734 0xc000 USB Cradle CRD-7734-RU +product OPTO CRD7734_1 0xc001 USB Cradle CRD-7734-RU + /* OvisLink product */ product OVISLINK RT3072 0x3072 RT3072 Modified: user/attilio/vmcontention/sys/fs/nfs/nfsport.h ============================================================================== --- user/attilio/vmcontention/sys/fs/nfs/nfsport.h Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/fs/nfs/nfsport.h Tue Mar 12 12:02:06 2013 (r248190) @@ -140,32 +140,32 @@ * Allocate mbufs. Must succeed and never set the mbuf ptr to NULL. */ #define NFSMGET(m) do { \ - MGET((m), M_TRYWAIT, MT_DATA); \ + MGET((m), M_WAITOK, MT_DATA); \ while ((m) == NULL ) { \ (void) nfs_catnap(PZERO, 0, "nfsmget"); \ - MGET((m), M_TRYWAIT, MT_DATA); \ + MGET((m), M_WAITOK, MT_DATA); \ } \ } while (0) #define NFSMGETHDR(m) do { \ - MGETHDR((m), M_TRYWAIT, MT_DATA); \ + MGETHDR((m), M_WAITOK, MT_DATA); \ while ((m) == NULL ) { \ (void) nfs_catnap(PZERO, 0, "nfsmget"); \ - MGETHDR((m), M_TRYWAIT, MT_DATA); \ + MGETHDR((m), M_WAITOK, MT_DATA); \ } \ } while (0) #define NFSMCLGET(m, w) do { \ - MGET((m), M_TRYWAIT, MT_DATA); \ + MGET((m), M_WAITOK, MT_DATA); \ while ((m) == NULL ) { \ (void) nfs_catnap(PZERO, 0, "nfsmget"); \ - MGET((m), M_TRYWAIT, MT_DATA); \ + MGET((m), M_WAITOK, MT_DATA); \ } \ MCLGET((m), (w)); \ } while (0) #define NFSMCLGETHDR(m, w) do { \ - MGETHDR((m), M_TRYWAIT, MT_DATA); \ + MGETHDR((m), M_WAITOK, MT_DATA); \ while ((m) == NULL ) { \ (void) nfs_catnap(PZERO, 0, "nfsmget"); \ - MGETHDR((m), M_TRYWAIT, MT_DATA); \ + MGETHDR((m), M_WAITOK, MT_DATA); \ } \ } while (0) #define NFSMTOD mtod Modified: user/attilio/vmcontention/sys/kern/kern_synch.c ============================================================================== --- user/attilio/vmcontention/sys/kern/kern_synch.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/kern/kern_synch.c Tue Mar 12 12:02:06 2013 (r248190) @@ -85,7 +85,7 @@ SYSINIT(synch_setup, SI_SUB_KICK_SCHEDUL NULL); int hogticks; -static int pause_wchan; +static uint8_t pause_wchan[MAXCPU]; static struct callout loadav_callout; @@ -198,7 +198,8 @@ _sleep(void *ident, struct lock_object * if (TD_ON_SLEEPQ(td)) sleepq_remove(td, td->td_wchan); - if (ident == &pause_wchan) + if ((uint8_t *)ident >= &pause_wchan[0] && + (uint8_t *)ident <= &pause_wchan[MAXCPU - 1]) sleepq_flags = SLEEPQ_PAUSE; else sleepq_flags = SLEEPQ_SLEEP; @@ -372,7 +373,7 @@ pause_sbt(const char *wmesg, sbintime_t DELAY((sbt & 0xffffffff) / SBT_1US); return (0); } - return (_sleep(&pause_wchan, NULL, 0, wmesg, sbt, pr, flags)); + return (_sleep(&pause_wchan[curcpu], NULL, 0, wmesg, sbt, pr, flags)); } /* Modified: user/attilio/vmcontention/sys/kern/kern_time.c ============================================================================== --- user/attilio/vmcontention/sys/kern/kern_time.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/kern/kern_time.c Tue Mar 12 12:02:06 2013 (r248190) @@ -477,7 +477,7 @@ kern_clock_getres(struct thread *td, clo return (0); } -static int nanowait; +static uint8_t nanowait[MAXCPU]; int kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt) @@ -503,8 +503,8 @@ kern_nanosleep(struct thread *td, struct if (TIMESEL(&sbt, tmp)) sbt += tc_tick_sbt; sbt += tmp; - error = tsleep_sbt(&nanowait, PWAIT | PCATCH, "nanslp", sbt, prec, - C_ABSOLUTE); + error = tsleep_sbt(&nanowait[curcpu], PWAIT | PCATCH, "nanslp", + sbt, prec, C_ABSOLUTE); if (error != EWOULDBLOCK) { if (error == ERESTART) error = EINTR; Modified: user/attilio/vmcontention/sys/kern/subr_sleepqueue.c ============================================================================== --- user/attilio/vmcontention/sys/kern/subr_sleepqueue.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/kern/subr_sleepqueue.c Tue Mar 12 12:02:06 2013 (r248190) @@ -88,16 +88,14 @@ __FBSDID("$FreeBSD$"); #endif /* - * Constants for the hash table of sleep queue chains. These constants are - * the same ones that 4BSD (and possibly earlier versions of BSD) used. - * Basically, we ignore the lower 8 bits of the address since most wait - * channel pointers are aligned and only look at the next 7 bits for the - * hash. SC_TABLESIZE must be a power of two for SC_MASK to work properly. + * Constants for the hash table of sleep queue chains. + * SC_TABLESIZE must be a power of two for SC_MASK to work properly. */ -#define SC_TABLESIZE 128 /* Must be power of 2. */ +#define SC_TABLESIZE 256 /* Must be power of 2. */ #define SC_MASK (SC_TABLESIZE - 1) #define SC_SHIFT 8 -#define SC_HASH(wc) (((uintptr_t)(wc) >> SC_SHIFT) & SC_MASK) +#define SC_HASH(wc) ((((uintptr_t)(wc) >> SC_SHIFT) ^ (uintptr_t)(wc)) & \ + SC_MASK) #define SC_LOOKUP(wc) &sleepq_chains[SC_HASH(wc)] #define NR_SLEEPQS 2 /* Modified: user/attilio/vmcontention/sys/kern/uipc_socket.c ============================================================================== --- user/attilio/vmcontention/sys/kern/uipc_socket.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/kern/uipc_socket.c Tue Mar 12 12:02:06 2013 (r248190) @@ -136,6 +136,7 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #include <sys/jail.h> #include <sys/syslog.h> +#include <netinet/in.h> #include <net/vnet.h> @@ -565,8 +566,12 @@ sonewconn(struct socket *head, int conns /* * The accept socket may be tearing down but we just * won a race on the ACCEPT_LOCK. + * However, if sctp_peeloff() is called on a 1-to-many + * style socket, the SO_ACCEPTCONN doesn't need to be set. */ - if (!(head->so_options & SO_ACCEPTCONN)) { + if (!(head->so_options & SO_ACCEPTCONN) && + ((head->so_proto->pr_protocol != IPPROTO_SCTP) || + (head->so_type != SOCK_SEQPACKET))) { SOCK_LOCK(so); so->so_head = NULL; sofree(so); /* NB: returns ACCEPT_UNLOCK'ed. */ Modified: user/attilio/vmcontention/sys/kern/uipc_syscalls.c ============================================================================== --- user/attilio/vmcontention/sys/kern/uipc_syscalls.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/kern/uipc_syscalls.c Tue Mar 12 12:02:06 2013 (r248190) @@ -2386,8 +2386,10 @@ sys_sctp_peeloff(td, uap) CURVNET_SET(head->so_vnet); so = sonewconn(head, SS_ISCONNECTED); - if (so == NULL) + if (so == NULL) { + error = ENOMEM; goto noconnection; + } /* * Before changing the flags on the socket, we have to bump the * reference count. Otherwise, if the protocol calls sofree(), Modified: user/attilio/vmcontention/sys/kern/uipc_usrreq.c ============================================================================== --- user/attilio/vmcontention/sys/kern/uipc_usrreq.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/kern/uipc_usrreq.c Tue Mar 12 12:02:06 2013 (r248190) @@ -282,7 +282,7 @@ static void unp_dispose(struct mbuf *); static void unp_shutdown(struct unpcb *); static void unp_drop(struct unpcb *, int); static void unp_gc(__unused void *, int); -static void unp_scan(struct mbuf *, void (*)(struct file *)); +static void unp_scan(struct mbuf *, void (*)(struct filedescent **, int)); static void unp_discard(struct file *); static void unp_freerights(struct filedescent **, int); static void unp_init(void); @@ -2135,17 +2135,22 @@ static int unp_marked; static int unp_unreachable; static void -unp_accessable(struct file *fp) +unp_accessable(struct filedescent **fdep, int fdcount) { struct unpcb *unp; + struct file *fp; + int i; - if ((unp = fptounp(fp)) == NULL) - return; - if (unp->unp_gcflag & UNPGC_REF) - return; - unp->unp_gcflag &= ~UNPGC_DEAD; - unp->unp_gcflag |= UNPGC_REF; - unp_marked++; + for (i = 0; i < fdcount; i++) { + fp = fdep[i]->fde_file; + if ((unp = fptounp(fp)) == NULL) + continue; + if (unp->unp_gcflag & UNPGC_REF) + continue; + unp->unp_gcflag &= ~UNPGC_DEAD; + unp->unp_gcflag |= UNPGC_REF; + unp_marked++; + } } static void @@ -2292,19 +2297,16 @@ unp_dispose(struct mbuf *m) { if (m) - unp_scan(m, unp_discard); + unp_scan(m, unp_freerights); } static void -unp_scan(struct mbuf *m0, void (*op)(struct file *)) +unp_scan(struct mbuf *m0, void (*op)(struct filedescent **, int)) { struct mbuf *m; - struct filedescent **fdep; struct cmsghdr *cm; void *data; - int i; socklen_t clen, datalen; - int qfds; while (m0 != NULL) { for (m = m0; m; m = m->m_next) { @@ -2324,10 +2326,8 @@ unp_scan(struct mbuf *m0, void (*op)(str if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_RIGHTS) { - qfds = datalen / sizeof(*fdep); - fdep = data; - for (i = 0; i < qfds; i++) - (*op)(fdep[i]->fde_file); + (*op)(data, datalen / + sizeof(struct filedescent *)); } if (CMSG_SPACE(datalen) < clen) { Modified: user/attilio/vmcontention/sys/modules/ath/Makefile ============================================================================== --- user/attilio/vmcontention/sys/modules/ath/Makefile Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/modules/ath/Makefile Tue Mar 12 12:02:06 2013 (r248190) @@ -124,7 +124,7 @@ SRCS+= ah_eeprom_9287.c SRCS+= ar9287.c ar9287_reset.c ar9287_attach.c ar9287_cal.c ar9287_olc.c # + AR9300 HAL -# .PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9003 +# .PATH: ${.CURDIR}/../../contrib/sys/dev/ath/ath_hal/ar9300 #SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c #SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c #SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c @@ -149,6 +149,7 @@ SRCS+= amrr.c SRCS+= dfs_null.c CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal +# CFLAGS+= -I. -I${.CURDIR}/../../contrib/sys/dev/ath/ath_hal/ .if !defined(KERNBUILDDIR) opt_ah.h: Modified: user/attilio/vmcontention/sys/net/if_bridge.c ============================================================================== --- user/attilio/vmcontention/sys/net/if_bridge.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/net/if_bridge.c Tue Mar 12 12:02:06 2013 (r248190) @@ -2314,6 +2314,7 @@ bridge_input(struct ifnet *ifp, struct m BRIDGE_UNLOCK(sc); \ return (NULL); \ } \ + eh = mtod(m, struct ether_header *); \ } \ } \ if (bif->bif_flags & IFBIF_LEARNING) { \ Modified: user/attilio/vmcontention/sys/netinet/libalias/alias_db.c ============================================================================== --- user/attilio/vmcontention/sys/netinet/libalias/alias_db.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/netinet/libalias/alias_db.c Tue Mar 12 12:02:06 2013 (r248190) @@ -2729,7 +2729,6 @@ static void InitPunchFW(struct libalias *la) { - LIBALIAS_LOCK_ASSERT(la); la->fireWallField = malloc(la->fireWallNumNums); if (la->fireWallField) { memset(la->fireWallField, 0, la->fireWallNumNums); @@ -2745,7 +2744,6 @@ static void UninitPunchFW(struct libalias *la) { - LIBALIAS_LOCK_ASSERT(la); ClearAllFWHoles(la); if (la->fireWallFD >= 0) close(la->fireWallFD); @@ -2765,7 +2763,6 @@ PunchFWHole(struct alias_link *lnk) struct ip_fw rule; /* On-the-fly built rule */ int fwhole; /* Where to punch hole */ - LIBALIAS_LOCK_ASSERT(la); la = lnk->la; /* Don't do anything unless we are asked to */ @@ -2839,7 +2836,6 @@ ClearFWHole(struct alias_link *lnk) { struct libalias *la; - LIBALIAS_LOCK_ASSERT(la); la = lnk->la; if (lnk->link_type == LINK_TCP) { int fwhole = lnk->data.tcp->fwhole; /* Where is the firewall @@ -2864,7 +2860,6 @@ ClearAllFWHoles(struct libalias *la) struct ip_fw rule; /* On-the-fly built rule */ int i; - LIBALIAS_LOCK_ASSERT(la); if (la->fireWallFD < 0) return; @@ -2878,7 +2873,7 @@ ClearAllFWHoles(struct libalias *la) memset(la->fireWallField, 0, la->fireWallNumNums); } -#endif +#endif /* !NO_FW_PUNCH */ void LibAliasSetFWBase(struct libalias *la, unsigned int base, unsigned int num) Modified: user/attilio/vmcontention/sys/netinet6/raw_ip6.c ============================================================================== --- user/attilio/vmcontention/sys/netinet6/raw_ip6.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/netinet6/raw_ip6.c Tue Mar 12 12:02:06 2013 (r248190) @@ -197,6 +197,7 @@ rip6_input(struct mbuf **mp, int *offp, &ip6->ip6_dst) != 0) continue; } + INP_RLOCK(in6p); if (in6p->in6p_cksum != -1) { V_rip6stat.rip6s_isum++; if (in6_cksum(m, proto, *offp, @@ -206,7 +207,6 @@ rip6_input(struct mbuf **mp, int *offp, continue; } } - INP_RLOCK(in6p); /* * If this raw socket has multicast state, and we * have received a multicast, check if this socket Modified: user/attilio/vmcontention/sys/xdr/xdr_mbuf.c ============================================================================== --- user/attilio/vmcontention/sys/xdr/xdr_mbuf.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/sys/xdr/xdr_mbuf.c Tue Mar 12 12:02:06 2013 (r248190) @@ -228,9 +228,9 @@ xdrmbuf_putbytes(XDR *xdrs, const char * if (xdrs->x_handy == m->m_len && M_TRAILINGSPACE(m) == 0) { if (!m->m_next) { - MGET(n, M_TRYWAIT, m->m_type); + MGET(n, M_WAITOK, m->m_type); if (m->m_flags & M_EXT) - MCLGET(n, M_TRYWAIT); + MCLGET(n, M_WAITOK); m->m_next = n; } m = m->m_next; Modified: user/attilio/vmcontention/usr.bin/top/machine.c ============================================================================== --- user/attilio/vmcontention/usr.bin/top/machine.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/usr.bin/top/machine.c Tue Mar 12 12:02:06 2013 (r248190) @@ -797,7 +797,7 @@ format_next_process(caddr_t handle, char double pct; struct handle *hp; char status[16]; - int state; + int cpu, state; struct rusage ru, *rup; long p_tot, s_tot; char *proc_fmt, thr_buf[6], jid_buf[6]; @@ -997,6 +997,13 @@ format_next_process(caddr_t handle, char } /* format this entry */ + if (smpmode) { + if (state == SRUN && pp->ki_oncpu != 0xff) + cpu = pp->ki_oncpu; + else + cpu = pp->ki_lastcpu; + } else + cpu = 0; proc_fmt = smpmode ? smp_Proc_format : up_Proc_format; if (ps.thread != 0) thr_buf[0] = '\0'; @@ -1014,7 +1021,7 @@ format_next_process(caddr_t handle, char format_k2(PROCSIZE(pp)), format_k2(pagetok(pp->ki_rssize)), status, - smpmode ? pp->ki_lastcpu : 0, + cpu, format_time(cputime), ps.wcpu ? 100.0 * weighted_cpu(pct, pp) : 100.0 * pct, screen_width > cmdlengthdelta ? screen_width - cmdlengthdelta : 0, Modified: user/attilio/vmcontention/usr.sbin/bhyve/pci_passthru.c ============================================================================== --- user/attilio/vmcontention/usr.sbin/bhyve/pci_passthru.c Tue Mar 12 10:05:36 2013 (r248189) +++ user/attilio/vmcontention/usr.sbin/bhyve/pci_passthru.c Tue Mar 12 12:02:06 2013 (r248190) @@ -279,6 +279,7 @@ msix_table_read(struct passthru_softc *s int index; pi = sc->psc_pi; + offset -= pi->pi_msix.table_offset; index = offset / MSIX_TABLE_ENTRY_SIZE; if (index >= pi->pi_msix.table_count) @@ -323,6 +324,8 @@ msix_table_write(struct vmctx *ctx, int int error, index; pi = sc->psc_pi; + offset -= pi->pi_msix.table_offset; + index = offset / MSIX_TABLE_ENTRY_SIZE; if (index >= pi->pi_msix.table_count) return;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303121202.r2CC27Zn065074>