Re: svn commit: r277100 - head/sys/dev/ahci

[Konstantin Belousov]

On Tue, Jan 13, 2015 at 01:21:00AM +, Steven Hartland wrote:
> Looks like this missed the addition of the new quirk to AHCI_Q_BIT_STRING.
Thank you for noting.

See the patch below.  Is anything else amiss ?

Index: sys/dev/ahci/ahci.h
===
--- sys/dev/ahci/ahci.h (revision 277100)
+++ sys/dev/ahci/ahci.h (working copy)
@@ -591,7 +591,8 @@
"\015NOMSI" \
"\016ATI_PMP_BUG"   \
"\017MAXIO_64K" \
-   "\020SATA1_UNIT0"
+   "\020SATA1_UNIT0"   \
+   "\021ABAR0"
 
 int ahci_attach(device_t dev);
 int ahci_detach(device_t dev);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r277100 - head/sys/dev/ahci

[Steven Hartland]

On 13/01/2015 08:20, Konstantin Belousov wrote:

On Tue, Jan 13, 2015 at 01:21:00AM +, Steven Hartland wrote:

Looks like this missed the addition of the new quirk to AHCI_Q_BIT_STRING.

Thank you for noting.

See the patch below.  Is anything else amiss ?

Index: sys/dev/ahci/ahci.h
===
--- sys/dev/ahci/ahci.h (revision 277100)
+++ sys/dev/ahci/ahci.h (working copy)
@@ -591,7 +591,8 @@
"\015NOMSI"   \
"\016ATI_PMP_BUG" \
"\017MAXIO_64K"   \
-   "\020SATA1_UNIT0"
+   "\020SATA1_UNIT0" \
+   "\021ABAR0"
  
  int ahci_attach(device_t dev);

  int ahci_detach(device_t dev);

Yep that's the puppy, everything else looks good :)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277126 - head/sys/dev/ahci

[Konstantin Belousov]

Author: kib
Date: Tue Jan 13 09:50:15 2015
New Revision: 277126
URL: https://svnweb.freebsd.org/changeset/base/277126

Log:
  Complete r277100: add AHCI_Q_ABAR0 tp AHCI_Q_BIT_STRING.
  
  Noted and reviewed by:smh
  MFC after:6 days

Modified:
  head/sys/dev/ahci/ahci.h

Modified: head/sys/dev/ahci/ahci.h
==
--- head/sys/dev/ahci/ahci.hTue Jan 13 09:29:34 2015(r277125)
+++ head/sys/dev/ahci/ahci.hTue Jan 13 09:50:15 2015(r277126)
@@ -591,7 +591,8 @@ enum ahci_err_type {
"\015NOMSI" \
"\016ATI_PMP_BUG"   \
"\017MAXIO_64K" \
-   "\020SATA1_UNIT0"
+   "\020SATA1_UNIT0"   \
+   "\021ABAR0"
 
 int ahci_attach(device_t dev);
 int ahci_detach(device_t dev);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r277054 - in head: share/man/man4 sys/modules/cc sys/modules/cc/cc_dctcp sys/netinet sys/netinet/cc

[Midori Kato]

Hi Pedro,

Thank you for your mention about the patent problem.
Thanks to Hiren and Lars support, we have already discuss patent with
microsoft people. But I am not sure that we must care about Linux because
we worked on our implementation without linux. Let's wait and see if redhat
people say about it.

Again, thank you for your interest to dctcp implementation :)

Regards,
-- Midori


2015-01-13 1:06 GMT+09:00 Pedro Giffuni :

>
> On 12/01/2015 03:33 a.m., Hiren Panchasara wrote:
>
>> Author: hiren
>> Date: Mon Jan 12 08:33:04 2015
>> New Revision: 277054
>> URL: https://svnweb.freebsd.org/changeset/base/277054
>>
>> Log:
>>DCTCP (Data Center TCP) implementation.
>>   DCTCP congestion control algorithm aims to maximise throughput and
>> minimise
>>latency in data center networks by utilising the proportion of Explicit
>>Congestion Notification (ECN) marked packets received from capable
>> hardware as a
>>congestion signal.
>>   Highlights:
>>Implemented as a mod_cc(4) module.
>>ECN (Explicit congestion notification) processing is done differently
>> from
>>RFC3168.
>>Takes one-sided DCTCP into consideration where only one of the sides
>> is using
>>DCTCP and other is using standard ECN.
>>   IETF draft: http://tools.ietf.org/html/draft-bensley-tcpm-dctcp-00
>>Thesis report by Midori Kato: https://eggert.org/students/
>> kato-thesis.pdf
>>   Submitted by: Midori Kato  and
>> Lars Eggert 
>> with help and modifications from
>> hiren
>>Differential Revision:   https://reviews.freebsd.org/D604
>>Reviewed by: gnn
>>
>
> Missing
>
> RelNotes=yes
>
> Huge thank you!
>
> FWIW, I thought the linux guys wouldn't take it over some GPL vs patent
> issue but apparently redhat pushed some muscle and just did it:
>
> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=
> e3118e8359bb7c59555aca60c725106e6d78c5ce
>
> Not that I care much what they do ;).
>
> Pedro.
>
>
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277127 - head/sys/fs/cuse

[Hans Petter Selasky]

Author: hselasky
Date: Tue Jan 13 13:32:18 2015
New Revision: 277127
URL: https://svnweb.freebsd.org/changeset/base/277127

Log:
  Don't use POLLNVAL as a return value from the client side poll
  function. Many existing clients don't understand POLLNVAL and instead
  relies on an error code from the read(), write() or ioctl() system
  call. Also make sure we wakeup any client pollers before the cuse
  server is closing, so they don't wait forever for an event.

Modified:
  head/sys/fs/cuse/cuse.c

Modified: head/sys/fs/cuse/cuse.c
==
--- head/sys/fs/cuse/cuse.c Tue Jan 13 09:50:15 2015(r277126)
+++ head/sys/fs/cuse/cuse.c Tue Jan 13 13:32:18 2015(r277127)
@@ -142,6 +142,7 @@ static struct cuse_server *cuse_alloc_un
 static int cuse_alloc_unit_id[CUSE_DEVICES_MAX];
 static struct cuse_memory cuse_mem[CUSE_ALLOC_UNIT_MAX];
 
+static void cuse_server_wakeup_all_client_locked(struct cuse_server *pcs);
 static void cuse_client_kqfilter_read_detach(struct knote *kn);
 static void cuse_client_kqfilter_write_detach(struct knote *kn);
 static int cuse_client_kqfilter_read_event(struct knote *kn, long hint);
@@ -648,6 +649,8 @@ cuse_server_free(void *arg)
return;
}
cuse_server_is_closing(pcs);
+   /* final client wakeup, if any */
+   cuse_server_wakeup_all_client_locked(pcs);
 
TAILQ_REMOVE(&cuse_server_head, pcs, entry);
 
