svn commit: r282269 - head/sys/dev/atkbdc

2015-04-30 Thread Roger Pau Monné
Author: royger
Date: Thu Apr 30 07:00:25 2015
New Revision: 282269
URL: https://svnweb.freebsd.org/changeset/base/282269

Log:
  atkbd: remove usage of x86bios
  
  Instead of trying to get the keyboard repeat rate set by the BIOS just set a
  default one. This allows removing the usage of x86bios from atkbd.
  
  Sponsored by: Citrix Systems RD
  Reviewed by: jkim, delphij
  Differential Revision: https://reviews.freebsd.org/D2399
  MFC after: 2 weeks

Modified:
  head/sys/dev/atkbdc/atkbd.c

Modified: head/sys/dev/atkbdc/atkbd.c
==
--- head/sys/dev/atkbdc/atkbd.c Thu Apr 30 04:44:41 2015(r282268)
+++ head/sys/dev/atkbdc/atkbd.c Thu Apr 30 07:00:25 2015(r282269)
@@ -47,8 +47,6 @@ __FBSDID($FreeBSD$);
 #if defined(__i386__) || defined(__amd64__)
 #include machine/md_var.h
 #include machine/psl.h
-#include compat/x86bios/x86bios.h
-#include machine/pc/bios.h
 
 #include vm/vm.h
 #include vm/pmap.h
@@ -82,6 +80,9 @@ static intatkbd_reset(KBDC kbdc, int f
 #define HAS_QUIRK(p, q)(((atkbdc_softc_t *)(p))-quirks  q)
 #define ALLOW_DISABLE_KBD(kbdc)!HAS_QUIRK(kbdc, 
KBDC_QUIRK_KEEP_ACTIVATED)
 
+#define DEFAULT_DELAY  0x1  /* 500ms */
+#define DEFAULT_RATE   0x10 /* 14Hz */
+
 int
 atkbd_probe_unit(device_t dev, int irq, int flags)
 {
@@ -249,7 +250,7 @@ static keyboard_switch_t atkbdsw = {
 KEYBOARD_DRIVER(atkbd, atkbdsw, atkbd_configure);
 
 /* local functions */
-static int get_typematic(keyboard_t *kbd);
+static int set_typematic(keyboard_t *kbd);
 static int setup_kbd_port(KBDC kbdc, int port, int intr);
 static int get_kbd_echo(KBDC kbdc);
 static int probe_keyboard(KBDC kbdc, int flags);
@@ -443,7 +444,7 @@ atkbd_init(int unit, keyboard_t **kbdp, 
goto bad;
}
atkbd_ioctl(kbd, KDSETLED, (caddr_t)state-ks_state);
-   get_typematic(kbd);
+   set_typematic(kbd);
delay[0] = kbd-kb_delay1;
delay[1] = kbd-kb_delay2;
atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay);
@@ -503,7 +504,7 @@ atkbd_intr(keyboard_t *kbd, void *arg)
init_keyboard(state-kbdc, kbd-kb_type, kbd-kb_config);
KBD_FOUND_DEVICE(kbd);
atkbd_ioctl(kbd, KDSETLED, (caddr_t)state-ks_state);
-   get_typematic(kbd);
+   set_typematic(kbd);
delay[0] = kbd-kb_delay1;
delay[1] = kbd-kb_delay2;
atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay);
@@ -1135,57 +1136,19 @@ atkbd_reset(KBDC kbdc, int flags, int c)
 /* local functions */
 
 static int
-get_typematic(keyboard_t *kbd)
+set_typematic(keyboard_t *kbd)
 {
-#if defined(__i386__) || defined(__amd64__)
-   /*
-* Only some systems allow us to retrieve the keyboard repeat
-* rate previously set via the BIOS...
-*/
-   x86regs_t regs;
-   uint8_t *p;
+   int val, error;
+   atkbd_state_t *state = kbd-kb_data;
 
-   /*
-* Traditional entry points of int 0x15 and 0x16 are fixed
-* and later BIOSes follow them.  (U)EFI CSM specification
-* also mandates these fixed entry points.
-*
-* Validate the entry points here before we proceed further.
-* It's known that some recent laptops does not have the
-* same entry point and hang on boot if we call it.
-*/
-   if (x86bios_get_intr(0x15) != 0xf000f859 ||
-   x86bios_get_intr(0x16) != 0xf000e82e)
-   return (ENODEV);
-
-   /* Is BIOS system configuration table supported? */
-   x86bios_init_regs(regs);
-   regs.R_AH = 0xc0;
-   x86bios_intr(regs, 0x15);
-   if ((regs.R_FLG  PSL_C) != 0 || regs.R_AH != 0)
-   return (ENODEV);
-
-   /* Is int 0x16, function 0x09 supported? */
-   p = x86bios_offset((regs.R_ES  4) + regs.R_BX);
-   if (readw(p)  5 || (readb(p + 6)  0x40) == 0)
-   return (ENODEV);
-
-   /* Is int 0x16, function 0x0306 supported? */
-   x86bios_init_regs(regs);
-   regs.R_AH = 0x09;
-   x86bios_intr(regs, 0x16);
-   if ((regs.R_AL  0x08) == 0)
-   return (ENODEV);
-
-   x86bios_init_regs(regs);
-   regs.R_AX = 0x0306;
-   x86bios_intr(regs, 0x16);
-   kbd-kb_delay1 = typematic_delay(regs.R_BH  5);
-   kbd-kb_delay2 = typematic_rate(regs.R_BL);
-   return (0);
-#else
-   return (ENODEV);
-#endif /* __i386__ || __amd64__ */
+   val = typematic(DEFAULT_DELAY, DEFAULT_RATE);
+   error = write_kbd(state-kbdc, KBDC_SET_TYPEMATIC, val);
+   if (error == 0) {
+   kbd-kb_delay1 = typematic_delay(val);
+   kbd-kb_delay2 = typematic_rate(val);
+   }
+
+   return (error);
 }
 
 static int
___

svn commit: r282270 - in stable/10/sys: fs/ext2fs fs/fuse fs/msdosfs fs/nandfs fs/nfsclient fs/nfsserver fs/nullfs kern sys ufs/ffs

2015-04-30 Thread Rick Macklem
Author: rmacklem
Date: Thu Apr 30 12:39:24 2015
New Revision: 282270
URL: https://svnweb.freebsd.org/changeset/base/282270

Log:
  MFC: r281562
  File systems that do not use the buffer cache (such as ZFS) must
  use VOP_FSYNC() to perform the NFS server's Commit operation.
  This patch adds a mnt_kern_flag called MNTK_USES_BCACHE which
  is set by file systems that use the buffer cache. If this flag
  is not set, the NFS server always does a VOP_FSYNC().
  This should be ok for old file system modules that do not set
  MNTK_USES_BCACHE, since calling VOP_FSYNC() is correct, although
  it might not be optimal for file systems that use the buffer cache.

Modified:
  stable/10/sys/fs/ext2fs/ext2_vfsops.c
  stable/10/sys/fs/fuse/fuse_vfsops.c
  stable/10/sys/fs/msdosfs/msdosfs_vfsops.c
  stable/10/sys/fs/nandfs/nandfs_vfsops.c
  stable/10/sys/fs/nfsclient/nfs_clvfsops.c
  stable/10/sys/fs/nfsserver/nfs_nfsdport.c
  stable/10/sys/fs/nullfs/null_vfsops.c
  stable/10/sys/kern/vfs_subr.c
  stable/10/sys/sys/mount.h
  stable/10/sys/ufs/ffs/ffs_vfsops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/ext2fs/ext2_vfsops.c
