From owner-svn-src-user@FreeBSD.ORG Thu Jul 2 22:52:11 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95AF61065672; Thu, 2 Jul 2009 22:52:11 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 82A178FC17; Thu, 2 Jul 2009 22:52:11 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n62MqBUa060037; Thu, 2 Jul 2009 22:52:11 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n62MqBHI060031; Thu, 2 Jul 2009 22:52:11 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200907022252.n62MqBHI060031@svn.freebsd.org> From: Kip Macy Date: Thu, 2 Jul 2009 22:52:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195299 - in user/kmacy/releng_7_2_fcs/sys: kern netgraph sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2009 22:52:11 -0000 Author: kmacy Date: Thu Jul 2 22:52:10 2009 New Revision: 195299 URL: http://svn.freebsd.org/changeset/base/195299 Log: MFC 195148 - Turn the third (islocked) argument of the knote call into flags parameter. Introduce the new flag KNF_NOKQLOCK to allow event callers to be called without KQ_LOCK mtx held. - Modify VFS knote calls to always use KNF_NOKQLOCK flag. This is required for ZFS as its getattr implementation may sleep. Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_event.c user/kmacy/releng_7_2_fcs/sys/netgraph/ng_ksocket.c user/kmacy/releng_7_2_fcs/sys/sys/event.h user/kmacy/releng_7_2_fcs/sys/sys/mount.h user/kmacy/releng_7_2_fcs/sys/sys/vnode.h Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_event.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/kern_event.c Thu Jul 2 22:34:42 2009 (r195298) +++ user/kmacy/releng_7_2_fcs/sys/kern/kern_event.c Thu Jul 2 22:52:10 2009 (r195299) @@ -1599,17 +1599,18 @@ kqueue_wakeup(struct kqueue *kq) * first. */ void -knote(struct knlist *list, long hint, int islocked) +knote(struct knlist *list, long hint, int lockflags) { struct kqueue *kq; struct knote *kn; + int error; if (list == NULL) return; - KNL_ASSERT_LOCK(list, islocked); + KNL_ASSERT_LOCK(list, lockflags & KNF_LISTLOCKED); - if (!islocked) + if ((lockflags & KNF_LISTLOCKED) == 0) list->kl_lock(list->kl_lockarg); /* @@ -1624,17 +1625,28 @@ knote(struct knlist *list, long hint, in kq = kn->kn_kq; if ((kn->kn_status & KN_INFLUX) != KN_INFLUX) { KQ_LOCK(kq); - if ((kn->kn_status & KN_INFLUX) != KN_INFLUX) { + if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) { + KQ_UNLOCK(kq); + } else if ((lockflags & KNF_NOKQLOCK) != 0) { + kn->kn_status |= KN_INFLUX; + KQ_UNLOCK(kq); + error = kn->kn_fop->f_event(kn, hint); + KQ_LOCK(kq); + kn->kn_status &= ~KN_INFLUX; + if (error) + KNOTE_ACTIVATE(kn, 1); + KQ_UNLOCK_FLUX(kq); + } else { kn->kn_status |= KN_HASKQLOCK; if (kn->kn_fop->f_event(kn, hint)) KNOTE_ACTIVATE(kn, 1); kn->kn_status &= ~KN_HASKQLOCK; + KQ_UNLOCK(kq); } - KQ_UNLOCK(kq); } kq = NULL; } - if (!islocked) + if ((lockflags & KNF_LISTLOCKED) == 0) list->kl_unlock(list->kl_lockarg); } Modified: user/kmacy/releng_7_2_fcs/sys/netgraph/ng_ksocket.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/netgraph/ng_ksocket.c Thu Jul 2 22:34:42 2009 (r195298) +++ user/kmacy/releng_7_2_fcs/sys/netgraph/ng_ksocket.c Thu Jul 2 22:52:10 2009 (r195299) @@ -1214,7 +1214,7 @@ ng_ksocket_finish_accept(priv_p priv) SOCK_UNLOCK(so); ACCEPT_UNLOCK(); - /* XXX KNOTE(&head->so_rcv.sb_sel.si_note, 0); */ + /* XXX KNOTE_UNLOCKED(&head->so_rcv.sb_sel.si_note, 0); */ soaccept(so, &sa); Modified: user/kmacy/releng_7_2_fcs/sys/sys/event.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/sys/event.h Thu Jul 2 22:34:42 2009 (r195298) +++ user/kmacy/releng_7_2_fcs/sys/sys/event.h Thu Jul 2 22:52:10 2009 (r195299) @@ -135,8 +135,14 @@ struct knlist { MALLOC_DECLARE(M_KQUEUE); #endif -#define KNOTE(list, hist, lock) knote(list, hist, lock) -#define KNOTE_LOCKED(list, hint) knote(list, hint, 1) +/* + * Flags for knote call + */ +#define KNF_LISTLOCKED 0x0001 /* knlist is locked */ +#define KNF_NOKQLOCK 0x0002 /* do not keep KQ_LOCK */ + +#define KNOTE(list, hist, flags) knote(list, hist, flags) +#define KNOTE_LOCKED(list, hint) knote(list, hint, KNF_LISTLOCKED) #define KNOTE_UNLOCKED(list, hint) knote(list, hint, 0) #define KNLIST_EMPTY(list) SLIST_EMPTY(&(list)->kl_list) @@ -204,7 +210,7 @@ struct thread; struct proc; struct knlist; -extern void knote(struct knlist *list, long hint, int islocked); +extern void knote(struct knlist *list, long hint, int lockflags); extern void knote_fork(struct knlist *list, int pid); extern void knlist_add(struct knlist *knl, struct knote *kn, int islocked); extern void knlist_remove(struct knlist *knl, struct knote *kn, int islocked); Modified: user/kmacy/releng_7_2_fcs/sys/sys/mount.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/sys/mount.h Thu Jul 2 22:34:42 2009 (r195298) +++ user/kmacy/releng_7_2_fcs/sys/sys/mount.h Thu Jul 2 22:52:10 2009 (r195299) @@ -637,7 +637,7 @@ extern int mpsafe_vfs; #define VFS_KNOTE_LOCKED(vp, hint) do \ { \ if (((vp)->v_vflag & VV_NOKNOTE) == 0) \ - VN_KNOTE((vp), (hint), 1); \ + VN_KNOTE((vp), (hint), KNF_LISTLOCKED); \ } while (0) #define VFS_KNOTE_UNLOCKED(vp, hint) do \ Modified: user/kmacy/releng_7_2_fcs/sys/sys/vnode.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/sys/vnode.h Thu Jul 2 22:34:42 2009 (r195298) +++ user/kmacy/releng_7_2_fcs/sys/sys/vnode.h Thu Jul 2 22:52:10 2009 (r195299) @@ -222,9 +222,10 @@ struct xvnode { #define VN_KNOTE(vp, b, a) \ do { \ if (!VN_KNLIST_EMPTY(vp)) \ - KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), (a)); \ + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ + (a) | KNF_NOKQLOCK); \ } while (0) -#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, 1) +#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, KNF_LISTLOCKED) #define VN_KNOTE_UNLOCKED(vp, b) VN_KNOTE(vp, b, 0) /*