@@ -716,6 +719,9 @@ cuse_server_close(struct cdev *dev, int 
 
cuse_lock();
cuse_server_is_closing(pcs);
+   /* final client wakeup, if any */
+   cuse_server_wakeup_all_client_locked(pcs);
+
knlist_clear(&pcs->selinfo.si_note, 1);
cuse_unlock();
 
@@ -920,6 +926,18 @@ cuse_server_wakeup_locked(struct cuse_se
KNOTE_LOCKED(&pcs->selinfo.si_note, 0);
 }
 
+static void
+cuse_server_wakeup_all_client_locked(struct cuse_server *pcs)
+{
+   struct cuse_client *pcc;
+
+   TAILQ_FOREACH(pcc, &pcs->hcli, entry) {
+   pcc->cflags |= (CUSE_CLI_KNOTE_NEED_READ |
+   CUSE_CLI_KNOTE_NEED_WRITE);
+   }
+   cuse_server_wakeup_locked(pcs);
+}
+
 static int
 cuse_free_unit_by_id_locked(struct cuse_server *pcs, int id)
 {
@@ -1226,11 +1244,7 @@ cuse_server_ioctl(struct cdev *dev, unsi
 * We don't know which direction caused the event.
 * Wakeup both!
 */
-   TAILQ_FOREACH(pcc, &pcs->hcli, entry) {
-   pcc->cflags |= (CUSE_CLI_KNOTE_NEED_READ |
-   CUSE_CLI_KNOTE_NEED_WRITE);
-   }
-   cuse_server_wakeup_locked(pcs);
+   cuse_server_wakeup_all_client_locked(pcs);
cuse_unlock();
break;
 
@@ -1677,7 +1691,7 @@ cuse_client_poll(struct cdev *dev, int e
 
error = cuse_client_get(&pcc);
if (error != 0)
-   return (POLLNVAL);
+   goto pollnval;
 
temp = 0;
 
@@ -1705,8 +1719,10 @@ cuse_client_poll(struct cdev *dev, int e
error = cuse_client_receive_command_locked(pccmd, 0, 0);
cuse_unlock();
 
+   cuse_cmd_unlock(pccmd);
+
if (error < 0) {
-   revents = POLLNVAL;
+   goto pollnval;
} else {
revents = 0;
if (error & CUSE_POLL_READ)
@@ -1716,10 +1732,12 @@ cuse_client_poll(struct cdev *dev, int e
if (error & CUSE_POLL_ERROR)
revents |= (events & POLLHUP);
}
-
-   cuse_cmd_unlock(pccmd);
-
return (revents);
+
+ pollnval:
+   /* XXX many clients don't understand POLLNVAL */
+   return (events & (POLLHUP | POLLPRI | POLLIN |
+   POLLRDNORM | POLLOUT | POLLWRNORM));
 }
 
 static int
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277128 - head/usr.sbin/fstyp

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Jan 13 13:59:48 2015
New Revision: 277128
URL: https://svnweb.freebsd.org/changeset/base/277128

Log:
  Fix detection of ext2/ext3 filesystems that lack labels.
  
  MFC after:1 month
  Sponsored by: The FreeBSD Foundation

Modified:
  head/usr.sbin/fstyp/ext2fs.c

Modified: head/usr.sbin/fstyp/ext2fs.c
==
--- head/usr.sbin/fstyp/ext2fs.cTue Jan 13 13:32:18 2015
(r277127)
+++ head/usr.sbin/fstyp/ext2fs.cTue Jan 13 13:59:48 2015
(r277128)
@@ -78,12 +78,6 @@ fstyp_ext2fs(FILE *fp, char *label, size
if (s_volume_name[0] == '/')
s_volume_name += 1;
 
-   /* Check for volume label */
-   if (s_volume_name[0] == '\0') {
-   free(fs);
-   return (1);
-   }
-
strlcpy(label, s_volume_name, size);
free(fs);
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277129 - in head/sys: conf dev/usb dev/usb/template

[Ruslan Bukin]

Author: br
Date: Tue Jan 13 14:03:56 2015
New Revision: 277129
URL: https://svnweb.freebsd.org/changeset/base/277129

Log:
  Add usb template SERIALNET allowing us to have both USB CDC Ethernet
  and USB CDC Modem same time by single cable.
  
  Reviewed by:  hselasky@

Added:
  head/sys/dev/usb/template/usb_template_serialnet.c   (contents, props changed)
Modified:
  head/sys/conf/files
  head/sys/dev/usb/template/usb_template.c
  head/sys/dev/usb/template/usb_template.h
  head/sys/dev/usb/usb_ioctl.h

Modified: head/sys/conf/files
==
--- head/sys/conf/files Tue Jan 13 13:59:48 2015(r277128)
+++ head/sys/conf/files Tue Jan 13 14:03:56 2015(r277129)
@@ -2559,6 +2559,7 @@ dev/usb/template/usb_template_mouse.c op
 dev/usb/template/usb_template_msc.coptional usb_template
 dev/usb/template/usb_template_mtp.coptional usb_template
 dev/usb/template/usb_template_phone.c  optional usb_template
+dev/usb/template/usb_template_serialnet.c  optional usb_template
 #
 # USB END
 #

Modified: head/sys/dev/usb/template/usb_template.c
==
--- head/sys/dev/usb/template/usb_template.cTue Jan 13 13:59:48 2015
(r277128)
+++ head/sys/dev/usb/template/usb_template.cTue Jan 13 14:03:56 2015
(r277129)
@@ -1371,6 +1371,9 @@ usb_temp_setup_by_index(struct usb_devic
case USB_TEMP_PHONE:
err = usb_temp_setup(udev, &usb_template_phone);
break;
+   case USB_TEMP_SERIALNET:
+   err = usb_temp_setup(udev, &usb_template_serialnet);
+   break;
default:
return (USB_ERR_INVAL);
}

Modified: head/sys/dev/usb/template/usb_template.h
==
--- head/sys/dev/usb/template/usb_template.hTue Jan 13 13:59:48 2015
(r277128)
+++ head/sys/dev/usb/template/usb_template.hTue Jan 13 14:03:56 2015
(r277129)
@@ -106,6 +106,7 @@ extern const struct usb_temp_device_desc
 extern const struct usb_temp_device_desc usb_template_msc;
 extern const struct usb_temp_device_desc usb_template_mtp;
 extern const struct usb_temp_device_desc usb_template_phone;
+extern const struct usb_temp_device_desc usb_template_serialnet;
 
 usb_error_tusb_temp_setup(struct usb_device *,
const struct usb_temp_device_desc *);

Added: head/sys/dev/usb/template/usb_template_serialnet.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/dev/usb/template/usb_template_serialnet.c  Tue Jan 13 14:03:56 
2015(r277129)
@@ -0,0 +1,387 @@
+/*-
+ * Copyright (c) 2015 Ruslan Bukin 
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * This file contains the USB template for USB Networking and Serial
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#ifdef USB_GLOBAL_INCLUDE_FILE
+#include USB_GLOBAL_INCLUDE_FILE
+#else
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#endif /* USB_GLOBAL_INCLUDE_FILE */
+
+#defineMODEM_IFACE_0 0
+#defineMODEM_IFACE_1 1
+
+enu

svn commit: r277130 - head/sys/dev/ixl

[Bjoern A. Zeeb]

Author: bz
Date: Tue Jan 13 14:15:00 2015
New Revision: 277130
URL: https://svnweb.freebsd.org/changeset/base/277130

Log:
  Move the vsi variable outside of the #ifdef block to unbreak NOIP kernels
  after r277084.
  
  MFC after:6 days
  X-MFC with:   r277084

Modified:
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/ixl_txrx.c
==
--- head/sys/dev/ixl/ixl_txrx.c Tue Jan 13 14:03:56 2015(r277129)
+++ head/sys/dev/ixl/ixl_txrx.c Tue Jan 13 14:15:00 2015(r277130)
@@ -1108,8 +1108,8 @@ int
 ixl_init_rx_ring(struct ixl_queue *que)
 {
struct  rx_ring *rxr = &que->rxr;
-#if defined(INET6) || defined(INET)
struct ixl_vsi  *vsi = que->vsi;
+#if defined(INET6) || defined(INET)
struct ifnet*ifp = vsi->ifp;
struct lro_ctrl *lro = &rxr->lro;
 #endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277131 - head/sys/modules/usb/template

[Hans Petter Selasky]

Author: hselasky
Date: Tue Jan 13 14:26:05 2015
New Revision: 277131
URL: https://svnweb.freebsd.org/changeset/base/277131

Log:
  Add new USB template to the USB template module.

Modified:
  head/sys/modules/usb/template/Makefile

Modified: head/sys/modules/usb/template/Makefile
==
--- head/sys/modules/usb/template/Makefile  Tue Jan 13 14:15:00 2015
(r277130)
+++ head/sys/modules/usb/template/Makefile  Tue Jan 13 14:26:05 2015
(r277131)
@@ -39,6 +39,7 @@ SRCS= opt_bus.h opt_usb.h device_if.h bu
usb_template_mouse.c \
usb_template_msc.c \
usb_template_mtp.c \
-   usb_template_phone.c
+   usb_template_phone.c \
+   usb_template_serialnet.c
 
 .include 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277132 - in head/sys: arm/samsung/exynos dev/uart

[Ruslan Bukin]

Author: br
Date: Tue Jan 13 15:04:28 2015
New Revision: 277132
URL: https://svnweb.freebsd.org/changeset/base/277132

Log:
  Rename Exynos UART driver. No functional change.
  
  Submitted by: Michal Meloun 

Modified:
  head/sys/arm/samsung/exynos/exynos_uart.c
  head/sys/dev/uart/uart.h
  head/sys/dev/uart/uart_bus_fdt.c

Modified: head/sys/arm/samsung/exynos/exynos_uart.c
==
--- head/sys/arm/samsung/exynos/exynos_uart.c   Tue Jan 13 14:26:05 2015
(r277131)
+++ head/sys/arm/samsung/exynos/exynos_uart.c   Tue Jan 13 15:04:28 2015
(r277132)
@@ -50,17 +50,17 @@ __FBSDID("$FreeBSD$");
 #defineDEF_CLK 1
 
 static int sscomspeed(long, long);
-static int s3c24x0_uart_param(struct uart_bas *, int, int, int, int);
+static int exynos4210_uart_param(struct uart_bas *, int, int, int, int);
 
 /*
  * Low-level UART interface.
  */
-static int s3c2410_probe(struct uart_bas *bas);
-static void s3c2410_init(struct uart_bas *bas, int, int, int, int);
-static void s3c2410_term(struct uart_bas *bas);
-static void s3c2410_putc(struct uart_bas *bas, int);
-static int s3c2410_rxready(struct uart_bas *bas);
-static int s3c2410_getc(struct uart_bas *bas, struct mtx *mtx);
+static int exynos4210_probe(struct uart_bas *bas);
+static void exynos4210_init(struct uart_bas *bas, int, int, int, int);
+static void exynos4210_term(struct uart_bas *bas);
+static void exynos4210_putc(struct uart_bas *bas, int);
+static int exynos4210_rxready(struct uart_bas *bas);
+static int exynos4210_getc(struct uart_bas *bas, struct mtx *mtx);
 
 extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
 
@@ -76,7 +76,7 @@ sscomspeed(long speed, long frequency)
 }
 
 static int
-s3c24x0_uart_param(struct uart_bas *bas, int baudrate, int databits,
+exynos4210_uart_param(struct uart_bas *bas, int baudrate, int databits,
 int stopbits, int parity)
 {
int brd, ulcon;
@@ -127,38 +127,38 @@ s3c24x0_uart_param(struct uart_bas *bas,
return (0);
 }
 
-struct uart_ops uart_s3c2410_ops = {
-   .probe = s3c2410_probe,
-   .init = s3c2410_init,
-   .term = s3c2410_term,
-   .putc = s3c2410_putc,
-   .rxready = s3c2410_rxready,
-   .getc = s3c2410_getc,
+struct uart_ops uart_exynos4210_ops = {
+   .probe = exynos4210_probe,
+   .init = exynos4210_init,
+   .term = exynos4210_term,
+   .putc = exynos4210_putc,
+   .rxready = exynos4210_rxready,
+   .getc = exynos4210_getc,
 };
 
 static int
-s3c2410_probe(struct uart_bas *bas)
+exynos4210_probe(struct uart_bas *bas)
 {
 
return (0);
 }
 
 static void
-s3c2410_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
+exynos4210_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
 int parity)
 {
 
if (bas->rclk == 0)
bas->rclk = DEF_CLK;
 
-   KASSERT(bas->rclk != 0, ("s3c2410_init: Invalid rclk"));
+   KASSERT(bas->rclk != 0, ("exynos4210_init: Invalid rclk"));
 
uart_setreg(bas, SSCOM_UCON, 0);
uart_setreg(bas, SSCOM_UFCON,
UFCON_TXTRIGGER_8 | UFCON_RXTRIGGER_8 |
UFCON_TXFIFO_RESET | UFCON_RXFIFO_RESET |
UFCON_FIFO_ENABLE);
-   s3c24x0_uart_param(bas, baudrate, databits, stopbits, parity);
+   exynos4210_uart_param(bas, baudrate, databits, stopbits, parity);
 
/* Enable UART. */
uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT | UCON_RXMODE_INT |
@@ -167,13 +167,13 @@ s3c2410_init(struct uart_bas *bas, int b
 }
 
 static void
-s3c2410_term(struct uart_bas *bas)
+exynos4210_term(struct uart_bas *bas)
 {
/* XXX */
 }
 
 static void
-s3c2410_putc(struct uart_bas *bas, int c)
+exynos4210_putc(struct uart_bas *bas, int c)
 {
 
while ((bus_space_read_4(bas->bst, bas->bsh, SSCOM_UFSTAT) &
@@ -184,7 +184,7 @@ s3c2410_putc(struct uart_bas *bas, int c
 }
 
 static int
-s3c2410_rxready(struct uart_bas *bas)
+exynos4210_rxready(struct uart_bas *bas)
 {
 
return ((uart_getreg(bas, SSCOM_UTRSTAT) & UTRSTAT_RXREADY) ==
@@ -192,7 +192,7 @@ s3c2410_rxready(struct uart_bas *bas)
 }
 
 static int
-s3c2410_getc(struct uart_bas *bas, struct mtx *mtx)
+exynos4210_getc(struct uart_bas *bas, struct mtx *mtx)
 {
int utrstat;
 
@@ -205,34 +205,34 @@ s3c2410_getc(struct uart_bas *bas, struc
return (bus_space_read_1(bas->bst, bas->bsh, SSCOM_URXH));
 }
 
-static int s3c2410_bus_probe(struct uart_softc *sc);
-static int s3c2410_bus_attach(struct uart_softc *sc);
-static int s3c2410_bus_flush(struct uart_softc *, int);
-static int s3c2410_bus_getsig(struct uart_softc *);
-static int s3c2410_bus_ioctl(struct uart_softc *, int, intptr_t);
-static int s3c2410_bus_ipend(struct uart_softc *);
-static int s3c2410_bus_param(struct uart_softc *, int, int, int, int);
-static int s3c2410_bus_receive(struct uart_softc *);
-static int s3c2410_bus_setsig(struct uart_softc *, int);
-static 

svn commit: r277133 - head/contrib/elftoolchain/libdwarf

[Ed Maste]

Author: emaste
Date: Tue Jan 13 15:18:54 2015
New Revision: 277133
URL: https://svnweb.freebsd.org/changeset/base/277133

Log:
  libdwarf: add missing break
  
  Reported by:  Coverity
  CID:  1193315
  MFC after:1 week
  Sponsored by: The FreeBSD Foundation

Modified:
  head/contrib/elftoolchain/libdwarf/dwarf_attrval.c

Modified: head/contrib/elftoolchain/libdwarf/dwarf_attrval.c
==
--- head/contrib/elftoolchain/libdwarf/dwarf_attrval.c  Tue Jan 13 15:04:28 
2015(r277132)
+++ head/contrib/elftoolchain/libdwarf/dwarf_attrval.c  Tue Jan 13 15:18:54 
2015(r277133)
@@ -125,6 +125,7 @@ dwarf_attrval_signed(Dwarf_Die die, Dwar
break;
case DW_FORM_data4:
*valp = (int32_t) at->u[0].s64;
+   break;
case DW_FORM_data8:
case DW_FORM_sdata:
*valp = at->u[0].s64;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r277054 - in head: share/man/man4 sys/modules/cc sys/modules/cc/cc_dctcp sys/netinet sys/netinet/cc

[Pedro Giffuni]

Midori-san;

I am aware of the patent issue as we spoke about it with George (gnn@) 
at BSDCan.
It's not really an issue for us, and if you find more patent under the 
same free-use

conditions, feel free to send patches :).

The linux guys are aware of the patent but I agree that the issues linux
might have are none of our business.

Thank you all involved in the DCTCP implementation: it's great to see 
FreeBSD's

networking implementation getting better!

Best regards,

Pedro.


On 01/13/15 06:49, Midori Kato wrote:

Hi Pedro,

Thank you for your mention about the patent problem.
Thanks to Hiren and Lars support, we have already discuss patent with 
microsoft people. But I am not sure that we must care about Linux 
because we worked on our implementation without linux. Let's wait and 
see if redhat people say about it.


Again, thank you for your interest to dctcp implementation :)

Regards,
-- Midori


2015-01-13 1:06 GMT+09:00 Pedro Giffuni >:



On 12/01/2015 03:33 a.m., Hiren Panchasara wrote:

Author: hiren
Date: Mon Jan 12 08:33:04 2015
New Revision: 277054
URL: https://svnweb.freebsd.org/changeset/base/277054

Log:
   DCTCP (Data Center TCP) implementation.
  DCTCP congestion control algorithm aims to maximise
throughput and minimise
   latency in data center networks by utilising the proportion
of Explicit
   Congestion Notification (ECN) marked packets received from
capable hardware as a
   congestion signal.
  Highlights:
   Implemented as a mod_cc(4) module.
   ECN (Explicit congestion notification) processing is done
differently from
   RFC3168.
   Takes one-sided DCTCP into consideration where only one of
the sides is using
   DCTCP and other is using standard ECN.
  IETF draft:
http://tools.ietf.org/html/draft-bensley-tcpm-dctcp-00
   Thesis report by Midori Kato:
https://eggert.org/students/kato-thesis.pdf
  Submitted by: Midori Kato mailto:kat...@sfc.wide.ad.jp>> and
Lars Eggert mailto:l...@netapp.com>>
with help and modifications from
hiren
   Differential Revision: https://reviews.freebsd.org/D604
   Reviewed by: gnn


Missing

RelNotes=yes

Huge thank you!

FWIW, I thought the linux guys wouldn't take it over some GPL vs
patent issue but apparently redhat pushed some muscle and just did it:


http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=e3118e8359bb7c59555aca60c725106e6d78c5ce

Not that I care much what they do ;).

Pedro.




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

Re: svn commit: r272886 - in head/sys: netinet netinet6

[Bryan Venteicher]

On Mon, Jan 12, 2015 at 5:20 PM, Michael Tuexen 
wrote:

>
> > On 12 Jan 2015, at 18:42, Bjoern A. Zeeb  wrote:
> >
> >
> >> On 12 Jan 2015, at 15:51 , John Baldwin  wrote:
> >>
> >> On Tuesday, January 06, 2015 07:07:11 PM Bryan Venteicher wrote:
> >>> On Tue, Jan 6, 2015 at 5:27 PM, Bryan Drewery 
> wrote:
>  On 1/6/2015 4:00 PM, Bryan Venteicher wrote:
> > On Tue, Jan 6, 2015 at 2:52 PM, John Nielsen  >
> > > wrote:
> >   Bryan-
> >
> >   On Oct 10, 2014, at 12:09 AM, Bryan Venteicher  >
> >   > wrote:
> >> Author: bryanv
> >> Date: Fri Oct 10 06:08:59 2014
> >> New Revision: 272886
> >> URL: https://svnweb.freebsd.org/changeset/base/272886
> >>
> >> Log:
> >> Add context pointer and source address to the UDP tunnel callback
> >>
> >> These are needed for the forthcoming vxlan implementation. The
> 
>  context
> 
> >> pointer means we do not have to use a spare pointer field in the
> 
>  inpcb,
> 
> >> and the source address is required to populate vxlan's forwarding
> 
>  table.
> 
> >> While I highly doubt there is an out of tree consumer of the UDP
> >> tunneling callback, this change may be a difficult to eventually
> 
>  MFC.
> 
> >   I noticed this comment while doing an MFC of vxlan to my local
> tree.
> >   Do you think an MFC to 10-STABLE of this change (and vxlan
> >   generally) will be feasible? Is there precedent for ABI changes
> like
> >   this being sanctioned? Could symbol versioning help?
> >
> > I'd like to get some consensus on whether this commit is OK to MFC.
> With
> > this commit, vxlan should be an easy to MFC.
> 
>  Breaking ABI will potentially hurt packages. FreeBSD builds packages
> for
>  the oldest supported release on a branch. If you break ABI in 10.2
> while
>  we are building packages for 10.1 then any packages using these
>  interfaces may not work right or result in panics packages with kmods.
>  Please consider that.
> >>>
> >>> The only user visible change of this commit would be the addition of a
> >>> field at the end of 'struct udpcb'. I don't think that is a problem, at
> >>> least a similar change didn't prevent the MFC of UDP Lite.
> >>>
> >>> The kernel part of this changes the UDP tunneling functions which I
> guess
> >>> there could be a 3rd party module out there, but I very highly doubt
> that,
> >>> based on how un-useful the previous interface was.
> >>
> >> Userland should not be impacted by this at all.  (Nothing in userland
> cares
> >> about udpcb's internals.)  I think there was only ever one consumer for
> the
> >> existing UDP tunneling code (bz@ knows what it is).  I'm not sure
> where it
> >> lives.
> >
> > If you are talking about u_tun_func then it came from SCTP over UDP
> tunneling.  tuexen and rrs are your friends.
> rrs implemented it to support SCTP over UDP over IPv[46]. To be more
> precisely, to
> receive such packets.
>
>

So I am just being overly cautious and this change is fine to MFC?


Best regards
> Michael
> >
> > I was wondering if it could be used similarly for IPsec UDPencap but I
> think that went nowhere back then.
> >
> > —
> > Bjoern A. Zeeb  Charles Haddon Spurgeon:
> > "Friendship is one of the sweetest joys of life.  Many might have failed
> > beneath the bitterness of their trial  had they not found a friend."
> >
> >
> >
>
>
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277134 - head/sys/boot/usb

[Hans Petter Selasky]

Author: hselasky
Date: Tue Jan 13 16:06:38 2015
New Revision: 277134
URL: https://svnweb.freebsd.org/changeset/base/277134

Log:
  Add new USB template to the USB bootloader module.

Modified:
  head/sys/boot/usb/usbcore.mk

Modified: head/sys/boot/usb/usbcore.mk
==
--- head/sys/boot/usb/usbcore.mkTue Jan 13 15:18:54 2015
(r277133)
+++ head/sys/boot/usb/usbcore.mkTue Jan 13 16:06:38 2015
(r277134)
@@ -142,6 +142,7 @@ KSRCS+= usb_template_mouse.c
 KSRCS+=usb_template_kbd.c
 KSRCS+=usb_template_audio.c
 KSRCS+=usb_template_phone.c
+KSRCS+=usb_template_serialnet.c
 
 #
 # USB mass storage support
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277135 - head/sys/dev/cxgbe/iw_cxgbe

[Navdeep Parhar]

Author: np
Date: Tue Jan 13 16:18:31 2015
New Revision: 277135
URL: https://svnweb.freebsd.org/changeset/base/277135

Log:
  cxgbe/iw_cxgbe: fix whitespace nit in r277102.
  
  Reported by:  stefanf@

Modified:
  head/sys/dev/cxgbe/iw_cxgbe/cm.c

Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c
==
--- head/sys/dev/cxgbe/iw_cxgbe/cm.cTue Jan 13 16:06:38 2015
(r277134)
+++ head/sys/dev/cxgbe/iw_cxgbe/cm.cTue Jan 13 16:18:31 2015
(r277135)
@@ -955,7 +955,7 @@ send_mpa_req(struct c4iw_ep *ep)
if (mpa_rev_to_use == 2)
mpalen += sizeof(struct mpa_v2_conn_params);
 
-mpa = malloc(mpalen, M_CXGBE, M_NOWAIT);
+   mpa = malloc(mpalen, M_CXGBE, M_NOWAIT);
if (mpa == NULL) {
 failed:
connect_reply_upcall(ep, -ENOMEM);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277136 - in head/sys/dev/usb: . controller

[Hans Petter Selasky]

Author: hselasky
Date: Tue Jan 13 16:37:43 2015
New Revision: 277136
URL: https://svnweb.freebsd.org/changeset/base/277136

Log:
  Resolve a special case deadlock: When two or more threads are
  simultaneously detaching kernel drivers on the same USB device we can
  get stuck in the "usb_wait_pending_ref_locked()" function because the
  conditions needed for allowing detach are not met. The "destroy_dev()"
  function waits for all system calls involving the given character
  device to return. Character device system calls may lock the USB
  enumeration lock, which is also held when "destroy_dev()" is
  called. This can sometimes lead to a deadlock not noticed by
  WITNESS. The current solution is to ensure the calling thread is the
  only one holding the USB enumeration lock and prevent other threads
  from getting refs while a USB device detach is ongoing. This turned
  out not to be sufficient. To solve this deadlock we could use
  "destroy_dev_sched()" to schedule the device destruction in the
  background, but then we don't know when it is safe to free() the
  private data of the character device. Instead a callback function is
  executed by the USB explore process to kill off any leftover USB
  character devices synchronously after the USB device explore code is
  finished and the USB enumeration lock is no longer locked. This makes
  porting easier and also ensures us that character devices must
  eventually go away after a USB device detach.
  
  While at it ensure that "flag_iserror" is only written when "priv_mtx"
  is locked, which is protecting it.
  
  MFC after:5 days

Modified:
  head/sys/dev/usb/controller/usb_controller.c
  head/sys/dev/usb/usb_bus.h
  head/sys/dev/usb/usb_dev.c
  head/sys/dev/usb/usb_device.c
  head/sys/dev/usb/usb_device.h

Modified: head/sys/dev/usb/controller/usb_controller.c
==
--- head/sys/dev/usb/controller/usb_controller.cTue Jan 13 16:18:31 
2015(r277135)
+++ head/sys/dev/usb/controller/usb_controller.cTue Jan 13 16:37:43 
2015(r277136)
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -219,6 +220,11 @@ usb_detach(device_t dev)
usb_proc_mwait(USB_BUS_EXPLORE_PROC(bus),
&bus->detach_msg[0], &bus->detach_msg[1]);
 
+#if USB_HAVE_UGEN
+   /* Wait for cleanup to complete */
+   usb_proc_mwait(USB_BUS_EXPLORE_PROC(bus),
+   &bus->cleanup_msg[0], &bus->cleanup_msg[1]);
+#endif
USB_BUS_UNLOCK(bus);
 
 #if USB_HAVE_PER_BUS_PROCESS
@@ -631,6 +637,32 @@ usb_bus_shutdown(struct usb_proc_msg *pm
USB_BUS_LOCK(bus);
 }
 
+/**
+ * usb_bus_cleanup
+ *
+ * This function is used to cleanup leftover USB character devices.
+ **/
+#if USB_HAVE_UGEN
+static void
+usb_bus_cleanup(struct usb_proc_msg *pm)
+{
+   struct usb_bus *bus;
+   struct usb_fs_privdata *pd;
+
+   bus = ((struct usb_bus_msg *)pm)->bus;
+
+   while ((pd = LIST_FIRST(&bus->pd_cleanup_list)) != NULL) {
+
+   LIST_REMOVE(pd, pd_next);
+   USB_BUS_UNLOCK(bus);
+
+   usb_destroy_dev_sync(pd);
+
+   USB_BUS_LOCK(bus);
+   }
+}
+#endif
+
 static void
 usb_power_wdog(void *arg)
 {
@@ -813,6 +845,14 @@ usb_attach_sub(device_t dev, struct usb_
bus->shutdown_msg[1].hdr.pm_callback = &usb_bus_shutdown;
bus->shutdown_msg[1].bus = bus;
 
+#if USB_HAVE_UGEN
+   LIST_INIT(&bus->pd_cleanup_list);
+   bus->cleanup_msg[0].hdr.pm_callback = &usb_bus_cleanup;
+   bus->cleanup_msg[0].bus = bus;
+   bus->cleanup_msg[1].hdr.pm_callback = &usb_bus_cleanup;
+   bus->cleanup_msg[1].bus = bus;
+#endif
+
 #if USB_HAVE_PER_BUS_PROCESS
/* Create USB explore and callback processes */
 

Modified: head/sys/dev/usb/usb_bus.h
==
--- head/sys/dev/usb/usb_bus.h  Tue Jan 13 16:18:31 2015(r277135)
+++ head/sys/dev/usb/usb_bus.h  Tue Jan 13 16:37:43 2015(r277136)
@@ -27,6 +27,8 @@
 #ifndef _USB_BUS_H_
 #define_USB_BUS_H_
 
+struct usb_fs_privdata;
+
 /*
  * The following structure defines the USB explore message sent to the USB
  * explore process.
@@ -83,6 +85,10 @@ struct usb_bus {
struct usb_bus_msg resume_msg[2];
struct usb_bus_msg reset_msg[2];
struct usb_bus_msg shutdown_msg[2];
+#if USB_HAVE_UGEN
+   struct usb_bus_msg cleanup_msg[2];
+   LIST_HEAD(,usb_fs_privdata) pd_cleanup_list;
+#endif
/*
 * This mutex protects the USB hardware:
 */

Modified: head/sys/dev/usb/usb_dev.c
==
--- head/sys/dev/usb/usb_dev.c  Tue Jan 13 16:18:31 2015(r277135)
+++ head/sys/dev/

Re: svn commit: r272886 - in head/sys: netinet netinet6

[John Baldwin]

On Monday, January 12, 2015 05:42:34 PM Bjoern A. Zeeb wrote:
> > On 12 Jan 2015, at 15:51 , John Baldwin  wrote:
> > 
> > On Tuesday, January 06, 2015 07:07:11 PM Bryan Venteicher wrote:
> >> On Tue, Jan 6, 2015 at 5:27 PM, Bryan Drewery  
wrote:
> >>> On 1/6/2015 4:00 PM, Bryan Venteicher wrote:
>  On Tue, Jan 6, 2015 at 2:52 PM, John Nielsen   
>  > wrote:
> Bryan-
> 
> On Oct 10, 2014, at 12:09 AM, Bryan Venteicher  > 
> > wrote:
> > Author: bryanv
> > Date: Fri Oct 10 06:08:59 2014
> > New Revision: 272886
> > URL: https://svnweb.freebsd.org/changeset/base/272886
> > 
> > Log:
> > Add context pointer and source address to the UDP tunnel callback
> > 
> > These are needed for the forthcoming vxlan implementation. The
> >>> 
> >>> context
> >>> 
> > pointer means we do not have to use a spare pointer field in the
> >>> 
> >>> inpcb,
> >>> 
> > and the source address is required to populate vxlan's forwarding
> >>> 
> >>> table.
> >>> 
> > While I highly doubt there is an out of tree consumer of the UDP
> > tunneling callback, this change may be a difficult to eventually
> >>> 
> >>> MFC.
> >>> 
> I noticed this comment while doing an MFC of vxlan to my local tree.
> Do you think an MFC to 10-STABLE of this change (and vxlan
> generally) will be feasible? Is there precedent for ABI changes like
> this being sanctioned? Could symbol versioning help?
>  
>  I'd like to get some consensus on whether this commit is OK to MFC.
>  With
>  this commit, vxlan should be an easy to MFC.
> >>> 
> >>> Breaking ABI will potentially hurt packages. FreeBSD builds packages for
> >>> the oldest supported release on a branch. If you break ABI in 10.2 while
> >>> we are building packages for 10.1 then any packages using these
> >>> interfaces may not work right or result in panics packages with kmods.
> >>> Please consider that.
> >> 
> >> The only user visible change of this commit would be the addition of a
> >> field at the end of 'struct udpcb'. I don't think that is a problem, at
> >> least a similar change didn't prevent the MFC of UDP Lite.
> >> 
> >> The kernel part of this changes the UDP tunneling functions which I guess
> >> there could be a 3rd party module out there, but I very highly doubt
> >> that,
> >> based on how un-useful the previous interface was.
> > 
> > Userland should not be impacted by this at all.  (Nothing in userland
> > cares
> > about udpcb's internals.)  I think there was only ever one consumer for
> > the
> > existing UDP tunneling code (bz@ knows what it is).  I'm not sure where it
> > lives.
> 
> If you are talking about u_tun_func then it came from SCTP over UDP
> tunneling.  tuexen and rrs are your friends.
> 
> I was wondering if it could be used similarly for IPsec UDPencap but I think
> that went nowhere back then.

It is the IPsec UDPencap case I was thinking of.  If that is a dead end then 
the only consumer is already in-tree, so in this case I think this is ok to 
MFC (but remember to bump __FreeBSD_version).

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

svn commit: r277143 - head/sys/dev/ixl

[Jack F Vogel]

Author: jfv
Date: Tue Jan 13 18:56:29 2015
New Revision: 277143
URL: https://svnweb.freebsd.org/changeset/base/277143

Log:
  Complete the RX side RSS code: parse the encoded portion of the RX
  descriptor to determine the correct hash type.
  
  MFC after:1 week

Modified:
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/ixl_txrx.c
==
--- head/sys/dev/ixl/ixl_txrx.c Tue Jan 13 18:56:28 2015(r277142)
+++ head/sys/dev/ixl/ixl_txrx.c Tue Jan 13 18:56:29 2015(r277143)
@@ -1364,6 +1364,63 @@ ixl_rx_discard(struct rx_ring *rxr, int 
return;
 }
 
+#ifdef RSS
+/*
+** i40e_ptype_to_hash: parse the packet type
+** to determine the appropriate hash.
+*/
+static inline int
+ixl_ptype_to_hash(u8 ptype)
+{
+struct i40e_rx_ptype_decoded   decoded;
+   u8  ex = 0
+
+   decode = decode_rx_desc_ptype(ptype);
+   ex = decoded.outer_frag;
+
+   if (!decoded.known)
+   return M_HASHTYPE_OPAQUE;
+
+   if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_L2) 
+   return M_HASHTYPE_OPAQUE;
+
+   /* Note: anything that gets to this point is IP */
+if (decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV6) { 
+   switch (decoded.inner_prot) {
+   case I40E_RX_PTYPE_INNER_PROT_TCP:
+   if (ex)
+   return M_HASHTYPE_RSS_TCP_IPV6_EX;
+   else
+   return M_HASHTYPE_RSS_TCP_IPV6;
+   case I40E_RX_PTYPE_INNER_PROT_UDP:
+   if (ex)
+   return M_HASHTYPE_RSS_UDP_IPV6_EX;
+   else
+   return M_HASHTYPE_RSS_UDP_IPV6;
+   default:
+   if (ex)
+   return M_HASHTYPE_RSS_IPV6_EX;
+   else
+   return M_HASHTYPE_RSS_IPV6;
+   }
+   }
+if (decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV4) { 
+   switch (decoded.inner_prot) {
+   case I40E_RX_PTYPE_INNER_PROT_TCP:
+   return M_HASHTYPE_RSS_TCP_IPV4;
+   case I40E_RX_PTYPE_INNER_PROT_UDP:
+   if (ex)
+   return M_HASHTYPE_RSS_UDP_IPV4_EX;
+   else
+   return M_HASHTYPE_RSS_UDP_IPV4;
+   default:
+   return M_HASHTYPE_RSS_IPV4;
+   }
+   }
+   /* We should never get here!! */
+   return M_HASHTYPE_OPAQUE;
+}
+#endif /* RSS */
 
 /*
  *
@@ -1562,10 +1619,13 @@ ixl_rxeof(struct ixl_queue *que, int cou
if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
ixl_rx_checksum(sendmp, status, error, ptype);
 #ifdef RSS
-   /* XXX Work in Progress, fix the build for now */
-#endif
+   sendmp->m_pkthdr.flowid =
+   le32toh(cur->wb.qword0.hi_dword.rss);
+   M_HASHTYPE_SET(sendmp, ixl_ptype_to_hash(ptype));
+#else
sendmp->m_pkthdr.flowid = que->msix;
M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE);
+#endif
}
 next_desc:
bus_dmamap_sync(rxr->dma.tag, rxr->dma.map,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277146 - in head: etc/mtree lib lib/libclang_rt tools/build/mk

[Dimitry Andric]

Author: dim
Date: Tue Jan 13 19:54:47 2015
New Revision: 277146
URL: https://svnweb.freebsd.org/changeset/base/277146

Log:
  Connect libclang_rt to the build, for specific architectures.  This
  contains the libraries for Address Sanitizer (asan), Undefined Behavior
  Sanitizer (ubsan) and Profile Guided Optimization.
  
  ASan is a fast memory error detector. It can detect the following types
  of bugs:
  
  Out-of-bounds accesses to heap, stack and globals
  Use-after-free
  Use-after-return (to some extent)
  Double-free, invalid free
  Memory leaks (experimental)
  
  Typical slowdown introduced by AddressSanitizer is 2x.
  
  UBSan is a fast and compatible undefined behavior checker. It enables a
  number of undefined behavior checks that have small runtime cost and no
  impact on address space layout or ABI.
  
  PLEASE NOTE: the sanitizers still have some rough edges on FreeBSD,
  particularly on i386.  These will hopefully be smoothed out in the
  coming time.
  
  Differential Revision: https://reviews.freebsd.org/D1505

Modified:
  head/etc/mtree/BSD.debug.dist
  head/etc/mtree/BSD.usr.dist
  head/lib/Makefile
  head/lib/libclang_rt/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/mtree/BSD.debug.dist
==
--- head/etc/mtree/BSD.debug.dist   Tue Jan 13 19:38:43 2015
(r277145)
+++ head/etc/mtree/BSD.debug.dist   Tue Jan 13 19:54:47 2015
(r277146)
@@ -24,6 +24,14 @@
 games
 ..
 lib
+clang
+3.5.0
+lib
+freebsd
+..
+..
+..
+..
 engines
 ..
 i18n

Modified: head/etc/mtree/BSD.usr.dist
==
--- head/etc/mtree/BSD.usr.dist Tue Jan 13 19:38:43 2015(r277145)
+++ head/etc/mtree/BSD.usr.dist Tue Jan 13 19:54:47 2015(r277146)
@@ -14,6 +14,14 @@
 lib
 aout
 ..
+clang
+3.5.0
+lib
+freebsd
+..
+..
+..
+..
 compat
 aout
 ..

Modified: head/lib/Makefile
==
--- head/lib/Makefile   Tue Jan 13 19:38:43 2015(r277145)
+++ head/lib/Makefile   Tue Jan 13 19:54:47 2015(r277146)
@@ -13,6 +13,7 @@ SUBDIR_ORDERED=   ${_csu} \
libc \
libc_nonshared \
libcompiler_rt \
+   ${_libclang_rt} \
${_libcplusplus} \
${_libcxxrt} \
libelf \
@@ -211,6 +212,15 @@ _libcom_err= libcom_err
 _libldns=  libldns
 .endif
 
+# The libraries under libclang_rt can only be built by clang, and only make
+# sense to build when clang is enabled at all.  Furthermore, they can only be
+# built for certain architectures.
+.if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \
+(${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
+(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb"))
+_libclang_rt=  libclang_rt
+.endif
+
 .if ${MK_LIBCPLUSPLUS} != "no"
 _libcxxrt= libcxxrt
 _libcplusplus= libc++

Modified: head/lib/libclang_rt/Makefile
==
--- head/lib/libclang_rt/Makefile   Tue Jan 13 19:38:43 2015
(r277145)
+++ head/lib/libclang_rt/Makefile   Tue Jan 13 19:54:47 2015
(r277146)
@@ -1,10 +1,18 @@
 # $FreeBSD$
 
-SUBDIR=asan\
-   asan_cxx\
-   profile\
-   san\
-   ubsan\
-   ubsan_cxx
+.include 
+
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+SUBDIR+= asan\
+asan_cxx\
+san\
+ubsan\
+ubsan_cxx
+.endif
+
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
+(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
+SUBDIR+= profile
+.endif
 
 .include 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Tue Jan 13 19:38:43 
2015(r277145)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Tue Jan 13 19:54:47 
2015(r277146)
@@ -527,6 +527,23 @@ OLD_FILES+=usr/include/clang/3.5.0/xmmin
 OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.0
 OLD_DIRS+=usr/include/clang
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cx

svn commit: r277147 - head/lib/libmagic

[Dimitry Andric]

Author: dim
Date: Tue Jan 13 20:37:57 2015
New Revision: 277147
URL: https://svnweb.freebsd.org/changeset/base/277147

Log:
  Since the merge of file 5.21 in r276415 and r276416, stable/9 and
  stable/10 cannot be built from FreeBSD 8.x.  This is because the
  build-tools stage requires libmagic, but lib/libmagic/config.h was
  generated on head, and it now enables using the xlocale.h APIs, which
  are not supported on 8.x (and on 9.x before __FreeBSD_version 900506).
  
  See also the start of this thread on -stable:
  https://lists.freebsd.org/pipermail/freebsd-stable/2015-January/081521.html
  
  To fix this, conditionalize the use of xlocale.h APIs to make
  bootstrapping from older FreeBSD versions work correctly.
  
  Reviewed by:  delphij
  MFC after:3 days
  Differential Revision: https://reviews.freebsd.org/D1518

Modified:
  head/lib/libmagic/config.h

Modified: head/lib/libmagic/config.h
==
--- head/lib/libmagic/config.h  Tue Jan 13 19:54:47 2015(r277146)
+++ head/lib/libmagic/config.h  Tue Jan 13 20:37:57 2015(r277147)
@@ -1,5 +1,13 @@
 /* $FreeBSD$ */
 
+/* Get __FreeBSD_version. */
+#include 
+
+/* Only specific versions of FreeBSD support xlocale */
+#if __FreeBSD_version >= 102 || (__FreeBSD_version < 100 && 
__FreeBSD_version >= 900506)
+#define FREEBSD_XLOCALE_SUPPORT 1
+#endif
+
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
@@ -48,7 +56,9 @@
 #define HAVE_FORK 1
 
 /* Define to 1 if you have the `freelocale' function. */
+#ifdef FREEBSD_XLOCALE_SUPPORT
 #define HAVE_FREELOCALE 1
+#endif
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
@@ -102,7 +112,9 @@
 #define HAVE_MMAP 1
 
 /* Define to 1 if you have the `newlocale' function. */
+#ifdef FREEBSD_XLOCALE_SUPPORT
 #define HAVE_NEWLOCALE 1
+#endif
 
 /* Define to 1 if you have the `pread' function. */
 #define HAVE_PREAD 1
@@ -195,7 +207,9 @@
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `uselocale' function. */
+#ifdef FREEBSD_XLOCALE_SUPPORT
 #define HAVE_USELOCALE 1
+#endif
 
 /* Define to 1 if you have the `utime' function. */
 #define HAVE_UTIME 1
@@ -235,7 +249,9 @@
 #define HAVE_WORKING_VFORK 1
 
 /* Define to 1 if you have the  header file. */
+#ifdef FREEBSD_XLOCALE_SUPPORT
 #define HAVE_XLOCALE_H 1
+#endif
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_ZLIB_H 1
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277149 - in head/sys/amd64: include vmm vmm/amd vmm/intel

[Neel Natu]

Author: neel
Date: Tue Jan 13 22:00:47 2015
New Revision: 277149
URL: https://svnweb.freebsd.org/changeset/base/277149

Log:
  'struct vm_exception' was intended to be used only as the collateral for the
  VM_INJECT_EXCEPTION ioctl. However it morphed into other uses like keeping
  track pending exceptions for a vcpu. This in turn causes confusion because
  some fields in 'struct vm_exception' like 'vcpuid' make sense only in the
  ioctl context. It also makes it harder to add or remove structure fields.
  
  Fix this by using 'struct vm_exception' only to communicate information
  from userspace to vmm.ko when injecting an exception.
  
  Also, add a field 'restart_instruction' to 'struct vm_exception'. This
  field is set to '1' for exceptions where the faulting instruction is
  restarted after the exception is handled.
  
  MFC after:  1 week

Modified:
  head/sys/amd64/include/vmm.h
  head/sys/amd64/include/vmm_dev.h
  head/sys/amd64/vmm/amd/svm.c
  head/sys/amd64/vmm/intel/vmx.c
  head/sys/amd64/vmm/vmm.c
  head/sys/amd64/vmm/vmm_dev.c

Modified: head/sys/amd64/include/vmm.h
==
--- head/sys/amd64/include/vmm.hTue Jan 13 21:29:24 2015
(r277148)
+++ head/sys/amd64/include/vmm.hTue Jan 13 22:00:47 2015
(r277149)
@@ -289,7 +289,7 @@ struct vpmtmr *vm_pmtmr(struct vm *vm);
 struct vrtc *vm_rtc(struct vm *vm);
 
 /*
- * Inject exception 'vme' into the guest vcpu. This function returns 0 on
+ * Inject exception 'vector' into the guest vcpu. This function returns 0 on
  * success and non-zero on failure.
  *
  * Wrapper functions like 'vm_inject_gp()' should be preferred to calling
@@ -299,7 +299,8 @@ struct vrtc *vm_rtc(struct vm *vm);
  * This function should only be called in the context of the thread that is
  * executing this vcpu.
  */
-int vm_inject_exception(struct vm *vm, int vcpuid, struct vm_exception *vme);
+int vm_inject_exception(struct vm *vm, int vcpuid, int vector, int err_valid,
+uint32_t errcode, int restart_instruction);
 
 /*
  * This function is called after a VM-exit that occurred during exception or
@@ -628,4 +629,6 @@ vm_inject_ss(void *vm, int vcpuid, int e
 
 void vm_inject_pf(void *vm, int vcpuid, int error_code, uint64_t cr2);
 
+int vm_restart_instruction(void *vm, int vcpuid);
+
 #endif /* _VMM_H_ */

Modified: head/sys/amd64/include/vmm_dev.h
==
--- head/sys/amd64/include/vmm_dev.hTue Jan 13 21:29:24 2015
(r277148)
+++ head/sys/amd64/include/vmm_dev.hTue Jan 13 22:00:47 2015
(r277149)
@@ -63,6 +63,7 @@ struct vm_exception {
int vector;
uint32_terror_code;
int error_code_valid;
+   int restart_instruction;
 };
 
 struct vm_lapic_msi {

Modified: head/sys/amd64/vmm/amd/svm.c
==
--- head/sys/amd64/vmm/amd/svm.cTue Jan 13 21:29:24 2015
(r277148)
+++ head/sys/amd64/vmm/amd/svm.cTue Jan 13 22:00:47 2015
(r277149)
@@ -1201,7 +1201,6 @@ svm_vmexit(struct svm_softc *svm_sc, int
struct vmcb_state *state;
struct vmcb_ctrl *ctrl;
struct svm_regctx *ctx;
-   struct vm_exception exception;
uint64_t code, info1, info2, val;
uint32_t eax, ecx, edx;
int error, errcode_valid, handled, idtvec, reflect;
@@ -1315,6 +1314,7 @@ svm_vmexit(struct svm_softc *svm_sc, int
/* fallthru */
default:
errcode_valid = 0;
+   info1 = 0;
break;
}
KASSERT(vmexit->inst_length == 0, ("invalid inst_length (%d) "
@@ -1323,17 +1323,10 @@ svm_vmexit(struct svm_softc *svm_sc, int
 
if (reflect) {
/* Reflect the exception back into the guest */
-   bzero(&exception, sizeof(struct vm_exception));
-   exception.vector = idtvec;
-   if (errcode_valid) {
-   exception.error_code = info1;
-   exception.error_code_valid = 1;
-   }
VCPU_CTR2(svm_sc->vm, vcpu, "Reflecting exception "
-   "%d/%#x into the guest", exception.vector,
-   exception.error_code);
-   error = vm_inject_exception(svm_sc->vm, vcpu,
-   &exception);
+   "%d/%#x into the guest", idtvec, (int)info1);
+   error = vm_inject_exception(svm_sc->vm, vcpu, idtvec,
+   errcode_valid, info1, 0);
KASSERT(error == 0, ("%s: vm_inject_exception error %d",
__func__, error));
}

svn commit: r277151 - head/sys/dev/ixl

[Jack F Vogel]

Author: jfv
Date: Tue Jan 13 22:13:30 2015
New Revision: 277151
URL: https://svnweb.freebsd.org/changeset/base/277151

Log:
  Cleanup some bogus code in the RSS config, and add the include
  for the rss option file. And bump the version.
  
  MFC after:1 week

Modified:
  head/sys/dev/ixl/if_ixl.c
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/if_ixl.c
==
--- head/sys/dev/ixl/if_ixl.c   Tue Jan 13 22:13:03 2015(r277150)
+++ head/sys/dev/ixl/if_ixl.c   Tue Jan 13 22:13:30 2015(r277151)
@@ -41,7 +41,7 @@
 /*
  *  Driver version
  */
-char ixl_driver_version[] = "1.3.0";
+char ixl_driver_version[] = "1.3.1";
 
 /*
  *  PCI Device ID Table
@@ -3212,12 +3212,12 @@ static void ixl_config_rss(struct ixl_vs
 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP);
if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6)
 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_OTHER);
+if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6_EX)
+   set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6);
if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6)
 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
 if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP);
-if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
-set_hena |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;
 #else
set_hena =
((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |

Modified: head/sys/dev/ixl/ixl_txrx.c
==
--- head/sys/dev/ixl/ixl_txrx.c Tue Jan 13 22:13:03 2015(r277150)
+++ head/sys/dev/ixl/ixl_txrx.c Tue Jan 13 22:13:30 2015(r277151)
@@ -40,6 +40,7 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_rss.h"
 #include "ixl.h"
 
 /* Local Prototypes */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277156 - in head/sys/arm: arm include

[Ganbold Tsagaankhuu]

Author: ganbold
Date: Wed Jan 14 01:23:50 2015
New Revision: 277156
URL: https://svnweb.freebsd.org/changeset/base/277156

Log:
  Correct cpu type, it was rather Cortex A12 R0.
  
  Approved by:stas (mentor)

Modified:
  head/sys/arm/arm/cpufunc.c
  head/sys/arm/arm/identcpu.c
  head/sys/arm/include/armreg.h

Modified: head/sys/arm/arm/cpufunc.c
==
--- head/sys/arm/arm/cpufunc.c  Tue Jan 13 22:51:44 2015(r277155)
+++ head/sys/arm/arm/cpufunc.c  Wed Jan 14 01:23:50 2015(r277156)
@@ -1067,11 +1067,11 @@ set_cpufuncs()
cputype == CPU_ID_CORTEXA9R1 ||
cputype == CPU_ID_CORTEXA9R2 ||
cputype == CPU_ID_CORTEXA9R3 ||
+   cputype == CPU_ID_CORTEXA12R0 ||
cputype == CPU_ID_CORTEXA15R0 ||
cputype == CPU_ID_CORTEXA15R1 ||
cputype == CPU_ID_CORTEXA15R2 ||
cputype == CPU_ID_CORTEXA15R3 ||
-   cputype == CPU_ID_CORTEXA17 ||
cputype == CPU_ID_KRAIT ) {
cpufuncs = cortexa_cpufuncs;
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */

Modified: head/sys/arm/arm/identcpu.c
==
--- head/sys/arm/arm/identcpu.c Tue Jan 13 22:51:44 2015(r277155)
+++ head/sys/arm/arm/identcpu.c Wed Jan 14 01:23:50 2015(r277156)
@@ -185,6 +185,8 @@ const struct cpuidtab cpuids[] = {
  generic_steppings },
{ CPU_ID_CORTEXA9R3,CPU_CLASS_CORTEXA,  "Cortex A9-r3",
  generic_steppings },
+   { CPU_ID_CORTEXA12R0,   CPU_CLASS_CORTEXA,  "Cortex A12-r0",
+ generic_steppings },
{ CPU_ID_CORTEXA15R0,   CPU_CLASS_CORTEXA,  "Cortex A15-r0",
  generic_steppings },
{ CPU_ID_CORTEXA15R1,   CPU_CLASS_CORTEXA,  "Cortex A15-r1",
@@ -193,8 +195,6 @@ const struct cpuidtab cpuids[] = {
  generic_steppings },
{ CPU_ID_CORTEXA15R3,   CPU_CLASS_CORTEXA,  "Cortex A15-r3",
  generic_steppings },
-   { CPU_ID_CORTEXA17, CPU_CLASS_CORTEXA,  "Cortex A17",
- generic_steppings },
{ CPU_ID_KRAIT, CPU_CLASS_KRAIT,"Krait",
  generic_steppings },
 

Modified: head/sys/arm/include/armreg.h
==
--- head/sys/arm/include/armreg.h   Tue Jan 13 22:51:44 2015
(r277155)
+++ head/sys/arm/include/armreg.h   Wed Jan 14 01:23:50 2015
(r277156)
@@ -133,11 +133,11 @@
 #define CPU_ID_CORTEXA9R1  0x411fc090
 #define CPU_ID_CORTEXA9R2  0x412fc090
 #define CPU_ID_CORTEXA9R3  0x413fc090
+#define CPU_ID_CORTEXA12R0 0x410fc0d0
 #define CPU_ID_CORTEXA15R0 0x410fc0f0
 #define CPU_ID_CORTEXA15R1 0x411fc0f0
 #define CPU_ID_CORTEXA15R2 0x412fc0f0
 #define CPU_ID_CORTEXA15R3 0x413fc0f0
-#define CPU_ID_CORTEXA17   0x410fc0d0
 #defineCPU_ID_KRAIT0x510f06f0 /* Snapdragon S4 Pro/APQ8064 
*/
 #defineCPU_ID_TI925T   0x54029250
 #define CPU_ID_MV88FR131   0x56251310 /* Marvell Feroceon 88FR131 Core */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277157 - head/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Wed Jan 14 02:18:29 2015
New Revision: 277157
URL: https://svnweb.freebsd.org/changeset/base/277157

Log:
  Do not remap Open Firmware mappings covered by the direct map. It's
  pointless and wastes resources.
  
  MFC after:1 week

Modified:
  head/sys/powerpc/aim/mmu_oea64.c

Modified: head/sys/powerpc/aim/mmu_oea64.c
==
--- head/sys/powerpc/aim/mmu_oea64.cWed Jan 14 01:23:50 2015
(r277156)
+++ head/sys/powerpc/aim/mmu_oea64.cWed Jan 14 02:18:29 2015
(r277157)
@@ -224,6 +224,8 @@ uma_zone_t  moea64_mpvo_zone; /* zone for
 #defineBPVO_POOL_SIZE  327680
 static struct  pvo_entry *moea64_bpvo_pool;
 static int moea64_bpvo_pool_index = 0;
+SYSCTL_INT(_machdep, OID_AUTO, moea64_allocated_bpvo_entries, CTLFLAG_RD, 
+&moea64_bpvo_pool_index, 0, "");
 
 #defineVSID_NBPW   (sizeof(u_int32_t) * 8)
 #ifdef __powerpc64__
@@ -534,6 +536,11 @@ moea64_add_ofw_mappings(mmu_t mmup, phan
 
DISABLE_TRANS(msr);
for (off = 0; off < translations[i].om_len; off += PAGE_SIZE) {
+   /* If this address is direct-mapped, skip remapping */
+   if (hw_direct_map && translations[i].om_va == pa_base &&
+   moea64_calc_wimg(pa_base + off, VM_MEMATTR_DEFAULT) 
== LPTE_M)
+   continue;
+
if (moea64_pvo_find_va(kernel_pmap,
translations[i].om_va + off) != NULL)
continue;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277158 - head/sys/kern

[Jamie Gritton]

Author: jamie
Date: Wed Jan 14 03:52:41 2015
New Revision: 277158
URL: https://svnweb.freebsd.org/changeset/base/277158

Log:
  Don't set prison's pr_ip4s or pr_ip6s to -1.
  
  PR:   196474
  MFC after:3 days

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c   Wed Jan 14 02:18:29 2015(r277157)
+++ head/sys/kern/kern_jail.c   Wed Jan 14 03:52:41 2015(r277158)
@@ -800,7 +800,7 @@ kern_jail_set(struct thread *td, struct 
 #ifdef INET
error = vfs_getopt(opts, "ip4.addr", &op, &ip4s);
if (error == ENOENT)
-   ip4s = (pr_flags & PR_IP4_DISABLE) ? 0 : -1;
+   ip4s = 0;
else if (error != 0)
goto done_free;
else if (ip4s & (sizeof(*ip4) - 1)) {
@@ -858,7 +858,7 @@ kern_jail_set(struct thread *td, struct 
 #ifdef INET6
error = vfs_getopt(opts, "ip6.addr", &op, &ip6s);
if (error == ENOENT)
-   ip6s = (pr_flags & PR_IP6_DISABLE) ? 0 : -1;
+   ip6s = 0;
else if (error != 0)
goto done_free;
else if (ip6s & (sizeof(*ip6) - 1)) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277159 - in head/sys: kern sys

[Jamie Gritton]

Author: jamie
Date: Wed Jan 14 04:50:28 2015
New Revision: 277159
URL: https://svnweb.freebsd.org/changeset/base/277159

Log:
  Remove the prison flags PR_IP4_DISABLE and PR_IP6_DISABLE, which have been
  write-only for as long as they've existed.

Modified:
  head/sys/kern/kern_jail.c
  head/sys/sys/jail.h

Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c   Wed Jan 14 03:52:41 2015(r277158)
+++ head/sys/kern/kern_jail.c   Wed Jan 14 04:50:28 2015(r277159)
@@ -187,10 +187,10 @@ struct jailsys_flags {
{ "vnet", 0, PR_VNET },
 #endif
 #ifdef INET
-   { "ip4", PR_IP4_USER | PR_IP4_DISABLE, PR_IP4_USER },
+   { "ip4", PR_IP4_USER, PR_IP4_USER },
 #endif
 #ifdef INET6
-   { "ip6", PR_IP6_USER | PR_IP6_DISABLE, PR_IP6_USER },
+   { "ip6", PR_IP6_USER, PR_IP6_USER },
 #endif
 };
 const size_t pr_flag_jailsys_size = sizeof(pr_flag_jailsys);
@@ -807,11 +807,9 @@ kern_jail_set(struct thread *td, struct 
error = EINVAL;
goto done_free;
} else {
-   ch_flags |= PR_IP4_USER | PR_IP4_DISABLE;
-   if (ip4s == 0)
-   pr_flags |= PR_IP4_USER | PR_IP4_DISABLE;
-   else {
-   pr_flags = (pr_flags & ~PR_IP4_DISABLE) | PR_IP4_USER;
+   ch_flags |= PR_IP4_USER;
+   pr_flags |= PR_IP4_USER;
+   if (ip4s > 0) {
ip4s /= sizeof(*ip4);
if (ip4s > jail_max_af_ips) {
error = EINVAL;
@@ -865,11 +863,9 @@ kern_jail_set(struct thread *td, struct 
error = EINVAL;
goto done_free;
} else {
-   ch_flags |= PR_IP6_USER | PR_IP6_DISABLE;
-   if (ip6s == 0)
-   pr_flags |= PR_IP6_USER | PR_IP6_DISABLE;
-   else {
-   pr_flags = (pr_flags & ~PR_IP6_DISABLE) | PR_IP6_USER;
+   ch_flags |= PR_IP6_USER;
+   pr_flags |= PR_IP6_USER;
+   if (ip6s > 0) {
ip6s /= sizeof(*ip6);
if (ip6s > jail_max_af_ips) {
error = EINVAL;
@@ -1249,8 +1245,7 @@ kern_jail_set(struct thread *td, struct 
{
 #ifdef INET
if (!(ch_flags & PR_IP4_USER))
-   pr->pr_flags |=
-   PR_IP4 | PR_IP4_USER | PR_IP4_DISABLE;
+   pr->pr_flags |= PR_IP4 | PR_IP4_USER;
else if (!(pr_flags & PR_IP4_USER)) {
pr->pr_flags |= ppr->pr_flags & PR_IP4;
if (ppr->pr_ip4 != NULL) {
@@ -1265,8 +1260,7 @@ kern_jail_set(struct thread *td, struct 
 #endif
 #ifdef INET6
if (!(ch_flags & PR_IP6_USER))
-   pr->pr_flags |=
-   PR_IP6 | PR_IP6_USER | PR_IP6_DISABLE;
+   pr->pr_flags |= PR_IP6 | PR_IP6_USER;
else if (!(pr_flags & PR_IP6_USER)) {
pr->pr_flags |= ppr->pr_flags & PR_IP6;
if (ppr->pr_ip6 != NULL) {
@@ -2724,7 +2718,6 @@ prison_restrict_ip4(struct prison *pr, s
}
}
if (pr->pr_ip4s == 0) {
-   pr->pr_flags |= PR_IP4_DISABLE;
free(pr->pr_ip4, M_PRISON);
pr->pr_ip4 = NULL;
}
@@ -3065,7 +3058,6 @@ prison_restrict_ip6(struct prison *pr, s
}
}
if (pr->pr_ip6s == 0) {
-   pr->pr_flags |= PR_IP6_DISABLE;
free(pr->pr_ip6, M_PRISON);
pr->pr_ip6 = NULL;
}

Modified: head/sys/sys/jail.h
==
--- head/sys/sys/jail.h Wed Jan 14 03:52:41 2015(r277158)
+++ head/sys/sys/jail.h Wed Jan 14 04:50:28 2015(r277159)
@@ -201,8 +201,6 @@ struct prison_racct {
 #definePR_IP4_USER 0x0004  /* Restrict IPv4 addresses */
 #definePR_IP6_USER 0x0008  /* Restrict IPv6 addresses */
 #definePR_VNET 0x0010  /* Virtual network stack */
-#definePR_IP4_DISABLE  0x0020  /* Disable IPv4 */
-#definePR_IP6_DISABLE  0x0040  /* Disable IPv6 */
 #definePR_IP4_SADDRSEL 0x0080  /* Do IPv4 src addr sel. or use 
the */
/* primary jail address. */
 #definePR_IP6_SADDRSEL 0x0100  /* Do IPv6 src addr sel. or use 
the */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.

svn commit: r277162 - in head/sys/modules: cardbus cbb

[Warner Losh]

Author: imp
Date: Wed Jan 14 05:41:28 2015
New Revision: 277162
URL: https://svnweb.freebsd.org/changeset/base/277162

Log:
  On x86 force NEW_PCIB, since that's the default. While this option
  would be picked up for kernel builds, it isn't picked up for
  old-fashioned builds. Without this option, PCI bus numbers are busted
  for modules build iteratively.

Modified:
  head/sys/modules/cardbus/Makefile
  head/sys/modules/cbb/Makefile

Modified: head/sys/modules/cardbus/Makefile
==
--- head/sys/modules/cardbus/Makefile   Wed Jan 14 05:32:16 2015
(r277161)
+++ head/sys/modules/cardbus/Makefile   Wed Jan 14 05:41:28 2015
(r277162)
@@ -6,4 +6,8 @@ KMOD=   cardbus
 SRCS=  cardbus.c cardbus_cis.c cardbus_device.c \
device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CFLAGS += -DNEW_PCIB
+.endif
+
 .include 

Modified: head/sys/modules/cbb/Makefile
==
--- head/sys/modules/cbb/Makefile   Wed Jan 14 05:32:16 2015
(r277161)
+++ head/sys/modules/cbb/Makefile   Wed Jan 14 05:41:28 2015
(r277162)
@@ -6,4 +6,8 @@ KMOD=   cbb
 SRCS=  pccbb.c pccbb_isa.c pccbb_pci.c \
device_if.h bus_if.h power_if.h card_if.h isa_if.h pci_if.h pcib_if.h
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CFLAGS += -DNEW_PCIB
+.endif
+
 .include 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277164 - head/sys/dev/pccbb

[Warner Losh]

Author: imp
Date: Wed Jan 14 05:41:33 2015
New Revision: 277164
URL: https://svnweb.freebsd.org/changeset/base/277164

Log:
  Various interrelated fixes to make suspend / resume work better. We now
  can suspend / resume and unload / load cbb and cardbus without errors
  on my Lenovo T400, which wasn't possible before. Cards suspending
  and resuming in the CardBus slot not yet tested.
  o Enable memory cycles to the bridge early (as part of the new
cbb_pci_bridge_init). This fixes the Bad VCC errors which were
caused by the code accessing the device registers with this
cleared. The suspend / resume process clears it.
  o Refactor suspend / resume into bus specific code (though the ISA
code is just stubbed). This isn't strictly necessary, but makes
the initializaiton code more uniform and should be more bullet
proof in the face of variant behavior among cardbus bridges.
  o Fixup comments in the power-up sequence to reflect reality. These
comments were written for one regime of power-up, but not updated
as things were revised.
  o Add a paranoid small delay (100ms) to cover noisy cards powering
down.
  o Fix some debugging prints to be easier to grep from dmesg.
  
  Sponsored by: Netflix

Modified:
  head/sys/dev/pccbb/pccbb.c
  head/sys/dev/pccbb/pccbb_isa.c
  head/sys/dev/pccbb/pccbb_pci.c
  head/sys/dev/pccbb/pccbbvar.h

Modified: head/sys/dev/pccbb/pccbb.c
==
--- head/sys/dev/pccbb/pccbb.c  Wed Jan 14 05:41:31 2015(r277163)
+++ head/sys/dev/pccbb/pccbb.c  Wed Jan 14 05:41:33 2015(r277164)
@@ -477,7 +477,7 @@ cbb_event_thread(void *arg)
 */
mtx_lock(&Giant);
status = cbb_get(sc, CBB_SOCKET_STATE);
-   DPRINTF(("Status is 0x%x\n", status));
+   DEVPRINTF((sc->dev, "Status is %#x\n", status));
if (!CBB_CARD_PRESENT(status)) {
not_a_card = 0; /* We know card type */
cbb_removal(sc);
@@ -800,13 +800,14 @@ cbb_power(device_t brdev, int volts)
if (on) {
mtx_lock(&sc->mtx);
cnt = sc->powerintr;
+
/*
 * We have a shortish timeout of 500ms here.  Some bridges do
-* not generate a POWER_CYCLE event for 16-bit cards.  In
-* those cases, we have to cope the best we can, and having
-* only a short delay is better than the alternatives.  Others
-* raise the power cycle a smidge before it is really ready.
-* We deal with those below.
+* not generate a POWER_CYCLE event for 16-bit cards.  In those
+* cases, we have to cope the best we can, and having only a
+* short delay is better than the alternatives.  Others raise
+* the power cycle a smidge before it is really ready.  We deal
+* with those below.
 */
sane = 10;
while (!(cbb_get(sc, CBB_SOCKET_STATE) & CBB_STATE_POWER_CYCLE) 
&&
@@ -816,19 +817,18 @@ cbb_power(device_t brdev, int volts)
 
/*
 * Relax for 100ms.  Some bridges appear to assert this signal
-* right away, but before the card has stabilized.  Other
-* cards need need more time to cope up reliabily.
-* Experiments with troublesome setups show this to be a
-* "cheap" way to enhance reliabilty.  We need not do this for
-* "off" since we don't touch the card after we turn it off.
+* right away, but before the card has stabilized.  Other cards
+* need need more time to cope up reliabily.  Experiments with
+* troublesome setups show this to be a "cheap" way to enhance
+* reliabilty.
 */
pause("cbbPwr", min(hz / 10, 1));
 
/*
-* The TOPIC95B requires a little bit extra time to get its
-* act together, so delay for an additional 100ms.  Also as
-* documented below, it doesn't seem to set the POWER_CYCLE
-* bit, so don't whine if it never came on.
+* The TOPIC95B requires a little bit extra time to get its act
+* together, so delay for an additional 100ms.  Also as
+* documented below, it doesn't seem to set the POWER_CYCLE bit,
+* so don't whine if it never came on.
 */
if (sc->chipset == CB_TOPIC95)
pause("cbb95B", hz / 10);
@@ -838,26 +838,27 @@ cbb_power(device_t brdev, int volts)
 
/*
 * After the power is good, we can turn off the power interrupt.
-* However, the PC Card standard says that we must delay turning the
-* CD bit back on

svn commit: r277163 - head/sys/dev/cardbus

[Warner Losh]

Author: imp
Date: Wed Jan 14 05:41:31 2015
New Revision: 277163
URL: https://svnweb.freebsd.org/changeset/base/277163

Log:
  Add a rather obnoxious warning if you don't have NEW_PCIB defined
  since it's a total crap shoot if things will work.

Modified:
  head/sys/dev/cardbus/cardbus.c

Modified: head/sys/dev/cardbus/cardbus.c
==
--- head/sys/dev/cardbus/cardbus.c  Wed Jan 14 05:41:28 2015
(r277162)
+++ head/sys/dev/cardbus/cardbus.c  Wed Jan 14 05:41:31 2015
(r277163)
@@ -106,6 +106,8 @@ cardbus_attach(device_t cbdev)
device_printf(cbdev, "failed to allocate bus number\n");
return (ENXIO);
}
+#else
+   device_printf(cbdev, "Your bus numbers may be AFU\n");
 #endif
return (0);
 }
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277165 - head/lib/libusb

[Hans Petter Selasky]

Author: hselasky
Date: Wed Jan 14 06:46:25 2015
New Revision: 277165
URL: https://svnweb.freebsd.org/changeset/base/277165

Log:
  Fix spelling.

Modified:
  head/lib/libusb/libusb.3

Modified: head/lib/libusb/libusb.3
==
--- head/lib/libusb/libusb.3Wed Jan 14 05:41:33 2015(r277164)
+++ head/lib/libusb/libusb.3Wed Jan 14 06:46:25 2015(r277165)
@@ -42,9 +42,9 @@ The
 .Nm
 library contains interfaces for directly managing a usb device.
 The current implementation supports v1.0 of the libusb API.
-.Sh LIBRARY INITIALISATION / DEINITIALISATION
+.Sh LIBRARY INITIALISATION AND DEINITIALISATION
 .Ft int
-.Fn libusb_init libusb_context **ctx
+.Fn libusb_init "libusb_context **ctx"
 This function initialises libusb.
 It must be called at the beginning
 of the program, before other libusb routines are used.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277167 - head/usr.bin/gcore

[Justin Hibbits]

Author: jhibbits
Date: Wed Jan 14 07:02:21 2015
New Revision: 277167
URL: https://svnweb.freebsd.org/changeset/base/277167

Log:
  Make use of the new Altivec ptrace support, to save the Altivec registers in
  gcore.
  
  MFC after:2 weeks
  Relnotes: yes

Modified:
  head/usr.bin/gcore/elfcore.c

Modified: head/usr.bin/gcore/elfcore.c
==
--- head/usr.bin/gcore/elfcore.cWed Jan 14 07:01:21 2015
(r277166)
+++ head/usr.bin/gcore/elfcore.cWed Jan 14 07:02:21 2015
(r277167)
@@ -105,6 +105,9 @@ static void *elf_note_thrmisc(void *, si
 #if defined(__i386__) || defined(__amd64__)
 static void *elf_note_x86_xstate(void *, size_t *);
 #endif
+#if defined(__powerpc__)
+static void *elf_note_powerpc_vmx(void *, size_t *);
+#endif
 static void *elf_note_procstat_auxv(void *, size_t *);
 static void *elf_note_procstat_files(void *, size_t *);
 static void *elf_note_procstat_groups(void *, size_t *);
@@ -348,6 +351,9 @@ elf_putnotes(pid_t pid, struct sbuf *sb,
 #if defined(__i386__) || defined(__amd64__)
elf_putnote(NT_X86_XSTATE, elf_note_x86_xstate, tids + i, sb);
 #endif
+#if defined(__powerpc__)
+   elf_putnote(NT_PPC_VMX, elf_note_powerpc_vmx, tids + i, sb);
+#endif
}
 
 #ifndef ELFCORE_COMPAT_32
@@ -650,6 +656,32 @@ elf_note_x86_xstate(void *arg, size_t *s
 }
 #endif
 
+#if defined(__powerpc__)
+static void *
+elf_note_powerpc_vmx(void *arg, size_t *sizep)
+{
+   lwpid_t tid;
+   struct vmxreg *vmx;
+   static bool has_vmx = true;
+   struct vmxreg info;
+
+   tid = *(lwpid_t *)arg;
+   if (has_vmx) {
+   if (ptrace(PT_GETVRREGS, tid, (void *)&info,
+   sizeof(info)) != 0)
+   has_vmx = false;
+   }
+   if (!has_vmx) {
+   *sizep = 0;
+   return (NULL);
+   }
+   vmx = calloc(1, sizeof(*vmx));
+   memcpy(vmx, &info, sizeof(*vmx));
+   *sizep = sizeof(*vmx);
+   return (vmx);
+}
+#endif
+
 static void *
 procstat_sysctl(void *arg, int what, size_t structsz, size_t *sizep)
 {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r277166 - in head/sys: conf powerpc/include powerpc/powerpc

[Justin Hibbits]

Author: jhibbits
Date: Wed Jan 14 07:01:21 2015
New Revision: 277166
URL: https://svnweb.freebsd.org/changeset/base/277166

Log:
  Add Altivec/VMX register support to ptrace.
  
  MFC after:2 weeks
  Relnotes: yes

Added:
  head/sys/powerpc/powerpc/ptrace_machdep.c   (contents, props changed)
Modified:
  head/sys/conf/files.powerpc
  head/sys/powerpc/include/ptrace.h
  head/sys/powerpc/include/reg.h

Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Wed Jan 14 06:46:25 2015(r277165)
+++ head/sys/conf/files.powerpc Wed Jan 14 07:01:21 2015(r277166)
@@ -202,6 +202,7 @@ powerpc/powerpc/pic_if.mstandard
 powerpc/powerpc/pmap_dispatch.cstandard
 powerpc/powerpc/platform.c standard
 powerpc/powerpc/platform_if.m  standard
+powerpc/powerpc/ptrace_machdep.c   standard
 powerpc/powerpc/sc_machdep.c   optionalsc
 powerpc/powerpc/setjmp.S   standard
 powerpc/powerpc/sigcode32.Soptionalpowerpc | compat_freebsd32

Modified: head/sys/powerpc/include/ptrace.h
==
--- head/sys/powerpc/include/ptrace.h   Wed Jan 14 06:46:25 2015
(r277165)
+++ head/sys/powerpc/include/ptrace.h   Wed Jan 14 07:01:21 2015
(r277166)
@@ -1,6 +1,6 @@
 /*-
- * Copyright (c) 1992, 1993
- * The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2014 Justin Hibbits
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,4 +33,9 @@
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
 
+#define__HAVE_PTRACE_MACHDEP
+
+#define PT_GETVRREGS   (PT_FIRSTMACH + 0)
+#define PT_SETVRREGS   (PT_FIRSTMACH + 1)
+
 #endif

Modified: head/sys/powerpc/include/reg.h
==
--- head/sys/powerpc/include/reg.h  Wed Jan 14 06:46:25 2015
(r277165)
+++ head/sys/powerpc/include/reg.h  Wed Jan 14 07:01:21 2015
(r277166)
@@ -24,6 +24,14 @@ struct fpreg {
double fpscr;
 };
 
+/* Must match pcb.pcb_vec */
+struct vmxreg {
+   uint32_t vr[32][4];
+   uint32_t pad[2];
+   uint32_t vrsave;
+   uint32_t vscr;
+};
+
 struct dbreg {
unsigned intjunk;
 };
@@ -43,6 +51,10 @@ struct fpreg32 {
struct fpreg data;
 };
 
+struct vmxreg32 {
+   struct vmxreg data;
+};
+
 struct dbreg32 {
struct dbreg data;
 };

Added: head/sys/powerpc/powerpc/ptrace_machdep.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/powerpc/powerpc/ptrace_machdep.c   Wed Jan 14 07:01:21 2015
(r277166)
@@ -0,0 +1,82 @@
+/*-
+ * Copyright (c) 2014 Justin Hibbits
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include "opt_compat.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+int
+cpu_ptrace(struct thread *td, int req, void *addr, int data)
+{
+   int error;
+   struct pcb *pcb;
+   struct vec vec;
+
+   pcb = td->td_pcb;
+
+   bzero(&vec, sizeof(vec));
+
+   error = EINVAL;
+   switch (req) {
+   case PT_GETVRREGS:
+   if (!(cpu_features & PPC_FEATURE_HAS_ALTIVEC))
+   break;
+
+   if (pcb->pcb_flags & PCB_VEC) {
+   save_vec_nodrop(td);
+ 

svn commit: r277168 - head/sys/amd64/vmm

[Neel Natu]

Author: neel
Date: Wed Jan 14 07:18:51 2015
New Revision: 277168
URL: https://svnweb.freebsd.org/changeset/base/277168

Log:
  Fix typo (missing comma).
  
  MFC after:3 days

Modified:
  head/sys/amd64/vmm/vmm_ioport.c

Modified: head/sys/amd64/vmm/vmm_ioport.c
==
--- head/sys/amd64/vmm/vmm_ioport.c Wed Jan 14 07:02:21 2015
(r277167)
+++ head/sys/amd64/vmm/vmm_ioport.c Wed Jan 14 07:18:51 2015
(r277168)
@@ -74,7 +74,7 @@ inout_instruction(struct vm_exit *vmexit
static const char *iodesc[] = {
"outb", "outw", "outl",
"inb", "inw", "inl",
-   "outsb", "outsw", "outsd"
+   "outsb", "outsw", "outsd",
"insb", "insw", "insd",
};
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"