==
--- stable/10/sys/fs/ext2fs/ext2_vfsops.c   Thu Apr 30 07:00:25 2015
(r282269)
+++ stable/10/sys/fs/ext2fs/ext2_vfsops.c   Thu Apr 30 12:39:24 2015
(r282270)
@@ -661,7 +661,8 @@ ext2_mountfs(struct vnode *devvp, struct
 * Initialize filesystem stat information in mount struct.
 */
MNT_ILOCK(mp);
-   mp-mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED;
+   mp-mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED |
+   MNTK_USES_BCACHE;
MNT_IUNLOCK(mp);
return (0);
 out:

Modified: stable/10/sys/fs/fuse/fuse_vfsops.c
==
--- stable/10/sys/fs/fuse/fuse_vfsops.c Thu Apr 30 07:00:25 2015
(r282269)
+++ stable/10/sys/fs/fuse/fuse_vfsops.c Thu Apr 30 12:39:24 2015
(r282270)
@@ -337,6 +337,7 @@ fuse_vfsop_mount(struct mount *mp)
MNT_ILOCK(mp);
mp-mnt_data = data;
mp-mnt_flag |= MNT_LOCAL;
+   mp-mnt_kern_flag |= MNTK_USES_BCACHE;
MNT_IUNLOCK(mp);
/* We need this here as this slot is used by getnewvnode() */
mp-mnt_stat.f_iosize = PAGE_SIZE;

Modified: stable/10/sys/fs/msdosfs/msdosfs_vfsops.c
==
--- stable/10/sys/fs/msdosfs/msdosfs_vfsops.c   Thu Apr 30 07:00:25 2015
(r282269)
+++ stable/10/sys/fs/msdosfs/msdosfs_vfsops.c   Thu Apr 30 12:39:24 2015
(r282270)
@@ -759,6 +759,7 @@ mountmsdosfs(struct vnode *devvp, struct
mp-mnt_stat.f_fsid.val[1] = mp-mnt_vfc-vfc_typenum;
MNT_ILOCK(mp);
mp-mnt_flag |= MNT_LOCAL;
+   mp-mnt_kern_flag |= MNTK_USES_BCACHE;
MNT_IUNLOCK(mp);
 
if (pmp-pm_flags  MSDOSFS_LARGEFS)

Modified: stable/10/sys/fs/nandfs/nandfs_vfsops.c
==
--- stable/10/sys/fs/nandfs/nandfs_vfsops.c Thu Apr 30 07:00:25 2015
(r282269)
+++ stable/10/sys/fs/nandfs/nandfs_vfsops.c Thu Apr 30 12:39:24 2015
(r282270)
@@ -1385,6 +1385,7 @@ nandfs_mountfs(struct vnode *devvp, stru
nmp-nm_ronly = ronly;
MNT_ILOCK(mp);
mp-mnt_flag |= MNT_LOCAL;
+   mp-mnt_kern_flag |= MNTK_USES_BCACHE;
MNT_IUNLOCK(mp);
nmp-nm_nandfsdev = nandfsdev;
/* Add our mountpoint */

Modified: stable/10/sys/fs/nfsclient/nfs_clvfsops.c
==
--- stable/10/sys/fs/nfsclient/nfs_clvfsops.c   Thu Apr 30 07:00:25 2015
(r282269)
+++ stable/10/sys/fs/nfsclient/nfs_clvfsops.c   Thu Apr 30 12:39:24 2015
(r282270)
@@ -1193,7 +1193,8 @@ nfs_mount(struct mount *mp)
 out:
if (!error) {
MNT_ILOCK(mp);
-   mp-mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_NO_IOPF;
+   mp-mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_NO_IOPF |
+   MNTK_USES_BCACHE;
MNT_IUNLOCK(mp);
}
return (error);

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdport.c
==
--- stable/10/sys/fs/nfsserver/nfs_nfsdport.c   Thu Apr 30 07:00:25 2015
(r282269)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdport.c   Thu Apr 30 12:39:24 2015
(r282270)
@@ -1270,8 +1270,11 @@ nfsvno_fsync(struct vnode *vp, u_int64_t
 * file is done.  At this time VOP_FSYNC does not accept offset and
 * byte count parameters so call VOP_FSYNC the whole file for now.
 * The same is true for NFSv4: RFC 3530 Sec. 14.2.3.
+* File systems that do not use the buffer cache (as indicated
+* by 

svn commit: r282271 - in stable/10/sys/fs: nfs nfsserver

2015-04-30 Thread Rick Macklem
Author: rmacklem
Date: Thu Apr 30 12:44:20 2015
New Revision: 282271
URL: https://svnweb.freebsd.org/changeset/base/282271

Log:
  MFC: r281628
  mav@ has found that NFS servers exporting ZFS file systems
  can perform better when using a 128K read/write data size.
  This patch changes NFS_MAXDATA from 64K to 128K so that
  clients can use 128K for NFS mounts to allow this.
  The patch also renames NFS_MAXDATA to NFS_SRVMAXIO so
  that it is clear that it applies to the NFS server side
  only. It also avoids a name conflict with the NFS_MAXDATA
  defined in rpcsvc/nfs_prot.h, that is used for userland RPC.

Modified:
  stable/10/sys/fs/nfs/nfs.h
  stable/10/sys/fs/nfs/nfs_commonport.c
  stable/10/sys/fs/nfs/nfsproto.h
  stable/10/sys/fs/nfsserver/nfs_nfsdserv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfs/nfs.h
==
--- stable/10/sys/fs/nfs/nfs.h  Thu Apr 30 12:39:24 2015(r282270)
+++ stable/10/sys/fs/nfs/nfs.h  Thu Apr 30 12:44:20 2015(r282271)
@@ -159,7 +159,7 @@
(t).tv_sec = time.tv_sec; (t).tv_nsec = 1000 * time.tv_usec; } while (0)
 #defineNFS_SRVMAXDATA(n)   
\
(((n)-nd_flag  (ND_NFSV3 | ND_NFSV4)) ?   \
-NFS_MAXDATA : NFS_V2MAXDATA)
+NFS_SRVMAXIO : NFS_V2MAXDATA)
 #defineNFS64BITSSET0xull
 #defineNFS64BITSMINUS1 0xfffeull
 

Modified: stable/10/sys/fs/nfs/nfs_commonport.c
==
--- stable/10/sys/fs/nfs/nfs_commonport.c   Thu Apr 30 12:39:24 2015
(r282270)
+++ stable/10/sys/fs/nfs/nfs_commonport.c   Thu Apr 30 12:44:20 2015
(r282271)
@@ -281,11 +281,11 @@ nfsvno_getfs(struct nfsfsinfo *sip, int 
if (isdgram)
pref = NFS_MAXDGRAMDATA;
else
-   pref = NFS_MAXDATA;
-   sip-fs_rtmax = NFS_MAXDATA;
+   pref = NFS_SRVMAXIO;
+   sip-fs_rtmax = NFS_SRVMAXIO;
sip-fs_rtpref = pref;
sip-fs_rtmult = NFS_FABLKSIZE;
-   sip-fs_wtmax = NFS_MAXDATA;
+   sip-fs_wtmax = NFS_SRVMAXIO;
sip-fs_wtpref = pref;
sip-fs_wtmult = NFS_FABLKSIZE;
sip-fs_dtpref = pref;

Modified: stable/10/sys/fs/nfs/nfsproto.h
==
--- stable/10/sys/fs/nfs/nfsproto.h Thu Apr 30 12:39:24 2015
(r282270)
+++ stable/10/sys/fs/nfs/nfsproto.h Thu Apr 30 12:44:20 2015
(r282271)
@@ -54,11 +54,10 @@
 #defineNFS_VER44
 #defineNFS_V2MAXDATA   8192
 #defineNFS_MAXDGRAMDATA 16384
-#defineNFS_MAXDATA NFS_MAXBSIZE
 #defineNFS_MAXPATHLEN  1024
 #defineNFS_MAXNAMLEN   255
 #defineNFS_MAXPKTHDR   404
-#defineNFS_MAXPACKET   (NFS_MAXDATA + 2048)
+#defineNFS_MAXPACKET   (NFS_SRVMAXIO + 2048)
 #defineNFS_MINPACKET   20
 #defineNFS_FABLKSIZE   512 /* Size in bytes of a block wrt 
fa_blocks */
 #defineNFSV4_MINORVERSION  0   /* V4 Minor version */
@@ -67,6 +66,18 @@
 #defineNFSV41_CBVERS   4   /* V4.1 CB Version */
 #defineNFSV4_SMALLSTR  50  /* Strings small enough for 
stack */
 
+/*
+ * This value isn't a fixed value in the RFCs.
+ * It is the maximum data size supported by NFSv3 or NFSv4 over TCP for
+ * the server.  It should be set to the I/O size preferred by ZFS or
+ * MAXBSIZE, whichever is greater.
+ * ZFS currently prefers 128K.
+ * It used to be called NFS_MAXDATA, but has been renamed to clarify that
+ * it refers to server side only and doesn't conflict with the NFS_MAXDATA
+ * defined in rpcsvc/nfs_prot.h for userland.
+ */
+#defineNFS_SRVMAXIO(128 * 1024)
+
 /* Stat numbers for rpc returns (version 2, 3 and 4) */
 /*
  * These numbers are hard-wired in the RFCs, so they can't be changed.

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- stable/10/sys/fs/nfsserver/nfs_nfsdserv.c   Thu Apr 30 12:39:24 2015
(r282270)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdserv.c   Thu Apr 30 12:44:20 2015
(r282271)
@@ -870,7 +870,7 @@ nfsrvd_write(struct nfsrv_descript *nd, 
i = mbuf_len(mp);
}
 
-   if (retlen  NFS_MAXDATA || retlen  0)
+   if (retlen  NFS_SRVMAXIO || retlen  0)
nd-nd_repstat = EIO;
if (vnode_vtype(vp) != VREG  !nd-nd_repstat) {
if (nd-nd_flag  ND_NFSV3)
___
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: r282272 - head/usr.sbin/nfsd

2015-04-30 Thread Edward Tomasz Napierala
Author: trasz
Date: Thu Apr 30 12:55:27 2015
New Revision: 282272
URL: https://svnweb.freebsd.org/changeset/base/282272

Log:
  Remove oldnfs remnants from nfsd(8).
  
  Reviewed by:  rmacklem@
  Sponsored by: The FreeBSD Foundation

Modified:
  head/usr.sbin/nfsd/nfsd.8
  head/usr.sbin/nfsd/nfsd.c

Modified: head/usr.sbin/nfsd/nfsd.8
==
--- head/usr.sbin/nfsd/nfsd.8   Thu Apr 30 12:44:20 2015(r282271)
+++ head/usr.sbin/nfsd/nfsd.8   Thu Apr 30 12:55:27 2015(r282272)
@@ -28,7 +28,7 @@
 .\@(#)nfsd.8  8.4 (Berkeley) 3/29/95
 .\ $FreeBSD$
 .\
-.Dd January 1, 2015
+.Dd April 25, 2015
 .Dt NFSD 8
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 server
 .Sh SYNOPSIS
 .Nm
-.Op Fl arduteo
+.Op Fl ardute
 .Op Fl n Ar num_servers
 .Op Fl h Ar bindip
 .Op Fl Fl maxthreads Ar max_threads
@@ -112,10 +112,7 @@ Serve
 .Tn UDP NFS
 clients.
 .It Fl e
-Enable NFSv4 support.
-It is enabled by default; this option should be considered deprecated.
-.It Fl o
-Disable NFSv4 support.
+Ignored; included for backward compatibility.
 .El
 .Pp
 For example,

Modified: head/usr.sbin/nfsd/nfsd.c
==
--- head/usr.sbin/nfsd/nfsd.c   Thu Apr 30 12:44:20 2015(r282271)
+++ head/usr.sbin/nfsd/nfsd.c   Thu Apr 30 12:55:27 2015(r282272)
@@ -87,8 +87,6 @@ static int nfsdcnt;   /* number of childr
 static int nfsdcnt_set;
 static int minthreads;
 static int maxthreads;
-static int new_syscall;
-static int run_v4server = 1;   /* Force running of nfsv4 server */
 static int nfssvc_nfsd;/* Set to correct NFSSVC_xxx flag */
 static int stablefd = -1;  /* Fd for the stable restart file */
 static int backupfd;   /* Fd for the backup stable restart file */
@@ -156,7 +154,7 @@ main(int argc, char **argv)
socklen_t len;
int on = 1, unregister, reregister, sock;
int tcp6sock, ip6flag, tcpflag, tcpsock;
-   int udpflag, ecode, error, s, srvcnt;
+   int udpflag, ecode, error, s;
int bindhostc, bindanyflag, rpcbreg, rpcbregcnt;
int nfssvc_addsock;
int longindex = 0;
@@ -167,10 +165,10 @@ main(int argc, char **argv)
nfsdcnt = DEFNFSDCNT;
unregister = reregister = tcpflag = maxsock = 0;
bindanyflag = udpflag = connect_type_cnt = bindhostc = 0;
-   getopt_shortopts = ah:n:rdtueo;
+   getopt_shortopts = ah:n:rdtue;
getopt_usage =
usage:\n
- nfsd [-ardtueo] [-h bindip]\n
+ nfsd [-ardtue] [-h bindip]\n
   [-n numservers] [--minthreads #] [--maxthreads #]\n;
while ((ch = getopt_long(argc, argv, getopt_shortopts, longopts,
longindex)) != -1)
@@ -205,9 +203,6 @@ main(int argc, char **argv)
case 'e':
/* now a no-op, since this is the default */
break;
-   case 'o':
-   run_v4server = 0;
-   break;
case 0:
lopt = longopts[longindex].name;
if (!strcmp(lopt, minthreads)) {
@@ -242,15 +237,9 @@ main(int argc, char **argv)
 * Unless the -o option was specified, try and run nfsd.
 * If -o was specified, try and run nfsserver.
 */
-   if (run_v4server  0) {
-   if (modfind(nfsd)  0) {
-   /* Not present in kernel, try loading it */
-   if (kldload(nfsd)  0 || modfind(nfsd)  0)
-   errx(1, NFS server is not available);
-   }
-   } else if (modfind(nfsserver)  0) {
+   if (modfind(nfsd)  0) {
/* Not present in kernel, try loading it */
-   if (kldload(nfsserver)  0 || modfind(nfsserver)  0)
+   if (kldload(nfsd)  0 || modfind(nfsd)  0)
errx(1, NFS server is not available);
}
 
@@ -392,55 +381,21 @@ main(int argc, char **argv)
 * level write-back caching. (See SCSI doc for more information
 * on how to prevent write-back caching on SCSI disks.)
 */
-   if (run_v4server  0) {
-   open_stable(stablefd, backupfd);
-   if (stablefd  0) {
-   syslog(LOG_ERR, Can't open %s: %m\n, 
NFSD_STABLERESTART);
-   exit(1);
-   }
-   /* This system call will fail for old kernels, but that's ok. */
-   nfssvc(NFSSVC_BACKUPSTABLE, NULL);
-   if (nfssvc(NFSSVC_STABLERESTART, (caddr_t)stablefd)  0) {
-   syslog(LOG_ERR, Can't read stable storage file: %m\n);
-   exit(1);
-   }
-   nfssvc_addsock = NFSSVC_NFSDADDSOCK;
-   nfssvc_nfsd = NFSSVC_NFSDNFSD;
-   new_syscall = TRUE;
-   } else {
-   

svn commit: r282276 - head/sys/netinet

2015-04-30 Thread George V. Neville-Neil
Author: gnn
Date: Thu Apr 30 17:43:40 2015
New Revision: 282276
URL: https://svnweb.freebsd.org/changeset/base/282276

Log:
  Move the SIFTR DTrace probe out of the writing thread context
  and directly into the place where the data is collected.

Modified:
  head/sys/netinet/siftr.c

Modified: head/sys/netinet/siftr.c
==
--- head/sys/netinet/siftr.cThu Apr 30 16:08:47 2015(r282275)
+++ head/sys/netinet/siftr.cThu Apr 30 17:43:40 2015(r282276)
@@ -549,7 +549,6 @@ siftr_process_pkt(struct pkt_node * pkt_
}
 #endif
 
-   TCP_PROBE1(siftr, pkt_node);
alq_post_flags(siftr_alq, log_buf, 0);
 }
 
@@ -814,6 +813,8 @@ siftr_siftdata(struct pkt_node *pn, stru
 * maximum pps throughput processing when SIFTR is loaded and enabled.
 */
microtime(pn-tval);
+   TCP_PROBE1(siftr, pn);
+
 }
 
 
___
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: r282257 - in head: lib/libnv sys/kern sys/sys

2015-04-30 Thread Bryan Drewery
On 4/29/2015 5:57 PM, Mariusz Zaborski wrote:
 Author: oshogbo
 Date: Wed Apr 29 22:57:04 2015
 New Revision: 282257
 URL: https://svnweb.freebsd.org/changeset/base/282257
 
 Log:
   Remove the nvlist_.*[fv] functions.
   
   Those functions are problematic, because there is no way to report
   memory allocation problems without complicating the API, so we can
   either abort or potentially return invalid results. None of which is
   acceptable.
   
   In most cases the caller knows the size of the name, so he can allocate
   buffer on the stack and use snprintf(3) to prepare the name.
   
   After some discussion the conclusion is to removed those functions,
   which also simplifies the API.
   
   Discussed with: pjd, rstone
   Approved by:pjd (mentor)
 
 Modified:
   head/lib/libnv/Makefile

This breaks the ABI of libnv.so.0.

You should either bump the SHLIB_MAJOR or consider making this a
PRIVATELIB so it is not in the public /lib but in the private
/usr/lib/private or use symbol versioning.

Being in /lib we must maintain ABI compatibility among the same shlib
version.

Bumping the SHLIB_MAJOR or moving to PRIVATELIB will require adding the
libnv.so.0 to the ObsoleteFiles.inc OLD_FILES list.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


svn commit: r282280 - in head/sys/dev: e1000 ixgbe ixl

2015-04-30 Thread John Baldwin
Author: jhb
Date: Thu Apr 30 18:23:38 2015
New Revision: 282280
URL: https://svnweb.freebsd.org/changeset/base/282280

Log:
  Various fixes to the stats in igb(4), ixgbe(4), and ixl(4).
  - Use hardware counters for ifnet stats in igb(4) when possible.  This
ensures these stats include packets that bypass the regular stack via
netmap.
  - Don't derefence values off the end of the igb(4) VF stats structure.
Instead, add a dedicated if_get_counter method for igb(4) VF interfaces.
  - Report missed packets on igb(4) as input queue drops rather than an
input error.
  - Report bug_ring drop counts as output queue drops for igb(4) and ixgbe(4).
  - Export the buf_ring drop stats for individual rings via sysctl on
ixgbe(4).
  - Fix a typo that in ixl(4) that caused output queue drops to be reported
as input queue drops and input queue drops to be unreported.
  
  Differential Revision:https://reviews.freebsd.org/D2402
  Reviewed by:  jfv, rstone (6)
  Sponsored by: Norse Corp, Inc.

Modified:
  head/sys/dev/e1000/if_igb.c
  head/sys/dev/ixgbe/if_ix.c
  head/sys/dev/ixl/ixl.h

Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Thu Apr 30 18:11:43 2015(r282279)
+++ head/sys/dev/e1000/if_igb.c Thu Apr 30 18:23:38 2015(r282280)
@@ -1046,8 +1046,7 @@ igb_mq_start_locked(struct ifnet *ifp, s
}
drbr_advance(ifp, txr-br);
enq++;
-   if_inc_counter(ifp, IFCOUNTER_OBYTES, next-m_pkthdr.len);
-   if (next-m_flags  M_MCAST)
+   if (next-m_flags  M_MCAST  adapter-vf_ifp)
if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
ETHER_BPF_MTAP(ifp, next);
if ((ifp-if_drv_flags  IFF_DRV_RUNNING) == 0)
@@ -4055,7 +4054,9 @@ static bool
 igb_txeof(struct tx_ring *txr)
 {
struct adapter  *adapter = txr-adapter;
+#ifdef DEV_NETMAP
struct ifnet*ifp = adapter-ifp;
+#endif /* DEV_NETMAP */
u32 work, processed = 0;
u16 limit = txr-process_limit;
struct igb_tx_buf   *buf;
@@ -4130,7 +4131,6 @@ igb_txeof(struct tx_ring *txr)
}
++txr-packets;
++processed;
-   if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
txr-watchdog_time = ticks;
 
/* Try the next packet */
@@ -5127,7 +5127,6 @@ igb_rxeof(struct igb_queue *que, int cou
 
if (eop) {
rxr-fmp-m_pkthdr.rcvif = ifp;
-   if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
rxr-rx_packets++;
/* capture data for AIM */
rxr-packets++;
@@ -5560,24 +5559,94 @@ igb_led_func(void *arg, int onoff)
 }
 
 static uint64_t
+igb_get_vf_counter(if_t ifp, ift_counter cnt)
+{
+   struct adapter *adapter;
+   struct e1000_vf_stats *stats;
+#ifndef IGB_LEGACY_TX
+   struct tx_ring *txr;
+   uint64_t rv;
+#endif
+
+   adapter = if_getsoftc(ifp);
+   stats = (struct e1000_vf_stats *)adapter-stats;
+
+   switch (cnt) {
+   case IFCOUNTER_IPACKETS:
+   return (stats-gprc);
+   case IFCOUNTER_OPACKETS:
+   return (stats-gptc);
+   case IFCOUNTER_IBYTES:
+   return (stats-gorc);
+   case IFCOUNTER_OBYTES:
+   return (stats-gotc);
+   case IFCOUNTER_IMCASTS:
+   return (stats-mprc);
+   case IFCOUNTER_IERRORS:
+   return (adapter-dropped_pkts);
+   case IFCOUNTER_OERRORS:
+   return (adapter-watchdog_events);
+#ifndef IGB_LEGACY_TX
+   case IFCOUNTER_OQDROPS:
+   rv = 0;
+   txr = adapter-tx_rings;
+   for (int i = 0; i  adapter-num_queues; i++, txr++)
+   rv += txr-br-br_drops;
+   return (rv);
+#endif
+   default:
+   return (if_get_counter_default(ifp, cnt));
+   }
+}
+
+static uint64_t
 igb_get_counter(if_t ifp, ift_counter cnt)
 {
struct adapter *adapter;
struct e1000_hw_stats *stats;
+#ifndef IGB_LEGACY_TX
+   struct tx_ring *txr;
+   uint64_t rv;
+#endif
 
adapter = if_getsoftc(ifp);
+   if (adapter-vf_ifp)
+   return (igb_get_vf_counter(ifp, cnt));
+
stats = (struct e1000_hw_stats *)adapter-stats;
 
switch (cnt) {
+   case IFCOUNTER_IPACKETS:
+   return (stats-gprc);
+   case IFCOUNTER_OPACKETS:
+   return (stats-gptc);
+   case IFCOUNTER_IBYTES:
+   return (stats-gorc);
+   case IFCOUNTER_OBYTES:
+   return (stats-gotc);
+   case IFCOUNTER_IMCASTS:
+   return (stats-mprc);
+   case IFCOUNTER_OMCASTS:
+   return (stats-mptc);
case 

svn commit: r282277 - in head/sys: conf dev/atkbdc

2015-04-30 Thread Jung-uk Kim
Author: jkim
Date: Thu Apr 30 17:49:35 2015
New Revision: 282277
URL: https://svnweb.freebsd.org/changeset/base/282277

Log:
  Remove leftover from r282269.
  
  MFC after:2 weeks
  X-MFC with:   r282269

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/dev/atkbdc/atkbd.c

Modified: head/sys/conf/files.amd64
==
--- head/sys/conf/files.amd64   Thu Apr 30 17:43:40 2015(r282276)
+++ head/sys/conf/files.amd64   Thu Apr 30 17:49:35 2015(r282277)
@@ -514,10 +514,10 @@ compat/ndis/winx64_wrap.S optionalndisa
 libkern/memmove.c  standard
 libkern/memset.c   standard
 #
-# x86 real mode BIOS emulator, required by atkbdc/dpms/pci/vesa
+# x86 real mode BIOS emulator, required by dpms/pci/vesa
 #
-compat/x86bios/x86bios.c   optional x86bios | atkbd | dpms | pci | vesa
-contrib/x86emu/x86emu.coptional x86bios | atkbd | dpms | pci | 
vesa
+compat/x86bios/x86bios.c   optional x86bios | dpms | pci | vesa
+contrib/x86emu/x86emu.coptional x86bios | dpms | pci | vesa
 #
 # bvm console
 #

Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Thu Apr 30 17:43:40 2015(r282276)
+++ head/sys/conf/files.i386Thu Apr 30 17:49:35 2015(r282277)
@@ -525,9 +525,9 @@ i386/xbox/xboxfb.c  optional xboxfb
 dev/fb/boot_font.c optional xboxfb
 i386/xbox/pic16l.s optional xbox
 #
-# x86 real mode BIOS support, required by atkbdc/dpms/pci/vesa
+# x86 real mode BIOS support, required by dpms/pci/vesa
 #
-compat/x86bios/x86bios.c   optional x86bios | atkbd | dpms | pci | vesa
+compat/x86bios/x86bios.c   optional x86bios | dpms | pci | vesa
 #
 # bvm console
 #

Modified: head/sys/dev/atkbdc/atkbd.c
==
--- head/sys/dev/atkbdc/atkbd.c Thu Apr 30 17:43:40 2015(r282276)
+++ head/sys/dev/atkbdc/atkbd.c Thu Apr 30 17:49:35 2015(r282277)
@@ -44,17 +44,6 @@ __FBSDID($FreeBSD$);
 #include machine/bus.h
 #include machine/resource.h
 
-#if defined(__i386__) || defined(__amd64__)
-#include machine/md_var.h
-#include machine/psl.h
-
-#include vm/vm.h
-#include vm/pmap.h
-#include vm/vm_param.h
-
-#include isa/isareg.h
-#endif /* __i386__ || __amd64__ */
-
 #include sys/kbio.h
 #include dev/kbd/kbdreg.h
 #include dev/atkbdc/atkbdreg.h
___
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: r282279 - stable/9/usr.bin/wc

2015-04-30 Thread Bryan Drewery
Author: bdrewery
Date: Thu Apr 30 18:11:43 2015
New Revision: 282279
URL: https://svnweb.freebsd.org/changeset/base/282279

Log:
  MFC r281617:
  
wc: Fix SIGINFO race causing final results to be lost to stderr.
  
  Relnotes: yes

Modified:
  stable/9/usr.bin/wc/wc.c
Directory Properties:
  stable/9/usr.bin/wc/   (props changed)

Modified: stable/9/usr.bin/wc/wc.c
==
--- stable/9/usr.bin/wc/wc.cThu Apr 30 18:07:48 2015(r282278)
+++ stable/9/usr.bin/wc/wc.cThu Apr 30 18:11:43 2015(r282279)
@@ -74,6 +74,14 @@ siginfo_handler(int sig __unused)
siginfo = 1;
 }
 
+static void
+reset_siginfo(void)
+{
+
+   signal(SIGINFO, SIG_DFL);
+   siginfo = 0;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -207,6 +215,7 @@ cnt(const char *file)
} else
tmpll++;
}
+   reset_siginfo();
tlinect += linect;
if (dochar)
tcharct += charct;
@@ -229,6 +238,7 @@ cnt(const char *file)
return (1);
}
if (S_ISREG(sb.st_mode)) {
+   reset_siginfo();
charct = sb.st_size;
show_cnt(file, linect, wordct, charct, llct);
tcharct += charct;
@@ -289,6 +299,7 @@ word:   gotsp = 1;
}
}
}
+   reset_siginfo();
if (domulti  MB_CUR_MAX  1)
if (mbrtowc(NULL, NULL, 0, mbs) == (size_t)-1  !warned)
warn(%s, file != NULL ? file : stdin);
___
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: r282278 - stable/10/usr.bin/wc

2015-04-30 Thread Bryan Drewery
Author: bdrewery
Date: Thu Apr 30 18:07:48 2015
New Revision: 282278
URL: https://svnweb.freebsd.org/changeset/base/282278

Log:
  MFC r281617:
  
wc: Fix SIGINFO race causing final results to be lost to stderr.
  
  Relnotes: yes

Modified:
  stable/10/usr.bin/wc/wc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/wc/wc.c
==
--- stable/10/usr.bin/wc/wc.c   Thu Apr 30 17:49:35 2015(r282277)
+++ stable/10/usr.bin/wc/wc.c   Thu Apr 30 18:07:48 2015(r282278)
@@ -74,6 +74,14 @@ siginfo_handler(int sig __unused)
siginfo = 1;
 }
 
+static void
+reset_siginfo(void)
+{
+
+   signal(SIGINFO, SIG_DFL);
+   siginfo = 0;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -207,6 +215,7 @@ cnt(const char *file)
} else
tmpll++;
}
+   reset_siginfo();
tlinect += linect;
if (dochar)
tcharct += charct;
@@ -229,6 +238,7 @@ cnt(const char *file)
return (1);
}
if (S_ISREG(sb.st_mode)) {
+   reset_siginfo();
charct = sb.st_size;
show_cnt(file, linect, wordct, charct, llct);
tcharct += charct;
@@ -289,6 +299,7 @@ word:   gotsp = 1;
}
}
}
+   reset_siginfo();
if (domulti  MB_CUR_MAX  1)
if (mbrtowc(NULL, NULL, 0, mbs) == (size_t)-1  !warned)
warn(%s, file != NULL ? file : stdin);
___
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: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_module

2015-04-30 Thread Bryan Drewery
On 4/30/2015 11:08 AM, Tijl Coosemans wrote:
 Author: tijl
 Date: Thu Apr 30 16:08:47 2015
 New Revision: 282275
 URL: https://svnweb.freebsd.org/changeset/base/282275
 
 Log:
   MFC r275805:
   
   Fix incorrect type of invalids argument in __iconv() prototype.
   
   MFC r281550,281591:
   
   Remove the const qualifier from iconv(3) to comply with POSIX:
   http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
   
   Adjust all code that calls iconv.
   
   PR: 199099
 
 Modified:
   stable/10/UPDATING
   stable/10/bin/csh/config.h
   stable/10/bin/csh/iconv_stub.h
   stable/10/contrib/smbfs/include/netsmb/smb_lib.h
   stable/10/contrib/smbfs/lib/smb/nls.c
   stable/10/contrib/smbfs/lib/smb/print.c
   stable/10/contrib/smbfs/lib/smb/rq.c
   stable/10/include/iconv.h
   stable/10/lib/libarchive/Makefile
   stable/10/lib/libc/iconv/__iconv.c
   stable/10/lib/libc/iconv/bsd_iconv.c
   stable/10/lib/libc/iconv/citrus_iconv.h
   stable/10/lib/libc/iconv/citrus_iconv_local.h
   stable/10/lib/libc/iconv/citrus_none.c
   stable/10/lib/libc/iconv/citrus_stdenc.h
   stable/10/lib/libc/iconv/citrus_stdenc_local.h
   stable/10/lib/libc/iconv/citrus_stdenc_template.h
   stable/10/lib/libc/iconv/iconv-internal.h
   stable/10/lib/libc/iconv/iconv.3
   stable/10/lib/libc/iconv/iconv.c
   stable/10/lib/libc/iconv/iconv_compat.c
   stable/10/lib/libc/locale/cXXrtomb_iconv.h
   stable/10/lib/libc/locale/mbrtocXX_iconv.h
   stable/10/lib/libiconv_modules/BIG5/citrus_big5.c
   stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
   stable/10/lib/libiconv_modules/EUC/citrus_euc.c
   stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c
   stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
   stable/10/lib/libiconv_modules/HZ/citrus_hz.c
   stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c
   stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c
   stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c
   stable/10/lib/libiconv_modules/UES/citrus_ues.c
   stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c
   stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c
   stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c
   stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c
   stable/10/lib/libiconv_modules/ZW/citrus_zw.c
   stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
   stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
   stable/10/lib/libkiconv/xlat16_iconv.c
   stable/10/sys/sys/param.h
   stable/10/usr.bin/iconv/iconv.c
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/UPDATING
 ==
 --- stable/10/UPDATINGThu Apr 30 15:48:48 2015(r282274)
 +++ stable/10/UPDATINGThu Apr 30 16:08:47 2015(r282275)
 @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
  stable/10, and then rebuild without this option. The bootstrap process from
  older version of current is a bit fragile.
  
 +20150430:
 + The const qualifier has been removed from iconv(3) to comply with
 + POSIX.  The ports tree is aware of this from r384038 onwards.
 +

Being an ABI change this seems wrong to MFC. Binaries are not only built
from Ports.

For a binary built on 10.1 will this change cause any issues?

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


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

2015-04-30 Thread Mariusz Zaborski
Author: oshogbo
Date: Thu Apr 30 20:47:33 2015
New Revision: 282282
URL: https://svnweb.freebsd.org/changeset/base/282282

Log:
  Rename macros to use prefix ERRNO. Add macro ERRNO_SET. Now
  ERRNO_{RESTORE/SAVE} must by used together, additional variable is not
  needed. Always use ERRNO_{SAVE/RESTORE/SET} macros.
  
  Approved by:  pjd (mentor)

Modified:
  head/sys/kern/subr_nvlist.c
  head/sys/kern/subr_nvpair.c
  head/sys/sys/nv_impl.h

Modified: head/sys/kern/subr_nvlist.c
==
--- head/sys/kern/subr_nvlist.c Thu Apr 30 19:23:50 2015(r282281)
+++ head/sys/kern/subr_nvlist.c Thu Apr 30 20:47:33 2015(r282282)
@@ -142,12 +142,11 @@ void
 nvlist_destroy(nvlist_t *nvl)
 {
nvpair_t *nvp;
-   int serrno;
 
if (nvl == NULL)
return;
 
-   SAVE_ERRNO(serrno);
+   ERRNO_SAVE();
 
NVLIST_ASSERT(nvl);
 
@@ -158,7 +157,7 @@ nvlist_destroy(nvlist_t *nvl)
nvl-nvl_magic = 0;
nv_free(nvl);
 
-   RESTORE_ERRNO(serrno);
+   ERRNO_RESTORE();
 }
 
 void
@@ -264,7 +263,7 @@ nvlist_find(const nvlist_t *nvl, int typ
}
 
if (nvp == NULL)
-   RESTORE_ERRNO(ENOENT);
+   ERRNO_SET(ENOENT);
 
return (nvp);
 }
