gmane.os.freebsd.devel.cvs.src
http://blog.gmane.org/gmane.os.freebsd.devel.cvs.src
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
svn commit: r250978 - in stable/9/sys: fs/nullfs kern sys
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165514
<pre>Author: kib
Date: Sat May 25 11:05:00 2013
New Revision: 250978
URL: http://svnweb.freebsd.org/changeset/base/250978
Log:
MFC r250505:
- Fix nullfs vnode reference leak in nullfs_reclaim_lowervp(). The
null_hashget() obtains the reference on the nullfs vnode, which must
be dropped.
- Fix a wart which existed from the introduction of the nullfs
caching, do not unlock lower vnode in the nullfs_reclaim_lowervp().
It should be innocent, but now it is also formally safe. Inform the
nullfs_reclaim() about this using the NULLV_NOUNLOCK flag set on
nullfs inode.
- Add a callback to the upper filesystems for the lower vnode
unlinking. When inactivating a nullfs vnode, check if the lower
vnode was unlinked, indicated by nullfs flag NULLV_DROP or VV_NOSYNC
on the lower vnode, and reclaim upper vnode if so. This allows
nullfs to purge cached vnodes for the unlinked lower vnode, avoiding
excessive caching.
MFC r250852:
Do not leak the NULLV_NOUNLOCK flag from the nullfs_unlink_lowervp(),
for the case when the nullfs vnode is not reclaimed. Otherwise, later
reclamation would not unlock the lower vnode.
Modified:
stable/9/sys/fs/nullfs/null.h
stable/9/sys/fs/nullfs/null_subr.c
stable/9/sys/fs/nullfs/null_vfsops.c
stable/9/sys/fs/nullfs/null_vnops.c
stable/9/sys/kern/vfs_subr.c
stable/9/sys/kern/vfs_syscalls.c
stable/9/sys/sys/mount.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/fs/nullfs/null.h
==============================================================================
--- stable/9/sys/fs/nullfs/null.hSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/fs/nullfs/null.hSat May 25 11:05:00 2013(r250978)
< at >< at > -53,8 +53,12 < at >< at > struct null_node {
LIST_ENTRY(null_node)null_hash;/* Hash list */
struct vnode *null_lowervp;/* VREFed once */
struct vnode*null_vnode;/* Back pointer */
+u_intnull_flags;
};
+#defineNULLV_NOUNLOCK0x0001
+#defineNULLV_DROP0x0002
+
#defineMOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data))
#defineVTONULL(vp) ((struct null_node *)(vp)->v_data)
#defineNULLTOV(xp) ((xp)->null_vnode)
Modified: stable/9/sys/fs/nullfs/null_subr.c
==============================================================================
--- stable/9/sys/fs/nullfs/null_subr.cSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/fs/nullfs/null_subr.cSat May 25 11:05:00 2013(r250978)
< at >< at > -251,6 +251,7 < at >< at > null_nodeget(mp, lowervp, vpp)
xp->null_vnode = vp;
xp->null_lowervp = lowervp;
+xp->null_flags = 0;
vp->v_type = lowervp->v_type;
vp->v_data = xp;
vp->v_vnlock = lowervp->v_vnlock;
Modified: stable/9/sys/fs/nullfs/null_vfsops.c
==============================================================================
--- stable/9/sys/fs/nullfs/null_vfsops.cSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/fs/nullfs/null_vfsops.cSat May 25 11:05:00 2013(r250978)
< at >< at > -65,7 +65,6 < at >< at > static vfs_statfs_tnullfs_statfs;
static vfs_unmount_tnullfs_unmount;
static vfs_vget_tnullfs_vget;
static vfs_extattrctl_tnullfs_extattrctl;
-static vfs_reclaim_lowervp_t nullfs_reclaim_lowervp;
/*
* Mount null layer
< at >< at > -390,8 +389,49 < at >< at > nullfs_reclaim_lowervp(struct mount *mp,
vp = null_hashget(mp, lowervp);
if (vp == NULL)
return;
+VTONULL(vp)->null_flags |= NULLV_NOUNLOCK;
vgone(vp);
-vn_lock(lowervp, LK_EXCLUSIVE | LK_RETRY);
+vput(vp);
+}
+
+static void
+nullfs_unlink_lowervp(struct mount *mp, struct vnode *lowervp)
+{
+struct vnode *vp;
+struct null_node *xp;
+
+vp = null_hashget(mp, lowervp);
+if (vp == NULL)
+return;
+xp = VTONULL(vp);
+xp->null_flags |= NULLV_DROP | NULLV_NOUNLOCK;
+vhold(vp);
+vunref(vp);
+
+if (vp->v_usecount == 0) {
+/*
+ * If vunref() dropped the last use reference on the
+ * nullfs vnode, it must be reclaimed, and its lock
+ * was split from the lower vnode lock. Need to do
+ * extra unlock before allowing the final vdrop() to
+ * free the vnode.
+ */
+KASSERT((vp->v_iflag & VI_DOOMED) != 0,
+ ("not reclaimed nullfs vnode %p", vp));
+VOP_UNLOCK(vp, 0);
+} else {
+/*
+ * Otherwise, the nullfs vnode still shares the lock
+ * with the lower vnode, and must not be unlocked.
+ * Also clear the NULLV_NOUNLOCK, the flag is not
+ * relevant for future reclamations.
+ */
+ASSERT_VOP_ELOCKED(vp, "unlink_lowervp");
+KASSERT((vp->v_iflag & VI_DOOMED) == 0,
+ ("reclaimed nullfs vnode %p", vp));
+xp->null_flags &= ~NULLV_NOUNLOCK;
+}
+vdrop(vp);
}
static struct vfsops null_vfsops = {
< at >< at > -407,6 +447,7 < at >< at > static struct vfsops null_vfsops = {
.vfs_unmount =nullfs_unmount,
.vfs_vget =nullfs_vget,
.vfs_reclaim_lowervp =nullfs_reclaim_lowervp,
+.vfs_unlink_lowervp =nullfs_unlink_lowervp,
};
VFS_SET(null_vfsops, nullfs, VFCF_LOOPBACK | VFCF_JAIL);
Modified: stable/9/sys/fs/nullfs/null_vnops.c
==============================================================================
--- stable/9/sys/fs/nullfs/null_vnops.cSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/fs/nullfs/null_vnops.cSat May 25 11:05:00 2013(r250978)
< at >< at > -692,18 +692,24 < at >< at > null_unlock(struct vop_unlock_args *ap)
static int
null_inactive(struct vop_inactive_args *ap __unused)
{
-struct vnode *vp;
+struct vnode *vp, *lvp;
+struct null_node *xp;
struct mount *mp;
struct null_mount *xmp;
vp = ap->a_vp;
+xp = VTONULL(vp);
+lvp = NULLVPTOLOWERVP(vp);
mp = vp->v_mount;
xmp = MOUNTTONULLMOUNT(mp);
-if ((xmp->nullm_flags & NULLM_CACHE) == 0) {
+if ((xmp->nullm_flags & NULLM_CACHE) == 0 ||
+ (xp->null_flags & NULLV_DROP) != 0 ||
+ (lvp->v_vflag & VV_NOSYNC) != 0) {
/*
* If this is the last reference and caching of the
- * nullfs vnodes is not enabled, then free up the
- * vnode so as not to tie up the lower vnodes.
+ * nullfs vnodes is not enabled, or the lower vnode is
+ * deleted, then free up the vnode so as not to tie up
+ * the lower vnodes.
*/
vp->v_object = NULL;
vrecycle(vp, curthread);
< at >< at > -748,7 +754,10 < at >< at > null_reclaim(struct vop_reclaim_args *ap
*/
if (vp->v_writecount > 0)
VOP_ADD_WRITECOUNT(lowervp, -1);
-vput(lowervp);
+if ((xp->null_flags & NULLV_NOUNLOCK) != 0)
+vunref(lowervp);
+else
+vput(lowervp);
free(xp, M_NULLFSNODE);
return (0);
Modified: stable/9/sys/kern/vfs_subr.c
==============================================================================
--- stable/9/sys/kern/vfs_subr.cSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/kern/vfs_subr.cSat May 25 11:05:00 2013(r250978)
< at >< at > -2756,19 +2756,20 < at >< at > vgone(struct vnode *vp)
}
static void
-vgonel_reclaim_lowervp_vfs(struct mount *mp __unused,
+notify_lowervp_vfs_dummy(struct mount *mp __unused,
struct vnode *lowervp __unused)
{
}
/*
- * Notify upper mounts about reclaimed vnode.
+ * Notify upper mounts about reclaimed or unlinked vnode.
*/
-static void
-vgonel_reclaim_lowervp(struct vnode *vp)
+void
+vfs_notify_upper(struct vnode *vp, int event)
{
static struct vfsops vgonel_vfsops = {
-.vfs_reclaim_lowervp = vgonel_reclaim_lowervp_vfs
+.vfs_reclaim_lowervp = notify_lowervp_vfs_dummy,
+.vfs_unlink_lowervp = notify_lowervp_vfs_dummy,
};
struct mount *mp, *ump, *mmp;
< at >< at > -2792,7 +2793,17 < at >< at > vgonel_reclaim_lowervp(struct vnode *vp)
}
TAILQ_INSERT_AFTER(&mp->mnt_uppers, ump, mmp, mnt_upper_link);
MNT_IUNLOCK(mp);
-VFS_RECLAIM_LOWERVP(ump, vp);
+switch (event) {
+case VFS_NOTIFY_UPPER_RECLAIM:
+VFS_RECLAIM_LOWERVP(ump, vp);
+break;
+case VFS_NOTIFY_UPPER_UNLINK:
+VFS_UNLINK_LOWERVP(ump, vp);
+break;
+default:
+KASSERT(0, ("invalid event %d", event));
+break;
+}
MNT_ILOCK(mp);
ump = TAILQ_NEXT(mmp, mnt_upper_link);
TAILQ_REMOVE(&mp->mnt_uppers, mmp, mnt_upper_link);
< at >< at > -2839,7 +2850,7 < at >< at > vgonel(struct vnode *vp)
active = vp->v_usecount;
oweinact = (vp->v_iflag & VI_OWEINACT);
VI_UNLOCK(vp);
-vgonel_reclaim_lowervp(vp);
+vfs_notify_upper(vp, VFS_NOTIFY_UPPER_RECLAIM);
/*
* Clean out any buffers associated with the vnode.
Modified: stable/9/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/9/sys/kern/vfs_syscalls.cSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/kern/vfs_syscalls.cSat May 25 11:05:00 2013(r250978)
< at >< at > -1949,6 +1949,7 < at >< at > restart:
if (error)
goto out;
#endif
+vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK);
error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd);
#ifdef MAC
out:
< at >< at > -3947,6 +3948,7 < at >< at > restart:
return (error);
goto restart;
}
+vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK);
error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
vn_finished_write(mp);
out:
Modified: stable/9/sys/sys/mount.h
==============================================================================
--- stable/9/sys/sys/mount.hSat May 25 10:35:05 2013(r250977)
+++ stable/9/sys/sys/mount.hSat May 25 11:05:00 2013(r250978)
< at >< at > -630,7 +630,7 < at >< at > typedefint vfs_mount_t(struct mount *mp
typedef int vfs_sysctl_t(struct mount *mp, fsctlop_t op,
struct sysctl_req *req);
typedef void vfs_susp_clean_t(struct mount *mp);
-typedef void vfs_reclaim_lowervp_t(struct mount *mp, struct vnode *lowervp);
+typedef void vfs_notify_lowervp_t(struct mount *mp, struct vnode *lowervp);
struct vfsops {
vfs_mount_t*vfs_mount;
< at >< at > -648,7 +648,8 < at >< at > struct vfsops {
vfs_extattrctl_t*vfs_extattrctl;
vfs_sysctl_t*vfs_sysctl;
vfs_susp_clean_t*vfs_susp_clean;
-vfs_reclaim_lowervp_t*vfs_reclaim_lowervp;
+vfs_notify_lowervp_t*vfs_reclaim_lowervp;
+vfs_notify_lowervp_t*vfs_unlink_lowervp;
};
vfs_statfs_t__vfs_statfs;
< at >< at > -713,6 +714,12 < at >< at > vfs_statfs_t__vfs_statfs;
mtx_assert(&Giant, MA_OWNED);\
} while (0)
+#defineVFS_UNLINK_LOWERVP(MP, VP) do {\
+if (*(MP)->mnt_op->vfs_unlink_lowervp != NULL) {\
+(*(MP)->mnt_op->vfs_unlink_lowervp)((MP), (VP));\
+}\
+} while (0)
+
#define VFS_KNOTE_LOCKED(vp, hint) do\
{\
if (((vp)->v_vflag & VV_NOKNOTE) == 0)\
< at >< at > -725,6 +732,9 < at >< at > vfs_statfs_t__vfs_statfs;
VN_KNOTE((vp), (hint), 0);\
} while (0)
+#defineVFS_NOTIFY_UPPER_RECLAIM1
+#defineVFS_NOTIFY_UPPER_UNLINK2
+
#include <sys/module.h>
/*
< at >< at > -803,6 +813,7 < at >< at > intvfs_modevent(module_t, int, void *);
voidvfs_mount_error(struct mount *, const char *, ...);
voidvfs_mountroot(void);/* mount our root filesystem */
voidvfs_mountedfrom(struct mount *, const char *from);
+voidvfs_notify_upper(struct vnode *, int);
voidvfs_oexport_conv(const struct oexport_args *oexp,
struct export_args *exp);
voidvfs_ref(struct mount *);
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Konstantin Belousov2013-05-25T11:05:00svn commit: r250976 - stable/9/usr.sbin/ctladm
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165513
<pre>Author: jh
Date: Sat May 25 09:47:33 2013
New Revision: 250976
URL: http://svnweb.freebsd.org/changeset/base/250976
Log:
MFC r250443: Check the return value of sbuf_finish().
Modified:
stable/9/usr.sbin/ctladm/ctladm.c
Directory Properties:
stable/9/usr.sbin/ctladm/ (props changed)
Modified: stable/9/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/9/usr.sbin/ctladm/ctladm.cSat May 25 07:17:16 2013(r250975)
+++ stable/9/usr.sbin/ctladm/ctladm.cSat May 25 09:47:33 2013(r250976)
< at >< at > -545,7 +545,8 < at >< at > retry:
}
if (xml != 0) {
sbuf_printf(sb, "</ctlfelist>\n");
-sbuf_finish(sb);
+if (sbuf_finish(sb) != 0)
+err(1, "%s: sbuf_finish", __func__);
printf("%s", sbuf_data(sb));
sbuf_delete(sb);
}
< at >< at > -3492,7 +3493,8 < at >< at > cctl_end_element(void *user_data, const
errx(1, "%s: no valid sbuf at level %d (name %s)", __func__,
devlist->level, name);
-sbuf_finish(devlist->cur_sb[devlist->level]);
+if (sbuf_finish(devlist->cur_sb[devlist->level]) != 0)
+err(1, "%s: sbuf_finish", __func__);
str = strdup(sbuf_data(devlist->cur_sb[devlist->level]));
if (str == NULL)
err(1, "%s can't allocate %zd bytes for string", __func__,
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Jaakko Heinonen2013-05-25T09:47:33svn commit: r250975 - head/usr.bin/patch
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165512
<pre>Author: gjb (doc,ports committer)
Date: Sat May 25 07:17:16 2013
New Revision: 250975
URL: http://svnweb.freebsd.org/changeset/base/250975
Log:
Revert r250972 to fix build.
Modified:
head/usr.bin/patch/patch.c
head/usr.bin/patch/util.c
Modified: head/usr.bin/patch/patch.c
==============================================================================
--- head/usr.bin/patch/patch.cSat May 25 06:28:30 2013(r250974)
+++ head/usr.bin/patch/patch.cSat May 25 07:17:16 2013(r250975)
< at >< at > -303,7 +303,7 < at >< at > main(int argc, char *argv[])
++fuzz <= mymaxfuzz);
if (skip_rest_of_patch) {/* just got decided */
-if (ferror(ofp) | fclose(ofp)) {
+if (ferror(ofp) || fclose(ofp)) {
say("Error writing %s\n",
TMPOUTNAME);
error = 1;
< at >< at > -385,7 +385,7 < at >< at > main(int argc, char *argv[])
}
}
}
-if (ferror(rejfp) | fclose(rejfp)) {
+if (ferror(rejfp) || fclose(rejfp)) {
say("Error writing %s\n", rejname);
error = 1;
}
< at >< at > -977,7 +977,7 < at >< at > spew_output(void)
#endif
if (input_lines)
copy_till(input_lines, true);/* dump remainder of file */
-rv = ferror(ofp) == 0 & fclose(ofp) == 0;
+rv = ferror(ofp) == 0 && fclose(ofp) == 0;
ofp = NULL;
return rv;
}
Modified: head/usr.bin/patch/util.c
==============================================================================
--- head/usr.bin/patch/util.cSat May 25 06:28:30 2013(r250974)
+++ head/usr.bin/patch/util.cSat May 25 07:17:16 2013(r250975)
< at >< at > -412,7 +412,7 < at >< at > checked_in(char *file)
void
version(void)
{
-fprintf(stderr, "patch 2.0-12u9 FreeBSD\n");
+fprintf(stderr, "patch 2.0-12u8 FreeBSD\n");
my_exit(EXIT_SUCCESS);
}
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Glen Barber2013-05-25T07:17:16svn commit: r250974 - head/sys/net80211
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165511
<pre>Author: adrian
Date: Sat May 25 06:28:30 2013
New Revision: 250974
URL: http://svnweb.freebsd.org/changeset/base/250974
Log:
Fix net80211 fragment creation.
When creating fragment frames, the header length should honour the
DATAPAD flag.
This fixes the fragments that are queued to the ath(4) driver but it
doesn't yet fix fragment transmission. That requires further changes
to the ath(4) transmit path. Well, strictly speaking, it requires
further changes to _all_ wifi driver transmit paths, but this is at least
a start.
Tested:
* AR5416, STA mode, w/ fragthreshold set to 256.
Modified:
head/sys/net80211/ieee80211_output.c
Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.cFri May 24 18:59:44 2013(r250973)
+++ head/sys/net80211/ieee80211_output.cSat May 25 06:28:30 2013(r250974)
< at >< at > -1495,18 +1495,28 < at >< at > static int
ieee80211_fragment(struct ieee80211vap *vap, struct mbuf *m0,
u_int hdrsize, u_int ciphdrsize, u_int mtu)
{
+struct ieee80211com *ic = vap->iv_ic;
struct ieee80211_frame *wh, *whf;
struct mbuf *m, *prev, *next;
u_int totalhdrsize, fragno, fragsize, off, remainder, payload;
+u_int hdrspace;
KASSERT(m0->m_nextpkt == NULL, ("mbuf already chained?"));
KASSERT(m0->m_pkthdr.len > mtu,
("pktlen %u mtu %u", m0->m_pkthdr.len, mtu));
+/*
+ * Honor driver DATAPAD requirement.
+ */
+if (ic->ic_flags & IEEE80211_F_DATAPAD)
+hdrspace = roundup(hdrsize, sizeof(uint32_t));
+else
+hdrspace = hdrsize;
+
wh = mtod(m0, struct ieee80211_frame *);
/* NB: mark the first frag; it will be propagated below */
wh->i_fc[1] |= IEEE80211_FC1_MORE_FRAG;
-totalhdrsize = hdrsize + ciphdrsize;
+totalhdrsize = hdrspace + ciphdrsize;
fragno = 1;
off = mtu - ciphdrsize;
remainder = m0->m_pkthdr.len - off;
< at >< at > -1553,9 +1563,10 < at >< at > ieee80211_fragment(struct ieee80211vap *
payload = fragsize - totalhdrsize;
/* NB: destination is known to be contiguous */
-m_copydata(m0, off, payload, mtod(m, uint8_t *) + hdrsize);
-m->m_len = hdrsize + payload;
-m->m_pkthdr.len = hdrsize + payload;
+
+m_copydata(m0, off, payload, mtod(m, uint8_t *) + hdrspace);
+m->m_len = hdrspace + payload;
+m->m_pkthdr.len = hdrspace + payload;
m->m_flags |= M_FRAG;
/* chain up the fragment */
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Adrian Chadd2013-05-25T06:28:30svn commit: r250973 - in stable/9: lib/libc/sys sys/kern
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165508
<pre>Author: jilles
Date: Fri May 24 18:59:44 2013
New Revision: 250973
URL: http://svnweb.freebsd.org/changeset/base/250973
Log:
MFC r248593: Allow O_CLOEXEC in posix_openpt() flags.
PR:kern/162374
Modified:
stable/9/lib/libc/sys/posix_openpt.2
stable/9/sys/kern/tty_pts.c
Directory Properties:
stable/9/lib/libc/ (props changed)
stable/9/lib/libc/sys/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/lib/libc/sys/posix_openpt.2
==============================================================================
--- stable/9/lib/libc/sys/posix_openpt.2Fri May 24 18:54:52 2013(r250972)
+++ stable/9/lib/libc/sys/posix_openpt.2Fri May 24 18:59:44 2013(r250973)
< at >< at > -37,7 +37,7 < at >< at >
.\"
.\" $FreeBSD$
.\"
-.Dd August 20, 2008
+.Dd March 21, 2013
.Dt POSIX_OPENPT 2
.Os
.Sh NAME
< at >< at > -71,7 +71,7 < at >< at > Values for
are constructed by a bitwise-inclusive OR of flags from the following
list, defined in
.In fcntl.h :
-.Bl -tag -width ".Dv O_NOCTTY"
+.Bl -tag -width ".Dv O_CLOEXEC"
.It Dv O_RDWR
Open for reading and writing.
.It Dv O_NOCTTY
< at >< at > -79,6 +79,8 < at >< at > If set
.Fn posix_openpt
shall not cause the terminal device to become the controlling terminal
for the process.
+.It Dv O_CLOEXEC
+Set the close-on-exec flag for the new file descriptor.
.El
.Pp
The
< at >< at > -116,6 +118,9 < at >< at > The
.Fn posix_openpt
function conforms to
.St -p1003.1-2001 .
+The ability to use
+.Dv O_CLOEXEC
+is an extension to the standard.
.Sh HISTORY
The
.Fn posix_openpt
Modified: stable/9/sys/kern/tty_pts.c
==============================================================================
--- stable/9/sys/kern/tty_pts.cFri May 24 18:54:52 2013(r250972)
+++ stable/9/sys/kern/tty_pts.cFri May 24 18:59:44 2013(r250973)
< at >< at > -825,10 +825,10 < at >< at > sys_posix_openpt(struct thread *td, stru
* POSIX states it's unspecified when other flags are passed. We
* don't allow this.
*/
-if (uap->flags & ~(O_RDWR|O_NOCTTY))
+if (uap->flags & ~(O_RDWR|O_NOCTTY|O_CLOEXEC))
return (EINVAL);
-error = falloc(td, &fp, &fd, 0);
+error = falloc(td, &fp, &fd, uap->flags);
if (error)
return (error);
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Jilles Tjoelker2013-05-24T18:59:45svn commit: r250972 - head/usr.bin/patch
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165507
<pre>Author: se
Date: Fri May 24 18:54:52 2013
New Revision: 250972
URL: http://svnweb.freebsd.org/changeset/base/250972
Log:
The error handling for writes to the target file could lead to the final
fclose() being skipped. Fix this by using boolean "&" and "|" instead of
short-cut operators "&&" and "||".
While here, increment the last part of the version string. The reason is
the fixed output file selection logic in pch.c, which was committed as
r250943, yesterday.
Reviewed by:pfg
Modified:
head/usr.bin/patch/patch.c
head/usr.bin/patch/util.c
Modified: head/usr.bin/patch/patch.c
==============================================================================
--- head/usr.bin/patch/patch.cFri May 24 18:28:27 2013(r250971)
+++ head/usr.bin/patch/patch.cFri May 24 18:54:52 2013(r250972)
< at >< at > -303,7 +303,7 < at >< at > main(int argc, char *argv[])
++fuzz <= mymaxfuzz);
if (skip_rest_of_patch) {/* just got decided */
-if (ferror(ofp) || fclose(ofp)) {
+if (ferror(ofp) | fclose(ofp)) {
say("Error writing %s\n",
TMPOUTNAME);
error = 1;
< at >< at > -385,7 +385,7 < at >< at > main(int argc, char *argv[])
}
}
}
-if (ferror(rejfp) || fclose(rejfp)) {
+if (ferror(rejfp) | fclose(rejfp)) {
say("Error writing %s\n", rejname);
error = 1;
}
< at >< at > -977,7 +977,7 < at >< at > spew_output(void)
#endif
if (input_lines)
copy_till(input_lines, true);/* dump remainder of file */
-rv = ferror(ofp) == 0 && fclose(ofp) == 0;
+rv = ferror(ofp) == 0 & fclose(ofp) == 0;
ofp = NULL;
return rv;
}
Modified: head/usr.bin/patch/util.c
==============================================================================
--- head/usr.bin/patch/util.cFri May 24 18:28:27 2013(r250971)
+++ head/usr.bin/patch/util.cFri May 24 18:54:52 2013(r250972)
< at >< at > -412,7 +412,7 < at >< at > checked_in(char *file)
void
version(void)
{
-fprintf(stderr, "patch 2.0-12u8 FreeBSD\n");
+fprintf(stderr, "patch 2.0-12u9 FreeBSD\n");
my_exit(EXIT_SUCCESS);
}
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Stefan Esser2013-05-24T18:54:52svn commit: r250971 - stable/8/usr.sbin/pciconf
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165506
<pre>Author: kib
Date: Fri May 24 18:28:27 2013
New Revision: 250971
URL: http://svnweb.freebsd.org/changeset/base/250971
Log:
MFC r250741:
Decode new HT 3.00 and 3.10 capabilities.
Modified:
stable/8/usr.sbin/pciconf/cap.c
Directory Properties:
stable/8/usr.sbin/pciconf/ (props changed)
Modified: stable/8/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/8/usr.sbin/pciconf/cap.cFri May 24 18:26:12 2013(r250970)
+++ stable/8/usr.sbin/pciconf/cap.cFri May 24 18:28:27 2013(r250971)
< at >< at > -276,6 +276,18 < at >< at > cap_ht(int fd, struct pci_conf *p, uint8
case PCIM_HTCAP_X86_ENCODING:
printf("X86 encoding");
break;
+case PCIM_HTCAP_GEN3:
+printf("Gen3");
+break;
+case PCIM_HTCAP_FLE:
+printf("function-level extension");
+break;
+case PCIM_HTCAP_PM:
+printf("power management");
+break;
+case PCIM_HTCAP_HIGH_NODE_COUNT:
+printf("high node count");
+break;
default:
printf("unknown %02x", command);
break;
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Konstantin Belousov2013-05-24T18:28:27svn commit: r250970 - stable/8/sys/dev/pci
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165505
<pre>Author: kib
Date: Fri May 24 18:26:12 2013
New Revision: 250970
URL: http://svnweb.freebsd.org/changeset/base/250970
Log:
MFC r250740:
Add new capability types encodings from HyperTransport I/O Link
Specification revisions 3.00 and 3.10.
Modified:
stable/8/sys/dev/pci/pcireg.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/pci/ (props changed)
Modified: stable/8/sys/dev/pci/pcireg.h
==============================================================================
--- stable/8/sys/dev/pci/pcireg.hFri May 24 15:53:13 2013(r250969)
+++ stable/8/sys/dev/pci/pcireg.hFri May 24 18:26:12 2013(r250970)
< at >< at > -609,6 +609,10 < at >< at >
#definePCIM_HTCAP_VCSET0xb800/* 10111 */
#definePCIM_HTCAP_RETRY_MODE0xc000/* 11000 */
#definePCIM_HTCAP_X86_ENCODING0xc800/* 11001 */
+#definePCIM_HTCAP_GEN30xd000/* 11010 */
+#definePCIM_HTCAP_FLE0xd800/* 11011 */
+#definePCIM_HTCAP_PM0xe000/* 11100 */
+#definePCIM_HTCAP_HIGH_NODE_COUNT0xe800/* 11101 */
/* HT MSI Mapping Capability definitions. */
#definePCIM_HTCMD_MSI_ENABLE0x0001
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Konstantin Belousov2013-05-24T18:26:12svn commit: r250969 - head
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165503
<pre>Author: marcel
Date: Fri May 24 15:53:13 2013
New Revision: 250969
URL: http://svnweb.freebsd.org/changeset/base/250969
Log:
Fix building on slightly older -current and stable systems after
the switch to bmake. The rescue bits are built via crunchgen,
which didn't respect the MAKE environment variable until r237574
(i.e. ~11 months ago). This resulted in a failure due to bmake's
internal -J flag being passed around and not being understood by
the standard (i.e. host's) make.
Note that the failure is conditional upon having the jobServer
feature enabled within bmake.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1Fri May 24 14:57:38 2013(r250968)
+++ head/Makefile.inc1Fri May 24 15:53:13 2013(r250969)
< at >< at > -1215,6 +1215,10 < at >< at > _yacc=lib/liby \
usr.bin/yacc
.endif
+.if ${BOOTSTRAPPING} < 1000014
+_crunch=usr.sbin/crunch
+.endif
+
.if ${BOOTSTRAPPING} < 1000026
_nmtree=lib/libnetbsd \
usr.sbin/nmtree
< at >< at > -1293,6 +1297,7 < at >< at > bootstrap-tools:
usr.bin/xinstall \
${_gensnmptree} \
usr.sbin/config \
+ ${_crunch} \
${_nmtree}
${_+_}< at >${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Marcel Moolenaar2013-05-24T15:53:13svn commit: r250968 - head/share/man/man8
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165502
<pre>Author: jamie
Date: Fri May 24 14:57:38 2013
New Revision: 250968
URL: http://svnweb.freebsd.org/changeset/base/250968
Log:
Mention the "nojailvnet" keyword.
MFC after:3 days
Modified:
head/share/man/man8/rc.8
Modified: head/share/man/man8/rc.8
==============================================================================
--- head/share/man/man8/rc.8Fri May 24 11:27:06 2013(r250967)
+++ head/share/man/man8/rc.8Fri May 24 14:57:38 2013(r250968)
< at >< at > -124,7 +124,9 < at >< at > Load the configuration files.
Determine if booting in a jail,
and add
.Dq Li nojail
-to the list of KEYWORDS to skip in
+(no jails allowed) or
+.Dq Li nojailvnet
+(only allow vnet-enabled jails) to the list of KEYWORDS to skip in
.Xr rcorder 8 .
.It
Invoke
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Jamie Gritton2013-05-24T14:57:38svn commit: r250967 - head/sys/cam/scsi
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165501
<pre>Author: smh
Date: Fri May 24 11:27:06 2013
New Revision: 250967
URL: http://svnweb.freebsd.org/changeset/base/250967
Log:
Enforce validation on the selected delete method via sysctl.
This prevents users from selecting a delete method which may cause
corruption e.g. MPS WS16 on pre P14 firmware.
Reviewed by:pjd (mentor)
Approved by:pjd (mentor)
MFC after:2 days
Modified:
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.cFri May 24 09:48:42 2013(r250966)
+++ head/sys/cam/scsi/scsi_da.cFri May 24 11:27:06 2013(r250967)
< at >< at > -1780,7 +1780,8 < at >< at > dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
if (error != 0 || req->newptr == NULL)
return (error);
for (i = 0; i <= DA_DELETE_MAX; i++) {
-if (strcmp(buf, da_delete_method_names[i]) != 0)
+if (!(softc->delete_available & (1 << i)) ||
+ strcmp(buf, da_delete_method_names[i]) != 0)
continue;
dadeletemethodset(softc, i);
return (0);
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Steven Hartland2013-05-24T11:27:06svn commit: r250966 - head/sys/dev/md
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165500
<pre>Author: kib
Date: Fri May 24 09:48:42 2013
New Revision: 250966
URL: http://svnweb.freebsd.org/changeset/base/250966
Log:
Fix the data corruption on the swap-backed md.
Assign the rv variable a success code if the pager was not asked for
the page. Using an error code from the previous processed page caused
zeroing of the valid page, when e.g. the previous page was not
available in the pager.
Reported by:lstewart
Sponsored by:The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/dev/md/md.c
Modified: head/sys/dev/md/md.c
==============================================================================
--- head/sys/dev/md/md.cFri May 24 09:33:55 2013(r250965)
+++ head/sys/dev/md/md.cFri May 24 09:48:42 2013(r250966)
< at >< at > -829,7 +829,9 < at >< at > mdstart_swap(struct md_s *sc, struct bio
m = vm_page_grab(sc->object, i, VM_ALLOC_NORMAL |
VM_ALLOC_RETRY);
if (bp->bio_cmd == BIO_READ) {
-if (m->valid != VM_PAGE_BITS_ALL)
+if (m->valid == VM_PAGE_BITS_ALL)
+rv = VM_PAGER_OK;
+else
rv = vm_pager_get_pages(sc->object, &m, 1, 0);
if (rv == VM_PAGER_ERROR) {
vm_page_wakeup(m);
< at >< at > -854,6 +856,8 < at >< at > mdstart_swap(struct md_s *sc, struct bio
} else if (bp->bio_cmd == BIO_WRITE) {
if (len != PAGE_SIZE && m->valid != VM_PAGE_BITS_ALL)
rv = vm_pager_get_pages(sc->object, &m, 1, 0);
+else
+rv = VM_PAGER_OK;
if (rv == VM_PAGER_ERROR) {
vm_page_wakeup(m);
break;
< at >< at > -868,6 +872,8 < at >< at > mdstart_swap(struct md_s *sc, struct bio
} else if (bp->bio_cmd == BIO_DELETE) {
if (len != PAGE_SIZE && m->valid != VM_PAGE_BITS_ALL)
rv = vm_pager_get_pages(sc->object, &m, 1, 0);
+else
+rv = VM_PAGER_OK;
if (rv == VM_PAGER_ERROR) {
vm_page_wakeup(m);
break;
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Konstantin Belousov2013-05-24T09:48:42svn commit: r250965 - stable/9/usr.sbin/pciconf
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165499
<pre>Author: kib
Date: Fri May 24 09:33:55 2013
New Revision: 250965
URL: http://svnweb.freebsd.org/changeset/base/250965
Log:
MFC r250741:
Decode new HT 3.00 and 3.10 capabilities.
Modified:
stable/9/usr.sbin/pciconf/cap.c
Directory Properties:
stable/9/usr.sbin/pciconf/ (props changed)
Modified: stable/9/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/9/usr.sbin/pciconf/cap.cFri May 24 09:30:10 2013(r250964)
+++ stable/9/usr.sbin/pciconf/cap.cFri May 24 09:33:55 2013(r250965)
< at >< at > -276,6 +276,18 < at >< at > cap_ht(int fd, struct pci_conf *p, uint8
case PCIM_HTCAP_X86_ENCODING:
printf("X86 encoding");
break;
+case PCIM_HTCAP_GEN3:
+printf("Gen3");
+break;
+case PCIM_HTCAP_FLE:
+printf("function-level extension");
+break;
+case PCIM_HTCAP_PM:
+printf("power management");
+break;
+case PCIM_HTCAP_HIGH_NODE_COUNT:
+printf("high node count");
+break;
default:
printf("unknown %02x", command);
break;
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Konstantin Belousov2013-05-24T09:33:56svn commit: r250964 - stable/9/sys/dev/pci
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165498
<pre>Author: kib
Date: Fri May 24 09:30:10 2013
New Revision: 250964
URL: http://svnweb.freebsd.org/changeset/base/250964
Log:
MFC r250740:
Add new capability types encodings from HyperTransport I/O Link
Specification revisions 3.00 and 3.10.
Modified:
stable/9/sys/dev/pci/pcireg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/pci/pcireg.h
==============================================================================
--- stable/9/sys/dev/pci/pcireg.hFri May 24 09:22:43 2013(r250963)
+++ stable/9/sys/dev/pci/pcireg.hFri May 24 09:30:10 2013(r250964)
< at >< at > -612,6 +612,10 < at >< at >
#definePCIM_HTCAP_VCSET0xb800/* 10111 */
#definePCIM_HTCAP_RETRY_MODE0xc000/* 11000 */
#definePCIM_HTCAP_X86_ENCODING0xc800/* 11001 */
+#definePCIM_HTCAP_GEN30xd000/* 11010 */
+#definePCIM_HTCAP_FLE0xd800/* 11011 */
+#definePCIM_HTCAP_PM0xe000/* 11100 */
+#definePCIM_HTCAP_HIGH_NODE_COUNT0xe800/* 11101 */
/* HT MSI Mapping Capability definitions. */
#definePCIM_HTCMD_MSI_ENABLE0x0001
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Konstantin Belousov2013-05-24T09:30:10svn commit: r250963 - in head: share/man/man4 sys/amd64/conf sys/conf sys/dev/aacraid sys/i386/conf sys/ia64/conf sys/modules sys/modules/aacraid sys/modules/aacraid/aacraid_linux
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165497
<pre>Author: achim
Date: Fri May 24 09:22:43 2013
New Revision: 250963
URL: http://svnweb.freebsd.org/changeset/base/250963
Log:
Driver 'aacraid' added. Supports Adaptec by PMC RAID controller families Series 6, 7, 8 and upcoming products. Older Adaptec RAID controller families are supported by the 'aac' driver.
Approved by:scottl (mentor)
Added:
head/share/man/man4/aacraid.4 (contents, props changed)
head/sys/dev/aacraid/
head/sys/dev/aacraid/aacraid.c (contents, props changed)
head/sys/dev/aacraid/aacraid_cam.c (contents, props changed)
head/sys/dev/aacraid/aacraid_debug.c (contents, props changed)
head/sys/dev/aacraid/aacraid_debug.h (contents, props changed)
head/sys/dev/aacraid/aacraid_linux.c (contents, props changed)
head/sys/dev/aacraid/aacraid_pci.c (contents, props changed)
head/sys/dev/aacraid/aacraid_reg.h (contents, props changed)
head/sys/dev/aacraid/aacraid_var.h (contents, props changed)
head/sys/modules/aacraid/
head/sys/modules/aacraid/Makefile (contents, props changed)
head/sys/modules/aacraid/Makefile.inc (contents, props changed)
head/sys/modules/aacraid/aacraid_linux/
head/sys/modules/aacraid/aacraid_linux/Makefile (contents, props changed)
Modified:
head/share/man/man4/Makefile
head/sys/amd64/conf/GENERIC
head/sys/amd64/conf/NOTES
head/sys/conf/files
head/sys/conf/options
head/sys/i386/conf/GENERIC
head/sys/i386/conf/NOTES
head/sys/ia64/conf/GENERIC
head/sys/modules/Makefile
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/MakefileFri May 24 09:21:18 2013(r250962)
+++ head/share/man/man4/MakefileFri May 24 09:22:43 2013(r250963)
< at >< at > -4,6 +4,7 < at >< at >
.include <bsd.own.mk>
MAN=aac.4 \
+aacraid.4 \
acpi.4 \
${_acpi_asus.4} \
${_acpi_asus_wmi.4} \
Added: head/share/man/man4/aacraid.4
==============================================================================
--- /dev/null00:00:00 1970(empty, because file is newly added)
+++ head/share/man/man4/aacraid.4Fri May 24 09:22:43 2013(r250963)
< at >< at > -0,0 +1,139 < at >< at >
+.\" Copyright (c) 2013 Achim Leubner
+.\" 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.
+.\"
+.\" $FreeBSD$
+.Dd April 09, 2013
+.Dt AACRAID 4
+.Os
+.Sh NAME
+.Nm aacraid
+.Nd Adaptec AACRAID Controller driver
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd device pci
+.Cd device aacraid
+.Pp
+To compile in debugging code:
+.Cd options AACRAID_DEBUG=N
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+aacraid_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the Adaptec by PMC RAID controllers,
+including Series 6/7/8 and upcoming families.
+.Pp
+The RAID containers are handled via the
+.Nm aacraidp0
+bus.
+The physical buses are represented by the
+.Nm aacraidp?
+devices (beginning with aacraidp1). These devices enable the
+SCSI pass-thru interface and allows devices connected
+to the card such as CD-ROMs to be available via the CAM
+.Xr scsi 4
+subsystem.
+Note that not all cards allow this interface to be enabled.
+.Pp
+The
+.Pa /dev/aacraid?
+device nodes provide access to the management interface of the controller.
+One node exists per installed card.
+If the kernel is compiled with the
+.Dv COMPAT_LINUX
+option, or the
+.Pa aacraid_linux.ko
+and
+.Pa linux.ko
+modules are loaded, the
+Linux-compatible
+.Xr ioctl 2
+interface for the management device will be enabled and will allow
+Linux-based management applications to control the card.
+.Sh HARDWARE
+Controllers supported by the
+.Nm
+driver include:
+.Pp
+.Bl -bullet -compact
+.It
+Adaptec ASR-6405(T|E)
+.It
+Adaptec ASR-6445
+.It
+Adaptec ASR-6805(T|E|Q|TQ)
+.It
+Adaptec ASR-7085
+.It
+Adaptec ASR-7805(Q)
+.It
+Adaptec ASR-70165
+.It
+Adaptec ASR-71605(E|Q)
+.It
+Adaptec ASR-71685
+.It
+Adaptec ASR-72405
+.It
+Adaptec Series 8 cards
+.El
+.Sh FILES
+.Bl -tag -width /boot/kernel/aacraid.ko -compact
+.It Pa /dev/aacraid?
+aacraid management interface
+.El
+.Sh DIAGNOSTICS
+Compiling with
+.Dv AACRAID_DEBUG
+set to a number between 0 and 3
+will enable increasingly verbose debug messages.
+.Pp
+The adapter can send status and alert messages asynchronously
+to the driver.
+These messages are printed on the system console,
+and are also queued for retrieval by a management application.
+.Sh SEE ALSO
+.Xr kld 4 ,
+.Xr linux 4 ,
+.Xr scsi 4 ,
+.Xr kldload 8
+.Sh AUTHORS
+.An Achim Leubner
+.Aq achim< at >FreeBSD.org
+.An Ed Maste
+.Aq emaste< at >FreeBSD.org
+.An Scott Long
+.Aq scottl< at >FreeBSD.org
+.Sh BUGS
+.Pp
+The controller is not actually paused on suspend/resume.
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERICFri May 24 09:21:18 2013(r250962)
+++ head/sys/amd64/conf/GENERICFri May 24 09:22:43 2013(r250963)
< at >< at > -158,6 +158,7 < at >< at > devicetws# LSI 3ware 9750 SATA+SAS 6
# RAID controllers
deviceaac# Adaptec FSA RAID
deviceaacp# SCSI passthrough for aac (requires CAM)
+deviceaacraid# Adaptec by PMC RAID
deviceida# Compaq Smart RAID
devicemfi# LSI MegaRAID SAS
devicemlx# Mylex DAC960 family
Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTESFri May 24 09:21:18 2013(r250962)
+++ head/sys/amd64/conf/NOTESFri May 24 09:22:43 2013(r250963)
< at >< at > -406,6 +406,10 < at >< at > deviceaac
deviceaacp# SCSI Passthrough interface (optional, CAM required)
#
+# Adaptec by PMC RAID controllers, Series 6/7/8 and upcoming families
+deviceaacraid# Container interface, CAM required
+
+#
# Highpoint RocketRAID 27xx.
devicehpt27xx
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/filesFri May 24 09:21:18 2013(r250962)
+++ head/sys/conf/filesFri May 24 09:22:43 2013(r250963)
< at >< at > -573,6 +573,11 < at >< at > dev/aac/aac_debug.coptional aac
dev/aac/aac_disk.coptional aac
dev/aac/aac_linux.coptional aac compat_linux
dev/aac/aac_pci.coptional aac pci
+dev/aacraid/aacraid.coptional aacraid
+dev/aacraid/aacraid_cam.coptional aacraid scbus
+dev/aacraid/aacraid_debug.coptional aacraid
+dev/aacraid/aacraid_linux.coptional aacraid compat_linux
+dev/aacraid/aacraid_pci.coptional aacraid pci
dev/acpi_support/acpi_wmi.coptional acpi_wmi acpi
dev/acpi_support/acpi_asus.coptional acpi_asus acpi
dev/acpi_support/acpi_asus_wmi.coptional acpi_asus_wmi acpi
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/optionsFri May 24 09:21:18 2013(r250962)
+++ head/sys/conf/optionsFri May 24 09:22:43 2013(r250963)
< at >< at > -31,6 +31,7 < at >< at >
# opt_<name-of-option-in-lower-case>.h
AAC_DEBUGopt_aac.h
+AACRAID_DEBUGopt_aacraid.h
AHC_ALLOW_MEMIOopt_aic7xxx.h
AHC_TMODE_ENABLEopt_aic7xxx.h
AHC_DUMP_EEPROMopt_aic7xxx.h
Added: head/sys/dev/aacraid/aacraid.c
==============================================================================
--- /dev/null00:00:00 1970(empty, because file is newly added)
+++ head/sys/dev/aacraid/aacraid.cFri May 24 09:22:43 2013(r250963)
< at >< at > -0,0 +1,3501 < at >< at >
+/*-
+ * Copyright (c) 2000 Michael Smith
+ * Copyright (c) 2001 Scott Long
+ * Copyright (c) 2000 BSDi
+ * Copyright (c) 2001-2010 Adaptec, Inc.
+ * Copyright (c) 2010-2012 PMC-Sierra, Inc.
+ * 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Driver for the Adaptec by PMC Series 6,7,8,... families of RAID controllers
+ */
+#define AAC_DRIVERNAME"aacraid"
+
+#include "opt_aacraid.h"
+
+/* #include <stddef.h> */
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/kthread.h>
+#include <sys/sysctl.h>
+#include <sys/poll.h>
+#include <sys/ioccom.h>
+
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/signalvar.h>
+#include <sys/time.h>
+#include <sys/eventhandler.h>
+#include <sys/rman.h>
+
+#include <machine/bus.h>
+#include <sys/bus_dma.h>
+#include <machine/resource.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
+#include <dev/aacraid/aacraid_reg.h>
+#include <sys/aac_ioctl.h>
+#include <dev/aacraid/aacraid_debug.h>
+#include <dev/aacraid/aacraid_var.h>
+
+#ifndef FILTER_HANDLED
+#define FILTER_HANDLED0x02
+#endif
+
+static voidaac_add_container(struct aac_softc *sc,
+ struct aac_mntinforesp *mir, int f,
+ u_int32_t uid);
+static voidaac_get_bus_info(struct aac_softc *sc);
+static voidaac_container_bus(struct aac_softc *sc);
+static voidaac_daemon(void *arg);
+static int aac_convert_sgraw2(struct aac_softc *sc, struct aac_raw_io2 *raw,
+ int pages, int nseg, int nseg_new);
+
+/* Command Processing */
+static voidaac_timeout(struct aac_softc *sc);
+static voidaac_command_thread(struct aac_softc *sc);
+static intaac_sync_fib(struct aac_softc *sc, u_int32_t command,
+ u_int32_t xferstate, struct aac_fib *fib,
+ u_int16_t datasize);
+/* Command Buffer Management */
+static voidaac_map_command_helper(void *arg, bus_dma_segment_t *segs,
+ int nseg, int error);
+static intaac_alloc_commands(struct aac_softc *sc);
+static voidaac_free_commands(struct aac_softc *sc);
+static voidaac_unmap_command(struct aac_command *cm);
+
+/* Hardware Interface */
+static intaac_alloc(struct aac_softc *sc);
+static voidaac_common_map(void *arg, bus_dma_segment_t *segs, int nseg,
+ int error);
+static intaac_check_firmware(struct aac_softc *sc);
+static intaac_init(struct aac_softc *sc);
+static intaac_setup_intr(struct aac_softc *sc);
+
+/* PMC SRC interface */
+static intaac_src_get_fwstatus(struct aac_softc *sc);
+static voidaac_src_qnotify(struct aac_softc *sc, int qbit);
+static intaac_src_get_istatus(struct aac_softc *sc);
+static voidaac_src_clear_istatus(struct aac_softc *sc, int mask);
+static voidaac_src_set_mailbox(struct aac_softc *sc, u_int32_t command,
+ u_int32_t arg0, u_int32_t arg1,
+ u_int32_t arg2, u_int32_t arg3);
+static intaac_src_get_mailbox(struct aac_softc *sc, int mb);
+static voidaac_src_set_interrupts(struct aac_softc *sc, int enable);
+static int aac_src_send_command(struct aac_softc *sc, struct aac_command *cm);
+static int aac_src_get_outb_queue(struct aac_softc *sc);
+static void aac_src_set_outb_queue(struct aac_softc *sc, int index);
+
+struct aac_interface aacraid_src_interface = {
+aac_src_get_fwstatus,
+aac_src_qnotify,
+aac_src_get_istatus,
+aac_src_clear_istatus,
+aac_src_set_mailbox,
+aac_src_get_mailbox,
+aac_src_set_interrupts,
+aac_src_send_command,
+aac_src_get_outb_queue,
+aac_src_set_outb_queue
+};
+
+/* PMC SRCv interface */
+static voidaac_srcv_set_mailbox(struct aac_softc *sc, u_int32_t command,
+ u_int32_t arg0, u_int32_t arg1,
+ u_int32_t arg2, u_int32_t arg3);
+static intaac_srcv_get_mailbox(struct aac_softc *sc, int mb);
+
+struct aac_interface aacraid_srcv_interface = {
+aac_src_get_fwstatus,
+aac_src_qnotify,
+aac_src_get_istatus,
+aac_src_clear_istatus,
+aac_srcv_set_mailbox,
+aac_srcv_get_mailbox,
+aac_src_set_interrupts,
+aac_src_send_command,
+aac_src_get_outb_queue,
+aac_src_set_outb_queue
+};
+
+/* Debugging and Diagnostics */
+static struct aac_code_lookup aac_cpu_variant[] = {
+{"i960JX",CPUI960_JX},
+{"i960CX",CPUI960_CX},
+{"i960HX",CPUI960_HX},
+{"i960RX",CPUI960_RX},
+{"i960 80303",CPUI960_80303},
+{"StrongARM SA110",CPUARM_SA110},
+{"PPC603e",CPUPPC_603e},
+{"XScale 80321",CPU_XSCALE_80321},
+{"MIPS 4KC",CPU_MIPS_4KC},
+{"MIPS 5KC",CPU_MIPS_5KC},
+{"Unknown StrongARM",CPUARM_xxx},
+{"Unknown PowerPC",CPUPPC_xxx},
+{NULL, 0},
+{"Unknown processor",0}
+};
+
+static struct aac_code_lookup aac_battery_platform[] = {
+{"required battery present",PLATFORM_BAT_REQ_PRESENT},
+{"REQUIRED BATTERY NOT PRESENT",PLATFORM_BAT_REQ_NOTPRESENT},
+{"optional battery present",PLATFORM_BAT_OPT_PRESENT},
+{"optional battery not installed",PLATFORM_BAT_OPT_NOTPRESENT},
+{"no battery support",PLATFORM_BAT_NOT_SUPPORTED},
+{NULL, 0},
+{"unknown battery platform",0}
+};
+static voidaac_describe_controller(struct aac_softc *sc);
+static char*aac_describe_code(struct aac_code_lookup *table,
+ u_int32_t code);
+
+/* Management Interface */
+static d_open_taac_open;
+static d_ioctl_taac_ioctl;
+static d_poll_taac_poll;
+#if __FreeBSD_version >= 702000
+static voidaac_cdevpriv_dtor(void *arg);
+#else
+static d_close_taac_close;
+#endif
+static intaac_ioctl_sendfib(struct aac_softc *sc, caddr_t ufib);
+static intaac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg);
+static voidaac_handle_aif(struct aac_softc *sc, struct aac_fib *fib);
+static voidaac_request_aif(struct aac_softc *sc);
+static intaac_rev_check(struct aac_softc *sc, caddr_t udata);
+static intaac_open_aif(struct aac_softc *sc, caddr_t arg);
+static intaac_close_aif(struct aac_softc *sc, caddr_t arg);
+static intaac_getnext_aif(struct aac_softc *sc, caddr_t arg);
+static intaac_return_aif(struct aac_softc *sc,
+ struct aac_fib_context *ctx, caddr_t uptr);
+static intaac_query_disk(struct aac_softc *sc, caddr_t uptr);
+static intaac_get_pci_info(struct aac_softc *sc, caddr_t uptr);
+static intaac_supported_features(struct aac_softc *sc, caddr_t uptr);
+static voidaac_ioctl_event(struct aac_softc *sc,
+struct aac_event *event, void *arg);
+static intaac_reset_adapter(struct aac_softc *sc);
+static intaac_get_container_info(struct aac_softc *sc,
+ struct aac_fib *fib, int cid,
+ struct aac_mntinforesp *mir,
+ u_int32_t *uid);
+static u_int32_t
+aac_check_adapter_health(struct aac_softc *sc, u_int8_t *bled);
+
+static struct cdevsw aacraid_cdevsw = {
+.d_version =D_VERSION,
+.d_flags =D_NEEDGIANT,
+.d_open =aac_open,
+#if __FreeBSD_version < 702000
+.d_close =aac_close,
+#endif
+.d_ioctl =aac_ioctl,
+.d_poll =aac_poll,
+.d_name ="aacraid",
+};
+
+MALLOC_DEFINE(M_AACRAIDBUF, "aacraid_buf", "Buffers for the AACRAID driver");
+
+/* sysctl node */
+SYSCTL_NODE(_hw, OID_AUTO, aacraid, CTLFLAG_RD, 0, "AACRAID driver parameters");
+
+/*
+ * Device Interface
+ */
+
+/*
+ * Initialize the controller and softc
+ */
+int
+aacraid_attach(struct aac_softc *sc)
+{
+int error, unit;
+struct aac_fib *fib;
+struct aac_mntinforesp mir;
+int count = 0, i = 0;
+u_int32_t uid;
+
+fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+sc->hint_flags = device_get_flags(sc->aac_dev);
+/*
+ * Initialize per-controller queues.
+ */
+aac_initq_free(sc);
+aac_initq_ready(sc);
+aac_initq_busy(sc);
+
+/* mark controller as suspended until we get ourselves organised */
+sc->aac_state |= AAC_STATE_SUSPEND;
+
+/*
+ * Check that the firmware on the card is supported.
+ */
+if ((error = aac_check_firmware(sc)) != 0)
+return(error);
+
+/*
+ * Initialize locks
+ */
+mtx_init(&sc->aac_io_lock, "AACRAID I/O lock", NULL, MTX_DEF);
+TAILQ_INIT(&sc->aac_container_tqh);
+TAILQ_INIT(&sc->aac_ev_cmfree);
+
+#if __FreeBSD_version >= 800000
+/* Initialize the clock daemon callout. */
+callout_init_mtx(&sc->aac_daemontime, &sc->aac_io_lock, 0);
+#endif
+/*
+ * Initialize the adapter.
+ */
+if ((error = aac_alloc(sc)) != 0)
+return(error);
+if (!(sc->flags & AAC_FLAGS_SYNC_MODE)) {
+if ((error = aac_init(sc)) != 0)
+return(error);
+}
+
+/*
+ * Allocate and connect our interrupt.
+ */
+if ((error = aac_setup_intr(sc)) != 0)
+return(error);
+
+/*
+ * Print a little information about the controller.
+ */
+aac_describe_controller(sc);
+
+/*
+ * Make the control device.
+ */
+unit = device_get_unit(sc->aac_dev);
+sc->aac_dev_t = make_dev(&aacraid_cdevsw, unit, UID_ROOT, GID_OPERATOR,
+ 0640, "aacraid%d", unit);
+sc->aac_dev_t->si_drv1 = sc;
+
+/* Create the AIF thread */
+if (aac_kthread_create((void(*)(void *))aac_command_thread, sc,
+ &sc->aifthread, 0, 0, "aacraid%daif", unit))
+panic("Could not create AIF thread");
+
+/* Register the shutdown method to only be called post-dump */
+if ((sc->eh = EVENTHANDLER_REGISTER(shutdown_final, aacraid_shutdown,
+ sc->aac_dev, SHUTDOWN_PRI_DEFAULT)) == NULL)
+device_printf(sc->aac_dev,
+ "shutdown event registration failed\n");
+
+/* Find containers */
+mtx_lock(&sc->aac_io_lock);
+aac_alloc_sync_fib(sc, &fib);
+/* loop over possible containers */
+do {
+if ((aac_get_container_info(sc, fib, i, &mir, &uid)) != 0)
+continue;
+if (i == 0)
+count = mir.MntRespCount;
+aac_add_container(sc, &mir, 0, uid);
+i++;
+} while ((i < count) && (i < AAC_MAX_CONTAINERS));
+aac_release_sync_fib(sc);
+mtx_unlock(&sc->aac_io_lock);
+
+/* Register with CAM for the containers */
+TAILQ_INIT(&sc->aac_sim_tqh);
+aac_container_bus(sc);
+/* Register with CAM for the non-DASD devices */
+if ((sc->flags & AAC_FLAGS_ENABLE_CAM) != 0)
+aac_get_bus_info(sc);
+
+/* poke the bus to actually attach the child devices */
+bus_generic_attach(sc->aac_dev);
+
+/* mark the controller up */
+sc->aac_state &= ~AAC_STATE_SUSPEND;
+
+/* enable interrupts now */
+AAC_UNMASK_INTERRUPTS(sc);
+
+#if __FreeBSD_version >= 800000
+mtx_lock(&sc->aac_io_lock);
+callout_reset(&sc->aac_daemontime, 60 * hz, aac_daemon, sc);
+mtx_unlock(&sc->aac_io_lock);
+#else
+{
+struct timeval tv;
+tv.tv_sec = 60;
+tv.tv_usec = 0;
+sc->timeout_id = timeout(aac_daemon, (void *)sc, tvtohz(&tv));
+}
+#endif
+
+return(0);
+}
+
+static void
+aac_daemon(void *arg)
+{
+struct aac_softc *sc;
+struct timeval tv;
+struct aac_command *cm;
+struct aac_fib *fib;
+
+sc = arg;
+fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+#if __FreeBSD_version >= 800000
+mtx_assert(&sc->aac_io_lock, MA_OWNED);
+if (callout_pending(&sc->aac_daemontime) ||
+ callout_active(&sc->aac_daemontime) == 0)
+return;
+#else
+mtx_lock(&sc->aac_io_lock);
+#endif
+getmicrotime(&tv);
+
+if (!aacraid_alloc_command(sc, &cm)) {
+fib = cm->cm_fib;
+cm->cm_timestamp = time_uptime;
+cm->cm_datalen = 0;
+cm->cm_flags |= AAC_CMD_WAIT;
+
+fib->Header.Size =
+sizeof(struct aac_fib_header) + sizeof(u_int32_t);
+fib->Header.XferState =
+AAC_FIBSTATE_HOSTOWNED |
+AAC_FIBSTATE_INITIALISED |
+AAC_FIBSTATE_EMPTY |
+AAC_FIBSTATE_FROMHOST |
+AAC_FIBSTATE_REXPECTED |
+AAC_FIBSTATE_NORM |
+AAC_FIBSTATE_ASYNC |
+AAC_FIBSTATE_FAST_RESPONSE;
+fib->Header.Command = SendHostTime;
+*(uint32_t *)fib->data = tv.tv_sec;
+
+aacraid_map_command_sg(cm, NULL, 0, 0);
+aacraid_release_command(cm);
+}
+
+#if __FreeBSD_version >= 800000
+callout_schedule(&sc->aac_daemontime, 30 * 60 * hz);
+#else
+mtx_unlock(&sc->aac_io_lock);
+tv.tv_sec = 30 * 60;
+tv.tv_usec = 0;
+sc->timeout_id = timeout(aac_daemon, (void *)sc, tvtohz(&tv));
+#endif
+}
+
+void
+aacraid_add_event(struct aac_softc *sc, struct aac_event *event)
+{
+
+switch (event->ev_type & AAC_EVENT_MASK) {
+case AAC_EVENT_CMFREE:
+TAILQ_INSERT_TAIL(&sc->aac_ev_cmfree, event, ev_links);
+break;
+default:
+device_printf(sc->aac_dev, "aac_add event: unknown event %d\n",
+ event->ev_type);
+break;
+}
+
+return;
+}
+
+/*
+ * Request information of container #cid
+ */
+static int
+aac_get_container_info(struct aac_softc *sc, struct aac_fib *sync_fib, int cid,
+ struct aac_mntinforesp *mir, u_int32_t *uid)
+{
+struct aac_command *cm;
+struct aac_fib *fib;
+struct aac_mntinfo *mi;
+struct aac_cnt_config *ccfg;
+
+if (sync_fib == NULL) {
+if (aacraid_alloc_command(sc, &cm)) {
+device_printf(sc->aac_dev,
+"Warning, no free command available\n");
+return (-1);
+}
+fib = cm->cm_fib;
+} else {
+fib = sync_fib;
+}
+
+mi = (struct aac_mntinfo *)&fib->data[0];
+/* 4KB support?, 64-bit LBA? */
+if (sc->aac_support_opt2 & AAC_SUPPORTED_VARIABLE_BLOCK_SIZE)
+mi->Command = VM_NameServeAllBlk;
+else if (sc->flags & AAC_FLAGS_LBA_64BIT)
+mi->Command = VM_NameServe64;
+else
+mi->Command = VM_NameServe;
+mi->MntType = FT_FILESYS;
+mi->MntCount = cid;
+
+if (sync_fib) {
+if (aac_sync_fib(sc, ContainerCommand, 0, fib,
+ sizeof(struct aac_mntinfo))) {
+device_printf(sc->aac_dev, "Error probing container %d\n", cid);
+return (-1);
+}
+} else {
+cm->cm_timestamp = time_uptime;
+cm->cm_datalen = 0;
+
+fib->Header.Size =
+sizeof(struct aac_fib_header) + sizeof(struct aac_mntinfo);
+fib->Header.XferState =
+AAC_FIBSTATE_HOSTOWNED |
+AAC_FIBSTATE_INITIALISED |
+AAC_FIBSTATE_EMPTY |
+AAC_FIBSTATE_FROMHOST |
+AAC_FIBSTATE_REXPECTED |
+AAC_FIBSTATE_NORM |
+AAC_FIBSTATE_ASYNC |
+AAC_FIBSTATE_FAST_RESPONSE;
+fib->Header.Command = ContainerCommand;
+if (aacraid_wait_command(cm) != 0) {
+device_printf(sc->aac_dev, "Error probing container %d\n", cid);
+aacraid_release_command(cm);
+return (-1);
+}
+}
+bcopy(&fib->data[0], mir, sizeof(struct aac_mntinforesp));
+
+/* UID */
+*uid = cid;
+if (mir->MntTable[0].VolType != CT_NONE &&
+!(mir->MntTable[0].ContentState & AAC_FSCS_HIDDEN)) {
+if (!(sc->aac_support_opt2 & AAC_SUPPORTED_VARIABLE_BLOCK_SIZE))
+mir->MntTable[0].ObjExtension.BlockSize = 0x200;
+
+ccfg = (struct aac_cnt_config *)&fib->data[0];
+bzero(ccfg, sizeof (*ccfg) - CT_PACKET_SIZE);
+ccfg->Command = VM_ContainerConfig;
+ccfg->CTCommand.command = CT_CID_TO_32BITS_UID;
+ccfg->CTCommand.param[0] = cid;
+
+if (sync_fib) {
+if (aac_sync_fib(sc, ContainerCommand, 0, fib,
+sizeof(struct aac_cnt_config) == 0) &&
+ccfg->CTCommand.param[0] == ST_OK &&
+mir->MntTable[0].VolType != CT_PASSTHRU)
+*uid = ccfg->CTCommand.param[1];
+} else {
+fib->Header.Size =
+sizeof(struct aac_fib_header) + sizeof(struct aac_cnt_config);
+fib->Header.XferState =
+AAC_FIBSTATE_HOSTOWNED |
+AAC_FIBSTATE_INITIALISED |
+AAC_FIBSTATE_EMPTY |
+AAC_FIBSTATE_FROMHOST |
+AAC_FIBSTATE_REXPECTED |
+AAC_FIBSTATE_NORM |
+AAC_FIBSTATE_ASYNC |
+AAC_FIBSTATE_FAST_RESPONSE;
+fib->Header.Command = ContainerCommand;
+if (aacraid_wait_command(cm) == 0 &&
+ccfg->CTCommand.param[0] == ST_OK &&
+mir->MntTable[0].VolType != CT_PASSTHRU)
+*uid = ccfg->CTCommand.param[1];
+aacraid_release_command(cm);
+}
+}
+
+return (0);
+}
+
+/*
+ * Create a device to represent a new container
+ */
+static void
+aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f,
+ u_int32_t uid)
+{
+struct aac_container *co;
+
+fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+/*
+ * Check container volume type for validity. Note that many of
+ * the possible types may never show up.
+ */
+if ((mir->Status == ST_OK) && (mir->MntTable[0].VolType != CT_NONE)) {
+co = (struct aac_container *)malloc(sizeof *co, M_AACRAIDBUF,
+ M_NOWAIT | M_ZERO);
+if (co == NULL) {
+panic("Out of memory?!");
+}
+
+co->co_found = f;
+bcopy(&mir->MntTable[0], &co->co_mntobj,
+ sizeof(struct aac_mntobj));
+co->co_uid = uid;
+TAILQ_INSERT_TAIL(&sc->aac_container_tqh, co, co_link);
+}
+}
+
+/*
+ * Allocate resources associated with (sc)
+ */
+static int
+aac_alloc(struct aac_softc *sc)
+{
+bus_size_t maxsize;
+
+fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+/*
+ * Create DMA tag for mapping buffers into controller-addressable space.
+ */
+if (bus_dma_tag_create(sc->aac_parent_dmat, /* parent */
+ 1, 0, /* algnmnt, boundary */
+ (sc->flags & AAC_FLAGS_SG_64BIT) ?
+ BUS_SPACE_MAXADDR :
+ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */
+ BUS_SPACE_MAXADDR, /* highaddr */
+ NULL, NULL, /* filter, filterarg */
+ MAXBSIZE,/* maxsize */
+ sc->aac_sg_tablesize,/* nsegments */
+ MAXBSIZE,/* maxsegsize */
+ BUS_DMA_ALLOCNOW,/* flags */
+ busdma_lock_mutex,/* lockfunc */
+ &sc->aac_io_lock,/* lockfuncarg */
+ &sc->aac_buffer_dmat)) {
+device_printf(sc->aac_dev, "can't allocate buffer DMA tag\n");
+return (ENOMEM);
+}
+
+/*
+ * Create DMA tag for mapping FIBs into controller-addressable space..
+ */
+if (sc->flags & AAC_FLAGS_NEW_COMM_TYPE1)
+maxsize = sc->aac_max_fibs_alloc * (sc->aac_max_fib_size +
+sizeof(struct aac_fib_xporthdr) + 31);
+else
+maxsize = sc->aac_max_fibs_alloc * (sc->aac_max_fib_size + 31);
+if (bus_dma_tag_create(sc->aac_parent_dmat,/* parent */
+ 1, 0, /* algnmnt, boundary */
+ (sc->flags & AAC_FLAGS_4GB_WINDOW) ?
+ BUS_SPACE_MAXADDR_32BIT :
+ 0x7fffffff,/* lowaddr */
+ BUS_SPACE_MAXADDR, /* highaddr */
+ NULL, NULL, /* filter, filterarg */
+ maxsize, /* maxsize */
+ 1,/* nsegments */
+ maxsize,/* maxsize */
+ 0,/* flags */
+ NULL, NULL,/* No locking needed */
+ &sc->aac_fib_dmat)) {
+device_printf(sc->aac_dev, "can't allocate FIB DMA tag\n");
+return (ENOMEM);
+}
+
+/*
+ * Create DMA tag for the common structure and allocate it.
+ */
+maxsize = sizeof(struct aac_common);
+maxsize += sc->aac_max_fibs * sizeof(u_int32_t);
+if (bus_dma_tag_create(sc->aac_parent_dmat, /* parent */
+ 1, 0,/* algnmnt, boundary */
+ (sc->flags & AAC_FLAGS_4GB_WINDOW) ?
+ BUS_SPACE_MAXADDR_32BIT :
+ 0x7fffffff,/* lowaddr */
+ BUS_SPACE_MAXADDR, /* highaddr */
+ NULL, NULL, /* filter, filterarg */
+ maxsize, /* maxsize */
+ 1,/* nsegments */
+ maxsize,/* maxsegsize */
+ 0,/* flags */
+ NULL, NULL,/* No locking needed */
+ &sc->aac_common_dmat)) {
+device_printf(sc->aac_dev,
+ "can't allocate common structure DMA tag\n");
+return (ENOMEM);
+}
+if (bus_dmamem_alloc(sc->aac_common_dmat, (void **)&sc->aac_common,
+ BUS_DMA_NOWAIT, &sc->aac_common_dmamap)) {
+device_printf(sc->aac_dev, "can't allocate common structure\n");
+return (ENOMEM);
+}
+
+(void)bus_dmamap_load(sc->aac_common_dmat, sc->aac_common_dmamap,
+sc->aac_common, maxsize,
+aac_common_map, sc, 0);
+bzero(sc->aac_common, maxsize);
+
+/* Allocate some FIBs and associated command structs */
+TAILQ_INIT(&sc->aac_fibmap_tqh);
+sc->aac_commands = malloc(sc->aac_max_fibs * sizeof(struct aac_command),
+ M_AACRAIDBUF, M_WAITOK|M_ZERO);
+mtx_lock(&sc->aac_io_lock);
+while (sc->total_fibs < sc->aac_max_fibs) {
+if (aac_alloc_commands(sc) != 0)
+break;
+}
+mtx_unlock(&sc->aac_io_lock);
+if (sc->total_fibs == 0)
+return (ENOMEM);
+
+return (0);
+}
+
+/*
+ * Free all of the resources associated with (sc)
+ *
+ * Should not be called if the controller is active.
+ */
+void
+aacraid_free(struct aac_softc *sc)
+{
+fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+/* remove the control device */
+if (sc->aac_dev_t != NULL)
+destroy_dev(sc->aac_dev_t);
+
+/* throw away any FIB buffers, discard the FIB DMA tag */
+aac_free_commands(sc);
+if (sc->aac_fib_dmat)
+bus_dma_tag_destroy(sc->aac_fib_dmat);
+
+free(sc->aac_commands, M_AACRAIDBUF);
+
+/* destroy the common area */
+if (sc->aac_common) {
+bus_dmamap_unload(sc->aac_common_dmat, sc->aac_common_dmamap);
+bus_dmamem_free(sc->aac_common_dmat, sc->aac_common,
+sc->aac_common_dmamap);
+}
+if (sc->aac_common_dmat)
+bus_dma_tag_destroy(sc->aac_common_dmat);
+
+/* disconnect the interrupt handler */
+if (sc->aac_intr)
+bus_teardown_intr(sc->aac_dev, sc->aac_irq, sc->aac_intr);
+if (sc->aac_irq != NULL)
+bus_release_resource(sc->aac_dev, SYS_RES_IRQ, sc->aac_irq_rid,
+ sc->aac_irq);
+
+/* destroy data-transfer DMA tag */
+if (sc->aac_buffer_dmat)
+bus_dma_tag_destroy(sc->aac_buffer_dmat);
+
+/* destroy the parent DMA tag */
+if (sc->aac_parent_dmat)
+bus_dma_tag_destroy(sc->aac_parent_dmat);
+
+/* release the register window mapping */
+if (sc->aac_regs_res0 != NULL)
+bus_release_resource(sc->aac_dev, SYS_RES_MEMORY,
+ sc->aac_regs_rid0, sc->aac_regs_res0);
+if (sc->aac_regs_res1 != NULL)
+bus_release_resource(sc->aac_dev, SYS_RES_MEMORY,
+ sc->aac_regs_rid1, sc->aac_regs_res1);
+}
+
+/*
+ * Disconnect from the controller completely, in preparation for unload.
+ */
+int
+aacraid_detach(device_t dev)
+{
+struct aac_softc *sc;
+struct aac_container *co;
+struct aac_sim*sim;
+int error;
+
+sc = device_get_softc(dev);
+fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+#if __FreeBSD_version >= 800000
+callout_drain(&sc->aac_daemontime);
+#else
+untimeout(aac_daemon, (void *)sc, sc->timeout_id);
+#endif
+/* Remove the child containers */
+while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) {
+TAILQ_REMOVE(&sc->aac_container_tqh, co, co_link);
+free(co, M_AACRAIDBUF);
+}
+
+/* Remove the CAM SIMs */
+while ((sim = TAILQ_FIRST(&sc->aac_sim_tqh)) != NULL) {
+TAILQ_REMOVE(&sc->aac_sim_tqh, sim, sim_link);
+error = device_delete_child(dev, sim->sim_dev);
+if (error)
+return (error);
+free(sim, M_AACRAIDBUF);
+}
+
+if (sc->aifflags & AAC_AIFFLAGS_RUNNING) {
+sc->aifflags |= AAC_AIFFLAGS_EXIT;
+wakeup(sc->aifthread);
+tsleep(sc->aac_dev, PUSER | PCATCH, "aac_dch", 30 * hz);
+}
+
+if (sc->aifflags & AAC_AIFFLAGS_RUNNING)
+panic("Cannot shutdown AIF thread");
+
+if ((error = aacraid_shutdown(dev)))
+return(error);
+
+EVENTHANDLER_DEREGISTER(shutdown_final, sc->eh);
+
+aacraid_free(sc);
+
+mtx_destroy(&sc->aac_io_lock);
+
+return(0);
+}
+
+/*
+ * Bring the controller down to a dormant state and detach all child devices.
+ *
+ * This function is called before detach or system shutdown.
+ *
+ * Note that we can assume that the bioq on the controller is empty, as we won't
+ * allow shutdown if any device is open.
+ */
+int
+aacraid_shutdown(device_t dev)
+{
+struct aac_softc *sc;
+struct aac_fib *fib;
+struct aac_close_command *cc;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Achim Leubner2013-05-24T09:22:43svn commit: r250962 - head/sys/netinet
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165496
<pre>Author: tuexen
Date: Fri May 24 09:21:18 2013
New Revision: 250962
URL: http://svnweb.freebsd.org/changeset/base/250962
Log:
Withdraw http://svnweb.freebsd.org/changeset/base/250809
since the real fix is in http://svnweb.freebsd.org/changeset/base/250952.
Modified:
head/sys/netinet/sctp_os_bsd.h
Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.hFri May 24 06:13:36 2013(r250961)
+++ head/sys/netinet/sctp_os_bsd.hFri May 24 09:21:18 2013(r250962)
< at >< at > -435,7 +435,6 < at >< at > typedef struct rtentry sctp_rtentry_t;
{ \
int o_flgs = IP_RAWOUTPUT; \
struct sctp_tcb *local_stcb = stcb; \
-M_SETFIB(o_pak, 0); \
if (local_stcb && \
local_stcb->sctp_ep && \
local_stcb->sctp_ep->sctp_socket) \
< at >< at > -446,7 +445,6 < at >< at > typedef struct rtentry sctp_rtentry_t;
#define SCTP_IP6_OUTPUT(result, o_pak, ro, ifp, stcb, vrf_id) \
{ \
struct sctp_tcb *local_stcb = stcb; \
-M_SETFIB(o_pak, 0); \
if (local_stcb && local_stcb->sctp_ep) \
result = ip6_output(o_pak, \
((struct in6pcb *)(local_stcb->sctp_ep))->in6p_outputopts, \
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Michael Tuexen2013-05-24T09:21:18svn commit: r250961 - stable/9/sys/cam
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165492
<pre>Author: scottl
Date: Fri May 24 06:13:36 2013
New Revision: 250961
URL: http://svnweb.freebsd.org/changeset/base/250961
Log:
Revert r250948, it was merged too soon.
Modified:
stable/9/sys/cam/cam_periph.c
Modified: stable/9/sys/cam/cam_periph.c
==============================================================================
--- stable/9/sys/cam/cam_periph.cFri May 24 04:03:04 2013(r250960)
+++ stable/9/sys/cam/cam_periph.cFri May 24 06:13:36 2013(r250961)
< at >< at > -733,8 +733,6 < at >< at > cam_periph_mapmem(union ccb *ccb, struct
case XPT_CONT_TARGET_IO:
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_NONE)
return(0);
-KASSERT((ccb->ccb_h.flags & CAM_DATA_MASK) == CAM_DATA_VADDR,
- ("not VADDR for SCSI_IO %p %x\n", ccb, ccb->ccb_h.flags));
data_ptrs[0] = &ccb->csio.data_ptr;
lengths[0] = ccb->csio.dxfer_len;
< at >< at > -744,8 +742,6 < at >< at > cam_periph_mapmem(union ccb *ccb, struct
case XPT_ATA_IO:
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_NONE)
return(0);
-KASSERT((ccb->ccb_h.flags & CAM_DATA_MASK) == CAM_DATA_VADDR,
- ("not VADDR for ATA_IO %p %x\n", ccb, ccb->ccb_h.flags));
data_ptrs[0] = &ccb->ataio.data_ptr;
lengths[0] = ccb->ataio.dxfer_len;
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Scott Long2013-05-24T06:13:36svn commit: r250953 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165489
<pre>Author: markj
Date: Fri May 24 03:29:32 2013
New Revision: 250953
URL: http://svnweb.freebsd.org/changeset/base/250953
Log:
The fasttrap provider cleans up probes asynchronously when a process with
USDT probes exits. This was previously done with a callout; however, it is
possible to sleep while holding the DTrace mutexes, so a panic will occur
on INVARIANTS kernels if the callout handler can't immediately acquire one
of these mutexes. This panic will be frequently triggered on systems where
a USDT-enabled program (perl, for instance) is often run.
This revision changes the fasttrap cleanup mechanism so that a dedicated
thread is used instead of a callout. The old behaviour is otherwise
preserved.
Reviewed by:rpaulo
MFC after:1 month
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.cFri May 24 02:18:37 2013(r250952)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.cFri May 24 03:29:32 2013(r250953)
< at >< at > -155,9 +155,9 < at >< at > static struct cdevsw fasttrap_cdevsw = {
static struct cdev *fasttrap_cdev;
static dtrace_meta_provider_id_t fasttrap_meta_id;
-static struct callout fasttrap_timeout;
+static struct proc *fasttrap_cleanup_proc;
static struct mtx fasttrap_cleanup_mtx;
-static uint_t fasttrap_cleanup_work;
+static uint_t fasttrap_cleanup_work, fasttrap_cleanup_drain, fasttrap_cleanup_cv;
/*
* Generation count on modifications to the global tracepoint lookup table.
< at >< at > -310,8 +310,11 < at >< at > fasttrap_mod_barrier(uint64_t gen)
}
/*
- * This is the timeout's callback for cleaning up the providers and their
- * probes.
+ * This function performs asynchronous cleanup of fasttrap providers. The
+ * Solaris implementation of this mechanism use a timeout that's activated in
+ * fasttrap_pid_cleanup(), but this doesn't work in FreeBSD: one may sleep while
+ * holding the DTrace mutexes, but it is unsafe to sleep in a callout handler.
+ * Thus we use a dedicated process to perform the cleanup when requested.
*/
/*ARGSUSED*/
static void
< at >< at > -322,11 +325,8 < at >< at > fasttrap_pid_cleanup_cb(void *data)
dtrace_provider_id_t provid;
int i, later = 0, rval;
-static volatile int in = 0;
-ASSERT(in == 0);
-in = 1;
-
-while (fasttrap_cleanup_work) {
+mtx_lock(&fasttrap_cleanup_mtx);
+while (!fasttrap_cleanup_drain || later > 0) {
fasttrap_cleanup_work = 0;
mtx_unlock(&fasttrap_cleanup_mtx);
< at >< at > -397,39 +397,32 < at >< at > fasttrap_pid_cleanup_cb(void *data)
}
mutex_exit(&bucket->ftb_mtx);
}
-
mtx_lock(&fasttrap_cleanup_mtx);
-}
-#if 0
-ASSERT(fasttrap_timeout != 0);
-#endif
+/*
+ * If we were unable to retire a provider, try again after a
+ * second. This situation can occur in certain circumstances
+ * where providers cannot be unregistered even though they have
+ * no probes enabled because of an execution of dtrace -l or
+ * something similar.
+ */
+if (later > 0 || fasttrap_cleanup_work ||
+ fasttrap_cleanup_drain) {
+mtx_unlock(&fasttrap_cleanup_mtx);
+pause("ftclean", hz);
+mtx_lock(&fasttrap_cleanup_mtx);
+} else
+mtx_sleep(&fasttrap_cleanup_cv, &fasttrap_cleanup_mtx,
+ 0, "ftcl", 0);
+}
/*
- * If we were unable to remove a retired provider, try again after
- * a second. This situation can occur in certain circumstances where
- * providers cannot be unregistered even though they have no probes
- * enabled because of an execution of dtrace -l or something similar.
- * If the timeout has been disabled (set to 1 because we're trying
- * to detach), we set fasttrap_cleanup_work to ensure that we'll
- * get a chance to do that work if and when the timeout is reenabled
- * (if detach fails).
- */
-if (later > 0) {
-if (callout_active(&fasttrap_timeout)) {
-callout_reset(&fasttrap_timeout, hz,
- &fasttrap_pid_cleanup_cb, NULL);
-}
-
-else if (later > 0)
-fasttrap_cleanup_work = 1;
-} else {
-#if !defined(sun)
-/* Nothing to be done for FreeBSD */
-#endif
-}
+ * Wake up the thread in fasttrap_unload() now that we're done.
+ */
+wakeup(&fasttrap_cleanup_drain);
+mtx_unlock(&fasttrap_cleanup_mtx);
-in = 0;
+kthread_exit();
}
/*
< at >< at > -440,8 +433,10 < at >< at > fasttrap_pid_cleanup(void)
{
mtx_lock(&fasttrap_cleanup_mtx);
-fasttrap_cleanup_work = 1;
-callout_reset(&fasttrap_timeout, 1, &fasttrap_pid_cleanup_cb, NULL);
+if (!fasttrap_cleanup_work) {
+fasttrap_cleanup_work = 1;
+wakeup(&fasttrap_cleanup_cv);
+}
mtx_unlock(&fasttrap_cleanup_mtx);
}
< at >< at > -991,7 +986,6 < at >< at > fasttrap_pid_enable(void *arg, dtrace_id
proc_t *p = NULL;
int i, rc;
-
ASSERT(probe != NULL);
ASSERT(!probe->ftp_enabled);
ASSERT(id == probe->ftp_id);
< at >< at > -2272,17 +2266,23 < at >< at > static int
fasttrap_load(void)
{
ulong_t nent;
-int i;
+int i, ret;
/* Create the /dev/dtrace/fasttrap entry. */
fasttrap_cdev = make_dev(&fasttrap_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
"dtrace/fasttrap");
mtx_init(&fasttrap_cleanup_mtx, "fasttrap clean", "dtrace", MTX_DEF);
-callout_init_mtx(&fasttrap_timeout, &fasttrap_cleanup_mtx, 0);
mutex_init(&fasttrap_count_mtx, "fasttrap count mtx", MUTEX_DEFAULT,
NULL);
+ret = kproc_create(fasttrap_pid_cleanup_cb, NULL,
+ &fasttrap_cleanup_proc, 0, 0, "ftcleanup");
+if (ret != 0) {
+destroy_dev(fasttrap_cdev);
+return (ret);
+}
+
/*
* Install our hooks into fork(2), exec(2), and exit(2).
*/
< at >< at > -2389,15 +2389,6 < at >< at > fasttrap_unload(void)
return (-1);
/*
- * Prevent any new timeouts from running by setting fasttrap_timeout
- * to a non-zero value, and wait for the current timeout to complete.
- */
-mtx_lock(&fasttrap_cleanup_mtx);
-fasttrap_cleanup_work = 0;
-callout_drain(&fasttrap_timeout);
-mtx_unlock(&fasttrap_cleanup_mtx);
-
-/*
* Iterate over all of our providers. If there's still a process
* that corresponds to that pid, fail to detach.
*/
< at >< at > -2431,26 +2422,20 < at >< at > fasttrap_unload(void)
}
if (fail) {
-uint_t work;
-/*
- * If we're failing to detach, we need to unblock timeouts
- * and start a new timeout if any work has accumulated while
- * we've been unsuccessfully trying to detach.
- */
-mtx_lock(&fasttrap_cleanup_mtx);
-work = fasttrap_cleanup_work;
-callout_drain(&fasttrap_timeout);
-mtx_unlock(&fasttrap_cleanup_mtx);
-
-if (work)
-fasttrap_pid_cleanup();
-
(void) dtrace_meta_register("fasttrap", &fasttrap_mops, NULL,
&fasttrap_meta_id);
return (-1);
}
+mtx_lock(&fasttrap_cleanup_mtx);
+fasttrap_cleanup_drain = 1;
+/* Wait for the cleanup thread to finish up and signal us. */
+wakeup(&fasttrap_cleanup_cv);
+mtx_sleep(&fasttrap_cleanup_drain, &fasttrap_cleanup_mtx, 0, "ftcld",
+ 0);
+fasttrap_cleanup_proc = NULL;
+
#ifdef DEBUG
mutex_enter(&fasttrap_count_mtx);
ASSERT(fasttrap_pid_count == 0);
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Mark Johnston2013-05-24T03:29:32svn commit: r250952 - head/sys/kern
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165488
<pre>Author: julian
Date: Fri May 24 02:18:37 2013
New Revision: 250952
URL: http://svnweb.freebsd.org/changeset/base/250952
Log:
Initialising the new fibnum field to a known value turns out to
be a GOOD IDEA (TM).
Apparently MOST users set this (e.g. tcp and friends) but there are a few
users that just assume that it is a sensible value but then go on to read it.
These include SCTP, pf and the FLOWTABLE option (and maybe others).
Modified:
head/sys/kern/kern_mbuf.c
Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.cFri May 24 00:49:12 2013(r250951)
+++ head/sys/kern/kern_mbuf.cFri May 24 02:18:37 2013(r250952)
< at >< at > -470,6 +470,7 < at >< at > mb_ctor_mbuf(void *mem, int size, void *
m->m_pkthdr.tso_segsz = 0;
m->m_pkthdr.ether_vtag = 0;
m->m_pkthdr.flowid = 0;
+m->m_pkthdr.fibnum = 0;
SLIST_INIT(&m->m_pkthdr.tags);
#ifdef MAC
/* If the label init fails, fail the alloc */
< at >< at > -695,6 +696,7 < at >< at > mb_ctor_pack(void *mem, int size, void *
m->m_pkthdr.tso_segsz = 0;
m->m_pkthdr.ether_vtag = 0;
m->m_pkthdr.flowid = 0;
+m->m_pkthdr.fibnum = 0;
SLIST_INIT(&m->m_pkthdr.tags);
#ifdef MAC
/* If the label init fails, fail the alloc */
< at >< at > -720,6 +722,7 < at >< at > m_pkthdr_init(struct mbuf *m, int how)
m->m_pkthdr.header = NULL;
m->m_pkthdr.len = 0;
m->m_pkthdr.flowid = 0;
+m->m_pkthdr.fibnum = 0;
m->m_pkthdr.csum_flags = 0;
m->m_pkthdr.csum_data = 0;
m->m_pkthdr.tso_segsz = 0;
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Julian Elischer2013-05-24T02:18:37svn commit: r250951 - head/sys/kern
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165487
<pre>Author: lstewart
Date: Fri May 24 00:49:12 2013
New Revision: 250951
URL: http://svnweb.freebsd.org/changeset/base/250951
Log:
Ensure alq's shutdown_pre_sync event handler is deregistered on module unload to
avoid a dangling pointer and eventual panic on system shutdown.
Reported by:Ali <comnetboy at gmail.com>
Tested by:Ali <comnetboy at gmail.com>
MFC after:1 week
Modified:
head/sys/kern/kern_alq.c
Modified: head/sys/kern/kern_alq.c
==============================================================================
--- head/sys/kern/kern_alq.cThu May 23 22:52:21 2013(r250950)
+++ head/sys/kern/kern_alq.cFri May 24 00:49:12 2013(r250951)
< at >< at > -99,6 +99,7 < at >< at > static LIST_HEAD(, alq) ald_active;
static int ald_shutingdown = 0;
struct thread *ald_thread;
static struct proc *ald_proc;
+static eventhandler_tag alq_eventhandler_tag = NULL;
#defineALD_LOCK()mtx_lock(&ald_mtx)
#defineALD_UNLOCK()mtx_unlock(&ald_mtx)
< at >< at > -194,8 +195,8 < at >< at > ald_daemon(void)
ald_thread = FIRST_THREAD_IN_PROC(ald_proc);
-EVENTHANDLER_REGISTER(shutdown_pre_sync, ald_shutdown, NULL,
- SHUTDOWN_PRI_FIRST);
+alq_eventhandler_tag = EVENTHANDLER_REGISTER(shutdown_pre_sync,
+ ald_shutdown, NULL, SHUTDOWN_PRI_FIRST);
ALD_LOCK();
< at >< at > -228,6 +229,8 < at >< at > ald_shutdown(void *arg, int howto)
{
struct alq *alq;
+EVENTHANDLER_DEREGISTER(shutdown_pre_sync, alq_eventhandler_tag);
+
ALD_LOCK();
/* Ensure no new queues can be created. */
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Lawrence Stewart2013-05-24T00:49:12svn commit: r250950 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/lib/libzfs/common
http://comments.gmane.org/gmane.os.freebsd.devel.cvs.src/165486
<pre>Author: mm
Date: Thu May 23 22:52:21 2013
New Revision: 250950
URL: http://svnweb.freebsd.org/changeset/base/250950
Log:
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 14031:e4eb37f33d60
Illumos ZFS issues:
3699 zfs hold or release of a non-existent snapshot does not output error
3739 cannot set zfs quota or reservation on pool version < 22
Modified:
vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
Changes in other areas also in this revision:
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dir.c
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_prop.c
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.cThu May 23 22:51:56 2013(r250949)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.cThu May 23 22:52:21 2013(r250950)
< at >< at > -24,6 +24,7 < at >< at >
* Copyright (c) 2012 by Delphix. All rights reserved.
* Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved.
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2013 Martin Matuska. All rights reserved.
*/
#include <ctype.h>
< at >< at > -4116,6 +4117,20 < at >< at > zfs_hold(zfs_handle_t *zhp, const char *
ha.tag = tag;
ha.recursive = recursive;
(void) zfs_hold_one(zfs_handle_dup(zhp), &ha);
+
+if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+fnvlist_free(ha.nvl);
+ret = ENOENT;
+if (!enoent_ok) {
+(void) snprintf(errbuf, sizeof (errbuf),
+ dgettext(TEXT_DOMAIN,
+ "cannot hold snapshot '%s< at >%s'"),
+ zhp->zfs_name, snapname);
+(void) zfs_standard_error(hdl, ret, errbuf);
+}
+return (ret);
+}
+
ret = lzc_hold(ha.nvl, cleanup_fd, &errors);
fnvlist_free(ha.nvl);
< at >< at > -4217,12 +4232,25 < at >< at > zfs_release(zfs_handle_t *zhp, const cha
nvlist_t *errors;
nvpair_t *elem;
libzfs_handle_t *hdl = zhp->zfs_hdl;
+char errbuf[1024];
ha.nvl = fnvlist_alloc();
ha.snapname = snapname;
ha.tag = tag;
ha.recursive = recursive;
(void) zfs_release_one(zfs_handle_dup(zhp), &ha);
+
+if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+fnvlist_free(ha.nvl);
+ret = ENOENT;
+(void) snprintf(errbuf, sizeof (errbuf),
+ dgettext(TEXT_DOMAIN,
+ "cannot release hold from snapshot '%s< at >%s'"),
+ zhp->zfs_name, snapname);
+(void) zfs_standard_error(hdl, ret, errbuf);
+return (ret);
+}
+
ret = lzc_release(ha.nvl, &errors);
fnvlist_free(ha.nvl);
< at >< at > -4231,8 +4259,6 < at >< at > zfs_release(zfs_handle_t *zhp, const cha
if (nvlist_next_nvpair(errors, NULL) == NULL) {
/* no hold-specific errors */
-char errbuf[1024];
-
(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
"cannot release"));
switch (errno) {
< at >< at > -4249,8 +4275,6 < at >< at > zfs_release(zfs_handle_t *zhp, const cha
for (elem = nvlist_next_nvpair(errors, NULL);
elem != NULL;
elem = nvlist_next_nvpair(errors, elem)) {
-char errbuf[1024];
-
(void) snprintf(errbuf, sizeof (errbuf),
dgettext(TEXT_DOMAIN,
"cannot release hold from snapshot '%s'"),
_______________________________________________
svn-src-all< at >freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe< at >freebsd.org"
</pre>Martin Matuska2013-05-23T22:52:22Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.os.freebsd.devel.cvs.src