date:20131216

svn commit: r259454 - in stable/9/sys/dev/usb: . storage wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 08:51:58 2013
New Revision: 259454
URL: http://svnweb.freebsd.org/changeset/base/259454

Log:
  MFC r244503 and r246565:
  
  Make sure all USB drivers allocate buffer memory
  through the USB API and/or busdma.
  
  The following assumptions have been made:
  umass - buffers passed from CAM/SCSI layer are OK
  network - mbufs are OK.
  
  Some other nits while at it.

Modified:
  stable/9/sys/dev/usb/storage/ustorage_fs.c
  stable/9/sys/dev/usb/usb_msctest.c
  stable/9/sys/dev/usb/wlan/if_uath.c
  stable/9/sys/dev/usb/wlan/if_uathvar.h
  stable/9/sys/dev/usb/wlan/if_upgt.c
  stable/9/sys/dev/usb/wlan/if_upgtvar.h
  stable/9/sys/dev/usb/wlan/if_urtw.c
  stable/9/sys/dev/usb/wlan/if_urtwvar.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/storage/ustorage_fs.c
==
--- stable/9/sys/dev/usb/storage/ustorage_fs.c  Mon Dec 16 08:10:38 2013
(r259453)
+++ stable/9/sys/dev/usb/storage/ustorage_fs.c  Mon Dec 16 08:51:58 2013
(r259454)
@@ -74,7 +74,7 @@ SYSCTL_INT(_hw_usb_ustorage_fs, OID_AUTO
 /* Define some limits */
 
 #ifndef USTORAGE_FS_BULK_SIZE 
-#defineUSTORAGE_FS_BULK_SIZE (1UL  17)   /* bytes */
+#defineUSTORAGE_FS_BULK_SIZE   (1U  17)  /* bytes */
 #endif
 
 #ifndefUSTORAGE_FS_MAX_LUN
@@ -85,8 +85,6 @@ SYSCTL_INT(_hw_usb_ustorage_fs, OID_AUTO
 #defineUSTORAGE_QDATA_MAX  40  /* bytes */
 #endif
 
-#define sc_cmd_data sc_cbw.CBWCDB
-
 /*
  * The SCSI ID string must be exactly 28 characters long
  * exluding the terminating zero.
@@ -176,8 +174,9 @@ struct ustorage_fs_lun {
 
 struct ustorage_fs_softc {
 
-   ustorage_fs_bbb_cbw_t sc_cbw;   /* Command Wrapper Block */
-   ustorage_fs_bbb_csw_t sc_csw;   /* Command Status Block */
+   ustorage_fs_bbb_cbw_t *sc_cbw;  /* Command Wrapper Block */
+   ustorage_fs_bbb_csw_t *sc_csw;  /* Command Status Block */
+   void *sc_dma_ptr;   /* Main data buffer */
 
struct mtx sc_mtx;
 
@@ -275,7 +274,6 @@ static struct usb_config ustorage_fs_bbb
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = sizeof(ustorage_fs_bbb_cbw_t),
-   .flags = {.ext_buffer = 1,},
.callback = ustorage_fs_t_bbb_command_callback,
.usb_mode = USB_MODE_DEVICE,
},
@@ -295,7 +293,7 @@ static struct usb_config ustorage_fs_bbb
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = USTORAGE_FS_BULK_SIZE,
-   .flags = {.proxy_buffer = 1,.short_xfer_ok = 1,.ext_buffer = 1},
+   .flags = {.proxy_buffer = 1,.short_xfer_ok = 1},
.callback = ustorage_fs_t_bbb_data_read_callback,
.usb_mode = USB_MODE_DEVICE,
},
@@ -315,7 +313,7 @@ static struct usb_config ustorage_fs_bbb
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = sizeof(ustorage_fs_bbb_csw_t),
-   .flags = {.short_xfer_ok = 1,.ext_buffer = 1,},
+   .flags = {.short_xfer_ok = 1},
.callback = ustorage_fs_t_bbb_status_callback,
.usb_mode = USB_MODE_DEVICE,
},
@@ -409,6 +407,14 @@ ustorage_fs_attach(device_t dev)
transfers, %s\n, usbd_errstr(err));
goto detach;
}
+
+   sc-sc_cbw = usbd_xfer_get_frame_buffer(sc-sc_xfer[
+   USTORAGE_FS_T_BBB_COMMAND], 0);
+   sc-sc_csw = usbd_xfer_get_frame_buffer(sc-sc_xfer[
+   USTORAGE_FS_T_BBB_STATUS], 0);
+   sc-sc_dma_ptr = usbd_xfer_get_frame_buffer(sc-sc_xfer[
+   USTORAGE_FS_T_BBB_DATA_READ], 0);
+
/* start Mass Storage State Machine */
 