@@ -307,7 +306,7 @@ nvlist_clone(const nvlist_t *nvl)
NVLIST_ASSERT(nvl);
 
if (nvl-nvl_error != 0) {
-   RESTORE_ERRNO(nvl-nvl_error);
+   ERRNO_SET(nvl-nvl_error);
return (NULL);
}
 
@@ -596,7 +595,7 @@ nvlist_xpack(const nvlist_t *nvl, int64_
NVLIST_ASSERT(nvl);
 
if (nvl-nvl_error != 0) {
-   RESTORE_ERRNO(nvl-nvl_error);
+   ERRNO_SET(nvl-nvl_error);
return (NULL);
}
 
@@ -686,12 +685,12 @@ nvlist_pack(const nvlist_t *nvl, size_t 
NVLIST_ASSERT(nvl);
 
if (nvl-nvl_error != 0) {
-   RESTORE_ERRNO(nvl-nvl_error);
+   ERRNO_SET(nvl-nvl_error);
return (NULL);
}
 
if (nvlist_ndescriptors(nvl)  0) {
-   RESTORE_ERRNO(EOPNOTSUPP);
+   ERRNO_SET(EOPNOTSUPP);
return (NULL);
}
 
@@ -703,11 +702,11 @@ nvlist_check_header(struct nvlist_header
 {
 
if (nvlhdrp-nvlh_magic != NVLIST_HEADER_MAGIC) {
-   RESTORE_ERRNO(EINVAL);
+   ERRNO_SET(EINVAL);
return (false);
}
if ((nvlhdrp-nvlh_flags  ~NV_FLAG_ALL_MASK) != 0) {
-   RESTORE_ERRNO(EINVAL);
+   ERRNO_SET(EINVAL);
return (false);
}
 #if BYTE_ORDER == BIG_ENDIAN
@@ -759,7 +758,7 @@ nvlist_unpack_header(nvlist_t *nvl, cons
 
return (ptr);
 failed:
-   RESTORE_ERRNO(EINVAL);
+   ERRNO_SET(EINVAL);
return (NULL);
 }
 
@@ -853,10 +852,10 @@ nvlist_send(int sock, const nvlist_t *nv
int *fds;
void *data;
int64_t fdidx;
-   int serrno, ret;
+   int ret;
 
if (nvlist_error(nvl) != 0) {
-   errno = nvlist_error(nvl);
+   ERRNO_SET(nvlist_error(nvl));
return (-1);
}
 
@@ -882,10 +881,10 @@ nvlist_send(int sock, const nvlist_t *nv
 
ret = 0;
 out:
-   serrno = errno;
+   ERRNO_SAVE();
free(fds);
free(data);
-   errno = serrno;
+   ERRNO_RESTORE();
return (ret);
 }
 
@@ -896,7 +895,7 @@ nvlist_recv(int sock)
nvlist_t *nvl, *ret;
unsigned char *buf;
size_t nfds, size, i;
-   int serrno, *fds;
+   int *fds;
 
if (buf_recv(sock, nvlhdr, sizeof(nvlhdr)) == -1)
return (NULL);
@@ -929,19 +928,19 @@ nvlist_recv(int sock)
 
nvl = nvlist_xunpack(buf, size, fds, nfds);
if (nvl == NULL) {
-   SAVE_ERRNO(serrno);
+   ERRNO_SAVE();
for (i = 0; i  nfds; i++)
close(fds[i]);
-   RESTORE_ERRNO(serrno);
+   ERRNO_RESTORE();
goto out;
}
 
ret = nvl;
 out:
-   serrno = errno;
+   ERRNO_SAVE();
free(buf);
free(fds);
-   errno = serrno;
+   ERRNO_RESTORE();
 
return (ret);
 }
@@ -1054,19 +1053,19 @@ nvlist_add_nvpair(nvlist_t *nvl, const n
NVPAIR_ASSERT(nvp);
 
if (nvlist_error(nvl) != 0) {
-   RESTORE_ERRNO(nvlist_error(nvl));
+   ERRNO_SET(nvlist_error(nvl));
return;
}
if (nvlist_exists(nvl, nvpair_name(nvp))) {
nvl-nvl_error = EEXIST;
-   RESTORE_ERRNO(nvlist_error(nvl));
+   ERRNO_SET(nvlist_error(nvl));
return;
}
 
newnvp = nvpair_clone(nvp);
if (newnvp == NULL) {
nvl-nvl_error = ERRNO_OR_DEFAULT(ENOMEM);
-   RESTORE_ERRNO(nvlist_error(nvl));
+   ERRNO_SET(nvlist_error(nvl));
 

Re: svn commit: r282257 - in head: lib/libnv sys/kern sys/sys

2015-04-30 Thread Bryan Drewery
On 4/30/2015 2:52 PM, Mariusz Zaborski wrote:
 On 30 April 2015 at 20:28, Bryan Drewery bdrew...@freebsd.org
 mailto:bdrew...@freebsd.org wrote:
 
 You should either bump the SHLIB_MAJOR or consider making this a
 PRIVATELIB so it is not in the public /lib but in the private
 /usr/lib/private or use symbol versioning. 
 
  
 
 Being in /lib we must maintain ABI compatibility among the same shlib
 version.
 
 Bumping the SHLIB_MAJOR or moving to PRIVATELIB will require adding the
 libnv.so.0 to the ObsoleteFiles.inc OLD_FILES list.
 
 Oh, I didn't notice that. Bumping the SHLIB_MAJOR also refers to library
 which are only in HEAD?

You are right. I mistakenly thought this was added pre-10.0 and was in
stable/10. It is not there though.


-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r282257 - in head: lib/libnv sys/kern sys/sys

2015-04-30 Thread Mariusz Zaborski
On 30 April 2015 at 20:28, Bryan Drewery bdrew...@freebsd.org wrote:

 You should either bump the SHLIB_MAJOR or consider making this a
 PRIVATELIB so it is not in the public /lib but in the private
 /usr/lib/private or use symbol versioning.



Being in /lib we must maintain ABI compatibility among the same shlib
 version.

 Bumping the SHLIB_MAJOR or moving to PRIVATELIB will require adding the
 libnv.so.0 to the ObsoleteFiles.inc OLD_FILES list.

Oh, I didn't notice that. Bumping the SHLIB_MAJOR also refers to library
which are only in HEAD?

Cheers,
Mariusz Zaborski
___
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: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_module

2015-04-30 Thread Bryan Drewery
On 4/30/2015 2:39 PM, Tijl Coosemans wrote:
 On Thu, 30 Apr 2015 13:44:18 -0500 Bryan Drewery bdrew...@freebsd.org wrote:
 On 4/30/2015 11:08 AM, Tijl Coosemans wrote:
 Author: tijl
 Date: Thu Apr 30 16:08:47 2015
 New Revision: 282275
 URL: https://svnweb.freebsd.org/changeset/base/282275

 Log:
   MFC r275805:
   
   Fix incorrect type of invalids argument in __iconv() prototype.
   
   MFC r281550,281591:
   
   Remove the const qualifier from iconv(3) to comply with POSIX:
   http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
   
   Adjust all code that calls iconv.
   
   PR:   199099

 Modified:
   stable/10/UPDATING
   stable/10/bin/csh/config.h
   stable/10/bin/csh/iconv_stub.h
   stable/10/contrib/smbfs/include/netsmb/smb_lib.h
   stable/10/contrib/smbfs/lib/smb/nls.c
   stable/10/contrib/smbfs/lib/smb/print.c
   stable/10/contrib/smbfs/lib/smb/rq.c
   stable/10/include/iconv.h
   stable/10/lib/libarchive/Makefile
   stable/10/lib/libc/iconv/__iconv.c
   stable/10/lib/libc/iconv/bsd_iconv.c
   stable/10/lib/libc/iconv/citrus_iconv.h
   stable/10/lib/libc/iconv/citrus_iconv_local.h
   stable/10/lib/libc/iconv/citrus_none.c
   stable/10/lib/libc/iconv/citrus_stdenc.h
   stable/10/lib/libc/iconv/citrus_stdenc_local.h
   stable/10/lib/libc/iconv/citrus_stdenc_template.h
   stable/10/lib/libc/iconv/iconv-internal.h
   stable/10/lib/libc/iconv/iconv.3
   stable/10/lib/libc/iconv/iconv.c
   stable/10/lib/libc/iconv/iconv_compat.c
   stable/10/lib/libc/locale/cXXrtomb_iconv.h
   stable/10/lib/libc/locale/mbrtocXX_iconv.h
   stable/10/lib/libiconv_modules/BIG5/citrus_big5.c
   stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
   stable/10/lib/libiconv_modules/EUC/citrus_euc.c
   stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c
   stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
   stable/10/lib/libiconv_modules/HZ/citrus_hz.c
   stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c
   stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c
   stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c
   stable/10/lib/libiconv_modules/UES/citrus_ues.c
   stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c
   stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c
   stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c
   stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c
   stable/10/lib/libiconv_modules/ZW/citrus_zw.c
   stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
   stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
   stable/10/lib/libkiconv/xlat16_iconv.c
   stable/10/sys/sys/param.h
   stable/10/usr.bin/iconv/iconv.c
 Directory Properties:
   stable/10/   (props changed)

 Modified: stable/10/UPDATING
 ==
 --- stable/10/UPDATING  Thu Apr 30 15:48:48 2015(r282274)
 +++ stable/10/UPDATING  Thu Apr 30 16:08:47 2015(r282275)
 @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
  stable/10, and then rebuild without this option. The bootstrap process from
  older version of current is a bit fragile.
  
 +20150430:
 +   The const qualifier has been removed from iconv(3) to comply with
 +   POSIX.  The ports tree is aware of this from r384038 onwards.
 +

 Being an ABI change this seems wrong to MFC. Binaries are not only built
 from Ports.

 For a binary built on 10.1 will this change cause any issues?
 
 Removing const from a function parameter is not an ABI change, so there
 are no issues for binaries.  The worst you can run into is a warning/error
 from a compiler (when you pass a const char** argument to what is now a
 char** parameter), but this should be trivial to fix.
 

Thanks. I wasn't quite sure if it was really an ABI issue or just API.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


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

2015-04-30 Thread Neel Natu
Author: neel
Date: Thu Apr 30 21:00:47 2015
New Revision: 282284
URL: https://svnweb.freebsd.org/changeset/base/282284

Log:
  When an instruction cannot be decoded just return to userspace so bhyve(8)
  can dump the instruction bytes.
  
  Requested by: grehan
  MFC after:1 week

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

Modified: head/sys/amd64/vmm/vmm.c
==
--- head/sys/amd64/vmm/vmm.cThu Apr 30 20:50:42 2015(r282283)
+++ head/sys/amd64/vmm/vmm.cThu Apr 30 21:00:47 2015(r282284)
@@ -1293,8 +1293,12 @@ vm_handle_inst_emul(struct vm *vm, int v
else if (error != 0)
panic(%s: vmm_fetch_instruction error %d, __func__, error);
 
-   if (vmm_decode_instruction(vm, vcpuid, gla, cpu_mode, cs_d, vie) != 0)
-   return (EFAULT);
+   if (vmm_decode_instruction(vm, vcpuid, gla, cpu_mode, cs_d, vie) != 0) {
+   VCPU_CTR1(vm, vcpuid, Error decoding instruction at %#lx,
+   vme-rip + cs_base);
+   *retu = true;   /* dump instruction bytes in userspace */
+   return (0);
+   }
 
/*
 * If the instruction length was not specified then update it now
___
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: r282281 - in head/sys/amd64/vmm: . amd intel

2015-04-30 Thread Neel Natu
Author: neel
Date: Thu Apr 30 19:23:50 2015
New Revision: 282281
URL: https://svnweb.freebsd.org/changeset/base/282281

Log:
  Advertise the MTRR feature via CPUID and emulate the minimal set of MTRR MSRs.
  This is required for booting Windows guests.
  
  Reported by:  Leon Dang (ld...@nahannisys.com)
  MFC after:2 weeks

Modified:
  head/sys/amd64/vmm/amd/svm_msr.c
  head/sys/amd64/vmm/intel/vmx_msr.c
  head/sys/amd64/vmm/x86.c

Modified: head/sys/amd64/vmm/amd/svm_msr.c
==
--- head/sys/amd64/vmm/amd/svm_msr.cThu Apr 30 18:23:38 2015
(r282280)
+++ head/sys/amd64/vmm/amd/svm_msr.cThu Apr 30 19:23:50 2015
(r282281)
@@ -27,12 +27,18 @@
 #include sys/cdefs.h
 __FBSDID($FreeBSD$);
 
-#include sys/types.h
+#include sys/param.h
 #include sys/errno.h
+#include sys/systm.h
+#include sys/cpuset.h
 
 #include machine/cpufunc.h
 #include machine/specialreg.h
+#include machine/vmm.h
 
+#include svm.h
+#include vmcb.h
+#include svm_softc.h
 #include svm_msr.h
 
 #ifndef MSR_AMDK8_IPM
@@ -105,6 +111,13 @@ svm_rdmsr(struct svm_softc *sc, int vcpu
int error = 0;
 
switch (num) {
+   case MSR_MTRRcap:
+   case MSR_MTRRdefType:
+   case MSR_MTRR4kBase ... MSR_MTRR4kBase + 8:
+   case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1:
+   case MSR_MTRR64kBase:
+   *result = 0;
+   break;
case MSR_AMDK8_IPM:
*result = 0;
break;
@@ -122,6 +135,14 @@ svm_wrmsr(struct svm_softc *sc, int vcpu
int error = 0;
 
switch (num) {
+   case MSR_MTRRcap:
+   vm_inject_gp(sc-vm, vcpu);
+   break;
+   case MSR_MTRRdefType:
+   case MSR_MTRR4kBase ... MSR_MTRR4kBase + 8:
+   case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1:
+   case MSR_MTRR64kBase:
+   break;  /* Ignore writes */
case MSR_AMDK8_IPM:
/*
 * Ignore writes to the Interrupt Pending Message MSR.

Modified: head/sys/amd64/vmm/intel/vmx_msr.c
==
--- head/sys/amd64/vmm/intel/vmx_msr.c  Thu Apr 30 18:23:38 2015
(r282280)
+++ head/sys/amd64/vmm/intel/vmx_msr.c  Thu Apr 30 19:23:50 2015
(r282281)
@@ -396,6 +396,13 @@ vmx_rdmsr(struct vmx *vmx, int vcpuid, u
error = 0;
 
switch (num) {
+   case MSR_MTRRcap:
+   case MSR_MTRRdefType:
+   case MSR_MTRR4kBase ... MSR_MTRR4kBase + 8:
+   case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1:
+   case MSR_MTRR64kBase:
+   *val = 0;
+   break;
case MSR_IA32_MISC_ENABLE:
*val = misc_enable;
break;
@@ -427,6 +434,14 @@ vmx_wrmsr(struct vmx *vmx, int vcpuid, u
error = 0;
 
switch (num) {
+   case MSR_MTRRcap:
+   vm_inject_gp(vmx-vm, vcpuid);
+   break;
+   case MSR_MTRRdefType:
+   case MSR_MTRR4kBase ... MSR_MTRR4kBase + 8:
+   case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1:
+   case MSR_MTRR64kBase:
+   break;  /* Ignore writes */
case MSR_IA32_MISC_ENABLE:
changed = val ^ misc_enable;
/*

Modified: head/sys/amd64/vmm/x86.c
==
--- head/sys/amd64/vmm/x86.cThu Apr 30 18:23:38 2015(r282280)
+++ head/sys/amd64/vmm/x86.cThu Apr 30 19:23:50 2015(r282281)
@@ -289,9 +289,8 @@ x86_emulate_cpuid(struct vm *vm, int vcp

/*
 * Machine check handling is done in the host.
-* Hide MTRR capability.
 */
-   regs[3] = ~(CPUID_MCA | CPUID_MCE | CPUID_MTRR);
+   regs[3] = ~(CPUID_MCA | CPUID_MCE);
 
 /*
 * Hide the debug store capability.
___
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: r282283 - in head/sys: kern sys

2015-04-30 Thread Mariusz Zaborski
Author: oshogbo
Date: Thu Apr 30 20:50:42 2015
New Revision: 282283
URL: https://svnweb.freebsd.org/changeset/base/282283

Log:
  Mark local function as static as a result of removing recursion.
  
  Approved by:  pjd (mentor)

Modified:
  head/sys/kern/subr_nvlist.c
  head/sys/sys/nvlist_impl.h

Modified: head/sys/kern/subr_nvlist.c
==
--- head/sys/kern/subr_nvlist.c Thu Apr 30 20:47:33 2015(r282282)
+++ head/sys/kern/subr_nvlist.c Thu Apr 30 20:50:42 2015(r282283)
@@ -583,7 +583,7 @@ nvlist_pack_header(const nvlist_t *nvl, 
return (ptr);
 }
 
-void *
+static void *
 nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep)
 {
unsigned char *buf, *ptr;
@@ -762,7 +762,7 @@ failed:
return (NULL);
 }
 
-nvlist_t *
+static nvlist_t *
 nvlist_xunpack(const void *buf, size_t size, const int *fds, size_t nfds)
 {
const unsigned char *ptr;

Modified: head/sys/sys/nvlist_impl.h
==
--- head/sys/sys/nvlist_impl.h  Thu Apr 30 20:47:33 2015(r282282)
+++ head/sys/sys/nvlist_impl.h  Thu Apr 30 20:50:42 2015(r282283)
@@ -38,10 +38,6 @@
 
 #include nv.h
 
-void *nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep);
-nvlist_t *nvlist_xunpack(const void *buf, size_t size, const int *fds,
-size_t nfds);
-
 nvpair_t *nvlist_get_nvpair_parent(const nvlist_t *nvl);
 const unsigned char *nvlist_unpack_header(nvlist_t *nvl,
 const unsigned char *ptr, size_t nfds, bool *isbep, size_t *leftp);
___
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: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_module

2015-04-30 Thread Tijl Coosemans
On Thu, 30 Apr 2015 13:44:18 -0500 Bryan Drewery bdrew...@freebsd.org wrote:
 On 4/30/2015 11:08 AM, Tijl Coosemans wrote:
 Author: tijl
 Date: Thu Apr 30 16:08:47 2015
 New Revision: 282275
 URL: https://svnweb.freebsd.org/changeset/base/282275
 
 Log:
   MFC r275805:
   
   Fix incorrect type of invalids argument in __iconv() prototype.
   
   MFC r281550,281591:
   
   Remove the const qualifier from iconv(3) to comply with POSIX:
   http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
   
   Adjust all code that calls iconv.
   
   PR:199099
 
 Modified:
   stable/10/UPDATING
   stable/10/bin/csh/config.h
   stable/10/bin/csh/iconv_stub.h
   stable/10/contrib/smbfs/include/netsmb/smb_lib.h
   stable/10/contrib/smbfs/lib/smb/nls.c
   stable/10/contrib/smbfs/lib/smb/print.c
   stable/10/contrib/smbfs/lib/smb/rq.c
   stable/10/include/iconv.h
   stable/10/lib/libarchive/Makefile
   stable/10/lib/libc/iconv/__iconv.c
   stable/10/lib/libc/iconv/bsd_iconv.c
   stable/10/lib/libc/iconv/citrus_iconv.h
   stable/10/lib/libc/iconv/citrus_iconv_local.h
   stable/10/lib/libc/iconv/citrus_none.c
   stable/10/lib/libc/iconv/citrus_stdenc.h
   stable/10/lib/libc/iconv/citrus_stdenc_local.h
   stable/10/lib/libc/iconv/citrus_stdenc_template.h
   stable/10/lib/libc/iconv/iconv-internal.h
   stable/10/lib/libc/iconv/iconv.3
   stable/10/lib/libc/iconv/iconv.c
   stable/10/lib/libc/iconv/iconv_compat.c
   stable/10/lib/libc/locale/cXXrtomb_iconv.h
   stable/10/lib/libc/locale/mbrtocXX_iconv.h
   stable/10/lib/libiconv_modules/BIG5/citrus_big5.c
   stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
   stable/10/lib/libiconv_modules/EUC/citrus_euc.c
   stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c
   stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
   stable/10/lib/libiconv_modules/HZ/citrus_hz.c
   stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c
   stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c
   stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c
   stable/10/lib/libiconv_modules/UES/citrus_ues.c
   stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c
   stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c
   stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c
   stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c
   stable/10/lib/libiconv_modules/ZW/citrus_zw.c
   stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
   stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
   stable/10/lib/libkiconv/xlat16_iconv.c
   stable/10/sys/sys/param.h
   stable/10/usr.bin/iconv/iconv.c
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/UPDATING
 ==
 --- stable/10/UPDATING   Thu Apr 30 15:48:48 2015(r282274)
 +++ stable/10/UPDATING   Thu Apr 30 16:08:47 2015(r282275)
 @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
  stable/10, and then rebuild without this option. The bootstrap process from
  older version of current is a bit fragile.
  
 +20150430:
 +The const qualifier has been removed from iconv(3) to comply with
 +POSIX.  The ports tree is aware of this from r384038 onwards.
 +
 
 Being an ABI change this seems wrong to MFC. Binaries are not only built
 from Ports.
 
 For a binary built on 10.1 will this change cause any issues?

Removing const from a function parameter is not an ABI change, so there
are no issues for binaries.  The worst you can run into is a warning/error
from a compiler (when you pass a const char** argument to what is now a
char** parameter), but this should be trivial to fix.


pgpVIKvZjjvK9.pgp
Description: OpenPGP digital signature


svn commit: r282294 - head/tools/build

2015-04-30 Thread Bryan Drewery
Author: bdrewery
Date: Fri May  1 04:35:42 2015
New Revision: 282294
URL: https://svnweb.freebsd.org/changeset/base/282294

Log:
  Fix a comment

Modified:
  head/tools/build/check-links.sh

Modified: head/tools/build/check-links.sh
==
--- head/tools/build/check-links.sh Fri May  1 03:33:31 2015
(r282293)
+++ head/tools/build/check-links.sh Fri May  1 04:35:42 2015
(r282294)
@@ -83,7 +83,7 @@ if [ ${CHECK_UNRESOLVED} -eq 1 ]; then
libkey crt1.o
setvar ${libkey} ${lib_symbols}
 
-   # No search libs for all symbols and report missing ones.
+   # Now search libs for all symbols and report missing ones.
for sym in ${unresolved_symbols}; do
found=0
for lib in ${list_libs}; 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: r282295 - head/tools/build

2015-04-30 Thread Bryan Drewery
Author: bdrewery
Date: Fri May  1 05:01:56 2015
New Revision: 282295
URL: https://svnweb.freebsd.org/changeset/base/282295

Log:
  Add a -v to tell where each symbol is resolved from.
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/check-links.sh

Modified: head/tools/build/check-links.sh
==
--- head/tools/build/check-links.sh Fri May  1 04:35:42 2015
(r282294)
+++ head/tools/build/check-links.sh Fri May  1 05:01:56 2015
(r282295)
@@ -20,9 +20,11 @@ libkey() {
 
 ret=0
 CHECK_UNRESOLVED=1
-while getopts U flag; do
+VERBOSE_RESOLVED=0
+while getopts Uv flag; do
case ${flag} in
U) CHECK_UNRESOLVED=0 ;;
+   v) VERBOSE_RESOLVED=1 ;;
esac
 done
 shift $((OPTIND-1))
@@ -91,7 +93,12 @@ if [ ${CHECK_UNRESOLVED} -eq 1 ]; then
eval lib_symbols=\\${${libkey}}\
# lib_symbols now contains symbols for the lib.
case  ${lib_symbols}  in
-   *\ ${sym}\ *) found=1  break ;;
+   *\ ${sym}\ *)
+   [ ${VERBOSE_RESOLVED} -eq 1 ] 
+   echo Resolved symbol ${sym} from 
${lib}
+   found=1
+   break
+   ;;
esac
done
if [ $found -eq 0 ]; then
___
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: r282285 - in head: gnu/usr.bin/cc tools/build/mk usr.bin

2015-04-30 Thread Bjoern A. Zeeb

 On 30 Apr 2015, at 21:30 , Ed Maste ema...@freebsd.org wrote:
 
 Author: emaste
 Date: Thu Apr 30 21:30:33 2015
 New Revision: 282285
 URL: https://svnweb.freebsd.org/changeset/base/282285
 
 Log:
  Add ELF Tool Chain's c++filt to the build
 
  Differential Revision:   https://reviews.freebsd.org/D2408
  Reviewed by: brooks, imp
  Sponsored by:The FreeBSD Foundation
 
 Modified:
  head/gnu/usr.bin/cc/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile

svn add usr.bin/cxxfilt
svn commit -m “Missed in r282285” usr.bin/

?

— 
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-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: r282291 - head/usr.sbin/crunch/crunchide

2015-04-30 Thread Ed Maste
Author: emaste
Date: Thu Apr 30 23:48:05 2015
New Revision: 282291
URL: https://svnweb.freebsd.org/changeset/base/282291

Log:
  crunchide: Restore local EM_AARCH64 constant for bootstrapping
  
  Most of the EM_* constants are available in all supported host branches,
  but EM_AARCH64 was added relatively recently. Add it back to fix
  building HEAD on 10.x.
  
  Noticed by:   adrian, jmallett

Modified:
  head/usr.sbin/crunch/crunchide/exec_elf32.c

Modified: head/usr.sbin/crunch/crunchide/exec_elf32.c
==
--- head/usr.sbin/crunch/crunchide/exec_elf32.c Thu Apr 30 22:56:43 2015
(r282290)
+++ head/usr.sbin/crunch/crunchide/exec_elf32.c Thu Apr 30 23:48:05 2015
(r282291)
@@ -178,6 +178,9 @@ ELFNAMEEND(check)(int fd, const char *fn
switch (xe16toh(eh.e_machine)) {
case EM_386: break;
case EM_ALPHA: break;
+#ifndef EM_AARCH64
+#defineEM_AARCH64  183
+#endif
case EM_AARCH64: break;
case EM_ARM: break;
case EM_MIPS: break;
___
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: r282292 - stable/10/release/arm

2015-04-30 Thread Glen Barber
Author: gjb
Date: Fri May  1 00:31:40 2015
New Revision: 282292
URL: https://svnweb.freebsd.org/changeset/base/282292

Log:
  MFC r282148:
Fix CROCHETBRANCH.
  
  PR:   199760
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/10/release/arm/BEAGLEBONE.conf
  stable/10/release/arm/PANDABOARD.conf
  stable/10/release/arm/RPI-B.conf
  stable/10/release/arm/WANDBOARD-QUAD.conf
  stable/10/release/arm/ZEDBOARD.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/arm/BEAGLEBONE.conf
==
--- stable/10/release/arm/BEAGLEBONE.conf   Thu Apr 30 23:48:05 2015
(r282291)
+++ stable/10/release/arm/BEAGLEBONE.conf   Fri May  1 00:31:40 2015
(r282292)
@@ -25,6 +25,6 @@ XDEV_ARCH=armv6
 XDEV_FLAGS=WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1
 KERNEL=BEAGLEBONE
 CROCHETSRC=https://github.com/freebsd/crochet;
-CROCHETBRANCH=trunk@r744
+CROCHETBRANCH=trunk@rHEAD
 set +a
 

Modified: stable/10/release/arm/PANDABOARD.conf
==
--- stable/10/release/arm/PANDABOARD.conf   Thu Apr 30 23:48:05 2015
(r282291)
+++ stable/10/release/arm/PANDABOARD.conf   Fri May  1 00:31:40 2015
(r282292)
@@ -25,6 +25,6 @@ XDEV_ARCH=armv6
 XDEV_FLAGS=WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1
 KERNEL=PANDABOARD
 CROCHETSRC=https://github.com/freebsd/crochet;
-CROCHETBRANCH=trunk@r744
+CROCHETBRANCH=trunk@rHEAD
 set +a
 

Modified: stable/10/release/arm/RPI-B.conf
==
--- stable/10/release/arm/RPI-B.confThu Apr 30 23:48:05 2015
(r282291)
+++ stable/10/release/arm/RPI-B.confFri May  1 00:31:40 2015
(r282292)
@@ -25,7 +25,7 @@ XDEV_ARCH=armv6
 XDEV_FLAGS=WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1
 KERNEL=RPI-B
 CROCHETSRC=https://github.com/freebsd/crochet;
-CROCHETBRANCH=trunk@r744
+CROCHETBRANCH=trunk@rHEAD
 UBOOTSRC=https://github.com/gonzoua/u-boot-pi;
 UBOOTBRANCH=trunk
 UBOOTDIR=/tmp/crochet/u-boot-rpi

Modified: stable/10/release/arm/WANDBOARD-QUAD.conf
==
--- stable/10/release/arm/WANDBOARD-QUAD.conf   Thu Apr 30 23:48:05 2015
(r282291)
+++ stable/10/release/arm/WANDBOARD-QUAD.conf   Fri May  1 00:31:40 2015
(r282292)
@@ -25,6 +25,6 @@ XDEV_ARCH=armv6
 XDEV_FLAGS=WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1
 KERNEL=WANDBOARD-QUAD
 CROCHETSRC=https://github.com/freebsd/crochet;
-CROCHETBRANCH=trunk@r744
+CROCHETBRANCH=trunk@rHEAD
 set +a
 

Modified: stable/10/release/arm/ZEDBOARD.conf
==
--- stable/10/release/arm/ZEDBOARD.conf Thu Apr 30 23:48:05 2015
(r282291)
+++ stable/10/release/arm/ZEDBOARD.conf Fri May  1 00:31:40 2015
(r282292)
@@ -24,6 +24,6 @@ XDEV_ARCH=armv6
 XDEV_FLAGS=WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1
 KERNEL=ZEDBOARD
 CROCHETSRC=https://github.com/freebsd/crochet;
-CROCHETBRANCH=trunk@r744
+CROCHETBRANCH=trunk@rHEAD
 set +a
 
___
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: r282293 - head/sys/conf

2015-04-30 Thread Eric Joyner
Author: erj
Date: Fri May  1 03:33:31 2015
New Revision: 282293
URL: https://svnweb.freebsd.org/changeset/base/282293

Log:
  Fix build by adding ixgbe_x550.c to sys/conf/files for ixgbe.
  
  Submitted by: neel
  Approved by:  jfv (mentor)

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May  1 00:31:40 2015(r282292)
+++ head/sys/conf/files Fri May  1 03:33:31 2015(r282293)
@@ -1779,6 +1779,8 @@ dev/ixgbe/ixgbe_82599.c   optional ix ixv
compile-with ${NORMAL_C} -I$S/dev/ixgbe
 dev/ixgbe/ixgbe_x540.c optional ix ixv inet \
compile-with ${NORMAL_C} -I$S/dev/ixgbe
+dev/ixgbe/ixgbe_x550.c optional ix ixv inet \
+   compile-with ${NORMAL_C} -I$S/dev/ixgbe
 dev/ixgbe/ixgbe_dcb.c  optional ix ixv inet \
compile-with ${NORMAL_C} -I$S/dev/ixgbe
 dev/ixgbe/ixgbe_dcb_82598.coptional ix ixv inet \
___
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: r282287 - in head/sys/amd64: include vmm vmm/amd vmm/intel vmm/io

2015-04-30 Thread Neel Natu
Author: neel
Date: Thu Apr 30 22:23:22 2015
New Revision: 282287
URL: https://svnweb.freebsd.org/changeset/base/282287

Log:
  Don't require sys/cpuset.h to be always included before machine/vmm.h.
  
  Only a subset of source files that include machine/vmm.h need to use the
  APIs that require the inclusion of sys/cpuset.h.
  
  MFC after:1 week

Modified:
  head/sys/amd64/include/vmm.h
  head/sys/amd64/vmm/amd/amdv.c
  head/sys/amd64/vmm/amd/svm_msr.c
  head/sys/amd64/vmm/amd/vmcb.c
  head/sys/amd64/vmm/intel/vmx_msr.c
  head/sys/amd64/vmm/io/vatpic.c
  head/sys/amd64/vmm/io/vatpit.c
  head/sys/amd64/vmm/io/vhpet.c
  head/sys/amd64/vmm/io/vioapic.c
  head/sys/amd64/vmm/io/vpmtmr.c
  head/sys/amd64/vmm/io/vrtc.c
  head/sys/amd64/vmm/vmm_ioport.c
  head/sys/amd64/vmm/vmm_stat.c
  head/sys/amd64/vmm/x86.c

Modified: head/sys/amd64/include/vmm.h
==
--- head/sys/amd64/include/vmm.hThu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/include/vmm.hThu Apr 30 22:23:22 2015
(r282287)
@@ -204,13 +204,12 @@ int vm_get_x2apic_state(struct vm *vm, i
 int vm_set_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state state);
 int vm_apicid2vcpuid(struct vm *vm, int apicid);
 int vm_activate_cpu(struct vm *vm, int vcpu);
-cpuset_t vm_active_cpus(struct vm *vm);
-cpuset_t vm_suspended_cpus(struct vm *vm);
 struct vm_exit *vm_exitinfo(struct vm *vm, int vcpuid);
 void vm_exit_suspended(struct vm *vm, int vcpuid, uint64_t rip);
 void vm_exit_rendezvous(struct vm *vm, int vcpuid, uint64_t rip);
 void vm_exit_astpending(struct vm *vm, int vcpuid, uint64_t rip);
 
+#ifdef _SYS__CPUSET_H_
 /*
  * Rendezvous all vcpus specified in 'dest' and execute 'func(arg)'.
  * The rendezvous 'func(arg)' is not allowed to do anything that will
@@ -228,6 +227,9 @@ void vm_exit_astpending(struct vm *vm, i
 typedef void (*vm_rendezvous_func_t)(struct vm *vm, int vcpuid, void *arg);
 void vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest,
 vm_rendezvous_func_t func, void *arg);
+cpuset_t vm_active_cpus(struct vm *vm);
+cpuset_t vm_suspended_cpus(struct vm *vm);
+#endif /* _SYS__CPUSET_H_ */
 
 static __inline int
 vcpu_rendezvous_pending(void *rendezvous_cookie)

Modified: head/sys/amd64/vmm/amd/amdv.c
==
--- head/sys/amd64/vmm/amd/amdv.c   Thu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/vmm/amd/amdv.c   Thu Apr 30 22:23:22 2015
(r282287)
@@ -32,7 +32,6 @@ __FBSDID($FreeBSD$);
 #include sys/param.h
 #include sys/systm.h
 #include sys/errno.h
-#include sys/smp.h
 
 #include machine/vmm.h
 #include io/iommu.h

Modified: head/sys/amd64/vmm/amd/svm_msr.c
==
--- head/sys/amd64/vmm/amd/svm_msr.cThu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/vmm/amd/svm_msr.cThu Apr 30 22:23:22 2015
(r282287)
@@ -30,7 +30,6 @@ __FBSDID($FreeBSD$);
 #include sys/param.h
 #include sys/errno.h
 #include sys/systm.h
-#include sys/cpuset.h
 
 #include machine/cpufunc.h
 #include machine/specialreg.h

Modified: head/sys/amd64/vmm/amd/vmcb.c
==
--- head/sys/amd64/vmm/amd/vmcb.c   Thu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/vmm/amd/vmcb.c   Thu Apr 30 22:23:22 2015
(r282287)
@@ -29,7 +29,6 @@ __FBSDID($FreeBSD$);
 
 #include sys/param.h
 #include sys/systm.h
-#include sys/cpuset.h
 
 #include machine/segments.h
 #include machine/specialreg.h

Modified: head/sys/amd64/vmm/intel/vmx_msr.c
==
--- head/sys/amd64/vmm/intel/vmx_msr.c  Thu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/vmm/intel/vmx_msr.c  Thu Apr 30 22:23:22 2015
(r282287)
@@ -31,7 +31,6 @@ __FBSDID($FreeBSD$);
 
 #include sys/param.h
 #include sys/systm.h
-#include sys/cpuset.h
 
 #include machine/clock.h
 #include machine/cpufunc.h

Modified: head/sys/amd64/vmm/io/vatpic.c
==
--- head/sys/amd64/vmm/io/vatpic.c  Thu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/vmm/io/vatpic.c  Thu Apr 30 22:23:22 2015
(r282287)
@@ -30,7 +30,6 @@ __FBSDID($FreeBSD$);
 #include sys/param.h
 #include sys/types.h
 #include sys/queue.h
-#include sys/cpuset.h
 #include sys/kernel.h
 #include sys/lock.h
 #include sys/malloc.h

Modified: head/sys/amd64/vmm/io/vatpit.c
==
--- head/sys/amd64/vmm/io/vatpit.c  Thu Apr 30 21:51:12 2015
(r282286)
+++ head/sys/amd64/vmm/io/vatpit.c  Thu Apr 30 22:23:22 2015
(r282287)
@@ -31,7 +31,6 @@ __FBSDID($FreeBSD$);
 #include sys/param.h
 #include sys/types.h
 #include 

svn commit: r282288 - head/usr.bin/cxxfilt

2015-04-30 Thread Ed Maste
Author: emaste
Date: Thu Apr 30 22:51:15 2015
New Revision: 282288
URL: https://svnweb.freebsd.org/changeset/base/282288

Log:
  Actually add c++filt's Makefile
  
  Missed in r282285
  
  Pointy hat to:emaste

Added:
  head/usr.bin/cxxfilt/
  head/usr.bin/cxxfilt/Makefile   (contents, props changed)

Added: head/usr.bin/cxxfilt/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/cxxfilt/Makefile   Thu Apr 30 22:51:15 2015
(r282288)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.include src.opts.mk
+
+ELFTCDIR=  ${.CURDIR}/../../contrib/elftoolchain
+SRCDIR=${ELFTCDIR}/cxxfilt
+
+.PATH: ${SRCDIR}
+
+PROG=  c++filt
+SRCS=  cxxfilt.c
+
+LIBADD=elftc
+
+CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common
+
+.include bsd.prog.mk
___
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: r282285 - in head: gnu/usr.bin/cc tools/build/mk usr.bin

2015-04-30 Thread Ed Maste
Author: emaste
Date: Thu Apr 30 21:30:33 2015
New Revision: 282285
URL: https://svnweb.freebsd.org/changeset/base/282285

Log:
  Add ELF Tool Chain's c++filt to the build
  
  Differential Revision:https://reviews.freebsd.org/D2408
  Reviewed by:  brooks, imp
  Sponsored by: The FreeBSD Foundation

Modified:
  head/gnu/usr.bin/cc/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile

Modified: head/gnu/usr.bin/cc/Makefile
==
--- head/gnu/usr.bin/cc/MakefileThu Apr 30 21:00:47 2015
(r282284)
+++ head/gnu/usr.bin/cc/MakefileThu Apr 30 21:30:33 2015
(r282285)
@@ -12,7 +12,10 @@ SUBDIR+= cpp
 .endif
 
 .if ${MK_CXX} != no
-SUBDIR+= cc1plus c++ c++filt
+SUBDIR+= cc1plus c++
+.if ${MK_ELFTOOLCHAIN_TOOLS} == no
+SUBDIR+= c++filt
+.endif
 .endif
 
 .if ${MK_GCOV} != no

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Thu Apr 30 21:00:47 
2015(r282284)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Thu Apr 30 21:30:33 
2015(r282285)
@@ -1004,7 +1004,9 @@ OLD_DIRS+=usr/include/fs/cuse
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
+.if ${MK_ELFTOOLCHAIN_TOOLS} == no
 OLD_FILES+=usr/bin/c++filt
+.endif
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .if ${MK_GCC} == no

Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile   Thu Apr 30 21:00:47 2015(r282284)
+++ head/usr.bin/Makefile   Thu Apr 30 21:30:33 2015(r282285)
@@ -36,6 +36,7 @@ SUBDIR=   ${_addr2line} \
csplit \
ctlstat \
cut \
+   ${_cxxfilt} \
demandoc \
dirname \
dpv \
@@ -237,6 +238,7 @@ SUBDIR+=ee
 
 .if ${MK_ELFTOOLCHAIN_TOOLS} != no
 _addr2line=addr2line
+_cxxfilt=  cxxfilt
 _elfcopy=  elfcopy
 _nm=   nm
 _readelf=  readelf
___
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: r282286 - head/sys/netpfil/ipfw

2015-04-30 Thread Alexander V. Chernikov
Author: melifaro
Date: Thu Apr 30 21:51:12 2015
New Revision: 282286
URL: https://svnweb.freebsd.org/changeset/base/282286

Log:
  Fix KASSERT introduced in r282155.
  
  Found by: dhw

Modified:
  head/sys/netpfil/ipfw/ip_fw_table.c

Modified: head/sys/netpfil/ipfw/ip_fw_table.c
==
--- head/sys/netpfil/ipfw/ip_fw_table.c Thu Apr 30 21:30:33 2015
(r282285)
+++ head/sys/netpfil/ipfw/ip_fw_table.c Thu Apr 30 21:51:12 2015
(r282286)
@@ -3399,9 +3399,10 @@ ref_rule_objects(struct ip_fw_chain *ch,
 
IPFW_UH_WUNLOCK(ch);
 
-   KASSERT(found + unresolved == ci-object_opcodes,
-   (refcount incosistency: found: %d unr: %d total: %d,
-   found, unresolved, ci-object_opcodes));
+   found = pidx - oib;
+   KASSERT(found == ci-object_opcodes,
+   (refcount inconsistency: found: %d total: %d,
+   found, ci-object_opcodes));
 
/* Perform auto-creation for non-existing objects */
if (numnew != 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: r282289 - head/sys/dev/ixgbe

2015-04-30 Thread Eric Joyner
Author: erj
Date: Thu Apr 30 22:53:27 2015
New Revision: 282289
URL: https://svnweb.freebsd.org/changeset/base/282289

Log:
  Add support for certain Intel X550 devices.
  
  These include standalone X550 adapters, X552 10GbE backplane, and
  X552/X557-AT 10GBASE-T; with the latter two being integrated into Xeon D SoCs.
  
  As well, this bumps the ixgbe version number to 2.8.3, and includes updates
  to shared code for support for the new devices.
  
  Differential Revision: D2414
  Reviewed by:  gnn, adrian
  Approved by:  jfv (mentor), gnn (mentor)

Added:
  head/sys/dev/ixgbe/ixgbe_x550.c   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_x550.h   (contents, props changed)
Modified:
  head/sys/dev/ixgbe/if_ix.c
  head/sys/dev/ixgbe/if_ixv.c
  head/sys/dev/ixgbe/ix_txrx.c
  head/sys/dev/ixgbe/ixgbe.h
  head/sys/dev/ixgbe/ixgbe_82598.c
  head/sys/dev/ixgbe/ixgbe_82598.h
  head/sys/dev/ixgbe/ixgbe_82599.c
  head/sys/dev/ixgbe/ixgbe_82599.h
  head/sys/dev/ixgbe/ixgbe_api.c
  head/sys/dev/ixgbe/ixgbe_api.h
  head/sys/dev/ixgbe/ixgbe_common.c
  head/sys/dev/ixgbe/ixgbe_common.h
  head/sys/dev/ixgbe/ixgbe_dcb.c
  head/sys/dev/ixgbe/ixgbe_dcb.h
  head/sys/dev/ixgbe/ixgbe_dcb_82598.c
  head/sys/dev/ixgbe/ixgbe_dcb_82598.h
  head/sys/dev/ixgbe/ixgbe_dcb_82599.c
  head/sys/dev/ixgbe/ixgbe_dcb_82599.h
  head/sys/dev/ixgbe/ixgbe_mbx.c
  head/sys/dev/ixgbe/ixgbe_mbx.h
  head/sys/dev/ixgbe/ixgbe_osdep.h
  head/sys/dev/ixgbe/ixgbe_phy.c
  head/sys/dev/ixgbe/ixgbe_phy.h
  head/sys/dev/ixgbe/ixgbe_type.h
  head/sys/dev/ixgbe/ixgbe_vf.c
  head/sys/dev/ixgbe/ixgbe_vf.h
  head/sys/dev/ixgbe/ixgbe_x540.c
  head/sys/dev/ixgbe/ixgbe_x540.h

Modified: head/sys/dev/ixgbe/if_ix.c
==
--- head/sys/dev/ixgbe/if_ix.c  Thu Apr 30 22:51:15 2015(r282288)
+++ head/sys/dev/ixgbe/if_ix.c  Thu Apr 30 22:53:27 2015(r282289)
@@ -54,7 +54,7 @@ int ixgbe_display_debug_stat
 /*
  *  Driver version
  */
-char ixgbe_driver_version[] = 2.7.4;
+char ixgbe_driver_version[] = 2.8.3;
 
 /*
  *  PCI Device ID Table
@@ -117,6 +117,8 @@ static int  ixgbe_probe(device_t);
 static int  ixgbe_attach(device_t);
 static int  ixgbe_detach(device_t);
 static int  ixgbe_shutdown(device_t);
+static int ixgbe_suspend(device_t);
+static int ixgbe_resume(device_t);
 static int  ixgbe_ioctl(struct ifnet *, u_long, caddr_t);
 static voidixgbe_init(void *);
 static voidixgbe_init_locked(struct adapter *);
@@ -136,7 +138,12 @@ static int ixgbe_setup_msix(struct adapt
 static voidixgbe_free_pci_resources(struct adapter *);
 static voidixgbe_local_timer(void *);
 static int ixgbe_setup_interface(device_t, struct adapter *);
+static voidixgbe_config_dmac(struct adapter *);
+static voidixgbe_config_delay_values(struct adapter *);
 static voidixgbe_config_link(struct adapter *);
+static voidixgbe_check_eee_support(struct adapter *);
+static voidixgbe_check_wol_support(struct adapter *);
+static int ixgbe_setup_low_power_mode(struct adapter *);
 static voidixgbe_rearm_queues(struct adapter *, u64);
 
 static void ixgbe_initialize_transmit_units(struct adapter *);
@@ -150,9 +157,6 @@ static void ixgbe_update_stats_count
 static void ixgbe_set_promisc(struct adapter *);
 static void ixgbe_set_multi(struct adapter *);
 static void ixgbe_update_link_status(struct adapter *);
-static int ixgbe_set_flowcntl(SYSCTL_HANDLER_ARGS);
-static int ixgbe_set_advertise(SYSCTL_HANDLER_ARGS);
-static int ixgbe_set_thermal_test(SYSCTL_HANDLER_ARGS);
 static voidixgbe_set_ivar(struct adapter *, u8, u8, s8);
 static voidixgbe_configure_ivars(struct adapter *);
 static u8 *ixgbe_mc_array_itr(struct ixgbe_hw *, u8 **, u32 *);
@@ -161,7 +165,22 @@ static voidixgbe_setup_vlan_hw_support(
 static voidixgbe_register_vlan(void *, struct ifnet *, u16);
 static voidixgbe_unregister_vlan(void *, struct ifnet *, u16);
 
-static void ixgbe_add_hw_stats(struct adapter *adapter);
+static voidixgbe_add_device_sysctls(struct adapter *);
+static void ixgbe_add_hw_stats(struct adapter *);
+
+/* Sysctl handlers */
+static int ixgbe_set_flowcntl(SYSCTL_HANDLER_ARGS);
+static int ixgbe_set_advertise(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_thermal_test(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_dmac(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_phy_temp(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_phy_overtemp_occurred(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_wol_enable(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_wufc(SYSCTL_HANDLER_ARGS);
+static int ixgbe_sysctl_eee_enable(SYSCTL_HANDLER_ARGS);
+static 

svn commit: r282290 - in head/sys/modules: ix ixv

2015-04-30 Thread Eric Joyner
Author: erj
Date: Thu Apr 30 22:56:43 2015
New Revision: 282290
URL: https://svnweb.freebsd.org/changeset/base/282290

Log:
  Include makefiles necessary to make ixgbe build with the new code.
  
  Originally supposed to be included in r282289.
  
  Differential Revision: D2414

Modified:
  head/sys/modules/ix/Makefile
  head/sys/modules/ixv/Makefile

Modified: head/sys/modules/ix/Makefile
==
--- head/sys/modules/ix/MakefileThu Apr 30 22:53:27 2015
(r282289)
+++ head/sys/modules/ix/MakefileThu Apr 30 22:56:43 2015
(r282290)
@@ -9,7 +9,7 @@ SRCS+= if_ix.c ix_txrx.c
 # Shared source
 SRCS+= ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS+= ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
-SRCS+= ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
+SRCS+= ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
 
 .include bsd.kmod.mk

Modified: head/sys/modules/ixv/Makefile
==
--- head/sys/modules/ixv/Makefile   Thu Apr 30 22:53:27 2015
(r282289)
+++ head/sys/modules/ixv/Makefile   Thu Apr 30 22:56:43 2015
(r282290)
@@ -9,7 +9,7 @@ SRCS+= if_ixv.c ix_txrx.c
 # Shared source
 SRCS+= ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS+= ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
-SRCS+= ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
+SRCS+= ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
 
 .include bsd.kmod.mk
___
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: r282280 - in head/sys/dev: e1000 ixgbe ixl

2015-04-30 Thread Gleb Smirnoff
  John,

On Thu, Apr 30, 2015 at 06:23:39PM +, John Baldwin wrote:
J Author: jhb
J Date: Thu Apr 30 18:23:38 2015
J New Revision: 282280
J URL: https://svnweb.freebsd.org/changeset/base/282280
J 
J Log:
J   Various fixes to the stats in igb(4), ixgbe(4), and ixl(4).
J   - Use hardware counters for ifnet stats in igb(4) when possible.  This
J ensures these stats include packets that bypass the regular stack via
J netmap.
J   - Don't derefence values off the end of the igb(4) VF stats structure.
J Instead, add a dedicated if_get_counter method for igb(4) VF interfaces.
J   - Report missed packets on igb(4) as input queue drops rather than an
J input error.
J   - Report bug_ring drop counts as output queue drops for igb(4) and 
ixgbe(4).
J   - Export the buf_ring drop stats for individual rings via sysctl on
J ixgbe(4).
   ^

While you are here, let me remind you about this plan:

https://lists.freebsd.org/pipermail/svn-src-head/2014-October/063575.html

We can prototype the API to userland now, write down a utility that uses
it, or add the functionality to an existing utility. And start with Intel
drivers, that seem to be most interested in extra stats.


-- 
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: r282274 - in head: share/man/man4 sys/amd64/include/xen sys/conf sys/dev/xen/balloon sys/dev/xen/blkback sys/dev/xen/control sys/dev/xen/grant_table sys/dev/xen/netback sys/dev/xen/netf...

2015-04-30 Thread John Baldwin
Author: jhb
Date: Thu Apr 30 15:48:48 2015
New Revision: 282274
URL: https://svnweb.freebsd.org/changeset/base/282274

Log:
  Remove support for Xen PV domU kernels.  Support for HVM domU kernels
  remains.  Xen is planning to phase out support for PV upstream since it
  is harder to maintain and has more overhead.  Modern x86 CPUs include
  virtualization extensions that support HVM guests instead of PV guests.
  In addition, the PV code was i386 only and not as well maintained recently
  as the HVM code.
  - Remove the i386-only NATIVE option that was used to disable certain
components for PV kernels.  These components are now standard as they
are on amd64.
  - Remove !XENHVM bits from PV drivers.
  - Remove various shims required for XEN (e.g. PT_UPDATES_FLUSH, LOAD_CR3,
etc.)
  - Remove duplicate copy of xen/features.h.
  - Remove unused, i386-only xenstored.h.
  
  Differential Revision:https://reviews.freebsd.org/D2362
  Reviewed by:  royger
  Tested by:royger (i386/amd64 HVM domU and amd64 PVH dom0)
  Relnotes: yes

Deleted:
  head/sys/amd64/include/xen/xenpmap.h
  head/sys/i386/conf/XEN
  head/sys/i386/include/xen/features.h
  head/sys/i386/include/xen/xenpmap.h
  head/sys/i386/include/xen/xenstored.h
  head/sys/i386/xen/
Modified:
  head/share/man/man4/xen.4
  head/sys/amd64/include/xen/xenfunc.h
  head/sys/amd64/include/xen/xenvar.h
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/options.i386
  head/sys/dev/xen/balloon/balloon.c
  head/sys/dev/xen/blkback/blkback.c
  head/sys/dev/xen/control/control.c
  head/sys/dev/xen/grant_table/grant_table.c
  head/sys/dev/xen/netback/netback.c
  head/sys/dev/xen/netfront/netfront.c
  head/sys/i386/conf/DEFAULTS
  head/sys/i386/i386/apic_vector.s
  head/sys/i386/i386/genassym.c
  head/sys/i386/i386/machdep.c
  head/sys/i386/i386/minidump_machdep.c
  head/sys/i386/i386/support.s
  head/sys/i386/i386/swtch.s
  head/sys/i386/i386/sys_machdep.c
  head/sys/i386/i386/vm_machdep.c
  head/sys/i386/include/asmacros.h
  head/sys/i386/include/cpufunc.h
  head/sys/i386/include/intr_machdep.h
  head/sys/i386/include/pcpu.h
  head/sys/i386/include/pmap.h
  head/sys/i386/include/segments.h
  head/sys/i386/include/smp.h
  head/sys/i386/include/vmparam.h
  head/sys/i386/include/xen/hypercall.h
  head/sys/i386/include/xen/xen-os.h
  head/sys/i386/include/xen/xenfunc.h
  head/sys/i386/include/xen/xenvar.h
  head/sys/i386/isa/npx.c
  head/sys/i386/pci/pci_cfgreg.c
  head/sys/i386/pci/pci_pir.c
  head/sys/kern/kern_intr.c
  head/sys/kern/kern_synch.c
  head/sys/kern/subr_param.c
  head/sys/kern/subr_trap.c
  head/sys/vm/vm_page.c
  head/sys/x86/include/segments.h
  head/sys/x86/x86/busdma_bounce.c
  head/sys/x86/x86/cpu_machdep.c
  head/sys/x86/x86/identcpu.c
  head/sys/x86/x86/intr_machdep.c
  head/sys/x86/x86/local_apic.c
  head/sys/x86/xen/xen_intr.c
  head/sys/x86/xen/xen_nexus.c

Modified: head/share/man/man4/xen.4
==
--- head/share/man/man4/xen.4   Thu Apr 30 15:25:30 2015(r282273)
+++ head/share/man/man4/xen.4   Thu Apr 30 15:48:48 2015(r282274)
@@ -35,14 +35,6 @@
 .Nm xen
 .Nd Xen Hypervisor Guest (DomU) Support
 .Sh SYNOPSIS
-To compile para-virtualized (PV) Xen guest support into an i386 kernel, place
-the following lines in your kernel configuration file:
-.Bd -ragged -offset indent
-.Cd options PAE
-.Cd options XEN
-.Cd nooptions NATIVE
-.Ed
-.Pp
 To compile hardware-assisted virtualization (HVM) Xen guest support with
 para-virtualized drivers into an amd64 or i386 kernel,
 place the following lines in your kernel configuration file:
@@ -69,34 +61,14 @@ and hence able to optimize certain behav
 semantics.
 .Pp
 .Fx
-supports a fully para-virtualized (PV) kernel on the i386 architecture using
-.Cd options XEN
-and
-.Cd nooptions NATIVE ;
-currently, this requires use of a PAE kernel, enabled via
-.Cd options PAE .
-.Pp
-.Fx
-supports hardware-assisted virtualization (HVM) on both the i386 and amd64
-kernels; however, PV device drivers with an HVM kernel are only supported on
-the amd64 architecture, and require
-.Cd options XENHVM
-and
-.Cd device xenpci .
+supports hardware-assisted virtualization (HVM) on both i386 and amd64
+kernels.
 .Pp
 Para-virtualized device drivers are required in order to support certain
 functionality, such as processing management requests, returning idle
 physical memory pages to the hypervisor, etc.
 .Ss Xen DomU device drivers
-Xen para-virtualized drivers are automatically added to the kernel if a PV
-kernel is compiled using
-.Cd options XEN ;
-for HVM environments,
-.Cd options XENHVM
-and
-.Cd device xenpci
-are required.
-The follow drivers are supported:
+These para-virtualized drivers are supported:
 .Bl -hang -offset indent -width blkfront
 .It Nm balloon
 Allow physical memory pages to be returned to the hypervisor as a result of
@@ -148,8 +120,6 @@ It is 

Re: svn commit: r282274 - in head: share/man/man4 sys/amd64/include/xen sys/conf sys/dev/xen/balloon sys/dev/xen/blkback sys/dev/xen/control sys/dev/xen/grant_table sys/dev/xen/netback sys/dev/xen/net

2015-04-30 Thread John Baldwin
On Thursday, April 30, 2015 03:48:49 PM John Baldwin wrote:
 Author: jhb
 Date: Thu Apr 30 15:48:48 2015
 New Revision: 282274
 URL: https://svnweb.freebsd.org/changeset/base/282274
 
 Log:
   Remove support for Xen PV domU kernels.  Support for HVM domU kernels
   remains.  Xen is planning to phase out support for PV upstream since it
   is harder to maintain and has more overhead.  Modern x86 CPUs include
   virtualization extensions that support HVM guests instead of PV guests.
   In addition, the PV code was i386 only and not as well maintained recently
   as the HVM code.
   - Remove the i386-only NATIVE option that was used to disable certain
 components for PV kernels.  These components are now standard as they
 are on amd64.
   - Remove !XENHVM bits from PV drivers.
   - Remove various shims required for XEN (e.g. PT_UPDATES_FLUSH, LOAD_CR3,
 etc.)
   - Remove duplicate copy of xen/features.h.
   - Remove unused, i386-only xenstored.h.
   
   Differential Revision:  https://reviews.freebsd.org/D2362
   Reviewed by:royger
   Tested by:  royger (i386/amd64 HVM domU and amd64 PVH dom0)
   Relnotes:   yes

Forgot to add:

Discussed with: cperciva

Colin assured me that everyone using FreeBSD in EC2 is using HVM, not PV domU.

-- 
John Baldwin
___
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: r282273 - head/share/man/man4

2015-04-30 Thread John Baldwin
Author: jhb
Date: Thu Apr 30 15:25:30 2015
New Revision: 282273
URL: https://svnweb.freebsd.org/changeset/base/282273

Log:
  Update this page to note that XENHVM now works on i386.  (It shipped
  enabled in GENERIC in 10.0.)
  
  Reviewed by:  royger (earlier version)
  MFC after:1 week

Modified:
  head/share/man/man4/xen.4

Modified: head/share/man/man4/xen.4
==
--- head/share/man/man4/xen.4   Thu Apr 30 12:55:27 2015(r282272)
+++ head/share/man/man4/xen.4   Thu Apr 30 15:25:30 2015(r282273)
@@ -28,7 +28,7 @@
 .\
 .\ $FreeBSD$
 .\
-.Dd December 17, 2010
+.Dd April 30, 2015
 .Dt XEN 4
 .Os
 .Sh NAME
@@ -44,8 +44,8 @@ the following lines in your kernel confi
 .Ed
 .Pp
 To compile hardware-assisted virtualization (HVM) Xen guest support with
-para-virtualized drivers into an amd64 kernel, place the following lines in
-your kernel configuration file:
+para-virtualized drivers into an amd64 or i386 kernel,
+place the following lines in your kernel configuration file:
 .Bd -ragged -offset indent
 .Cd options XENHVM
 .Cd device xenpci
@@ -176,9 +176,6 @@ is only able to run as a Xen guest (DomU
 A fully para-virtualized (PV) kernel is only supported on i386, and not
 amd64.
 .Pp
-Para-virtualized drivers under hardware-assisted virtualization (HVM) kernel
-are only supported on amd64, not i386.
-.Pp
 As of this release, Xen PV DomU support is not heavily tested; instability
 has been reported during VM migration of PV kernels.
 .Pp
___
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: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_modules...

2015-04-30 Thread Tijl Coosemans
Author: tijl
Date: Thu Apr 30 16:08:47 2015
New Revision: 282275
URL: https://svnweb.freebsd.org/changeset/base/282275

Log:
  MFC r275805:
  
  Fix incorrect type of invalids argument in __iconv() prototype.
  
  MFC r281550,281591:
  
  Remove the const qualifier from iconv(3) to comply with POSIX:
  http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
  
  Adjust all code that calls iconv.
  
  PR:   199099

Modified:
  stable/10/UPDATING
  stable/10/bin/csh/config.h
  stable/10/bin/csh/iconv_stub.h
  stable/10/contrib/smbfs/include/netsmb/smb_lib.h
  stable/10/contrib/smbfs/lib/smb/nls.c
  stable/10/contrib/smbfs/lib/smb/print.c
  stable/10/contrib/smbfs/lib/smb/rq.c
  stable/10/include/iconv.h
  stable/10/lib/libarchive/Makefile
  stable/10/lib/libc/iconv/__iconv.c
  stable/10/lib/libc/iconv/bsd_iconv.c
  stable/10/lib/libc/iconv/citrus_iconv.h
  stable/10/lib/libc/iconv/citrus_iconv_local.h
  stable/10/lib/libc/iconv/citrus_none.c
  stable/10/lib/libc/iconv/citrus_stdenc.h
  stable/10/lib/libc/iconv/citrus_stdenc_local.h
  stable/10/lib/libc/iconv/citrus_stdenc_template.h
  stable/10/lib/libc/iconv/iconv-internal.h
  stable/10/lib/libc/iconv/iconv.3
  stable/10/lib/libc/iconv/iconv.c
  stable/10/lib/libc/iconv/iconv_compat.c
  stable/10/lib/libc/locale/cXXrtomb_iconv.h
  stable/10/lib/libc/locale/mbrtocXX_iconv.h
  stable/10/lib/libiconv_modules/BIG5/citrus_big5.c
  stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
  stable/10/lib/libiconv_modules/EUC/citrus_euc.c
  stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c
  stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
  stable/10/lib/libiconv_modules/HZ/citrus_hz.c
  stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c
  stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c
  stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c
  stable/10/lib/libiconv_modules/UES/citrus_ues.c
  stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c
  stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c
  stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c
  stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c
  stable/10/lib/libiconv_modules/ZW/citrus_zw.c
  stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
  stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
  stable/10/lib/libkiconv/xlat16_iconv.c
  stable/10/sys/sys/param.h
  stable/10/usr.bin/iconv/iconv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/UPDATING
==
--- stable/10/UPDATING  Thu Apr 30 15:48:48 2015(r282274)
+++ stable/10/UPDATING  Thu Apr 30 16:08:47 2015(r282275)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20150430:
+   The const qualifier has been removed from iconv(3) to comply with
+   POSIX.  The ports tree is aware of this from r384038 onwards.
+
 20141215:
At svn r275807, The default linux compat kernel ABI has been adjusted
to 2.6.18 in support of the linux-c6 compat ports infrastructure

Modified: stable/10/bin/csh/config.h
==
--- stable/10/bin/csh/config.h  Thu Apr 30 15:48:48 2015(r282274)
+++ stable/10/bin/csh/config.h  Thu Apr 30 16:08:47 2015(r282275)
@@ -198,7 +198,7 @@
 #define HAVE_WCWIDTH 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Support NLS. */
 #define NLS 1

Modified: stable/10/bin/csh/iconv_stub.h
==
--- stable/10/bin/csh/iconv_stub.h  Thu Apr 30 15:48:48 2015
(r282274)
+++ stable/10/bin/csh/iconv_stub.h  Thu Apr 30 16:08:47 2015
(r282275)
@@ -30,7 +30,7 @@
 #define _ICONV_H_
 
 typedef void *iconv_t;
-typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *);
+typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *);
 typedef int dl_iconv_close_t(iconv_t);
 
 extern iconv_t dl_iconv_open(const char *, const char *);

Modified: stable/10/contrib/smbfs/include/netsmb/smb_lib.h
==
--- stable/10/contrib/smbfs/include/netsmb/smb_lib.hThu Apr 30 15:48:48 
2015(r282274)
+++ stable/10/contrib/smbfs/include/netsmb/smb_lib.hThu Apr 30 16:08:47 
2015(r282275)
@@ -191,7 +191,7 @@ int  smb_ctx_readrc(struct smb_ctx *);
 int  smb_ctx_resolve(struct smb_ctx *);
 int  smb_ctx_setflags(struct smb_ctx *, int, int, int);
 
-int  smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*);
+int  smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*);
 int  smb_smb_close_print_file(struct smb_ctx *, smbfh);
 
 int  smb_read(struct