mtx_lock(sc-sc_mtx);
@@ -518,44 +524,44 @@ ustorage_fs_t_bbb_command_callback(struc
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
 
-   tag = UGETDW(sc-sc_cbw.dCBWSignature);
+   tag = UGETDW(sc-sc_cbw-dCBWSignature);
 
if (tag != CBWSIGNATURE) {
/* do nothing */
DPRINTF(invalid signature 0x%08x\n, tag);
break;
}
-   tag = UGETDW(sc-sc_cbw.dCBWTag);
+   tag = UGETDW(sc-sc_cbw-dCBWTag);
 
/* echo back tag */
-   USETDW(sc-sc_csw.dCSWTag, tag);
+   USETDW(sc-sc_csw-dCSWTag, tag);
 
/* reset status */
-   sc-sc_csw.bCSWStatus = 0;
+   sc-sc_csw-bCSWStatus = 0;
 
/* reset data offset, data length and data remainder */
sc-sc_transfer.offset = 0;
sc-sc_transfer.data_rem =
-   UGETDW(sc-sc_cbw.dCBWDataTransferLength);
+

svn commit: r259455 - stable/9/sys/dev/usb/wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 08:54:24 2013
New Revision: 259455
URL: http://svnweb.freebsd.org/changeset/base/259455

Log:
  MFC r246765:
  
  Remove unused variable.

Modified:
  stable/9/sys/dev/usb/wlan/if_upgt.c
  stable/9/sys/dev/usb/wlan/if_upgtvar.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/wlan/if_upgt.c
==
--- stable/9/sys/dev/usb/wlan/if_upgt.c Mon Dec 16 08:51:58 2013
(r259454)
+++ stable/9/sys/dev/usb/wlan/if_upgt.c Mon Dec 16 08:54:24 2013
(r259455)
@@ -1586,7 +1586,6 @@ upgt_tx_done(struct upgt_softc *sc, uint
data_tx-ni = NULL;
data_tx-addr = 0;
data_tx-m = NULL;
-   data_tx-use = 0;
 
DPRINTF(sc, UPGT_DEBUG_TX_PROC,
TX done: memaddr=0x%08x, status=0x%04x, rssi=%d, ,

Modified: stable/9/sys/dev/usb/wlan/if_upgtvar.h
==
--- stable/9/sys/dev/usb/wlan/if_upgtvar.h  Mon Dec 16 08:51:58 2013
(r259454)
+++ stable/9/sys/dev/usb/wlan/if_upgtvar.h  Mon Dec 16 08:54:24 2013
(r259455)
@@ -352,7 +352,6 @@ struct upgt_data {
struct ieee80211_node   *ni;
struct mbuf *m;
uint32_t addr;
-   uint8_t  use;
STAILQ_ENTRY(upgt_data)  next;
 };
 typedef STAILQ_HEAD(, upgt_data) upgt_datahead;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259456 - stable/9/sys/dev/usb/wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 08:56:45 2013
New Revision: 259456
URL: http://svnweb.freebsd.org/changeset/base/259456

Log:
  MFC r246614:
  - Streamline detach logic in wlan drivers, so that
freed memory cannot be used during detach.
  - Remove all panic() calls from the urtw driver because
panic() is not appropriate here.
  - Remove redundant checks for device detached in
device detach callbacks.
  - Use DEVMETHOD_END to mark end of device methods.

Modified:
  stable/9/sys/dev/usb/wlan/if_rum.c
  stable/9/sys/dev/usb/wlan/if_rumvar.h
  stable/9/sys/dev/usb/wlan/if_run.c
  stable/9/sys/dev/usb/wlan/if_runvar.h
  stable/9/sys/dev/usb/wlan/if_uath.c
  stable/9/sys/dev/usb/wlan/if_upgt.c
  stable/9/sys/dev/usb/wlan/if_upgtvar.h
  stable/9/sys/dev/usb/wlan/if_ural.c
  stable/9/sys/dev/usb/wlan/if_uralvar.h
  stable/9/sys/dev/usb/wlan/if_urtw.c
  stable/9/sys/dev/usb/wlan/if_urtwvar.h
  stable/9/sys/dev/usb/wlan/if_zyd.c
  stable/9/sys/dev/usb/wlan/if_zydreg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/wlan/if_rum.c
==
--- stable/9/sys/dev/usb/wlan/if_rum.c  Mon Dec 16 08:54:24 2013
(r259455)
+++ stable/9/sys/dev/usb/wlan/if_rum.c  Mon Dec 16 08:56:45 2013
(r259456)
@@ -543,6 +543,11 @@ rum_detach(device_t self)
struct ifnet *ifp = sc-sc_ifp;
struct ieee80211com *ic;
 
+   /* Prevent further ioctls */
+   RUM_LOCK(sc);
+   sc-sc_detached = 1;
+   RUM_UNLOCK(sc);
+
/* stop all USB transfers */
usbd_transfer_unsetup(sc-sc_xfer, RUM_N_TRANSFER);
 
@@ -557,7 +562,6 @@ rum_detach(device_t self)
if_free(ifp);
}
mtx_destroy(sc-sc_mtx);
-
return (0);
 }
 
@@ -1322,7 +1326,14 @@ rum_ioctl(struct ifnet *ifp, u_long cmd,
struct rum_softc *sc = ifp-if_softc;
struct ieee80211com *ic = ifp-if_l2com;
struct ifreq *ifr = (struct ifreq *) data;
-   int error = 0, startall = 0;
+   int error;
+   int startall = 0;
+
+   RUM_LOCK(sc);
+   error = sc-sc_detached ? ENXIO : 0;
+   RUM_UNLOCK(sc);
+   if (error)
+   return (error);
 
switch (cmd) {
case SIOCSIFFLAGS:
@@ -2366,8 +2377,7 @@ static device_method_t rum_methods[] = {
DEVMETHOD(device_probe, rum_match),
DEVMETHOD(device_attach,rum_attach),
DEVMETHOD(device_detach,rum_detach),
-
-   { 0, 0 }
+   DEVMETHOD_END
 };
 
 static driver_t rum_driver = {

Modified: stable/9/sys/dev/usb/wlan/if_rumvar.h
==
--- stable/9/sys/dev/usb/wlan/if_rumvar.h   Mon Dec 16 08:54:24 2013
(r259455)
+++ stable/9/sys/dev/usb/wlan/if_rumvar.h   Mon Dec 16 08:56:45 2013
(r259456)
@@ -106,6 +106,7 @@ struct rum_softc {
uint32_trf_regs[4];
uint8_t txpow[44];
uint8_t sc_bssid[6];
+   uint8_t sc_detached;
 
struct {
uint8_t val;

Modified: stable/9/sys/dev/usb/wlan/if_run.c
==
--- stable/9/sys/dev/usb/wlan/if_run.c  Mon Dec 16 08:54:24 2013
(r259455)
+++ stable/9/sys/dev/usb/wlan/if_run.c  Mon Dec 16 08:56:45 2013
(r259456)
@@ -718,11 +718,14 @@ run_detach(device_t self)
struct ieee80211com *ic;
int i;
 
+   RUN_LOCK(sc);
+   sc-sc_detached = 1;
+   RUN_UNLOCK(sc);
+
/* stop all USB transfers */
usbd_transfer_unsetup(sc-sc_xfer, RUN_N_XFER);
 
RUN_LOCK(sc);
-
sc-ratectl_run = RUN_RATECTL_OFF;
sc-cmdq_run = sc-cmdq_key_set = RUN_CMDQ_ABORT;
 
@@ -3443,7 +3446,13 @@ run_ioctl(struct ifnet *ifp, u_long cmd,
struct ieee80211com *ic = sc-sc_ifp-if_l2com;
struct ifreq *ifr = (struct ifreq *) data;
int startall = 0;
-   int error = 0;
+   int error;
+
+   RUN_LOCK(sc);
+   error = sc-sc_detached ? ENXIO : 0;
+   RUN_UNLOCK(sc);
+   if (error)
+   return (error);
 
switch (cmd) {
case SIOCSIFFLAGS:
@@ -4965,8 +4974,7 @@ static device_method_t run_methods[] = {
DEVMETHOD(device_probe, run_match),
DEVMETHOD(device_attach,run_attach),
DEVMETHOD(device_detach,run_detach),
-
-   { 0, 0 }
+   DEVMETHOD_END
 };
 
 static driver_t run_driver = {

Modified: stable/9/sys/dev/usb/wlan/if_runvar.h
==
--- stable/9/sys/dev/usb/wlan/if_runvar.h   Mon Dec 16 08:54:24 2013
(r259455)
+++ stable/9/sys/dev/usb/wlan/if_runvar.h   Mon Dec 16 08:56:45 2013
(r259456)
@@ -239,6 +239,7 @@ struct

svn commit: r259457 - in stable/9/sys/dev/usb: . wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 09:07:09 2013
New Revision: 259457
URL: http://svnweb.freebsd.org/changeset/base/259457

Log:
  MFC r238274, r246752, r256720, r256721, r256722, r256955, r257409
   r257429, r257435, r257712, r257732, r257743, r257748, r257955
   r257957, r257958, r258082, r258641, r258643, r258732, r258733,
   r258840, r258919, r258921, r259029, r259030, r259031, r259032 and r259046:
  
  - Add support for the MediaTek/Ralink RT5370/RT5372 chipset.
  - Various minor USB WLAN fixes and improvements.
  
  PR: usb/182936

Modified:
  stable/9/sys/dev/usb/usbdevs
  stable/9/sys/dev/usb/wlan/if_rum.c
  stable/9/sys/dev/usb/wlan/if_run.c
  stable/9/sys/dev/usb/wlan/if_runreg.h
  stable/9/sys/dev/usb/wlan/if_runvar.h
  stable/9/sys/dev/usb/wlan/if_uath.c
  stable/9/sys/dev/usb/wlan/if_upgt.c
  stable/9/sys/dev/usb/wlan/if_ural.c
  stable/9/sys/dev/usb/wlan/if_urtw.c
  stable/9/sys/dev/usb/wlan/if_zyd.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/usbdevs
==
--- stable/9/sys/dev/usb/usbdevsMon Dec 16 08:56:45 2013
(r259456)
+++ stable/9/sys/dev/usb/usbdevsMon Dec 16 09:07:09 2013
(r259457)
@@ -569,10 +569,12 @@ vendor FALCOM 0x0f94  Falcom Wireless Co
 vendor RIM 0x0fca  Research In Motion
 vendor DYNASTREAM  0x0fcf  Dynastream Innovations
 vendor LARSENBRUSGAARD 0x0fd8  Larsen and Brusgaard
+vendor OWL 0x0fde  OWL
 vendor KONTRON 0x0fe6  Kontron AG
 vendor QUALCOMM0x1004  Qualcomm
 vendor APACER  0x1005  Apacer
 vendor MOTOROLA4   0x100d  Motorola
+vendor HP3 0x103c  Hewlett Packard
 vendor AIRPLUS 0x1011  Airplus
 vendor DESKNOTE0x1019  Desknote
 vendor NEC30x1033  NEC
@@ -584,6 +586,7 @@ vendor CCYU 0x1065  CCYU Technology
 vendor CURITEL 0x106c  Curitel Communications Inc
 vendor SILABS2 0x10a6  SILABS2
 vendor USI 0x10ab  USI
+vendor LIEBERT20x10af  Liebert
 vendor PLX 0x10b5  PLX
 vendor ASANTE  0x10bd  Asante
 vendor SILABS  0x10c4  Silicon Labs
@@ -652,6 +655,8 @@ vendor OWEN 0x1555  Owen
 vendor OQO 0x1557  OQO
 vendor UMEDIA  0x157e  U-MEDIA Communications
 vendor FIBERLINE   0x1582  Fiberline
+vendor FREESCALE   0x15a2  Freescale Semiconductor, Inc.
+vendor AFATECH 0x15a4  Afatech Technologies, Inc.
 vendor SPARKLAN0x15a9  SparkLAN
 vendor OLIMEX  0x15ba  Olimex
 vendor SOUNDGRAPH  0x15c2  Soundgraph, Inc.
@@ -692,8 +697,9 @@ vendor QUALCOMMINC  0x19d2  Qualcomm, Inco
 vendor BAYER   0x1a79  Bayer
 vendor WCH20x1a86  QinHeng Electronics
 vendor STELERA 0x1a8d  Stelera Wireless
+vendor SEL 0x1adb  Schweitzer Engineering Laboratories
 vendor CORSAIR 0x1b1c  Corsair
-vendor MATRIXORBITAL   0x1b3d  Matrix Orbital 
+vendor MATRIXORBITAL   0x1b3d  Matrix Orbital
 vendor OVISLINK0x1b75  OvisLink
 vendor TML 0x1b91  The Mobility Lab
 vendor TCTMOBILE   0x1bbb  TCT Mobile
@@ -712,6 +718,7 @@ vendor METAGEEK20x1dd5  MetaGeek
 vendor ALINK   0x1e0e  Alink
 vendor AIRTIES 0x1eda  AirTies
 vendor FESTO   0x1e29  Festo
+vendor LAKESHORE   0x1fb9  Lake Shore Cryotronics, Inc.
 vendor VERTEX  0x1fe7  Vertex Wireless Co., Ltd.
 vendor DLINK   0x2001  D-Link
 vendor PLANEX2 0x2019  Planex Communications
@@ -721,10 +728,13 @@ vendor ENCORE 0x203d  Encore
 vendor QIHARDWARE  0x20b7  QI-hardware
 vendor PARA0x20b8  PARA Industrial
 vendor SIMTEC  0x20df  Simtec Electronics
+vendor TRENDNET0x20f4  TRENDnet
 vendor RTSYSTEMS   0x2100  RTSYSTEMS
 vendor VIALABS 0x2109  VIA Labs
 vendor ERICSSON0x2282  Ericsson
 vendor MOTOROLA2   0x22b8  Motorola
+vendor WETELECOM   0x22de  WeTelecom
+vendor WESTMOUNTAIN0x2405  West Mountain Radio
 vendor TRIPPLITE   0x2478  Tripp-Lite
 vendor HIROSE  0x2631  Hirose Electric
 vendor NHJ 0x2770  NHJ
@@ -742,6 +752,7 @@ vendor IRIVER   0x4102  iRiver
 vendor DELL0x413c  Dell
 vendor WCH 0x4348  QinHeng Electronics
 vendor ACEECA  0x4766  Aceeca
+vendor FEIXUN  0x4855  FeiXun Communication
 vendor PAPOUCH 0x5050  Papouch products
 vendor AVERATEC0x50c2  Averatec
 vendor SWEEX   0x5173  Sweex
@@ -757,6 +768,7 @@ vendor INTEL2   0x8087  Intel
 vendor ALLWIN  0x8516  ALLWIN Tech
 vendor SITECOM20x9016  Sitecom
 vendor MOSCHIP 0x9710  MosChip Semiconductor
+vendor NETGEAR40x9846  Netgear
 vendor MARVELL 0x9e88  Marvell

svn commit: r259458 - stable/9/sys/dev/usb/wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 09:23:21 2013
New Revision: 259458
URL: http://svnweb.freebsd.org/changeset/base/259458

Log:
  MFC r258083:
  Remove a couple of unused macros.

Modified:
  stable/9/sys/dev/usb/wlan/if_runreg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/wlan/if_runreg.h
==
--- stable/9/sys/dev/usb/wlan/if_runreg.h   Mon Dec 16 09:07:09 2013
(r259457)
+++ stable/9/sys/dev/usb/wlan/if_runreg.h   Mon Dec 16 09:23:21 2013
(r259458)
@@ -932,31 +932,6 @@ static const struct rt2860_rate {
 };
 
 /*
- * Control and status registers access macros.
- */
-#define RAL_READ(sc, reg)  \
-   bus_space_read_4((sc)-sc_st, (sc)-sc_sh, (reg))
-
-#define RAL_WRITE(sc, reg, val)
\
-   bus_space_write_4((sc)-sc_st, (sc)-sc_sh, (reg), (val))
-
-#define RAL_BARRIER_WRITE(sc)  \
-   bus_space_barrier((sc)-sc_st, (sc)-sc_sh, 0, 0x1800,  \
-   BUS_SPACE_BARRIER_WRITE)
-
-#define RAL_BARRIER_READ_WRITE(sc) \
-   bus_space_barrier((sc)-sc_st, (sc)-sc_sh, 0, 0x1800,  \
-   BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE)
-
-#define RAL_WRITE_REGION_1(sc, offset, datap, count)   \
-   bus_space_write_region_1((sc)-sc_st, (sc)-sc_sh, (offset),\
-   (datap), (count))
-
-#define RAL_SET_REGION_4(sc, offset, val, count)   \
-   bus_space_set_region_4((sc)-sc_st, (sc)-sc_sh, (offset),  \
-   (val), (count))
-
-/*
  * EEPROM access macro.
  */
 #define RT2860_EEPROM_CTL(sc, val) do {
\
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259459 - stable/9/sys/dev/usb/wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 09:31:15 2013
New Revision: 259459
URL: http://svnweb.freebsd.org/changeset/base/259459

Log:
  MFC r256718, r257410 and r257411:
  - Fix RF registers for RT3070.
  - Initialize BBP68 to improve RX sensitivity.
  - Add RT2860_BCN_OFFSET1 and RT2860_MAX_LEN_CFG register initialization to
  match with the vendor driver. While here, remove unused RT2860_DEF_MAC
  definition.

Modified:
  stable/9/sys/dev/usb/wlan/if_runreg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/wlan/if_runreg.h
==
--- stable/9/sys/dev/usb/wlan/if_runreg.h   Mon Dec 16 09:23:21 2013
(r259458)
+++ stable/9/sys/dev/usb/wlan/if_runreg.h   Mon Dec 16 09:31:15 2013
(r259459)
@@ -943,39 +943,9 @@ static const struct rt2860_rate {
 /*
  * Default values for MAC registers; values taken from the reference driver.
  */
-#define RT2860_DEF_MAC \
-   { RT2860_BCN_OFFSET0,   0xf8f0e8e0 },   \
-   { RT2860_LEGACY_BASIC_RATE, 0x013f },   \
-   { RT2860_HT_BASIC_RATE, 0x8003 },   \
-   { RT2860_MAC_SYS_CTRL,  0x },   \
-   { RT2860_BKOFF_SLOT_CFG,0x0209 },   \
-   { RT2860_TX_SW_CFG0,0x },   \
-   { RT2860_TX_SW_CFG1,0x00080606 },   \
-   { RT2860_TX_LINK_CFG,   0x1020 },   \
-   { RT2860_TX_TIMEOUT_CFG,0x000a2090 },   \
-   { RT2860_LED_CFG,   0x7f031e46 },   \
-   { RT2860_WMM_AIFSN_CFG, 0x2273 },   \
-   { RT2860_WMM_CWMIN_CFG, 0x2344 },   \
-   { RT2860_WMM_CWMAX_CFG, 0x34aa },   \
-   { RT2860_MAX_PCNT,  0x1f3fbf9f },   \
-   { RT2860_TX_RTY_CFG,0x47d01f0f },   \
-   { RT2860_AUTO_RSP_CFG,  0x0013 },   \
-   { RT2860_CCK_PROT_CFG,  0x05740003 },   \
-   { RT2860_OFDM_PROT_CFG, 0x05740003 },   \
-   { RT2860_GF20_PROT_CFG, 0x01744004 },   \
-   { RT2860_GF40_PROT_CFG, 0x03f44084 },   \
-   { RT2860_MM20_PROT_CFG, 0x01744004 },   \
-   { RT2860_MM40_PROT_CFG, 0x03f54084 },   \
-   { RT2860_TXOP_CTRL_CFG, 0x583f },   \
-   { RT2860_TXOP_HLDR_ET,  0x0002 },   \
-   { RT2860_TX_RTS_CFG,0x00092b20 },   \
-   { RT2860_EXP_ACK_TIME,  0x002400ca },   \
-   { RT2860_XIFS_TIME_CFG, 0x33a41010 },   \
-   { RT2860_PWR_PIN_CFG,   0x0003 }
-
-/* XXX only a few registers differ from above, try to merge? */
 #define RT2870_DEF_MAC \
{ RT2860_BCN_OFFSET0,   0xf8f0e8e0 },   \
+   { RT2860_BCN_OFFSET1,   0x6f77d0c8 },   \
{ RT2860_LEGACY_BASIC_RATE, 0x013f },   \
{ RT2860_HT_BASIC_RATE, 0x8003 },   \
{ RT2860_MAC_SYS_CTRL,  0x },   \
@@ -984,6 +954,7 @@ static const struct rt2860_rate {
{ RT2860_TX_SW_CFG1,0x00080606 },   \
{ RT2860_TX_LINK_CFG,   0x1020 },   \
{ RT2860_TX_TIMEOUT_CFG,0x000a2090 },   \
+   { RT2860_MAX_LEN_CFG,   0x1f00 },   \
{ RT2860_LED_CFG,   0x7f031e46 },   \
{ RT2860_WMM_AIFSN_CFG, 0x2273 },   \
{ RT2860_WMM_CWMIN_CFG, 0x2344 },   \
@@ -1012,6 +983,7 @@ static const struct rt2860_rate {
 #define RT2860_DEF_BBP \
{  65, 0x2c },  \
{  66, 0x38 },  \
+   {  68, 0x0b },  \
{  69, 0x12 },  \
{  70, 0x0a },  \
{  73, 0x10 },  \
@@ -1316,7 +1288,7 @@ static const struct rt2860_rate {
{  4, 0x40 },   \
{  5, 0x03 },   \
{  6, 0x02 },   \
-   {  7, 0x70 },   \
+   {  7, 0x60 },   \
{  9, 0x0f },   \
{ 10, 0x41 },   \
{ 11, 0x21 },   \
@@ -1330,7 +1302,7 @@ static const struct rt2860_rate {
{ 20, 0xba },   \
{ 21, 0xdb },   \
{ 24, 0x16 },   \
-   { 25, 0x01 },   \
+   { 25, 0x03 },   \
{ 29, 0x1f }
 
 #define RT3572_DEF_RF  \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259460 - stable/9/sys/dev/usb/wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 09:34:01 2013
New Revision: 259460
URL: http://svnweb.freebsd.org/changeset/base/259460

Log:
  MFC r253757:
  Fix alignment of USB WLAN radiotap headers. This makes USB WLAN adapters
  work on ARM, MIPS and similar platforms, where alignment matters.

Modified:
  stable/9/sys/dev/usb/wlan/if_rumvar.h
  stable/9/sys/dev/usb/wlan/if_runvar.h
  stable/9/sys/dev/usb/wlan/if_uathvar.h
  stable/9/sys/dev/usb/wlan/if_upgtvar.h
  stable/9/sys/dev/usb/wlan/if_uralvar.h
  stable/9/sys/dev/usb/wlan/if_urtwvar.h
  stable/9/sys/dev/usb/wlan/if_zydreg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/wlan/if_rumvar.h
==
--- stable/9/sys/dev/usb/wlan/if_rumvar.h   Mon Dec 16 09:31:15 2013
(r259459)
+++ stable/9/sys/dev/usb/wlan/if_rumvar.h   Mon Dec 16 09:34:01 2013
(r259460)
@@ -29,7 +29,7 @@ struct rum_rx_radiotap_header {
int8_t  wr_antsignal;
int8_t  wr_antnoise;
uint8_t wr_antenna;
-};
+} __packed __aligned(8);
 
 #define RT2573_RX_RADIOTAP_PRESENT \
((1  IEEE80211_RADIOTAP_FLAGS) |  \
@@ -47,7 +47,7 @@ struct rum_tx_radiotap_header {
uint16_twt_chan_freq;
uint16_twt_chan_flags;
uint8_t wt_antenna;
-};
+} __packed __aligned(8);
 
 #define RT2573_TX_RADIOTAP_PRESENT \
((1  IEEE80211_RADIOTAP_FLAGS) |  \

Modified: stable/9/sys/dev/usb/wlan/if_runvar.h
==
--- stable/9/sys/dev/usb/wlan/if_runvar.h   Mon Dec 16 09:31:15 2013
(r259459)
+++ stable/9/sys/dev/usb/wlan/if_runvar.h   Mon Dec 16 09:34:01 2013
(r259460)
@@ -52,7 +52,7 @@ struct run_rx_radiotap_header {
int8_t  wr_dbm_antsignal;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-} __packed;
+} __packed __aligned(8);
 
 #define RUN_RX_RADIOTAP_PRESENT\
(1  IEEE80211_RADIOTAP_FLAGS |\
@@ -69,7 +69,7 @@ struct run_tx_radiotap_header {
uint16_twt_chan_freq;
uint16_twt_chan_flags;
uint8_t wt_hwqueue;
-} __packed;
+} __packed __aligned(8);
 
 #define IEEE80211_RADIOTAP_HWQUEUE 15
 

Modified: stable/9/sys/dev/usb/wlan/if_uathvar.h
==
--- stable/9/sys/dev/usb/wlan/if_uathvar.h  Mon Dec 16 09:31:15 2013
(r259459)
+++ stable/9/sys/dev/usb/wlan/if_uathvar.h  Mon Dec 16 09:34:01 2013
(r259460)
@@ -52,7 +52,7 @@ struct uath_rx_radiotap_header {
int8_t  wr_antsignal;
int8_t  wr_antnoise;
u_int8_twr_antenna;
-} __packed;
+} __packed __aligned(8);
 
 #define UATH_RX_RADIOTAP_PRESENT ( \
(1  IEEE80211_RADIOTAP_TSFT)  | \
@@ -69,7 +69,7 @@ struct uath_tx_radiotap_header {
uint8_t wt_flags;
uint16_twt_chan_freq;
uint16_twt_chan_flags;
-} __packed;
+} __packed __aligned(8);
 
 #defineUATH_TX_RADIOTAP_PRESENT
\
((1  IEEE80211_RADIOTAP_FLAGS) |  \

Modified: stable/9/sys/dev/usb/wlan/if_upgtvar.h
==
--- stable/9/sys/dev/usb/wlan/if_upgtvar.h  Mon Dec 16 09:31:15 2013
(r259459)
+++ stable/9/sys/dev/usb/wlan/if_upgtvar.h  Mon Dec 16 09:34:01 2013
(r259460)
@@ -380,7 +380,7 @@ struct upgt_rx_radiotap_header {
uint16_twr_chan_freq;
uint16_twr_chan_flags;
int8_t  wr_antsignal;
-} __packed;
+} __packed __aligned(8);
 
 #define UPGT_RX_RADIOTAP_PRESENT   \
((1  IEEE80211_RADIOTAP_FLAGS) |  \
@@ -394,7 +394,7 @@ struct upgt_tx_radiotap_header {
uint8_t wt_rate;
uint16_twt_chan_freq;
uint16_twt_chan_flags;
-} __packed;
+} __packed __aligned(8);
 
 #define UPGT_TX_RADIOTAP_PRESENT   \
((1  IEEE80211_RADIOTAP_FLAGS) |  \

Modified: stable/9/sys/dev/usb/wlan/if_uralvar.h
==
--- stable/9/sys/dev/usb/wlan/if_uralvar.h  Mon Dec 16 09:31:15 2013
(r259459)
+++ stable/9/sys/dev/usb/wlan/if_uralvar.h  Mon Dec 16 09:34:01 2013
(r259460)
@@ -34,7 +34,7 @@ struct ural_rx_radiotap_header {
int8_t  wr_antsignal;
int8_t  wr_antnoise;
uint8_t

svn commit: r259461 - stable/10/sys/dev/usb/wlan

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 09:48:08 2013
New Revision: 259461
URL: http://svnweb.freebsd.org/changeset/base/259461

Log:
  MFC r256718, r257410 and r257411:
  - Fix RF registers for RT3070.
  - Initialize BBP68 to improve RX sensitivity.
  - Add RT2860_BCN_OFFSET1 and RT2860_MAX_LEN_CFG register initialization to
  match with the vendor driver. While here, remove unused RT2860_DEF_MAC
  definition.

Modified:
  stable/10/sys/dev/usb/wlan/if_runreg.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/wlan/if_runreg.h
==
--- stable/10/sys/dev/usb/wlan/if_runreg.h  Mon Dec 16 09:34:01 2013
(r259460)
+++ stable/10/sys/dev/usb/wlan/if_runreg.h  Mon Dec 16 09:48:08 2013
(r259461)
@@ -968,39 +968,9 @@ static const struct rt2860_rate {
 /*
  * Default values for MAC registers; values taken from the reference driver.
  */
-#define RT2860_DEF_MAC \
-   { RT2860_BCN_OFFSET0,   0xf8f0e8e0 },   \
-   { RT2860_LEGACY_BASIC_RATE, 0x013f },   \
-   { RT2860_HT_BASIC_RATE, 0x8003 },   \
-   { RT2860_MAC_SYS_CTRL,  0x },   \
-   { RT2860_BKOFF_SLOT_CFG,0x0209 },   \
-   { RT2860_TX_SW_CFG0,0x },   \
-   { RT2860_TX_SW_CFG1,0x00080606 },   \
-   { RT2860_TX_LINK_CFG,   0x1020 },   \
-   { RT2860_TX_TIMEOUT_CFG,0x000a2090 },   \
-   { RT2860_LED_CFG,   0x7f031e46 },   \
-   { RT2860_WMM_AIFSN_CFG, 0x2273 },   \
-   { RT2860_WMM_CWMIN_CFG, 0x2344 },   \
-   { RT2860_WMM_CWMAX_CFG, 0x34aa },   \
-   { RT2860_MAX_PCNT,  0x1f3fbf9f },   \
-   { RT2860_TX_RTY_CFG,0x47d01f0f },   \
-   { RT2860_AUTO_RSP_CFG,  0x0013 },   \
-   { RT2860_CCK_PROT_CFG,  0x05740003 },   \
-   { RT2860_OFDM_PROT_CFG, 0x05740003 },   \
-   { RT2860_GF20_PROT_CFG, 0x01744004 },   \
-   { RT2860_GF40_PROT_CFG, 0x03f44084 },   \
-   { RT2860_MM20_PROT_CFG, 0x01744004 },   \
-   { RT2860_MM40_PROT_CFG, 0x03f54084 },   \
-   { RT2860_TXOP_CTRL_CFG, 0x583f },   \
-   { RT2860_TXOP_HLDR_ET,  0x0002 },   \
-   { RT2860_TX_RTS_CFG,0x00092b20 },   \
-   { RT2860_EXP_ACK_TIME,  0x002400ca },   \
-   { RT2860_XIFS_TIME_CFG, 0x33a41010 },   \
-   { RT2860_PWR_PIN_CFG,   0x0003 }
-
-/* XXX only a few registers differ from above, try to merge? */
 #define RT2870_DEF_MAC \
{ RT2860_BCN_OFFSET0,   0xf8f0e8e0 },   \
+   { RT2860_BCN_OFFSET1,   0x6f77d0c8 },   \
{ RT2860_LEGACY_BASIC_RATE, 0x013f },   \
{ RT2860_HT_BASIC_RATE, 0x8003 },   \
{ RT2860_MAC_SYS_CTRL,  0x },   \
@@ -1009,6 +979,7 @@ static const struct rt2860_rate {
{ RT2860_TX_SW_CFG1,0x00080606 },   \
{ RT2860_TX_LINK_CFG,   0x1020 },   \
{ RT2860_TX_TIMEOUT_CFG,0x000a2090 },   \
+   { RT2860_MAX_LEN_CFG,   0x1f00 },   \
{ RT2860_LED_CFG,   0x7f031e46 },   \
{ RT2860_WMM_AIFSN_CFG, 0x2273 },   \
{ RT2860_WMM_CWMIN_CFG, 0x2344 },   \
@@ -1037,6 +1008,7 @@ static const struct rt2860_rate {
 #define RT2860_DEF_BBP \
{  65, 0x2c },  \
{  66, 0x38 },  \
+   {  68, 0x0b },  \
{  69, 0x12 },  \
{  70, 0x0a },  \
{  73, 0x10 },  \
@@ -1341,7 +1313,7 @@ static const struct rt2860_rate {
{  4, 0x40 },   \
{  5, 0x03 },   \
{  6, 0x02 },   \
-   {  7, 0x70 },   \
+   {  7, 0x60 },   \
{  9, 0x0f },   \
{ 10, 0x41 },   \
{ 11, 0x21 },   \
@@ -1355,7 +1327,7 @@ static const struct rt2860_rate {
{ 20, 0xba },   \
{ 21, 0xdb },   \
{ 24, 0x16 },   \
-   { 25, 0x01 },   \
+   { 25, 0x03 },   \
{ 29, 0x1f }
 
 #define RT3572_DEF_RF  \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259462 - head/sys/dev/usb/controller

2013-12-16 Thread Hans Petter Selasky

Author: hselasky
Date: Mon Dec 16 10:50:13 2013
New Revision: 259462
URL: http://svnweb.freebsd.org/changeset/base/259462

Log:
  Fix regression issue after r259248:
  
  Some Intel XHCI controlles timeout processing so-called TRBs when
  the final LINK TRB of a so-called TD has the CHAIN-BIT set.
  
  MFC after:1 week
  Tested by:glebius @

Modified:
  head/sys/dev/usb/controller/xhci.c

Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c  Mon Dec 16 09:48:08 2013
(r259461)
+++ head/sys/dev/usb/controller/xhci.c  Mon Dec 16 10:50:13 2013
(r259462)
@@ -1942,6 +1942,8 @@ restart:
/* remove chain bit because this is the last data TRB in the chain */
td-td_trb[td-ntrb - 1].dwTrb2 = ~htole32(XHCI_TRB_2_TDSZ_SET(15));
td-td_trb[td-ntrb - 1].dwTrb3 = ~htole32(XHCI_TRB_3_CHAIN_BIT);
+   /* remove CHAIN-BIT from last LINK TRB */
+   td-td_trb[td-ntrb].dwTrb3 = ~htole32(XHCI_TRB_3_CHAIN_BIT);
 
usb_pc_cpu_flush(td-page_cache);
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259463 - in head/etc: defaults rc.d

2013-12-16 Thread Pawel Jakub Dawidek

Author: pjd
Date: Mon Dec 16 11:03:59 2013
New Revision: 259463
URL: http://svnweb.freebsd.org/changeset/base/259463

Log:
  Start-up script for casperd daemon.
  
  Sponsored by: The FreeBSD Foundation

Added:
  head/etc/rc.d/casperd   (contents, props changed)
Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/Makefile

Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf   Mon Dec 16 10:50:13 2013(r259462)
+++ head/etc/defaults/rc.conf   Mon Dec 16 11:03:59 2013(r259463)
@@ -658,6 +658,7 @@ newsyslog_enable=YES  # Run newsyslog a
 newsyslog_flags=-CN  # Newsyslog flags to create marked files
 mixer_enable=YES # Run the sound mixer.
 opensm_enable=NO # Opensm(8) for infiniband devices defaults to off
+casperd_enable=NO# casperd(8) daemon
 
 ##
 ### Jail Configuration (see rc.conf(5) manual page) ##

Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile  Mon Dec 16 10:50:13 2013(r259462)
+++ head/etc/rc.d/Makefile  Mon Dec 16 11:03:59 2013(r259463)
@@ -26,6 +26,7 @@ FILES=DAEMON \
bridge \
bsnmpd \
${_bthidd} \
+   casperd \
ccd \
cleanvar \
cleartmp \

Added: head/etc/rc.d/casperd
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/etc/rc.d/casperd   Mon Dec 16 11:03:59 2013(r259463)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: casperd
+# REQUIRE: NETWORKING syslogd
+# BEFORE:  DAEMON
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name=casperd
+rcvar=casperd_enable
+pidfile=/var/run/${name}.pid
+command=/sbin/${name}
+
+load_rc_config $name
+run_rc_command $1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259422 - head/sys/conf

2013-12-16 Thread Konstantin Belousov

On Sun, Dec 15, 2013 at 10:33:47AM -0800, Rui Paulo wrote:
 On 15 Dec 2013, at 10:13, Konstantin Belousov k...@freebsd.org wrote:
 
  Author: kib
  Date: Sun Dec 15 18:13:42 2013
  New Revision: 259422
  URL: http://svnweb.freebsd.org/changeset/base/259422
  
  Log:
   Revert r259045.
  
   It seems that clang miscompiles code related to UDP with 
  -fno-strict-overflow.
 
 Could you please file a bug report if you haven't already?

I do not intend to do any further analysis of the issue.


pgpe_VtZi3JJJ.pgp
Description: PGP signature

Re: svn commit: r259010 - in head/sys: conf powerpc/fpu

2013-12-16 Thread Dag-Erling Smørgrav

John Baldwin j...@freebsd.org writes:
 Dag-Erling Smørgrav d...@des.no writes:
  John Baldwin j...@freebsd.org writes:
   LINT64 is yet another kernel config covered by 'make tinderbox',
   but not by the periodic tinderbox.  It is probably worth adding to
   the periodic tinderbox (someday it'd be nice if the two
   tinderboxes built the same set of things).
  Some day it would be nice if people talked to me directly instead of
  sniping from the sidelines.
 Ah, but when people have raised this exact issue before (that tcbuild
 and 'make tinderbox' build different things), you have blown them off
 repeatedly.

I have no idea what tcbuild is.

I blow people off when they complain that the tinderbox doesn't work
exactly like 'make tinderbox' because it's not intended to.

  Oh, and 'make tinderbox' should die.
 No, it is very developer friendly as it Just Works(tm) as a single
 command from an existing source tree checkout.

We already had 'make universe'.

The story behind 'make tinderbox' is that Alfred threw a fit over a
tinderbox breakage and insisted, despite being provided with ample proof
to the contrary, that my tinderbox was a black box which nobody knew how
worked and nobody could reproduce and that tinderbox reports were
therefore worthless.  He then proceeded to implement 'make tinderbox'
purely to piss me off.  It serves no other purpose and needs to die.

 It also happens to build more of the tree than the periodic tinderbox
 (by building more kernel configs, albeit doing quite a bit of
 duplicate work for platforms like arm in the process).

That's simply not true.  The tinderbox builds exactly the same kernels
as 'make tinderbox' if they're present.  The issue here is that a bug in
the source tree prevents some of these kernel configurations from being
generated, hence the tinderbox cannot build them.

DES
-- 
Dag-Erling Smørgrav - d...@des.no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259464 - head/sys/kern

2013-12-16 Thread Alexander Motin

Author: mav
Date: Mon Dec 16 13:52:18 2013
New Revision: 259464
URL: http://svnweb.freebsd.org/changeset/base/259464

Log:
  Fix periodic per-CPU timers startup on boot.
  
  Reported by:  neel
  MFC after:2 weeks

Modified:
  head/sys/kern/kern_clocksource.c

Modified: head/sys/kern/kern_clocksource.c
==
--- head/sys/kern/kern_clocksource.cMon Dec 16 11:03:59 2013
(r259463)
+++ head/sys/kern/kern_clocksource.cMon Dec 16 13:52:18 2013
(r259464)
@@ -233,7 +233,8 @@ handleevents(sbintime_t now, int fake)
if (!busy) {
state-idle = 0;
state-nextevent = t;
-   loadtimer(now, 0);
+   loadtimer(now, (fake == 2) 
+   (timer-et_flags  ET_FLAGS_PERCPU));
}
ET_HW_UNLOCK(state);
return (done);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259465 - stable/10/sys/kern

2013-12-16 Thread Nathan Whitehorn

Author: nwhitehorn
Date: Mon Dec 16 15:00:06 2013
New Revision: 259465
URL: http://svnweb.freebsd.org/changeset/base/259465

Log:
  MFC r258819,258928:
  
  Add new sysctl, kern.supported_archs, containing the list of FreeBSD
  MACHINE_ARCH values whose binaries this kernel can run. This patch provides
  a feature requested for implementing pkgng ABI identifiers in a robust
  way.
  
  The list is designed to indicate whether, say, an i386 package can be run on
  the current system. If kern.supported_abis contains i386, then the answer
  is yes. Otherwise, the answer is no.
  
  At the moment, this only supports MACHINE_ARCH and MACHINE_ARCH32. As we
  gain support for more interesting combinations, this needs to become more
  flexible, possibily through the sysent framework, along with the
  hw.machine_arch emulation immediately preceding this code in kern_mib.c.
  
  Reviewed by:  imp

Modified:
  stable/10/sys/kern/kern_mib.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_mib.c
==
--- stable/10/sys/kern/kern_mib.c   Mon Dec 16 13:52:18 2013
(r259464)
+++ stable/10/sys/kern/kern_mib.c   Mon Dec 16 15:00:06 2013
(r259465)
@@ -261,6 +261,13 @@ sysctl_hw_machine_arch(SYSCTL_HANDLER_AR
 SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD,
 NULL, 0, sysctl_hw_machine_arch, A, System architecture);
 
+SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE,
+#ifdef COMPAT_FREEBSD32
+MACHINE_ARCH   MACHINE_ARCH32, 0, Supported architectures for 
binaries);
+#else
+MACHINE_ARCH, 0, Supported architectures for binaries);
+#endif
+
 static int
 sysctl_hostname(SYSCTL_HANDLER_ARGS)
 {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259467 - stable/8/sys/kern

2013-12-16 Thread Nathan Whitehorn

Author: nwhitehorn
Date: Mon Dec 16 15:08:30 2013
New Revision: 259467
URL: http://svnweb.freebsd.org/changeset/base/259467

Log:
  MFC r258819,258928:
  
  Add new sysctl, kern.supported_archs, containing the list of FreeBSD
  MACHINE_ARCH values whose binaries this kernel can run. This patch provides
  a feature requested for implementing pkgng ABI identifiers in a robust
  way.
  
  The list is designed to indicate whether, say, an i386 package can be run on
  the current system. If kern.supported_abis contains i386, then the answer
  is yes. Otherwise, the answer is no.
  
  At the moment, this only supports MACHINE_ARCH and MACHINE_ARCH32. As we
  gain support for more interesting combinations, this needs to become more
  flexible, possibily through the sysent framework, along with the
  hw.machine_arch emulation immediately preceding this code in kern_mib.c.
  
  Reviewed by:  imp

Modified:
  stable/8/sys/kern/kern_mib.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/kern/   (props changed)

Modified: stable/8/sys/kern/kern_mib.c
==
--- stable/8/sys/kern/kern_mib.cMon Dec 16 15:02:10 2013
(r259466)
+++ stable/8/sys/kern/kern_mib.cMon Dec 16 15:08:30 2013
(r259467)
@@ -261,6 +261,13 @@ sysctl_hw_machine_arch(SYSCTL_HANDLER_AR
 SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD,
 NULL, 0, sysctl_hw_machine_arch, A, System architecture);
 
+SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE,
+#ifdef COMPAT_FREEBSD32
+MACHINE_ARCH   MACHINE_ARCH32, 0, Supported architectures for 
binaries);
+#else
+MACHINE_ARCH, 0, Supported architectures for binaries);
+#endif
+
 static int
 sysctl_hostname(SYSCTL_HANDLER_ARGS)
 {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259468 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 15:50:59 2013
New Revision: 259468
URL: http://svnweb.freebsd.org/changeset/base/259468

Log:
  Add a fix for Long-standing problem with VMware. Described in below links:
  https://communities.vmware.com/thread/107230
  https://communities.vmware.com/docs/DOC-11677
  
  Basically, ignore the ``function 62'' and ``function 63'' interpretations
  of the left/right command key when we're in the lengthiest portion of the
  installation (initiated by the `auto' module).
  
  The net effect is that you can now (once you've started the installer from
  the media) escape the VM without prematurely terminating the current action
  due to spurious escape sequence.
  
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/auto

Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto   Mon Dec 16 15:08:30 2013
(r259467)
+++ head/usr.sbin/bsdinstall/scripts/auto   Mon Dec 16 15:50:59 2013
(r259468)
@@ -49,6 +49,10 @@ error() {
 
  MAIN
 
+# Don't send ESC on function-key 62/63 (left/right command key)
+f_quietly kbdcontrol -f 62 ''
+f_quietly kbdcontrol -f 63 ''
+
 f_dprintf Began Installation at %s $( date )
 
 rm -rf $BSDINSTALL_TMPETC
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259468 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Nathan Whitehorn

Please add this to release/rc.local instead under the console setup. 
There is no guarantee that auto is running from an environment where 
this is defined -- for example, it may be running from a serial console 
or an xterm -- and the actual installer should not be polluted with 
assumptions about the media from which it runs.

-Nathan

On 12/16/13 09:50, Devin Teske wrote:

Author: dteske
Date: Mon Dec 16 15:50:59 2013
New Revision: 259468
URL: http://svnweb.freebsd.org/changeset/base/259468

Log:
   Add a fix for Long-standing problem with VMware. Described in below links:
   https://communities.vmware.com/thread/107230
   https://communities.vmware.com/docs/DOC-11677
   
   Basically, ignore the ``function 62'' and ``function 63'' interpretations

   of the left/right command key when we're in the lengthiest portion of the
   installation (initiated by the `auto' module).
   
   The net effect is that you can now (once you've started the installer from

   the media) escape the VM without prematurely terminating the current action
   due to spurious escape sequence.
   
   MFC after:	3 days


Modified:
   head/usr.sbin/bsdinstall/scripts/auto

Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto   Mon Dec 16 15:08:30 2013
(r259467)
+++ head/usr.sbin/bsdinstall/scripts/auto   Mon Dec 16 15:50:59 2013
(r259468)
@@ -49,6 +49,10 @@ error() {
  
   MAIN
  
+# Don't send ESC on function-key 62/63 (left/right command key)

+f_quietly kbdcontrol -f 62 ''
+f_quietly kbdcontrol -f 63 ''
+
  f_dprintf Began Installation at %s $( date )
  
  rm -rf $BSDINSTALL_TMPETC


___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r258346 - stable/10/sys/dev/ixgbe

2013-12-16 Thread Andrey V. Elsukov

On 19.11.2013 18:24, Oleg Bulyzhin wrote:
 Author: oleg
 Date: Tue Nov 19 14:24:25 2013
 New Revision: 258346
 URL: http://svnweb.freebsd.org/changeset/base/258346
 
 Log:
   MFC: 257695
   
   - Fix link loss on vlan reconfiguration.
   - Fix issues with 'vlanhwfilter'.

Hi, Oleg,

do you plan to merge this in stable/9 too?

-- 
WBR, Andrey V. Elsukov
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259470 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 17:03:44 2013
New Revision: 259470
URL: http://svnweb.freebsd.org/changeset/base/259470

Log:
  As per discussions on -current, re-add /var/mail (removed in r257842) but
  this time with atime=on in support of various software that requires it.
  
  Discussed on: -current
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 15:52:44 2013
(r259469)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 17:03:44 2013
(r259470)
@@ -132,6 +132,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA
/varmountpoint=/var
/var/crash  compression=lz4,exec=off,setuid=off
/var/logcompression=lz4,exec=off,setuid=off
+   /var/mail   compression=lz4,atime=on
/var/tmpcompression=lz4,exec=on,setuid=off
  # END-QUOTE
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259471 - head/share/misc

2013-12-16 Thread Bryan Drewery

Author: bdrewery
Date: Mon Dec 16 17:05:03 2013
New Revision: 259471
URL: http://svnweb.freebsd.org/changeset/base/259471

Log:
  Add myself to the src-committers list
  
  Approved by:  bapt (mentor)

Modified:
  head/share/misc/committers-src.dot

Modified: head/share/misc/committers-src.dot
==
--- head/share/misc/committers-src.dot  Mon Dec 16 17:03:44 2013
(r259470)
+++ head/share/misc/committers-src.dot  Mon Dec 16 17:05:03 2013
(r259471)
@@ -114,6 +114,7 @@ art [label=Artem Belevich\nart@FreeBSD.
 asomers [label=Alan Somers\nasom...@freebsd.org\n2013/04/24]
 avg [label=Andriy Gapon\n...@freebsd.org\n2009/02/18]
 bapt [label=Baptiste Daroussin\nb...@freebsd.org\n2011/12/23]
+bdrewery [label=Bryan Drewery\nbdrew...@freebsd.org\n2013/12/14]
 benl [label=Ben Laurie\nb...@freebsd.org\n2011/05/18]
 benno [label=Benno Rice\nbe...@freebsd.org\n2000/11/02]
 bms [label=Bruce M Simpson\n...@freebsd.org\n2003/08/06]
@@ -331,6 +332,8 @@ avg - art
 avg - pluknet
 avg - smh
 
+bapt - bdrewery
+
 benno - grehan
 
 billf - dougb
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259472 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 17:11:09 2013
New Revision: 259472
URL: http://svnweb.freebsd.org/changeset/base/259472

Log:
  Accept NULL input as also meaning zero swap.
  
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 17:05:03 2013
(r259471)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 17:11:09 2013
(r259472)
@@ -1387,7 +1387,7 @@ while :; do
f_dialog_input input \
$msg_please_enter_amount_of_swap_space \
$ZFSBOOT_SWAP_SIZE 
-   ZFSBOOT_SWAP_SIZE=$input
+   ZFSBOOT_SWAP_SIZE=${input:-0}
;;
esac
 done
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259473 - in head: lib/clang lib/clang/include lib/clang/include/llvm/Config lib/clang/libllvmpowerpcasmparser usr.bin/clang/clang usr.bin/clang/llc usr.bin/clang/lldb usr.bin/clang/llv...

2013-12-16 Thread Dimitry Andric

Author: dim
Date: Mon Dec 16 18:45:21 2013
New Revision: 259473
URL: http://svnweb.freebsd.org/changeset/base/259473

Log:
  Enable llvm's integrated assembler for PowerPC, since it should now be
  good enough for typical usage.
  
  Requested by: rdivacky
  MFC after:1 week

Added:
  head/lib/clang/include/PPCGenAsmMatcher.inc   (contents, props changed)
  head/lib/clang/libllvmpowerpcasmparser/
  head/lib/clang/libllvmpowerpcasmparser/Makefile   (contents, props changed)
Modified:
  head/lib/clang/Makefile
  head/lib/clang/include/llvm/Config/AsmParsers.def
  head/usr.bin/clang/clang/Makefile
  head/usr.bin/clang/llc/Makefile
  head/usr.bin/clang/lldb/Makefile
  head/usr.bin/clang/llvm-mc/Makefile
  head/usr.bin/clang/llvm-objdump/Makefile
  head/usr.bin/clang/llvm-rtdyld/Makefile
  head/usr.bin/clang/opt/Makefile

Modified: head/lib/clang/Makefile
==
--- head/lib/clang/Makefile Mon Dec 16 17:11:09 2013(r259472)
+++ head/lib/clang/Makefile Mon Dec 16 18:45:21 2013(r259473)
@@ -74,6 +74,7 @@ SUBDIR=   libclanganalysis \
libllvmmipsdisassembler \
libllvmmipsinfo \
libllvmmipsinstprinter \
+   libllvmpowerpcasmparser \
libllvmpowerpccodegen \
libllvmpowerpcdesc \
libllvmpowerpcinfo \

Added: head/lib/clang/include/PPCGenAsmMatcher.inc
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/lib/clang/include/PPCGenAsmMatcher.inc Mon Dec 16 18:45:21 2013
(r259473)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include PPCGenAsmMatcher.inc.h

Modified: head/lib/clang/include/llvm/Config/AsmParsers.def
==
--- head/lib/clang/include/llvm/Config/AsmParsers.def   Mon Dec 16 17:11:09 
2013(r259472)
+++ head/lib/clang/include/llvm/Config/AsmParsers.def   Mon Dec 16 18:45:21 
2013(r259473)
@@ -2,6 +2,7 @@
 
 LLVM_ASM_PARSER(ARM)
 LLVM_ASM_PARSER(Mips)
+LLVM_ASM_PARSER(PowerPC)
 LLVM_ASM_PARSER(X86)
 
 #undef LLVM_ASM_PARSER

Added: head/lib/clang/libllvmpowerpcasmparser/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/lib/clang/libllvmpowerpcasmparser/Makefile Mon Dec 16 18:45:21 
2013(r259473)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include bsd.own.mk
+
+LIB=   llvmpowerpcasmparser
+
+SRCDIR=lib/Target/PowerPC/AsmParser
+INCDIR=lib/Target/PowerPC
+SRCS=  PPCAsmParser.cpp
+
+TGHDRS=PPCGenAsmMatcher \
+   PPCGenInstrInfo \
+   PPCGenRegisterInfo \
+   PPCGenSubtargetInfo
+
+.include ../clang.lib.mk

Modified: head/usr.bin/clang/clang/Makefile
==
--- head/usr.bin/clang/clang/Makefile   Mon Dec 16 17:11:09 2013
(r259472)
+++ head/usr.bin/clang/clang/Makefile   Mon Dec 16 18:45:21 2013
(r259473)
@@ -85,8 +85,9 @@ LIBDEPS=clangfrontendtool \
llvmmipsinstprinter \
llvmpowerpccodegen \
llvmpowerpcdesc \
-   llvmpowerpcinfo \
llvmpowerpcinstprinter \
+   llvmpowerpcasmparser \
+   llvmpowerpcinfo \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \

Modified: head/usr.bin/clang/llc/Makefile
==
--- head/usr.bin/clang/llc/Makefile Mon Dec 16 17:11:09 2013
(r259472)
+++ head/usr.bin/clang/llc/Makefile Mon Dec 16 18:45:21 2013
(r259473)
@@ -24,8 +24,9 @@ LIBDEPS=llvmirreader \
llvmmipsinstprinter \
llvmpowerpccodegen \
llvmpowerpcdesc \
-   llvmpowerpcinfo \
llvmpowerpcinstprinter \
+   llvmpowerpcasmparser \
+   llvmpowerpcinfo \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \

Modified: head/usr.bin/clang/lldb/Makefile
==
--- head/usr.bin/clang/lldb/MakefileMon Dec 16 17:11:09 2013
(r259472)
+++ head/usr.bin/clang/lldb/MakefileMon Dec 16 18:45:21 2013
(r259473)
@@ -106,6 +106,7 @@ LIBDEPS=\
llvmmipsinstprinter \
llvmpowerpcdesc \
llvmpowerpcinstprinter \
+   llvmpowerpcasmparser \
llvmruntimedyld \
llvmvectorize \
llvmx86desc \

Modified: head/usr.bin/clang/llvm-mc/Makefile
==
--- head/usr.bin/clang/llvm-mc/Makefile Mon Dec 16 17:11:09 2013
(r259472)
+++ head/usr.bin/clang/llvm-mc/Makefile Mon Dec 16 18:45:21 2013
(r259473)
@@ -24,8 +24,9 @@ LIBDEPS=llvmmcdisassembler \
llvmmipsinstprinter \
llvmpowerpccodegen \

svn commit: r259474 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 18:53:09 2013
New Revision: 259474
URL: http://svnweb.freebsd.org/changeset/base/259474

Log:
  Bug-fixes and debugging improvments:
  + De-obfuscate debugging to show actual values
  + Change graid(8) syntax; s/destroy/delete/ [destroy is not invalid syntax]
  + Log commands that were previously quiet
  + Added some new comemnts and updated some existing ones
  + Add missing local for `disk' used in zfs_create_boot()
  + Use $disks instead of multiply-expanding $* in zfs_create_boot()
  + Pedantically unset variable holding geli(8) passphrase after use
  + Pedantically add double-quotes around zpool names and zfs datasets
  + Fix quotation expansion for zpool_cache entries of loader.conf(5)
  + Some limited whitespace changes
  
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 18:45:21 2013
(r259473)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 18:53:09 2013
(r259474)
@@ -156,8 +156,10 @@ CHMOD_MODE='chmod %s %s'
 DD_WITH_OPTIONS='dd if=%s of=%s %s'
 ECHO_APPEND='echo %s  %s'
 GELI_ATTACH='geli attach -j - -k %s %s'
+GELI_DETACH_F='geli detach -f %s'
 GELI_PASSWORD_INIT='geli init -b -B %s -e %s -J - -K %s -l 256 -s 4096 
%s'
 GNOP_CREATE='gnop create -S 4096 %s'
+GNOP_DESTROY='gnop destroy %s'
 GPART_ADD='gpart add -t %s %s'
 GPART_ADD_INDEX='gpart add -i %s -t %s %s'
 GPART_ADD_INDEX_WITH_SIZE='gpart add -i %s -t %s -s %s %s'
@@ -166,19 +168,23 @@ GPART_ADD_LABEL_WITH_SIZE='gpart add -l 
 GPART_BOOTCODE='gpart bootcode -b %s %s'
 GPART_BOOTCODE_PART='gpart bootcode -b %s -p %s -i %s %s'
 GPART_CREATE='gpart create -s %s %s'
+GPART_DESTROY_F='gpart destroy -F %s'
 GPART_SET_ACTIVE='gpart set -a active -i %s %s'
+GRAID_DELETE='graid delete %s'
 LN_SF='ln -sf %s %s'
 MKDIR_P='mkdir -p %s'
 MOUNT_TYPE='mount -t %s %s %s'
 PRINTF_CONF=printf '%s=\%%sn' %s  \%s\
 PRINTF_FSTAB='printf $FSTAB_FMT %s %s %s %s %s %s  %s'
 SHELL_TRUNCATE=': %s'
+UMOUNT='umount %s'
 ZFS_CREATE_WITH_OPTIONS='zfs create %s %s'
 ZFS_SET='zfs set %s %s'
 ZFS_UNMOUNT='zfs unmount %s'
 ZPOOL_CREATE_WITH_OPTIONS='zpool create %s %s %s %s'
 ZPOOL_EXPORT='zpool export %s'
 ZPOOL_IMPORT_WITH_OPTIONS='zpool import %s %s'
+ZPOOL_LABELCLEAR_F='zpool labelclear -f %s'
 ZPOOL_SET='zpool set %s %s'
 
 #
@@ -612,6 +618,8 @@ dialog_menu_layout()
 # replacement drivers do not have the exact same sector counts.
 #
 # NOTE: The MBR layout is more complicated (GPT is preferred).
+# NOTE: $swapsize and $gelisize should be defined by the calling function.
+# NOTE: Sets $bootpart and $targetpart for the calling function.
 #
 zfs_create_diskpart()
 {
@@ -664,13 +672,13 @@ zfs_create_diskpart()
# NOTE: Failure is ok here, blank disk will have nothing to destroy.
#
f_dprintf $funcname: Destroying all data/layouts on \`%s'... $disk
-   f_quietly gpart destroy -F $disk
-   f_quietly graid destroy $disk
-   f_quietly zpool labelclear -f /dev/$disk # Kill it with fire
+   f_eval_catch -d $funcname gpart $GPART_DESTROY_F $disk
+   f_eval_catch -d $funcname graid $GRAID_DELETE $disk
+   f_eval_catch -d $funcname zpool $ZPOOL_LABELCLEAR_F /dev/$disk
 
# Make doubly-sure backup GPT is destroyed
-   f_quietly gpart create -s gpt $disk
-   f_quietly gpart destroy -F $disk
+   f_eval_catch -d $funcname gpart $GPART_CREATE gpt $disk
+   f_eval_catch -d $funcname gpart $GPART_DESTROY_F $disk
 
# Calculate partition size given desired amount of swap
f_dprintf $funcname: Getting disk capactiy for \`%s' $disk
@@ -694,36 +702,35 @@ zfs_create_diskpart()
#
# 1. Create GPT layout using labels
#
-   f_eval_catch $funcname gpart $GPART_CREATE gpt \$disk ||
+   f_eval_catch $funcname gpart $GPART_CREATE gpt $disk ||
 return $FAILURE
 
#
# 2. Add small freebsd-boot partition labeled `boot#'
#
f_eval_catch $funcname gpart $GPART_ADD_LABEL_WITH_SIZE \
-gptboot\$index freebsd-boot 512k \$disk ||
+gptboot$index freebsd-boot 512k $disk ||
 return $FAILURE
f_eval_catch $funcname gpart $GPART_BOOTCODE_PART \
-/boot/pmbr /boot/gptzfsboot 1 \$disk ||
+/boot/pmbr /boot/gptzfsboot 1 $disk ||
 return $FAILURE
 
-   # zpool will use the `zfs#' GPT labels
+   # NB: zpool will use the `zfs#' GPT labels
bootpart=p2 targetpart=p2
 
# Change things around if we are using geli(8)
if [ $ZFSBOOT_GELI_ENCRYPTION ]; then

svn commit: r259475 - head/sys/kern

2013-12-16 Thread Adrian Chadd

Author: adrian
Date: Mon Dec 16 19:31:23 2013
New Revision: 259475
URL: http://svnweb.freebsd.org/changeset/base/259475

Log:
  Migrate the sendfile_sync struct to use a UMA zone rather than M_TEMP.
  
  This allows it to be better tracked as well as being able to leverage
  UMA for more interesting/useful behaviour at a later date.
  
  Sponsored by: Netflix, Inc.

Modified:
  head/sys/kern/uipc_syscalls.c

Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c   Mon Dec 16 18:53:09 2013
(r259474)
+++ head/sys/kern/uipc_syscalls.c   Mon Dec 16 19:31:23 2013
(r259475)
@@ -80,6 +80,9 @@ __FBSDID($FreeBSD$);
 #include compat/freebsd32/freebsd32_util.h
 #endif
 
+#include vm/uma.h
+#include vm/uma_int.h
+#include vm/uma_dbg.h
 #include net/vnet.h
 
 #include security/audit/audit.h
@@ -130,6 +133,7 @@ static int sfreadahead = 1;
 SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW,
 sfreadahead, 0, Number of sendfile(2) read-ahead MAXBSIZE blocks);
 
+static uma_zone_t  zone_sfsync;
 
 static void
 sfstat_init(const void *unused)
@@ -140,6 +144,22 @@ sfstat_init(const void *unused)
 }
 SYSINIT(sfstat, SI_SUB_MBUF, SI_ORDER_FIRST, sfstat_init, NULL);
 
+static void
+sf_sync_init(const void *unused)
+{
+
+   zone_sfsync = uma_zcreate(sendfile_sync, sizeof(struct sendfile_sync),
+   NULL, NULL,
+#ifdef INVARIANTS
+   trash_init, trash_fini,
+#else
+   NULL, NULL,
+#endif
+   UMA_ALIGN_CACHE,
+   0);
+}
+SYSINIT(sf_sync, SI_SUB_MBUF, SI_ORDER_FIRST, sf_sync_init, NULL);
+
 static int
 sfstat_sysctl(SYSCTL_HANDLER_ARGS)
 {
@@ -1898,7 +1918,7 @@ sf_sync_alloc(uint32_t flags)
 {
struct sendfile_sync *sfs;
 
-   sfs = malloc(sizeof *sfs, M_TEMP, M_WAITOK | M_ZERO);
+   sfs = uma_zalloc(zone_sfsync, M_WAITOK | M_ZERO);
mtx_init(sfs-mtx, sendfile, NULL, MTX_DEF);
cv_init(sfs-cv, sendfile);
sfs-flags = flags;
@@ -1953,7 +1973,7 @@ sf_sync_free(struct sendfile_sync *sfs)
KASSERT(sfs-count == 0, (sendfile sync still busy));
cv_destroy(sfs-cv);
mtx_destroy(sfs-mtx);
-   free(sfs, M_TEMP);
+   uma_zfree(zone_sfsync, sfs);
 }
 
 /*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259476 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 19:37:15 2013
New Revision: 259476
URL: http://svnweb.freebsd.org/changeset/base/259476

Log:
  Improve default ZFS disk layout (tested):
  + For GPT, always provision zfs# partition after swap [for resizability]
  + For MBR, always use a boot pool to relialy place root vdevs at EOD
  NB: Fixes edge-cases where MBR combination failed boot (e.g. swap-less)
  + Generalize boot pool logic so it can be used for any scheme (namely MBR)
  + Update existing comments and some whitespace fixes
  + Change some variable names to make reading/debugging the code easier
in zfs_create_boot() (namely prepend zroot_ or bootpool_ to property)
  + Because zroot vdevs are at EOD, no longer need to calculate partsize
(vdev consumes remaining space after allocating swap)
  + Optimize processing of disks -- no reason to loop over the disks 3-4
separate times when we can logically use a single loop to do everything
  
  Discussed on: -stable
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:31:23 2013
(r259475)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:37:15 2013
(r259476)
@@ -66,23 +66,30 @@ f_include $BSDCFG_SHARE/variable.subr
 
 #
 # Should we use geli(8) to encrypt the drives?
+# NB: Automatically enables ZFSBOOT_BOOT_POOL
 #
 : ${ZFSBOOT_GELI_ENCRYPTION=}
 
 #
-# Default name the unencrypted pool when using geli(8) to encrypt the drives
+# Default path to the geli(8) keyfile used in drive encryption
 #
-: ${ZFSBOOT_GELI_POOL_NAME:=bootpool}
+: ${ZFSBOOT_GELI_KEY_FILE:=/boot/encryption.key}
 
 #
-# Default size for the unencrypted boot pool when using geli(8)
+# Create a separate boot pool?
+# NB: Automatically set when using geli(8) or MBR
 #
-: ${ZFSBOOT_GELI_BOOT_SIZE:=2g}
+: ${ZFSBOOT_BOOT_POOL=}
 
 #
-# Default path to the geli(8) keyfile used in drive encryption
+# Default name for boot pool when enabled (e.g., geli(8) or MBR)
 #
-: ${ZFSBOOT_GELI_KEY_FILE:=/boot/encryption.key}
+: ${ZFSBOOT_BOOT_POOL_NAME:=bootpool}
+
+#
+# Default size for boot pool when enabled (e.g., geli(8) or MBR)
+#
+: ${ZFSBOOT_BOOT_POOL_SIZE:=2g}
 
 #
 # Default disks to use (always empty unless being scripted)
@@ -212,8 +219,8 @@ msg_geli_setup=Initializing encryption 
 msg_install=Install
 msg_install_desc=Proceed with Installation
 msg_install_help=Create ZFS boot pool with displayed options
+msg_invalid_boot_pool_size=Invalid boot pool size \`%s'
 msg_invalid_disk_argument=Invalid disk argument \`%s'
-msg_invalid_geli_boot_size=Invalid geli(8) boot size \`%s'
 msg_invalid_index_argument=Invalid index argument \`%s'
 msg_invalid_swap_size=Invalid swap size \`%s'
 msg_invalid_virtual_device_type=Invalid Virtual Device type \`%s'
@@ -617,15 +624,13 @@ dialog_menu_layout()
 # so we can have some real swap. This also provides wiggle room incase your
 # replacement drivers do not have the exact same sector counts.
 #
-# NOTE: The MBR layout is more complicated (GPT is preferred).
-# NOTE: $swapsize and $gelisize should be defined by the calling function.
+# NOTE: $swapsize and $bootsize should be defined by the calling function.
 # NOTE: Sets $bootpart and $targetpart for the calling function.
 #
 zfs_create_diskpart()
 {
local funcname=zfs_create_diskpart
local disk=$1 index=$2
-   local disksize partsize
 
# Check arguments
if [ ! $disk ]; then
@@ -680,18 +685,10 @@ zfs_create_diskpart()
f_eval_catch -d $funcname gpart $GPART_CREATE gpt $disk
f_eval_catch -d $funcname gpart $GPART_DESTROY_F $disk
 
-   # Calculate partition size given desired amount of swap
-   f_dprintf $funcname: Getting disk capactiy for \`%s' $disk
-   if ! device_$disk get capacity disksize; then
-   f_dprintf $funcname: Unable to get disk capacity of \`%s' \
- $disk
-   msg_error=$msg_error: $funcname \
-   f_show_err $msg_unable_to_get_disk_capacity $disk
-   return $FAILURE
-   fi
-   partsize=$(( $disksize - $swapsize ))
-   f_dprintf $funcname: disksize=[%s] partsize=[%s] \
- $disksize $partsize
+   #
+   # Enable boot pool if encryption is desired
+   #
+   [ $ZFSBOOT_GELI_ENCRYPTION ]  ZFSBOOT_BOOT_POOL=1
 
#
# Lay down the desired type of partition scheme
@@ -717,45 +714,36 @@ zfs_create_diskpart()
 
# NB: zpool will use the `zfs#' GPT labels
bootpart=p2 targetpart=p2
+   [ ${swapsize:-0} -gt 0 ]  targetpart=p3
 
-   # Change things around if we are using geli(8)
-   if [ $ZFSBOOT_GELI_ENCRYPTION ]; then
+   #
+   # Prepare boot pool if enabled (e.g., for geli(8))
+

svn commit: r259477 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 19:43:04 2013
New Revision: 259477
URL: http://svnweb.freebsd.org/changeset/base/259477

Log:
  fletcher4 is currently the default.
  
  Discussed on: -current
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:37:15 2013
(r259476)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:43:04 2013
(r259477)
@@ -1047,7 +1047,7 @@ zfs_create_boot()
# Customize the zroot a bit...
local option
f_dprintf $funcname: Setting miscellaneous options on root pool...
-   for option in checksum=fletcher4 atime=off; do
+   for option in atime=off; do
f_eval_catch $funcname zfs $ZFS_SET $option $zroot_name ||
return $FAILURE
done
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259478 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 19:44:45 2013
New Revision: 259478
URL: http://svnweb.freebsd.org/changeset/base/259478

Log:
  De-uglify the geli(8)-setup infobox by adding a newline.
  
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:43:04 2013
(r259477)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013
(r259478)
@@ -215,7 +215,7 @@ msg_force_4k_sectors=Force 4K Sectors?
 msg_force_4k_sectors_help=Use gnop(8) to configure forced 4K sector alignment
 msg_freebsd_installer=FreeBSD Installer
 msg_geli_password=Enter a strong passphrase, used to protect your encryption 
keys. You will be required to enter this passphrase each time the system is 
booted
-msg_geli_setup=Initializing encryption on the selected disks, this will take 
several seconds per disk
+msg_geli_setup=Initializing encryption on selected disks,\n this will take 
several seconds per disk
 msg_install=Install
 msg_install_desc=Proceed with Installation
 msg_install_help=Create ZFS boot pool with displayed options
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 19:47:04 2013
New Revision: 259479
URL: http://svnweb.freebsd.org/changeset/base/259479

Log:
  Add kern.geom.label.disk_ident.enable=0 to loader.conf(5).
  
  Discussed on: -current, -stable
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013
(r259478)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013
(r259479)
@@ -1159,6 +1159,9 @@ zfs_create_boot()
 $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
f_eval_catch $funcname echo $ECHO_APPEND 'zfs_load=\YES\' \
 $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+   f_eval_catch $funcname echo $ECHO_APPEND \
+'kern.geom.label.disk_ident.enable=\0\' \
+$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 
# We're all done unless we should go on for boot pool
[ $ZFSBOOT_BOOT_POOL ] || return $SUCCESS
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259480 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 19:51:11 2013
New Revision: 259480
URL: http://svnweb.freebsd.org/changeset/base/259480

Log:
  Fix a long-standing edge-case that would result in a ghosted `zroot' pool
  and subsequent headaches caused by multiple pools with the same name.
  Specifically, blast away any labels on the designated swap partition.
  Problem was when you install to a given layout *with* swap and then turn
  around and re-install the same layout *without* swap (we weren't doing a
  labelclear for the swap device, so would end up with an UNAVAIL status
  zroot pool that may only exist in the pool cache).
  
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013
(r259479)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:51:11 2013
(r259480)
@@ -745,6 +745,9 @@ zfs_create_diskpart()
 $GPART_ADD_LABEL_WITH_SIZE swap$index \
 freebsd-swap ${swapsize}b $disk ||
 return $FAILURE
+   # Pedantically nuke any old labels on the swap
+   f_eval_catch -d $funcname zpool $ZPOOL_LABELCLEAR_F \
+   /dev/gpt/swap$index
# Update fstab(5)
f_eval_catch $funcname printf $PRINTF_FSTAB \
 /dev/gpt/swap$index none swap sw 0 0 \
@@ -818,6 +821,9 @@ zfs_create_diskpart()
 $GPART_ADD_INDEX_WITH_SIZE 2 \
 freebsd-swap ${swapsize}b ${disk}s1 ||
 return $FAILURE
+   # Pedantically nuke any old labels on the swap
+   f_eval_catch -d $funcname zpool $ZPOOL_LABELCLEAR_F \
+   /dev/${disk}s1b
# Update fstab(5)
f_eval_catch $funcname printf $PRINTF_FSTAB \
 /dev/${disk}s1b none swap sw 0 0 \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259481 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Devin Teske

Author: dteske
Date: Mon Dec 16 19:54:55 2013
New Revision: 259481
URL: http://svnweb.freebsd.org/changeset/base/259481

Log:
  Auto-enable 4k sector alignment when disk encryption is requested (it is
  required in such a case). But don't prevent the user from pointing the
  gun at his/her foot -- you can disable 4k alignment after enabling geli).
  
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:51:11 2013
(r259480)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:54:55 2013
(r259481)
@@ -1372,6 +1372,7 @@ while :; do
if [ $ZFSBOOT_GELI_ENCRYPTION ]; then
ZFSBOOT_GELI_ENCRYPTION=
else
+   ZFSBOOT_GNOP_4K_FORCE_ALIGN=1
ZFSBOOT_GELI_ENCRYPTION=1
fi
;;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259482 - in head: lib/libvmmapi sys/amd64/include sys/amd64/vmm sys/amd64/vmm/io usr.sbin/bhyve

2013-12-16 Thread Neel Natu

Author: neel
Date: Mon Dec 16 19:59:31 2013
New Revision: 259482
URL: http://svnweb.freebsd.org/changeset/base/259482

Log:
  Add an API to deliver message signalled interrupts to vcpus. This allows
  callers treat the MSI 'addr' and 'data' fields as opaque and also lets
  bhyve implement multiple destination modes: physical, flat and clustered.
  
  Submitted by: Tycho Nightingale (tycho.nighting...@pluribusnetworks.com)
  Reviewed by:  grehan@

Modified:
  head/lib/libvmmapi/vmmapi.c
  head/lib/libvmmapi/vmmapi.h
  head/sys/amd64/include/vmm_dev.h
  head/sys/amd64/vmm/io/ppt.c
  head/sys/amd64/vmm/io/ppt.h
  head/sys/amd64/vmm/io/vhpet.c
  head/sys/amd64/vmm/io/vioapic.c
  head/sys/amd64/vmm/io/vlapic.c
  head/sys/amd64/vmm/io/vlapic.h
  head/sys/amd64/vmm/vmm_dev.c
  head/sys/amd64/vmm/vmm_lapic.c
  head/sys/amd64/vmm/vmm_lapic.h
  head/usr.sbin/bhyve/pci_emul.c
  head/usr.sbin/bhyve/pci_emul.h
  head/usr.sbin/bhyve/pci_passthru.c

Modified: head/lib/libvmmapi/vmmapi.c
==
--- head/lib/libvmmapi/vmmapi.c Mon Dec 16 19:54:55 2013(r259481)
+++ head/lib/libvmmapi/vmmapi.c Mon Dec 16 19:59:31 2013(r259482)
@@ -397,6 +397,18 @@ vm_lapic_irq(struct vmctx *ctx, int vcpu
 }
 
 int
+vm_lapic_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg)
+{
+   struct vm_lapic_msi vmmsi;
+
+   bzero(vmmsi, sizeof(vmmsi));
+   vmmsi.addr = addr;
+   vmmsi.msg = msg;
+
+   return (ioctl(ctx-fd, VM_LAPIC_MSI, vmmsi));
+}
+
+int
 vm_ioapic_assert_irq(struct vmctx *ctx, int irq)
 {
struct vm_ioapic_irq ioapic_irq;
@@ -552,7 +564,7 @@ vm_map_pptdev_mmio(struct vmctx *ctx, in
 
 int
 vm_setup_msi(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
-int destcpu, int vector, int numvec)
+uint64_t addr, uint64_t msg, int numvec)
 {
struct vm_pptdev_msi pptmsi;
 
@@ -561,8 +573,8 @@ vm_setup_msi(struct vmctx *ctx, int vcpu
pptmsi.bus = bus;
pptmsi.slot = slot;
pptmsi.func = func;
-   pptmsi.destcpu = destcpu;
-   pptmsi.vector = vector;
+   pptmsi.msg = msg;
+   pptmsi.addr = addr;
pptmsi.numvec = numvec;
 
return (ioctl(ctx-fd, VM_PPTDEV_MSI, pptmsi));
@@ -570,7 +582,7 @@ vm_setup_msi(struct vmctx *ctx, int vcpu
 
 int
 vm_setup_msix(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
- int idx, uint32_t msg, uint32_t vector_control, uint64_t addr)
+ int idx, uint64_t addr, uint64_t msg, uint32_t vector_control)
 {
struct vm_pptdev_msix pptmsix;
 

Modified: head/lib/libvmmapi/vmmapi.h
==
--- head/lib/libvmmapi/vmmapi.h Mon Dec 16 19:54:55 2013(r259481)
+++ head/lib/libvmmapi/vmmapi.h Mon Dec 16 19:59:31 2013(r259482)
@@ -67,6 +67,7 @@ int   vm_inject_event(struct vmctx *ctx, i
 intvm_inject_event2(struct vmctx *ctx, int vcpu, enum vm_event_type type,
 int vector, int error_code);
 intvm_lapic_irq(struct vmctx *ctx, int vcpu, int vector);
+intvm_lapic_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg);
 intvm_ioapic_assert_irq(struct vmctx *ctx, int irq);
 intvm_ioapic_deassert_irq(struct vmctx *ctx, int irq);
 intvm_ioapic_pulse_irq(struct vmctx *ctx, int irq);
@@ -82,9 +83,9 @@ int   vm_unassign_pptdev(struct vmctx *ctx
 intvm_map_pptdev_mmio(struct vmctx *ctx, int bus, int slot, int func,
   vm_paddr_t gpa, size_t len, vm_paddr_t hpa);
 intvm_setup_msi(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
-int dest, int vector, int numvec);
+   uint64_t addr, uint64_t msg, int numvec);
 intvm_setup_msix(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
- int idx, uint32_t msg, uint32_t vector_control, uint64_t 
addr);
+   int idx, uint64_t addr, uint64_t msg, uint32_t vector_control);
 
 /*
  * Return a pointer to the statistics buffer. Note that this is not MT-safe.

Modified: head/sys/amd64/include/vmm_dev.h
==
--- head/sys/amd64/include/vmm_dev.hMon Dec 16 19:54:55 2013
(r259481)
+++ head/sys/amd64/include/vmm_dev.hMon Dec 16 19:59:31 2013
(r259482)
@@ -66,6 +66,11 @@ struct vm_event {
int error_code_valid;
 };
 
+struct vm_lapic_msi {
+   uint64_tmsg;
+   uint64_taddr;
+};
+
 struct vm_lapic_irq {
int cpuid;
int vector;
@@ -103,8 +108,8 @@ struct vm_pptdev_msi {
int slot;
int func;
int numvec; /* 0 means disabled */
-   int vector;
-   int destcpu;
+   uint64_tmsg;
+   uint64_taddr;
 };
 
 struct vm_pptdev_msix {
@@ -113,7 +118,7 @@

svn commit: r259483 - stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace

2013-12-16 Thread Alan Somers

Author: asomers
Date: Mon Dec 16 19:59:34 2013
New Revision: 259483
URL: http://svnweb.freebsd.org/changeset/base/259483

Log:
  MFC r258311
  
  opensolaris/uts/common/dtrace/fasttrap.c
  Fix several problems that can cause panics on kldload and kldunload.
  
  * kproc_create(fasttrap_pid_cleanup_cb, ...) gets called before
fasttrap_provs.fth_table gets allocated.  This can lead to a panic
on module load, because fasttrap_pid_cleanup_cb references
fasttrap_provs.fth_table.  Move kproc_create down after the point
that fasttrap_provs.fth_table gets allocated, and modify the error
handling accordingly.
  
  * dtrace_fasttrap_{fork,exec,exit} weren't getting NULLed until
after fasttrap_provs.fth_table got freed.  That caused panics on
module unload because fasttrap_exec_exit calls
fasttrap_provider_retire, which references
fasttrap_provs.fth_table.  NULL those function pointers earlier.
  
  * There wasn't any code to destroy the
fasttrap_{tpoints,provs,procs}.fth_table mutexes on module unload,
leading to a resource leak when WITNESS is enabled.  Destroy those
mutexes during fasttrap_unload().
  
  Sponsored by: Spectra Logic Corporation

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Mon Dec 
16 19:59:31 2013(r259482)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Mon Dec 
16 19:59:34 2013(r259483)
@@ -2284,13 +2284,6 @@ fasttrap_load(void)
mutex_init(fasttrap_count_mtx, fasttrap count mtx, MUTEX_DEFAULT,
NULL);
 
-   ret = kproc_create(fasttrap_pid_cleanup_cb, NULL,
-   fasttrap_cleanup_proc, 0, 0, ftcleanup);
-   if (ret != 0) {
-   destroy_dev(fasttrap_cdev);
-   return (ret);
-   }
-
 #if defined(sun)
fasttrap_max = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS,
fasttrap-max-probes, FASTTRAP_MAX_DEFAULT);
@@ -2344,6 +2337,24 @@ fasttrap_load(void)
providers bucket mtx, MUTEX_DEFAULT, NULL);
 #endif
 
+   ret = kproc_create(fasttrap_pid_cleanup_cb, NULL,
+   fasttrap_cleanup_proc, 0, 0, ftcleanup);
+   if (ret != 0) {
+   destroy_dev(fasttrap_cdev);
+#if !defined(sun)
+   for (i = 0; i  fasttrap_provs.fth_nent; i++)
+   mutex_destroy(fasttrap_provs.fth_table[i].ftb_mtx);
+   for (i = 0; i  fasttrap_tpoints.fth_nent; i++)
+   mutex_destroy(fasttrap_tpoints.fth_table[i].ftb_mtx);
+#endif
+   kmem_free(fasttrap_provs.fth_table, fasttrap_provs.fth_nent *
+   sizeof (fasttrap_bucket_t));
+   mtx_destroy(fasttrap_cleanup_mtx);
+   mutex_destroy(fasttrap_count_mtx);
+   return (ret);
+   }
+
+
/*
 * ... and the procs hash table.
 */
@@ -2436,6 +2447,20 @@ fasttrap_unload(void)
return (-1);
}
 
+   /*
+* Stop new processes from entering these hooks now, before the
+* fasttrap_cleanup thread runs.  That way all processes will hopefully
+* be out of these hooks before we free fasttrap_provs.fth_table
+*/
+   ASSERT(dtrace_fasttrap_fork == fasttrap_fork);
+   dtrace_fasttrap_fork = NULL;
+
+   ASSERT(dtrace_fasttrap_exec == fasttrap_exec_exit);
+   dtrace_fasttrap_exec = NULL;
+
+   ASSERT(dtrace_fasttrap_exit == fasttrap_exec_exit);
+   dtrace_fasttrap_exit = NULL;
+
mtx_lock(fasttrap_cleanup_mtx);
fasttrap_cleanup_drain = 1;
/* Wait for the cleanup thread to finish up and signal us. */
@@ -2451,6 +2476,14 @@ fasttrap_unload(void)
mutex_exit(fasttrap_count_mtx);
 #endif
 
+#if !defined(sun)
+   for (i = 0; i  fasttrap_tpoints.fth_nent; i++)
+   mutex_destroy(fasttrap_tpoints.fth_table[i].ftb_mtx);
+   for (i = 0; i  fasttrap_provs.fth_nent; i++)
+   mutex_destroy(fasttrap_provs.fth_table[i].ftb_mtx);
+   for (i = 0; i  fasttrap_procs.fth_nent; i++)
+   mutex_destroy(fasttrap_procs.fth_table[i].ftb_mtx);
+#endif
kmem_free(fasttrap_tpoints.fth_table,
fasttrap_tpoints.fth_nent * sizeof (fasttrap_bucket_t));
fasttrap_tpoints.fth_nent = 0;
@@ -2463,22 +2496,6 @@ fasttrap_unload(void)
fasttrap_procs.fth_nent * sizeof (fasttrap_bucket_t));
fasttrap_procs.fth_nent = 0;
 
-   /*
-* We know there are no tracepoints in any process anywhere in
-* the system so there is no process which

Re: svn commit: r259475 - head/sys/kern

2013-12-16 Thread Gleb Smirnoff

  Adrian,

On Mon, Dec 16, 2013 at 07:31:24PM +, Adrian Chadd wrote:
A Modified: head/sys/kern/uipc_syscalls.c
A 
==
A --- head/sys/kern/uipc_syscalls.cMon Dec 16 18:53:09 2013
(r259474)
A +++ head/sys/kern/uipc_syscalls.cMon Dec 16 19:31:23 2013
(r259475)
A @@ -80,6 +80,9 @@ __FBSDID($FreeBSD$);
A  #include compat/freebsd32/freebsd32_util.h
A  #endif
A  
A +#include vm/uma.h
A +#include vm/uma_int.h
A +#include vm/uma_dbg.h
A  #include net/vnet.h
A  
A  #include security/audit/audit.h
A @@ -130,6 +133,7 @@ static int sfreadahead = 1;
A  SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW,
A  sfreadahead, 0, Number of sendfile(2) read-ahead MAXBSIZE blocks);
A  
A +static uma_zone_t   zone_sfsync;
A  
A  static void
A  sfstat_init(const void *unused)
A @@ -140,6 +144,22 @@ sfstat_init(const void *unused)
A  }
A  SYSINIT(sfstat, SI_SUB_MBUF, SI_ORDER_FIRST, sfstat_init, NULL);
A  
A +static void
A +sf_sync_init(const void *unused)
A +{
A +
A +zone_sfsync = uma_zcreate(sendfile_sync, sizeof(struct sendfile_sync),
A +NULL, NULL,
A +#ifdef  INVARIANTS
A +trash_init, trash_fini,
A +#else
A +NULL, NULL,
A +#endif
A +UMA_ALIGN_CACHE,
A +0);
A +}

You do not need the INVARIANTS ifdef, because uma(9) will do the same thing
for you automatically. Thus, you also do not need to pollute namespace with
uma_int.h and uma_dbg.h.

-- 
Totus tuus, Glebius.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Nathan Whitehorn


On 12/16/13 13:47, Devin Teske wrote:

Author: dteske
Date: Mon Dec 16 19:47:04 2013
New Revision: 259479
URL: http://svnweb.freebsd.org/changeset/base/259479

Log:
   Add kern.geom.label.disk_ident.enable=0 to loader.conf(5).
   
   Discussed on:	-current, -stable

   MFC after:   3 days

Modified:
   head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013
(r259478)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013
(r259479)
@@ -1159,6 +1159,9 @@ zfs_create_boot()
 $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
f_eval_catch $funcname echo $ECHO_APPEND 'zfs_load=\YES\' \
 $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+   f_eval_catch $funcname echo $ECHO_APPEND \
+'kern.geom.label.disk_ident.enable=\0\' \
+$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
  
  	# We're all done unless we should go on for boot pool

[ $ZFSBOOT_BOOT_POOL ] || return $SUCCESS


Uh -- what is all of this? Why are we disabling kernel functions 
depending on what the root filesystem is? Please don't MFC this.

-Nathan
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Teske, Devin


On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote:

 On 12/16/13 13:47, Devin Teske wrote:
 Author: dteske
 Date: Mon Dec 16 19:47:04 2013
 New Revision: 259479
 URL: 
 https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0Am=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0As=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e
 
 Log:
   Add kern.geom.label.disk_ident.enable=0 to loader.conf(5).
  Discussed on:   -current, -stable
   MFC after: 3 days
 
 Modified:
   head/usr.sbin/bsdinstall/scripts/zfsboot
 
 Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
 ==
 --- head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:44:45 2013
 (r259478)
 +++ head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:47:04 2013
 (r259479)
 @@ -1159,6 +1159,9 @@ zfs_create_boot()
   $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
  f_eval_catch $funcname echo $ECHO_APPEND 'zfs_load=\YES\' \
   $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 +f_eval_catch $funcname echo $ECHO_APPEND \
 + 'kern.geom.label.disk_ident.enable=\0\' \
 + $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
  # We're all done unless we should go on for boot pool
  [ $ZFSBOOT_BOOT_POOL ] || return $SUCCESS
 
 Uh -- what is all of this? Why are we disabling kernel functions depending on 
 what the root filesystem is? Please don't MFC this.

http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html
http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html

NB: Happy to rip it out... but want something in-reply to those threads (pretty 
please).
-- 
Devin

_
The information contained in this message is proprietary and/or confidential. 
If you are not the intended recipient, please: (i) delete the message and all 
copies; (ii) do not disclose, distribute or use the message in any manner; and 
(iii) notify the sender immediately. In addition, please be aware that any 
message addressed to our domain is subject to archiving and review by persons 
other than the intended recipient. Thank you.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Teske, Devin


On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote:

 
 On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote:
 
 On 12/16/13 13:47, Devin Teske wrote:
 Author: dteske
 Date: Mon Dec 16 19:47:04 2013
 New Revision: 259479
 URL: 
 https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0Am=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0As=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e
 
 Log:
  Add kern.geom.label.disk_ident.enable=0 to loader.conf(5).
 Discussed on:   -current, -stable
  MFC after: 3 days
 
 Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot
 
 Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
 ==
 --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 
 2013(r259478)
 +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 
 2013(r259479)
 @@ -1159,6 +1159,9 @@ zfs_create_boot()
  $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
 f_eval_catch $funcname echo $ECHO_APPEND 'zfs_load=\YES\' \
  $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 +   f_eval_catch $funcname echo $ECHO_APPEND \
 +'kern.geom.label.disk_ident.enable=\0\' \
 +$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 # We're all done unless we should go on for boot pool
 [ $ZFSBOOT_BOOT_POOL ] || return $SUCCESS
 
 Uh -- what is all of this? Why are we disabling kernel functions depending 
 on what the root filesystem is? Please don't MFC this.
 
 http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html
 http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html
 
 NB: Happy to rip it out... but want something in-reply to those threads 
 (pretty please).

Basically... the logic is...

The ZFS pool is built on vdevs of a specific name. The names that are used
should remain the same. Adding this to the loader.conf ensures that the names
that the pool(s) was/were built upon do not change.

This goes beyond just a swap partition I imagine. For example... copying the
data to a new drive using a duplicator. I'm sure there are other cases too.
-- 
Devin

_
The information contained in this message is proprietary and/or confidential. 
If you are not the intended recipient, please: (i) delete the message and all 
copies; (ii) do not disclose, distribute or use the message in any manner; and 
(iii) notify the sender immediately. In addition, please be aware that any 
message addressed to our domain is subject to archiving and review by persons 
other than the intended recipient. Thank you.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Teske, Devin


On Dec 16, 2013, at 1:50 PM, Nathan Whitehorn wrote:

 On 12/16/13 15:48, Teske, Devin wrote:
 On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote:
 
 On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote:
 
 On 12/16/13 13:47, Devin Teske wrote:
 Author: dteske
 Date: Mon Dec 16 19:47:04 2013
 New Revision: 259479
 URL: 
 https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0Am=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0As=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e
 
 Log:
  Add kern.geom.label.disk_ident.enable=0 to loader.conf(5).
 Discussed on: -current, -stable
  MFC after:   3 days
 
 Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot
 
 Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
 ==
 --- head/usr.sbin/bsdinstall/scripts/zfsboot  Mon Dec 16 19:44:45 
 2013(r259478)
 +++ head/usr.sbin/bsdinstall/scripts/zfsboot  Mon Dec 16 19:47:04 
 2013(r259479)
 @@ -1159,6 +1159,9 @@ zfs_create_boot()
$BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
   f_eval_catch $funcname echo $ECHO_APPEND 'zfs_load=\YES\' \
$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 + f_eval_catch $funcname echo $ECHO_APPEND \
 +  'kern.geom.label.disk_ident.enable=\0\' \
 +  $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
   # We're all done unless we should go on for boot pool
   [ $ZFSBOOT_BOOT_POOL ] || return $SUCCESS
 Uh -- what is all of this? Why are we disabling kernel functions depending 
 on what the root filesystem is? Please don't MFC this.
 https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.htmlk=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0Am=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0As=4f16f0d6399e3a3c5e105a7869c580884327a8721c2f44c1711b319212a23db7
 https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.htmlk=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0Am=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0As=17882f97e3633c1e3ebd45f332e62d2212dc53d1f0577acc4ae15d8234d09c7f
 
 NB: Happy to rip it out... but want something in-reply to those threads 
 (pretty please).
 Basically... the logic is...
 
 The ZFS pool is built on vdevs of a specific name. The names that are used
 should remain the same. Adding this to the loader.conf ensures that the names
 that the pool(s) was/were built upon do not change.
 
 This goes beyond just a swap partition I imagine. For example... copying the
 data to a new drive using a duplicator. I'm sure there are other cases too.
 
 Thanks for the explanation! I wonder if we should just turn off the disk 
 ident stuff by default globally -- it was causing problems for me as well 
 without ZFS root.

As I was making the commit to zfsboot... the very thought had occurred to me.

I'm happy to rip this out in favor of a new global default. The end-result is 
that
what Johan experienced won't be repeated.

I think there's an urgency to get something to solve this into 10.
-- 
Devin

_
The information contained in this message is proprietary and/or confidential. 
If you are not the intended recipient, please: (i) delete the message and all 
copies; (ii) do not disclose, distribute or use the message in any manner; and 
(iii) notify the sender immediately. In addition, please be aware that any 
message addressed to our domain is subject to archiving and review by persons 
other than the intended recipient. Thank you.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Nathan Whitehorn


On 12/16/13 15:55, Teske, Devin wrote:

On Dec 16, 2013, at 1:50 PM, Nathan Whitehorn wrote:


On 12/16/13 15:48, Teske, Devin wrote:

On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote:


On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote:


On 12/16/13 13:47, Devin Teske wrote:

Author: dteske
Date: Mon Dec 16 19:47:04 2013
New Revision: 259479
URL: 
https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0Am=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0As=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e

Log:
  Add kern.geom.label.disk_ident.enable=0 to loader.conf(5).
 Discussed on:  -current, -stable
  MFC after:3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013
(r259478)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013
(r259479)
@@ -1159,6 +1159,9 @@ zfs_create_boot()
 $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
f_eval_catch $funcname echo $ECHO_APPEND 'zfs_load=\YES\' \
 $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+   f_eval_catch $funcname echo $ECHO_APPEND \
+'kern.geom.label.disk_ident.enable=\0\' \
+$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
# We're all done unless we should go on for boot pool
[ $ZFSBOOT_BOOT_POOL ] || return $SUCCESS

Uh -- what is all of this? Why are we disabling kernel functions depending on 
what the root filesystem is? Please don't MFC this.

https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.htmlk=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0Am=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0As=4f16f0d6399e3a3c5e105a7869c580884327a8721c2f44c1711b319212a23db7
https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.htmlk=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0Ar=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0Am=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0As=17882f97e3633c1e3ebd45f332e62d2212dc53d1f0577acc4ae15d8234d09c7f

NB: Happy to rip it out... but want something in-reply to those threads (pretty 
please).

Basically... the logic is...

The ZFS pool is built on vdevs of a specific name. The names that are used
should remain the same. Adding this to the loader.conf ensures that the names
that the pool(s) was/were built upon do not change.

This goes beyond just a swap partition I imagine. For example... copying the
data to a new drive using a duplicator. I'm sure there are other cases too.

Thanks for the explanation! I wonder if we should just turn off the disk ident 
stuff by default globally -- it was causing problems for me as well without ZFS 
root.

As I was making the commit to zfsboot... the very thought had occurred to me.

I'm happy to rip this out in favor of a new global default. The end-result is 
that
what Johan experienced won't be repeated.

I think there's an urgency to get something to solve this into 10.


Yeah, I can see that. Let me bring this up on -CURRENT, with a short 
timeout, and see what the options are.

-Nathan
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259484 - head/sys/arm/mv

2013-12-16 Thread Nathan Whitehorn

Author: nwhitehorn
Date: Mon Dec 16 22:04:47 2013
New Revision: 259484
URL: http://svnweb.freebsd.org/changeset/base/259484

Log:
  Use the common Open Firmware PCI interrupt routing code instead of the
  duplicate version in dev/fdt.
  
  Tested by:zbb

Modified:
  head/sys/arm/mv/mv_pci.c

Modified: head/sys/arm/mv/mv_pci.c
==
--- head/sys/arm/mv/mv_pci.cMon Dec 16 19:59:34 2013(r259483)
+++ head/sys/arm/mv/mv_pci.cMon Dec 16 22:04:47 2013(r259484)
@@ -60,6 +60,7 @@ __FBSDID($FreeBSD$);
 
 #include dev/fdt/fdt_common.h
 #include dev/ofw/ofw_bus.h
+#include dev/ofw/ofw_pci.h
 #include dev/ofw/ofw_bus_subr.h
 #include dev/pci/pcivar.h
 #include dev/pci/pcireg.h
@@ -142,7 +143,7 @@ struct mv_pcib_softc {
int sc_type;
int sc_mode;/* Endpoint / Root Complex */
 
-   struct fdt_pci_intr sc_intr_info;
+   struct ofw_bus_iinfosc_pci_iinfo;
 };
 
 /* Local forward prototypes */
@@ -155,7 +156,6 @@ static void mv_pcib_hw_cfgwrite(struct m
 static int mv_pcib_init(struct mv_pcib_softc *, int, int);
 static int mv_pcib_init_all_bars(struct mv_pcib_softc *, int, int, int, int);
 static void mv_pcib_init_bridge(struct mv_pcib_softc *, int, int, int);
-static int mv_pcib_intr_info(phandle_t, struct mv_pcib_softc *);
 static inline void pcib_write_irq_mask(struct mv_pcib_softc *, uint32_t);
 static void mv_pcib_enable(struct mv_pcib_softc *, uint32_t);
 static int mv_pcib_mem_init(struct mv_pcib_softc *);
@@ -243,8 +243,8 @@ mv_pcib_probe(device_t self)
if (!fdt_is_type(node, pci))
return (ENXIO);
 
-   if (!(fdt_is_compatible(node, mrvl,pcie) ||
-   fdt_is_compatible(node, mrvl,pci)))
+   if (!(ofw_bus_is_compatible(self, mrvl,pcie) ||
+   ofw_bus_is_compatible(self, mrvl,pci)))
return (ENXIO);
 
device_set_desc(self, Marvell Integrated PCI/PCI-E Controller);
@@ -299,11 +299,8 @@ mv_pcib_attach(device_t self)
/*
 * Get PCI interrupt info.
 */
-   if ((sc-sc_mode == MV_MODE_ROOT) 
-   (mv_pcib_intr_info(node, sc) != 0)) {
-   device_printf(self, could not retrieve interrupt info\n);
-   return (ENXIO);
-   }
+   if (sc-sc_mode == MV_MODE_ROOT)
+   ofw_bus_setup_iinfo(node, sc-sc_pci_iinfo, sizeof(pcell_t));
 
/*
 * Configure decode windows for PCI(E) access.
@@ -881,19 +878,33 @@ mv_pcib_write_config(device_t dev, u_int
 }
 
 static int
-mv_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
+mv_pcib_route_interrupt(device_t bus, device_t dev, int pin)
 {
struct mv_pcib_softc *sc;
-   int err, interrupt;
-
-   sc = device_get_softc(pcib);
-
-   err = fdt_pci_route_intr(pci_get_bus(dev), pci_get_slot(dev),
-   pci_get_function(dev), pin, sc-sc_intr_info, interrupt);
-   if (err == 0)
-   return (interrupt);
+   struct ofw_pci_register reg;
+   uint32_t pintr, mintr;
+   phandle_t iparent;
+   uint8_t maskbuf[sizeof(reg) + sizeof(pintr)];
+
+   sc = device_get_softc(bus);
+   pintr = pin;
+
+   /* Fabricate imap information in case this isn't an OFW device */
+   bzero(reg, sizeof(reg));
+   reg.phys_hi = (pci_get_bus(dev)  OFW_PCI_PHYS_HI_BUSSHIFT) |
+   (pci_get_slot(dev)  OFW_PCI_PHYS_HI_DEVICESHIFT) |
+   (pci_get_function(dev)  OFW_PCI_PHYS_HI_FUNCTIONSHIFT);
+
+   if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), sc-sc_pci_iinfo, reg,
+   sizeof(reg), pintr, sizeof(pintr), mintr, sizeof(mintr),
+   iparent, maskbuf))
+   return (ofw_bus_map_intr(dev, iparent, mintr));
+
+   /* Maybe it's a real interrupt, not an intpin */
+   if (pin  4)
+   return (pin);
 
-   device_printf(pcib, could not route pin %d for device %d.%d\n,
+   device_printf(bus, could not route pin %d for device %d.%d\n,
pin, pci_get_slot(dev), pci_get_function(dev));
return (PCI_INVALID_IRQ);
 }
@@ -938,17 +949,6 @@ mv_pcib_decode_win(phandle_t node, struc
return (0);
 }
 
-static int
-mv_pcib_intr_info(phandle_t node, struct mv_pcib_softc *sc)
-{
-   int error;
-
-   if ((error = fdt_pci_intr_info(node, sc-sc_intr_info)) != 0)
-   return (error);
-
-   return (0);
-}
-
 #if defined(SOC_MV_ARMADAXP)
 static int
 mv_pcib_map_msi(device_t dev, device_t child, int irq, uint64_t *addr,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259485 - in stable/9/sys: . amd64/include/xen boot boot/forth boot/i386/efi boot/i386/gptboot boot/ia64/efi boot/ia64/ski boot/powerpc/boot1.chrp boot/powerpc/ofw cddl/contrib/opensola...

2013-12-16 Thread Andreas Tobler

Author: andreast
Date: Mon Dec 16 22:07:49 2013
New Revision: 259485
URL: http://svnweb.freebsd.org/changeset/base/259485

Log:
  Fix the outstanding mergeinfo part of r249374.

Modified:
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/forth/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/i386/gptboot/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/dev/puc/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)
  stable/9/sys/modules/ixgbe/   (props changed)
  stable/9/sys/net/   (props changed)
  stable/9/sys/sys/   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259487 - head/sys/dev/netmap

2013-12-16 Thread Luigi Rizzo

Author: luigi
Date: Mon Dec 16 23:57:43 2013
New Revision: 259487
URL: http://svnweb.freebsd.org/changeset/base/259487

Log:
  fix the build using __builtin_prefetch() instead of redefining prefetch()

Modified:
  head/sys/dev/netmap/ixgbe_netmap.h
  head/sys/dev/netmap/netmap_kern.h
  head/sys/dev/netmap/netmap_vale.c

Modified: head/sys/dev/netmap/ixgbe_netmap.h
==
--- head/sys/dev/netmap/ixgbe_netmap.h  Mon Dec 16 22:26:25 2013
(r259486)
+++ head/sys/dev/netmap/ixgbe_netmap.h  Mon Dec 16 23:57:43 2013
(r259487)
@@ -220,8 +220,8 @@ ixgbe_netmap_txsync(struct netmap_adapte
if (nm_i != cur) {  /* we have new packets to send */
nic_i = netmap_idx_k2n(kring, nm_i);
 
-   prefetch(ring-slot[nm_i]);
-   prefetch(txr-tx_buffers[nic_i]);
+   __builtin_prefetch(ring-slot[nm_i]);
+   __builtin_prefetch(txr-tx_buffers[nic_i]);
 
for (n = 0; nm_i != cur; n++) {
struct netmap_slot *slot = ring-slot[nm_i];
@@ -237,8 +237,8 @@ ixgbe_netmap_txsync(struct netmap_adapte
IXGBE_TXD_CMD_RS : 0;
 
/* prefetch for next round */
-   prefetch(ring-slot[nm_i + 1]);
-   prefetch(txr-tx_buffers[nic_i + 1]);
+   __builtin_prefetch(ring-slot[nm_i + 1]);
+   __builtin_prefetch(txr-tx_buffers[nic_i + 1]);
 
NM_CHECK_ADDR_LEN(addr, len);
 

Modified: head/sys/dev/netmap/netmap_kern.h
==
--- head/sys/dev/netmap/netmap_kern.h   Mon Dec 16 22:26:25 2013
(r259486)
+++ head/sys/dev/netmap/netmap_kern.h   Mon Dec 16 23:57:43 2013
(r259487)
@@ -61,7 +61,6 @@
 #define NM_ATOMIC_TEST_AND_SET(p)   (!atomic_cmpset_acq_int((p), 0, 1))
 #define NM_ATOMIC_CLEAR(p)  atomic_store_rel_int((p), 0)
 
-#define prefetch(x) __builtin_prefetch(x)
 
 MALLOC_DECLARE(M_NETMAP);
 

Modified: head/sys/dev/netmap/netmap_vale.c
==
--- head/sys/dev/netmap/netmap_vale.c   Mon Dec 16 22:26:25 2013
(r259486)
+++ head/sys/dev/netmap/netmap_vale.c   Mon Dec 16 23:57:43 2013
(r259487)
@@ -79,8 +79,6 @@ __FBSDID($FreeBSD$);
 #include sys/endian.h
 #include sys/refcount.h
 
-// #define prefetch(x) __builtin_prefetch(x)
-
 
 #define BDG_RWLOCK_T   struct rwlock // struct rwlock
 
@@ -1003,7 +1001,7 @@ nm_bdg_preflush(struct netmap_vp_adapter
ft[ft_i].ft_next = NM_FT_NULL;
buf = ft[ft_i].ft_buf = (slot-flags  NS_INDIRECT) ?
(void *)(uintptr_t)slot-ptr : BDG_NMB(na-up, slot);
-   prefetch(buf);
+   __builtin_prefetch(buf);
++ft_i;
if (slot-flags  NS_MOREFRAG) {
frags++;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259475 - head/sys/kern

2013-12-16 Thread Adrian Chadd

Ok. I'll go find where I copy pastes thus from. The mbuf code perhaps?

Should we do a big quick tidy up?

Adrian
On Dec 16, 2013 1:40 PM, Gleb Smirnoff gleb...@freebsd.org wrote:

   Adrian,

 On Mon, Dec 16, 2013 at 07:31:24PM +, Adrian Chadd wrote:
 A Modified: head/sys/kern/uipc_syscalls.c
 A
 ==
 A --- head/sys/kern/uipc_syscalls.cMon Dec 16 18:53:09 2013
  (r259474)
 A +++ head/sys/kern/uipc_syscalls.cMon Dec 16 19:31:23 2013
  (r259475)
 A @@ -80,6 +80,9 @@ __FBSDID($FreeBSD$);
 A  #include compat/freebsd32/freebsd32_util.h
 A  #endif
 A
 A +#include vm/uma.h
 A +#include vm/uma_int.h
 A +#include vm/uma_dbg.h
 A  #include net/vnet.h
 A
 A  #include security/audit/audit.h
 A @@ -130,6 +133,7 @@ static int sfreadahead = 1;
 A  SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW,
 A  sfreadahead, 0, Number of sendfile(2) read-ahead MAXBSIZE
 blocks);
 A
 A +static uma_zone_t   zone_sfsync;
 A
 A  static void
 A  sfstat_init(const void *unused)
 A @@ -140,6 +144,22 @@ sfstat_init(const void *unused)
 A  }
 A  SYSINIT(sfstat, SI_SUB_MBUF, SI_ORDER_FIRST, sfstat_init, NULL);
 A
 A +static void
 A +sf_sync_init(const void *unused)
 A +{
 A +
 A +zone_sfsync = uma_zcreate(sendfile_sync, sizeof(struct
 sendfile_sync),
 A +NULL, NULL,
 A +#ifdef  INVARIANTS
 A +trash_init, trash_fini,
 A +#else
 A +NULL, NULL,
 A +#endif
 A +UMA_ALIGN_CACHE,
 A +0);
 A +}

 You do not need the INVARIANTS ifdef, because uma(9) will do the same thing
 for you automatically. Thus, you also do not need to pollute namespace with
 uma_int.h and uma_dbg.h.

 --
 Totus tuus, Glebius.

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259488 - stable/10

2013-12-16 Thread Glen Barber

Author: gjb
Date: Tue Dec 17 01:02:34 2013
New Revision: 259488
URL: http://svnweb.freebsd.org/changeset/base/259488

Log:
  Record mergeinfo for r258927.
  
  Sponsored by: The FreeBSD Foundation

Modified:
Directory Properties:
  stable/10/   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259475 - head/sys/kern

2013-12-16 Thread Gleb Smirnoff

On Mon, Dec 16, 2013 at 04:54:15PM -0800, Adrian Chadd wrote:
A Ok. I'll go find where I copy pastes thus from. The mbuf code perhaps?
A 
A Should we do a big quick tidy up?

Nope, the mbuf code is somewhat different, due to secondary zones. An
item freed there isn't actually freed, that's why they need a shift of
trashing memory not in ctor/dtor, but in init/fini. Actually, now I see
that your code is not only extraneous but wrong.  You probably wanted to
set ctor/dtor methods, not init/fini. So just remove it, in case of INVARIANTS
the UMA automatically does all needed trash filling and later checking.


-- 
Totus tuus, Glebius.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259489 - head/sys/kern

2013-12-16 Thread Adrian Chadd

Author: adrian
Date: Tue Dec 17 03:06:21 2013
New Revision: 259489
URL: http://svnweb.freebsd.org/changeset/base/259489

Log:
  Remove the invariants stuff I copy/paste'd from the mbuf code when
  setting up the UMA zone.
  
  This should (a) be correct(er) and (b) it should build on non-amd64.
  
  Pointed out by: glebius

Modified:
  head/sys/kern/uipc_syscalls.c

Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c   Tue Dec 17 01:02:34 2013
(r259488)
+++ head/sys/kern/uipc_syscalls.c   Tue Dec 17 03:06:21 2013
(r259489)
@@ -80,9 +80,6 @@ __FBSDID($FreeBSD$);
 #include compat/freebsd32/freebsd32_util.h
 #endif
 
-#include vm/uma.h
-#include vm/uma_int.h
-#include vm/uma_dbg.h
 #include net/vnet.h
 
 #include security/audit/audit.h
@@ -95,6 +92,7 @@ __FBSDID($FreeBSD$);
 #include vm/vm_pager.h
 #include vm/vm_kern.h
 #include vm/vm_extern.h
+#include vm/uma.h
 
 #if defined(INET) || defined(INET6)
 #ifdef SCTP
@@ -150,11 +148,7 @@ sf_sync_init(const void *unused)
 
zone_sfsync = uma_zcreate(sendfile_sync, sizeof(struct sendfile_sync),
NULL, NULL,
-#ifdef INVARIANTS
-   trash_init, trash_fini,
-#else
NULL, NULL,
-#endif
UMA_ALIGN_CACHE,
0);
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259490 - head/release/doc/en_US.ISO8859-1/relnotes

2013-12-16 Thread Craig Rodrigues

Author: rodrigc
Date: Tue Dec 17 03:38:36 2013
New Revision: 259490
URL: http://svnweb.freebsd.org/changeset/base/259490

Log:
  Add release note items from Chelsio.
  
  Submitted by: np

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Dec 17 
03:06:21 2013(r259489)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Dec 17 
03:38:36 2013(r259490)
@@ -248,6 +248,12 @@
para arch=amd64,i386 role=mergedThe man.wpi.4; driver has
  been updated to include a number of stability fixes./para
 
+   paraThe man.cxgbe.4; driver has been updated to support
+ 40G/10G Ethernet NICs based on Chelsio's Terminator 5 (T5) 
ASIC./para
+
+   paraThe iw_cxgbe driver has been added.  This is an experimental 
iWARP/RDMA driver
+ (kernel verbs only) for Chelsio's T4 and T5 based cards./para
+
   /sect4
 /sect3
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259491 - stable/10/release/scripts

2013-12-16 Thread Glen Barber

Author: gjb
Date: Tue Dec 17 03:46:44 2013
New Revision: 259491
URL: http://svnweb.freebsd.org/changeset/base/259491

Log:
  MFC r259246:
Prevent release build errors found during snapshot builds where if
NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
WITH_DVD=1.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/10/release/scripts/pkg-stage.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/scripts/pkg-stage.sh
==
--- stable/10/release/scripts/pkg-stage.sh  Tue Dec 17 03:38:36 2013
(r259490)
+++ stable/10/release/scripts/pkg-stage.sh  Tue Dec 17 03:46:44 2013
(r259491)
@@ -24,6 +24,11 @@ fi
 REVISION=${2}
 . ${1} || exit 1
 
+# If NOPORTS is set for the release, do not attempt to build pkg(8).
+if [ ! -f /usr/ports/Makefile ]; then
+   exit 0
+fi
+
 if [ ! -x /usr/local/sbin/pkg ]; then
/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259492 - stable/10/release

2013-12-16 Thread Glen Barber

Author: gjb
Date: Tue Dec 17 04:16:20 2013
New Revision: 259492
URL: http://svnweb.freebsd.org/changeset/base/259492

Log:
  MFC r258770 (hrs):
Add NOPKG to disable pkg-stage.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile
==
--- stable/10/release/Makefile  Tue Dec 17 03:46:44 2013(r259491)
+++ stable/10/release/Makefile  Tue Dec 17 04:16:20 2013(r259492)
@@ -16,6 +16,7 @@
 #(by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
+#  NOPKG:if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:if set, do not distribute source tree
 #  NODOC:if set, do not generate release documentation
@@ -221,7 +222,7 @@ packagesystem: base.txz kernel.txz ${EXT
touch ${.TARGET}
 
 pkg-stage:
-.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
+.if !defined(NOPKG)  exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
${REVISION}
 .endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259493 - head/release/doc/en_US.ISO8859-1/relnotes

2013-12-16 Thread Craig Rodrigues

Author: rodrigc
Date: Tue Dec 17 04:19:03 2013
New Revision: 259493
URL: http://svnweb.freebsd.org/changeset/base/259493

Log:
  Add OFED and Mellanox items to release notes.
  
  Submitted by: Meny Yossefi menyy mellanox com

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Dec 17 
04:16:20 2013(r259492)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Dec 17 
04:19:03 2013(r259493)
@@ -254,6 +254,15 @@
paraThe iw_cxgbe driver has been added.  This is an experimental 
iWARP/RDMA driver
  (kernel verbs only) for Chelsio's T4 and T5 based cards./para
 
+   paraThe Open Fabrics Enterprise Distribution (OFED) and OFED 
Infiniband core has been
+ updated to the same version as supplied by Linux version 3.7/para
+
+   paraThe Mellanox Infiniband driver has been updated to firmware
+ version 2.30.3200 for ConnectX3 NICs.  Support has been added for 
ConnectX3 VPI NICs, where
+ each port can be used as Infiniband 56 GB/s or Ethernet 40 GB/s.  
Support has been added
+ for dynamically loading kernel modules for Infiniband core (ibcore) 
and
+ IP over Infiniband (ipoib)./para
+
   /sect4
 /sect3
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259494 - stable/10/release/doc/en_US.ISO8859-1/relnotes

2013-12-16 Thread Craig Rodrigues

Author: rodrigc
Date: Tue Dec 17 04:26:20 2013
New Revision: 259494
URL: http://svnweb.freebsd.org/changeset/base/259494

Log:
  MFC r259493:
  
Add OFED and Mellanox items to release notes.
  
Submitted by: Meny Yossefi menyy mellanox com
  
  MFC r259490:
  
Add release note items from Chelsio.
  
Submitted by: np

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml  Tue Dec 17 
04:19:03 2013(r259493)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml  Tue Dec 17 
04:26:20 2013(r259494)
@@ -248,6 +248,21 @@
para arch=amd64,i386 role=mergedThe man.wpi.4; driver has
  been updated to include a number of stability fixes./para
 
+   paraThe man.cxgbe.4; driver has been updated to support
+ 40G/10G Ethernet NICs based on Chelsio's Terminator 5 (T5) 
ASIC./para
+
+   paraThe iw_cxgbe driver has been added.  This is an experimental 
iWARP/RDMA driver
+ (kernel verbs only) for Chelsio's T4 and T5 based cards./para
+
+   paraThe Open Fabrics Enterprise Distribution (OFED) and OFED 
Infiniband core has been
+ updated to the same version as supplied by Linux version 3.7/para
+
+   paraThe Mellanox Infiniband driver has been updated to firmware
+ version 2.30.3200 for ConnectX3 NICs.  Support has been added for 
ConnectX3 VPI NICs, where
+ each port can be used as Infiniband 56 GB/s or Ethernet 40 GB/s.  
Support has been added
+ for dynamically loading kernel modules for Infiniband core (ibcore) 
and
+ IP over Infiniband (ipoib)./para
+
   /sect4
 /sect3
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259481 - head/usr.sbin/bsdinstall/scripts

2013-12-16 Thread Eitan Adler

On Mon, Dec 16, 2013 at 2:54 PM, Devin Teske dte...@freebsd.org wrote:
 Author: dteske
 Date: Mon Dec 16 19:54:55 2013
 New Revision: 259481
 URL: http://svnweb.freebsd.org/changeset/base/259481

 Log:
   Auto-enable 4k sector alignment when disk encryption is requested (it is
   required in such a case).

Nice

 But don't prevent the user from pointing the
   gun at his/her foot -- you can disable 4k alignment after enabling geli).

Why?  Is there ever a reason you would want to do this?




-- 
Eitan Adler
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r259463 - in head/etc: defaults rc.d

2013-12-16 Thread Eitan Adler

On Mon, Dec 16, 2013 at 6:03 AM, Pawel Jakub Dawidek p...@freebsd.org wrote:
 Author: pjd
 Date: Mon Dec 16 11:03:59 2013
 New Revision: 259463
 URL: http://svnweb.freebsd.org/changeset/base/259463

 Log:
   Start-up script for casperd daemon.

   Sponsored by: The FreeBSD Foundation

 Added:
   head/etc/rc.d/casperd   (contents, props changed)
 Modified:
   head/etc/defaults/rc.conf
   head/etc/rc.d/Makefile

 Modified: head/etc/defaults/rc.conf
 ==
 --- head/etc/defaults/rc.conf   Mon Dec 16 10:50:13 2013(r259462)
 +++ head/etc/defaults/rc.conf   Mon Dec 16 11:03:59 2013(r259463)
 @@ -658,6 +658,7 @@ newsyslog_enable=YES  # Run newsyslog a
  newsyslog_flags=-CN  # Newsyslog flags to create marked files
  mixer_enable=YES # Run the sound mixer.
  opensm_enable=NO # Opensm(8) for infiniband devices defaults to off
 +casperd_enable=NO# casperd(8) daemon

Why is casper disabled by default?



-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259495 - head/share/misc

2013-12-16 Thread Jonathan Chu

Author: milki (ports committer)
Date: Tue Dec 17 05:13:37 2013
New Revision: 259495
URL: http://svnweb.freebsd.org/changeset/base/259495

Log:
  milki is a new committer for ports.
  
  Approved by:  swills (mentor)

Modified:
  head/share/misc/committers-ports.dot

Modified: head/share/misc/committers-ports.dot
==
--- head/share/misc/committers-ports.dotTue Dec 17 04:26:20 2013
(r259494)
+++ head/share/misc/committers-ports.dotTue Dec 17 05:13:37 2013
(r259495)
@@ -154,6 +154,7 @@ mat [label=Mathieu Arnold\nmat@FreeBSD.
 matthew [label=Matthew Seaman\nmatt...@freebsd.org\n2012/02/07]
 mezz [label=Jeremy Messenger\nm...@freebsd.org\n2004/04/30]
 mharo [label=Michael Haro\nmh...@freebsd.org\n1999/04/13]
+milki [label=Jonathan Chu\nmi...@freebsd.org\n2013/12/15]
 miwi [label=Martin Wilke\nm...@freebsd.org\n2006/06/04]
 mm [label=Martin Matuska\n...@freebsd.org\n2007/04/04]
 mnag [label=Marcus Alves Grando\nm...@freebsd.org\n2005/09/15]
@@ -301,6 +302,7 @@ eadler - antoine
 eadler - dbn
 eadler - bdrewery
 eadler - gjb
+eadler - milki
 eadler - tj
 eadler - vg
 
@@ -510,6 +512,7 @@ stas - araujo
 steve - netchild
 
 swills - feld
+swills - milki
 swills - pclin
 
 tabthorpe - ashish
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r259496 - in releng/10.0/usr.sbin: bhyve bhyveload

2013-12-16 Thread Peter Grehan

Author: grehan
Date: Tue Dec 17 06:39:48 2013
New Revision: 259496
URL: http://svnweb.freebsd.org/changeset/base/259496

Log:
  MFStable-10 r259301
  
MFC r256657,r257018,r257347,r257423,r257729,r257767,
r257933,r258609,r258614,r258668,r258673,r258855
  
Pull in some minor bugfixes and functionality enhancements
from CURRENT. These are candidates to be moved to 10.0-release.
  
r258855
mdoc: quote string properly.
  
r258673
Don't create an initial value for the host filesystem of /.
  
r258668
Allow bhyve and bhyveload to attach to tty devices.
  
r258614
The 22-bit Data Byte Count (DBC) field of a Physical Region Descriptor was
being read as a 32-bit quantity by the bhyve AHCI driver.
  
r258609
Fix discrepancy between the IOAPIC ID advertised by firmware tables and the
actual value read by the guest.
  
r257933
Route the legacy timer interrupt (IRQ0) to pin 2 of the IOAPIC.
  
r257767
Fix an off-by-one error when iterating over the emulated PCI BARs.
  
r257729
Add the VM name to the process name with setproctitle().
  
r257423
Make the virtual ioapic available unconditionally in a bhyve virtual 
machine.
  
r257347
Update copyright to include the author of the LPC bridge emulation code.
  
hand-merge r257018
Tidy usage messages for bhyve and bhyveload.
  
r256657
Add an option to bhyveload(8) that allows setting a loader environment 
variable
from the command line.
  
  Approved by:  re@ (gjb)

Modified:
  releng/10.0/usr.sbin/bhyve/acpi.c
  releng/10.0/usr.sbin/bhyve/acpi.h
  releng/10.0/usr.sbin/bhyve/bhyverun.c
  releng/10.0/usr.sbin/bhyve/block_if.c
  releng/10.0/usr.sbin/bhyve/mevent.c
  releng/10.0/usr.sbin/bhyve/mptbl.c
  releng/10.0/usr.sbin/bhyve/mptbl.h
  releng/10.0/usr.sbin/bhyve/pci_ahci.c
  releng/10.0/usr.sbin/bhyve/pci_emul.c
  releng/10.0/usr.sbin/bhyve/pci_virtio_net.c
  releng/10.0/usr.sbin/bhyve/pit_8254.c
  releng/10.0/usr.sbin/bhyve/uart_emul.c
  releng/10.0/usr.sbin/bhyveload/bhyveload.8
  releng/10.0/usr.sbin/bhyveload/bhyveload.c
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/usr.sbin/bhyve/acpi.c
==
--- releng/10.0/usr.sbin/bhyve/acpi.c   Tue Dec 17 05:13:37 2013
(r259495)
+++ releng/10.0/usr.sbin/bhyve/acpi.c   Tue Dec 17 06:39:48 2013
(r259496)
@@ -253,13 +253,23 @@ basl_fwrite_madt(FILE *fp)
EFPRINTF(fp, [0001]\t\tSubtable Type : 01\n);
EFPRINTF(fp, [0001]\t\tLength : 0C\n);
/* iasl expects a hex value for the i/o apic id */
-   EFPRINTF(fp, [0001]\t\tI/O Apic ID : %02x\n, basl_ncpu);
+   EFPRINTF(fp, [0001]\t\tI/O Apic ID : %02x\n, 0);
EFPRINTF(fp, [0001]\t\tReserved : 00\n);
EFPRINTF(fp, [0004]\t\tAddress : fec0\n);
EFPRINTF(fp, [0004]\t\tInterrupt : \n);
EFPRINTF(fp, \n);
 
-   /* Override the 8259 chained vector. XXX maybe not needed */
+   /* Legacy IRQ0 is connected to pin 2 of the IOAPIC */
+   EFPRINTF(fp, [0001]\t\tSubtable Type : 02\n);
+   EFPRINTF(fp, [0001]\t\tLength : 0A\n);
+   EFPRINTF(fp, [0001]\t\tBus : 00\n);
+   EFPRINTF(fp, [0001]\t\tSource : 00\n);
+   EFPRINTF(fp, [0004]\t\tInterrupt : 0002\n);
+   EFPRINTF(fp, [0002]\t\tFlags (decoded below) : 0005\n);
+   EFPRINTF(fp, \t\t\tPolarity : 1\n);
+   EFPRINTF(fp, \t\t\tTrigger Mode : 1\n);
+   EFPRINTF(fp, \n);
+
EFPRINTF(fp, [0001]\t\tSubtable Type : 02\n);
EFPRINTF(fp, [0001]\t\tLength : 0A\n);
EFPRINTF(fp, [0001]\t\tBus : 00\n);
@@ -806,7 +816,7 @@ static struct {
 };
 
 int
-acpi_build(struct vmctx *ctx, int ncpu, int ioapic)
+acpi_build(struct vmctx *ctx, int ncpu)
 {
int err;
int i;
@@ -814,11 +824,6 @@ acpi_build(struct vmctx *ctx, int ncpu, 
err = 0;
basl_ncpu = ncpu;
 
-   if (!ioapic) {
-   fprintf(stderr, ACPI tables require an ioapic\n);
-   return (EINVAL);
-   }
-
/*
 * For debug, allow the user to have iasl compiler output sent
 * to stdout rather than /dev/null

Modified: releng/10.0/usr.sbin/bhyve/acpi.h
==
--- releng/10.0/usr.sbin/bhyve/acpi.h   Tue Dec 17 05:13:37 2013
(r259495)
+++ releng/10.0/usr.sbin/bhyve/acpi.h   Tue Dec 17 06:39:48 2013
(r259496)
@@ -29,6 +29,6 @@
 #ifndef _ACPI_H_
 #define _ACPI_H_
 
-intacpi_build(struct vmctx *ctx, int ncpu, int ioapic);
+intacpi_build(struct vmctx *ctx, int ncpu);
 
 #endif /* _ACPI_H_ */

Modified: releng/10.0/usr.sbin/bhyve/bhyverun.c
==
--- releng/10.0/usr.sbin/bhyve/bhyverun.c   Tue Dec 17 05:13:37 2013
(r259495)
+++ releng/10.0/usr.sbin/bhyve/bhyverun.c   Tue Dec 17

svn commit: r259497 - head/sys/i386/i386

2013-12-16 Thread Sergey Kandaurov

Author: pluknet
Date: Tue Dec 17 07:47:27 2013
New Revision: 259497
URL: http://svnweb.freebsd.org/changeset/base/259497

Log:
  Nuke symbols.raw
  
  This file seems to be unused since the switch to the ELF binary format.
  
  Discussed with:   jhb

Deleted:
  head/sys/i386/i386/symbols.raw
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

55 matches

Mail list logo