1999-10-21 09:06:11 +00:00
|
|
|
/*
|
|
|
|
* ng_base.c
|
2005-01-07 01:45:51 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*-
|
1999-10-21 09:06:11 +00:00
|
|
|
* Copyright (c) 1996-1999 Whistle Communications, Inc.
|
|
|
|
* All rights reserved.
|
2001-01-06 00:46:47 +00:00
|
|
|
*
|
1999-10-21 09:06:11 +00:00
|
|
|
* Subject to the following obligations and disclaimer of warranty, use and
|
|
|
|
* redistribution of this software, in source or object code forms, with or
|
|
|
|
* without modifications are expressly permitted by Whistle Communications;
|
|
|
|
* provided, however, that:
|
|
|
|
* 1. Any and all reproductions of the source or object code must include the
|
|
|
|
* copyright notice above and the following disclaimer of warranties; and
|
|
|
|
* 2. No rights are granted, in any manner or form, to use Whistle
|
|
|
|
* Communications, Inc. trademarks, including the mark "WHISTLE
|
|
|
|
* COMMUNICATIONS" on advertising, endorsements, or otherwise except as
|
|
|
|
* such appears in the above copyright notice or in the software.
|
2001-01-06 00:46:47 +00:00
|
|
|
*
|
1999-10-21 09:06:11 +00:00
|
|
|
* THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
|
|
|
|
* TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
|
|
|
|
* REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
|
|
|
|
* INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
|
|
|
|
* WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
|
|
|
|
* REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
|
|
|
|
* SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
|
|
|
|
* IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
|
|
|
|
* RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
|
|
|
|
* WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
|
|
|
* PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
|
|
* SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
|
|
|
|
* OF SUCH DAMAGE.
|
|
|
|
*
|
2000-10-24 17:32:45 +00:00
|
|
|
* Authors: Julian Elischer <julian@freebsd.org>
|
|
|
|
* Archie Cobbs <archie@freebsd.org>
|
1999-10-21 09:06:11 +00:00
|
|
|
*
|
|
|
|
* $FreeBSD$
|
|
|
|
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This file implements the base netgraph code.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
2004-12-23 13:09:37 +00:00
|
|
|
#include <sys/systm.h>
|
2004-12-23 10:48:10 +00:00
|
|
|
#include <sys/ctype.h>
|
1999-10-21 09:06:11 +00:00
|
|
|
#include <sys/errno.h>
|
2004-07-10 21:45:58 +00:00
|
|
|
#include <sys/kdb.h>
|
1999-10-21 09:06:11 +00:00
|
|
|
#include <sys/kernel.h>
|
2006-01-11 15:29:48 +00:00
|
|
|
#include <sys/ktr.h>
|
2003-04-29 13:36:06 +00:00
|
|
|
#include <sys/limits.h>
|
1999-10-21 09:06:11 +00:00
|
|
|
#include <sys/malloc.h>
|
|
|
|
#include <sys/mbuf.h>
|
2004-12-23 10:48:10 +00:00
|
|
|
#include <sys/queue.h>
|
2001-02-23 16:34:22 +00:00
|
|
|
#include <sys/sysctl.h>
|
2004-12-23 10:48:10 +00:00
|
|
|
#include <sys/syslog.h>
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
#include <net/netisr.h>
|
|
|
|
|
|
|
|
#include <netgraph/ng_message.h>
|
|
|
|
#include <netgraph/netgraph.h>
|
1999-11-30 02:45:32 +00:00
|
|
|
#include <netgraph/ng_parse.h>
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-02-05 18:57:11 +00:00
|
|
|
MODULE_VERSION(netgraph, NG_ABI_VERSION);
|
2000-04-29 13:36:07 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
/* List of all active nodes */
|
2001-01-06 00:46:47 +00:00
|
|
|
static LIST_HEAD(, ng_node) ng_nodelist;
|
|
|
|
static struct mtx ng_nodelist_mtx;
|
|
|
|
|
2005-11-02 15:23:47 +00:00
|
|
|
/* Mutex to protect topology events. */
|
|
|
|
static struct mtx ng_topo_mtx;
|
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
2005-11-15 10:54:20 +00:00
|
|
|
static struct mtx ngq_mtx; /* protects the queue item list */
|
2001-01-08 05:34:06 +00:00
|
|
|
|
|
|
|
static SLIST_HEAD(, ng_node) ng_allnodes;
|
|
|
|
static LIST_HEAD(, ng_node) ng_freenodes; /* in debug, we never free() them */
|
|
|
|
static SLIST_HEAD(, ng_hook) ng_allhooks;
|
|
|
|
static LIST_HEAD(, ng_hook) ng_freehooks; /* in debug, we never free() them */
|
|
|
|
|
|
|
|
static void ng_dumpitems(void);
|
|
|
|
static void ng_dumpnodes(void);
|
|
|
|
static void ng_dumphooks(void);
|
|
|
|
|
|
|
|
#endif /* NETGRAPH_DEBUG */
|
2001-01-11 19:27:54 +00:00
|
|
|
/*
|
2005-11-15 10:54:20 +00:00
|
|
|
* DEAD versions of the structures.
|
2001-01-11 19:27:54 +00:00
|
|
|
* In order to avoid races, it is sometimes neccesary to point
|
2005-11-15 10:54:20 +00:00
|
|
|
* at SOMETHING even though theoretically, the current entity is
|
2001-01-11 19:27:54 +00:00
|
|
|
* INVALID. Use these to avoid these races.
|
|
|
|
*/
|
|
|
|
struct ng_type ng_deadtype = {
|
|
|
|
NG_ABI_VERSION,
|
|
|
|
"dead",
|
|
|
|
NULL, /* modevent */
|
|
|
|
NULL, /* constructor */
|
|
|
|
NULL, /* rcvmsg */
|
|
|
|
NULL, /* shutdown */
|
|
|
|
NULL, /* newhook */
|
|
|
|
NULL, /* findhook */
|
|
|
|
NULL, /* connect */
|
|
|
|
NULL, /* rcvdata */
|
|
|
|
NULL, /* disconnect */
|
|
|
|
NULL, /* cmdlist */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ng_node ng_deadnode = {
|
|
|
|
"dead",
|
|
|
|
&ng_deadtype,
|
2004-07-20 17:15:38 +00:00
|
|
|
NGF_INVALID,
|
2001-01-11 19:27:54 +00:00
|
|
|
1, /* refs */
|
|
|
|
0, /* numhooks */
|
|
|
|
NULL, /* private */
|
|
|
|
0, /* ID */
|
|
|
|
LIST_HEAD_INITIALIZER(ng_deadnode.hooks),
|
|
|
|
{}, /* all_nodes list entry */
|
|
|
|
{}, /* id hashtable list entry */
|
|
|
|
{}, /* workqueue entry */
|
|
|
|
{ 0,
|
|
|
|
{}, /* should never use! (should hang) */
|
|
|
|
NULL,
|
|
|
|
&ng_deadnode.nd_input_queue.queue,
|
|
|
|
&ng_deadnode
|
|
|
|
},
|
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
ND_MAGIC,
|
|
|
|
__FILE__,
|
|
|
|
__LINE__,
|
|
|
|
{NULL}
|
|
|
|
#endif /* NETGRAPH_DEBUG */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ng_hook ng_deadhook = {
|
|
|
|
"dead",
|
|
|
|
NULL, /* private */
|
|
|
|
HK_INVALID | HK_DEAD,
|
|
|
|
1, /* refs always >= 1 */
|
2005-07-21 20:34:40 +00:00
|
|
|
0, /* undefined data link type */
|
2001-01-11 19:27:54 +00:00
|
|
|
&ng_deadhook, /* Peer is self */
|
|
|
|
&ng_deadnode, /* attached to deadnode */
|
|
|
|
{}, /* hooks list */
|
2001-01-31 20:46:00 +00:00
|
|
|
NULL, /* override rcvmsg() */
|
|
|
|
NULL, /* override rcvdata() */
|
2001-01-11 19:27:54 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
HK_MAGIC,
|
|
|
|
__FILE__,
|
|
|
|
__LINE__,
|
|
|
|
{NULL}
|
|
|
|
#endif /* NETGRAPH_DEBUG */
|
|
|
|
};
|
2001-01-08 05:34:06 +00:00
|
|
|
|
2001-01-11 19:27:54 +00:00
|
|
|
/*
|
|
|
|
* END DEAD STRUCTURES
|
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
/* List nodes with unallocated work */
|
|
|
|
static TAILQ_HEAD(, ng_node) ng_worklist = TAILQ_HEAD_INITIALIZER(ng_worklist);
|
2001-02-01 20:51:23 +00:00
|
|
|
static struct mtx ng_worklist_mtx; /* MUST LOCK NODE FIRST */
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* List of installed types */
|
2001-01-06 00:46:47 +00:00
|
|
|
static LIST_HEAD(, ng_type) ng_typelist;
|
|
|
|
static struct mtx ng_typelist_mtx;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/* Hash related definitions */
|
2001-01-21 23:32:00 +00:00
|
|
|
/* XXX Don't need to initialise them because it's a LIST */
|
|
|
|
#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */
|
|
|
|
static LIST_HEAD(, ng_node) ng_ID_hash[NG_ID_HASH_SIZE];
|
2001-01-06 00:46:47 +00:00
|
|
|
static struct mtx ng_idhash_mtx;
|
2001-01-21 23:32:00 +00:00
|
|
|
/* Method to find a node.. used twice so do it here */
|
|
|
|
#define NG_IDHASH_FN(ID) ((ID) % (NG_ID_HASH_SIZE))
|
|
|
|
#define NG_IDHASH_FIND(ID, node) \
|
|
|
|
do { \
|
2004-06-24 01:47:31 +00:00
|
|
|
mtx_assert(&ng_idhash_mtx, MA_OWNED); \
|
2001-01-21 23:32:00 +00:00
|
|
|
LIST_FOREACH(node, &ng_ID_hash[NG_IDHASH_FN(ID)], \
|
|
|
|
nd_idnodes) { \
|
|
|
|
if (NG_NODE_IS_VALID(node) \
|
|
|
|
&& (NG_NODE_ID(node) == ID)) { \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
} while (0)
|
2001-01-06 00:46:47 +00:00
|
|
|
|
1999-11-01 00:31:14 +00:00
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Internal functions */
|
|
|
|
static int ng_add_hook(node_p node, const char *name, hook_p * hookp);
|
2001-01-06 00:46:47 +00:00
|
|
|
static int ng_generic_msg(node_p here, item_p item, hook_p lasthook);
|
1999-11-01 00:31:14 +00:00
|
|
|
static ng_ID_t ng_decodeidname(const char *name);
|
1999-10-21 09:06:11 +00:00
|
|
|
static int ngb_mod_event(module_t mod, int event, void *data);
|
2001-01-06 00:46:47 +00:00
|
|
|
static void ng_worklist_remove(node_p node);
|
1999-10-21 09:06:11 +00:00
|
|
|
static void ngintr(void);
|
2005-10-11 13:48:38 +00:00
|
|
|
static int ng_apply_item(node_p node, item_p item, int rw);
|
2001-01-06 00:46:47 +00:00
|
|
|
static void ng_flush_input_queue(struct ng_queue * ngq);
|
|
|
|
static void ng_setisr(node_p node);
|
|
|
|
static node_p ng_ID2noderef(ng_ID_t ID);
|
2001-01-14 23:25:54 +00:00
|
|
|
static int ng_con_nodes(node_p node, const char *name, node_p node2,
|
|
|
|
const char *name2);
|
2001-01-30 20:51:52 +00:00
|
|
|
static void ng_con_part2(node_p node, hook_p hook, void *arg1, int arg2);
|
|
|
|
static void ng_con_part3(node_p node, hook_p hook, void *arg1, int arg2);
|
2001-01-14 23:25:54 +00:00
|
|
|
static int ng_mkpeer(node_p node, const char *name,
|
|
|
|
const char *name2, char *type);
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2005-11-15 10:54:20 +00:00
|
|
|
/* Imported, these used to be externally visible, some may go back. */
|
2001-01-06 00:46:47 +00:00
|
|
|
void ng_destroy_hook(hook_p hook);
|
|
|
|
node_p ng_name2noderef(node_p node, const char *name);
|
|
|
|
int ng_path2noderef(node_p here, const char *path,
|
|
|
|
node_p *dest, hook_p *lasthook);
|
|
|
|
int ng_make_node(const char *type, node_p *nodepp);
|
|
|
|
int ng_path_parse(char *addr, char **node, char **path, char **hook);
|
2001-01-30 20:51:52 +00:00
|
|
|
void ng_rmnode(node_p node, hook_p dummy1, void *dummy2, int dummy3);
|
2001-01-08 05:34:06 +00:00
|
|
|
void ng_unname(node_p node);
|
2001-01-06 00:46:47 +00:00
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Our own netgraph malloc type */
|
|
|
|
MALLOC_DEFINE(M_NETGRAPH, "netgraph", "netgraph structures and ctrl messages");
|
2001-01-06 00:46:47 +00:00
|
|
|
MALLOC_DEFINE(M_NETGRAPH_HOOK, "netgraph_hook", "netgraph hook structures");
|
|
|
|
MALLOC_DEFINE(M_NETGRAPH_NODE, "netgraph_node", "netgraph node structures");
|
|
|
|
MALLOC_DEFINE(M_NETGRAPH_ITEM, "netgraph_item", "netgraph item structures");
|
|
|
|
MALLOC_DEFINE(M_NETGRAPH_MSG, "netgraph_msg", "netgraph name storage");
|
|
|
|
|
|
|
|
/* Should not be visible outside this file */
|
2001-01-08 05:34:06 +00:00
|
|
|
|
|
|
|
#define _NG_ALLOC_HOOK(hook) \
|
|
|
|
MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH_HOOK, M_NOWAIT | M_ZERO)
|
|
|
|
#define _NG_ALLOC_NODE(node) \
|
|
|
|
MALLOC(node, node_p, sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO)
|
|
|
|
|
|
|
|
#ifdef NETGRAPH_DEBUG /*----------------------------------------------*/
|
|
|
|
/*
|
|
|
|
* In debug mode:
|
|
|
|
* In an attempt to help track reference count screwups
|
|
|
|
* we do not free objects back to the malloc system, but keep them
|
|
|
|
* in a local cache where we can examine them and keep information safely
|
|
|
|
* after they have been freed.
|
|
|
|
* We use this scheme for nodes and hooks, and to some extent for items.
|
|
|
|
*/
|
|
|
|
static __inline hook_p
|
|
|
|
ng_alloc_hook(void)
|
|
|
|
{
|
|
|
|
hook_p hook;
|
|
|
|
SLIST_ENTRY(ng_hook) temp;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
hook = LIST_FIRST(&ng_freehooks);
|
|
|
|
if (hook) {
|
|
|
|
LIST_REMOVE(hook, hk_hooks);
|
|
|
|
bcopy(&hook->hk_all, &temp, sizeof(temp));
|
|
|
|
bzero(hook, sizeof(struct ng_hook));
|
|
|
|
bcopy(&temp, &hook->hk_all, sizeof(temp));
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
hook->hk_magic = HK_MAGIC;
|
|
|
|
} else {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
_NG_ALLOC_HOOK(hook);
|
|
|
|
if (hook) {
|
|
|
|
hook->hk_magic = HK_MAGIC;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
SLIST_INSERT_HEAD(&ng_allhooks, hook, hk_all);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return (hook);
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline node_p
|
|
|
|
ng_alloc_node(void)
|
|
|
|
{
|
|
|
|
node_p node;
|
|
|
|
SLIST_ENTRY(ng_node) temp;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
node = LIST_FIRST(&ng_freenodes);
|
|
|
|
if (node) {
|
|
|
|
LIST_REMOVE(node, nd_nodes);
|
|
|
|
bcopy(&node->nd_all, &temp, sizeof(temp));
|
|
|
|
bzero(node, sizeof(struct ng_node));
|
|
|
|
bcopy(&temp, &node->nd_all, sizeof(temp));
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
node->nd_magic = ND_MAGIC;
|
|
|
|
} else {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
_NG_ALLOC_NODE(node);
|
|
|
|
if (node) {
|
|
|
|
node->nd_magic = ND_MAGIC;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
SLIST_INSERT_HEAD(&ng_allnodes, node, nd_all);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return (node);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define NG_ALLOC_HOOK(hook) do { (hook) = ng_alloc_hook(); } while (0)
|
|
|
|
#define NG_ALLOC_NODE(node) do { (node) = ng_alloc_node(); } while (0)
|
|
|
|
|
|
|
|
|
|
|
|
#define NG_FREE_HOOK(hook) \
|
|
|
|
do { \
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx); \
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_INSERT_HEAD(&ng_freehooks, hook, hk_hooks); \
|
|
|
|
hook->hk_magic = 0; \
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx); \
|
2001-01-08 05:34:06 +00:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define NG_FREE_NODE(node) \
|
|
|
|
do { \
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx); \
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_INSERT_HEAD(&ng_freenodes, node, nd_nodes); \
|
|
|
|
node->nd_magic = 0; \
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx); \
|
2001-01-08 05:34:06 +00:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#else /* NETGRAPH_DEBUG */ /*----------------------------------------------*/
|
|
|
|
|
|
|
|
#define NG_ALLOC_HOOK(hook) _NG_ALLOC_HOOK(hook)
|
|
|
|
#define NG_ALLOC_NODE(node) _NG_ALLOC_NODE(node)
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
#define NG_FREE_HOOK(hook) do { FREE((hook), M_NETGRAPH_HOOK); } while (0)
|
|
|
|
#define NG_FREE_NODE(node) do { FREE((node), M_NETGRAPH_NODE); } while (0)
|
2001-01-08 05:34:06 +00:00
|
|
|
|
|
|
|
#endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/
|
|
|
|
|
2004-07-10 21:45:58 +00:00
|
|
|
/* Set this to kdb_enter("X") to catch all errors as they occur */
|
1999-10-21 09:06:11 +00:00
|
|
|
#ifndef TRAP_ERROR
|
2001-01-14 23:25:54 +00:00
|
|
|
#define TRAP_ERROR()
|
1999-10-21 09:06:11 +00:00
|
|
|
#endif
|
|
|
|
|
1999-11-01 00:31:14 +00:00
|
|
|
static ng_ID_t nextID = 1;
|
|
|
|
|
1999-11-19 05:43:33 +00:00
|
|
|
#ifdef INVARIANTS
|
|
|
|
#define CHECK_DATA_MBUF(m) do { \
|
|
|
|
struct mbuf *n; \
|
|
|
|
int total; \
|
|
|
|
\
|
2003-04-08 14:25:47 +00:00
|
|
|
M_ASSERTPKTHDR(m); \
|
2005-09-06 17:02:13 +00:00
|
|
|
for (total = 0, n = (m); n != NULL; n = n->m_next) { \
|
1999-11-19 05:43:33 +00:00
|
|
|
total += n->m_len; \
|
2005-09-06 17:02:13 +00:00
|
|
|
if (n->m_nextpkt != NULL) \
|
|
|
|
panic("%s: m_nextpkt", __func__); \
|
|
|
|
} \
|
2005-09-06 20:36:38 +00:00
|
|
|
\
|
1999-11-19 05:43:33 +00:00
|
|
|
if ((m)->m_pkthdr.len != total) { \
|
|
|
|
panic("%s: %d != %d", \
|
2001-12-10 08:09:49 +00:00
|
|
|
__func__, (m)->m_pkthdr.len, total); \
|
1999-11-19 05:43:33 +00:00
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define CHECK_DATA_MBUF(m)
|
|
|
|
#endif
|
|
|
|
|
1999-11-01 00:31:14 +00:00
|
|
|
|
1999-11-30 02:45:32 +00:00
|
|
|
/************************************************************************
|
|
|
|
Parse type definitions for generic messages
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
/* Handy structure parse type defining macro */
|
|
|
|
#define DEFINE_PARSE_STRUCT_TYPE(lo, up, args) \
|
2002-05-31 23:48:03 +00:00
|
|
|
static const struct ng_parse_struct_field \
|
|
|
|
ng_ ## lo ## _type_fields[] = NG_GENERIC_ ## up ## _INFO args; \
|
1999-11-30 02:45:32 +00:00
|
|
|
static const struct ng_parse_type ng_generic_ ## lo ## _type = { \
|
|
|
|
&ng_parse_struct_type, \
|
2002-05-31 23:48:03 +00:00
|
|
|
&ng_ ## lo ## _type_fields \
|
1999-11-30 02:45:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(mkpeer, MKPEER, ());
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(connect, CONNECT, ());
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(name, NAME, ());
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(rmhook, RMHOOK, ());
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(nodeinfo, NODEINFO, ());
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(typeinfo, TYPEINFO, ());
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(linkinfo, LINKINFO, (&ng_generic_nodeinfo_type));
|
|
|
|
|
|
|
|
/* Get length of an array when the length is stored as a 32 bit
|
2001-02-18 10:43:53 +00:00
|
|
|
value immediately preceding the array -- as with struct namelist
|
1999-11-30 02:45:32 +00:00
|
|
|
and struct typelist. */
|
|
|
|
static int
|
|
|
|
ng_generic_list_getLength(const struct ng_parse_type *type,
|
|
|
|
const u_char *start, const u_char *buf)
|
|
|
|
{
|
|
|
|
return *((const u_int32_t *)(buf - 4));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get length of the array of struct linkinfo inside a struct hooklist */
|
|
|
|
static int
|
|
|
|
ng_generic_linkinfo_getLength(const struct ng_parse_type *type,
|
|
|
|
const u_char *start, const u_char *buf)
|
|
|
|
{
|
|
|
|
const struct hooklist *hl = (const struct hooklist *)start;
|
|
|
|
|
|
|
|
return hl->nodeinfo.hooks;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Array type for a variable length array of struct namelist */
|
|
|
|
static const struct ng_parse_array_info ng_nodeinfoarray_type_info = {
|
|
|
|
&ng_generic_nodeinfo_type,
|
|
|
|
&ng_generic_list_getLength
|
|
|
|
};
|
|
|
|
static const struct ng_parse_type ng_generic_nodeinfoarray_type = {
|
|
|
|
&ng_parse_array_type,
|
|
|
|
&ng_nodeinfoarray_type_info
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Array type for a variable length array of struct typelist */
|
|
|
|
static const struct ng_parse_array_info ng_typeinfoarray_type_info = {
|
|
|
|
&ng_generic_typeinfo_type,
|
|
|
|
&ng_generic_list_getLength
|
|
|
|
};
|
|
|
|
static const struct ng_parse_type ng_generic_typeinfoarray_type = {
|
|
|
|
&ng_parse_array_type,
|
|
|
|
&ng_typeinfoarray_type_info
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Array type for array of struct linkinfo in struct hooklist */
|
|
|
|
static const struct ng_parse_array_info ng_generic_linkinfo_array_type_info = {
|
|
|
|
&ng_generic_linkinfo_type,
|
|
|
|
&ng_generic_linkinfo_getLength
|
|
|
|
};
|
|
|
|
static const struct ng_parse_type ng_generic_linkinfo_array_type = {
|
|
|
|
&ng_parse_array_type,
|
|
|
|
&ng_generic_linkinfo_array_type_info
|
|
|
|
};
|
|
|
|
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(typelist, TYPELIST, (&ng_generic_nodeinfoarray_type));
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(hooklist, HOOKLIST,
|
|
|
|
(&ng_generic_nodeinfo_type, &ng_generic_linkinfo_array_type));
|
|
|
|
DEFINE_PARSE_STRUCT_TYPE(listnodes, LISTNODES,
|
|
|
|
(&ng_generic_nodeinfoarray_type));
|
|
|
|
|
|
|
|
/* List of commands and how to convert arguments to/from ASCII */
|
|
|
|
static const struct ng_cmdlist ng_generic_cmds[] = {
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_SHUTDOWN,
|
|
|
|
"shutdown",
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_MKPEER,
|
|
|
|
"mkpeer",
|
|
|
|
&ng_generic_mkpeer_type,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_CONNECT,
|
|
|
|
"connect",
|
|
|
|
&ng_generic_connect_type,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_NAME,
|
|
|
|
"name",
|
|
|
|
&ng_generic_name_type,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_RMHOOK,
|
|
|
|
"rmhook",
|
|
|
|
&ng_generic_rmhook_type,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_NODEINFO,
|
|
|
|
"nodeinfo",
|
|
|
|
NULL,
|
|
|
|
&ng_generic_nodeinfo_type
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_LISTHOOKS,
|
|
|
|
"listhooks",
|
|
|
|
NULL,
|
|
|
|
&ng_generic_hooklist_type
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_LISTNAMES,
|
|
|
|
"listnames",
|
|
|
|
NULL,
|
|
|
|
&ng_generic_listnodes_type /* same as NGM_LISTNODES */
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_LISTNODES,
|
|
|
|
"listnodes",
|
|
|
|
NULL,
|
|
|
|
&ng_generic_listnodes_type
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_LISTTYPES,
|
|
|
|
"listtypes",
|
|
|
|
NULL,
|
|
|
|
&ng_generic_typeinfo_type
|
|
|
|
},
|
2000-07-03 13:34:18 +00:00
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_TEXT_CONFIG,
|
|
|
|
"textconfig",
|
|
|
|
NULL,
|
|
|
|
&ng_parse_string_type
|
|
|
|
},
|
1999-11-30 02:45:32 +00:00
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_TEXT_STATUS,
|
|
|
|
"textstatus",
|
|
|
|
NULL,
|
|
|
|
&ng_parse_string_type
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_ASCII2BINARY,
|
|
|
|
"ascii2binary",
|
|
|
|
&ng_parse_ng_mesg_type,
|
|
|
|
&ng_parse_ng_mesg_type
|
|
|
|
},
|
|
|
|
{
|
|
|
|
NGM_GENERIC_COOKIE,
|
|
|
|
NGM_BINARY2ASCII,
|
|
|
|
"binary2ascii",
|
|
|
|
&ng_parse_ng_mesg_type,
|
|
|
|
&ng_parse_ng_mesg_type
|
|
|
|
},
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/************************************************************************
|
|
|
|
Node routines
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Instantiate a node of the requested type
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_make_node(const char *typename, node_p *nodepp)
|
|
|
|
{
|
|
|
|
struct ng_type *type;
|
2001-01-06 00:46:47 +00:00
|
|
|
int error;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Check that the type makes sense */
|
|
|
|
if (typename == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
|
2004-07-27 20:30:56 +00:00
|
|
|
/* Locate the node type. If we fail we return. Do not try to load
|
|
|
|
* module.
|
|
|
|
*/
|
|
|
|
if ((type = ng_findtype(typename)) == NULL)
|
|
|
|
return (ENXIO);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* If we have a constructor, then make the node and
|
|
|
|
* call the constructor to do type specific initialisation.
|
|
|
|
*/
|
|
|
|
if (type->constructor != NULL) {
|
|
|
|
if ((error = ng_make_node_common(type, nodepp)) == 0) {
|
|
|
|
if ((error = ((*type->constructor)(*nodepp)) != 0)) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_UNREF(*nodepp);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Node has no constructor. We cannot ask for one
|
|
|
|
* to be made. It must be brought into existance by
|
2001-01-11 19:27:54 +00:00
|
|
|
* some external agency. The external agency should
|
2001-01-06 00:46:47 +00:00
|
|
|
* call ng_make_node_common() directly to get the
|
|
|
|
* netgraph part initialised.
|
|
|
|
*/
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
}
|
|
|
|
return (error);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* Generic node creation. Called by node initialisation for externally
|
|
|
|
* instantiated nodes (e.g. hardware, sockets, etc ).
|
1999-10-21 09:06:11 +00:00
|
|
|
* The returned node has a reference count of 1.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_make_node_common(struct ng_type *type, node_p *nodepp)
|
|
|
|
{
|
|
|
|
node_p node;
|
|
|
|
|
|
|
|
/* Require the node type to have been already installed */
|
|
|
|
if (ng_findtype(type->name) == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make a node and try attach it to the type */
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_ALLOC_NODE(node);
|
1999-10-21 09:06:11 +00:00
|
|
|
if (node == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (ENOMEM);
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
node->nd_type = type;
|
|
|
|
NG_NODE_REF(node); /* note reference */
|
1999-10-21 09:06:11 +00:00
|
|
|
type->refs++;
|
|
|
|
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&node->nd_input_queue.q_mtx, "ng_node", NULL, MTX_SPIN);
|
2001-01-08 05:34:06 +00:00
|
|
|
node->nd_input_queue.queue = NULL;
|
|
|
|
node->nd_input_queue.last = &node->nd_input_queue.queue;
|
|
|
|
node->nd_input_queue.q_flags = 0;
|
|
|
|
node->nd_input_queue.q_node = node;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Initialize hook list for new node */
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_INIT(&node->nd_hooks);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/* Link us into the node linked list */
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_INSERT_HEAD(&ng_nodelist, node, nd_nodes);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
|
|
|
|
|
1999-11-01 00:31:14 +00:00
|
|
|
/* get an ID and put us in the hash chain */
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_idhash_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
for (;;) { /* wrap protection, even if silly */
|
2001-01-06 00:46:47 +00:00
|
|
|
node_p node2 = NULL;
|
2001-01-08 05:34:06 +00:00
|
|
|
node->nd_ID = nextID++; /* 137/second for 1 year before wrap */
|
2001-01-21 23:32:00 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
/* Is there a problem with the new number? */
|
2001-01-21 23:32:00 +00:00
|
|
|
NG_IDHASH_FIND(node->nd_ID, node2); /* already taken? */
|
|
|
|
if ((node->nd_ID != 0) && (node2 == NULL)) {
|
2001-01-08 05:34:06 +00:00
|
|
|
break;
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
2001-01-21 23:32:00 +00:00
|
|
|
LIST_INSERT_HEAD(&ng_ID_hash[NG_IDHASH_FN(node->nd_ID)],
|
2001-01-08 05:34:06 +00:00
|
|
|
node, nd_idnodes);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_idhash_mtx);
|
1999-11-01 00:31:14 +00:00
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Done */
|
|
|
|
*nodepp = node;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Forceably start the shutdown process on a node. Either call
|
|
|
|
* it's shutdown method, or do the default shutdown if there is
|
|
|
|
* no type-specific method.
|
|
|
|
*
|
2001-01-06 00:46:47 +00:00
|
|
|
* We can only be called form a shutdown message, so we know we have
|
2001-01-11 22:22:52 +00:00
|
|
|
* a writer lock, and therefore exclusive access. It also means
|
|
|
|
* that we should not be on the work queue, but we check anyhow.
|
2001-01-06 00:46:47 +00:00
|
|
|
*
|
|
|
|
* Persistent node types must have a type-specific method which
|
2001-01-11 22:22:52 +00:00
|
|
|
* Allocates a new node in which case, this one is irretrievably going away,
|
|
|
|
* or cleans up anything it needs, and just makes the node valid again,
|
2005-11-15 10:54:20 +00:00
|
|
|
* in which case we allow the node to survive.
|
2001-01-11 22:22:52 +00:00
|
|
|
*
|
|
|
|
* XXX We need to think of how to tell a persistant node that we
|
|
|
|
* REALLY need to go away because the hardware has gone or we
|
|
|
|
* are rebooting.... etc.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
|
|
|
void
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_rmnode(node_p node, hook_p dummy1, void *dummy2, int dummy3)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2001-01-11 22:22:52 +00:00
|
|
|
hook_p hook;
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Check if it's already shutting down */
|
2004-07-20 17:15:38 +00:00
|
|
|
if ((node->nd_flags & NGF_CLOSING) != 0)
|
1999-10-21 09:06:11 +00:00
|
|
|
return;
|
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
if (node == &ng_deadnode) {
|
|
|
|
printf ("shutdown called on deadnode\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Add an extra reference so it doesn't go away during this */
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_REF(node);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
/*
|
|
|
|
* Mark it invalid so any newcomers know not to try use it
|
|
|
|
* Also add our own mark so we can't recurse
|
2004-07-20 17:15:38 +00:00
|
|
|
* note that NGF_INVALID does not do this as it's also set during
|
2001-01-08 05:34:06 +00:00
|
|
|
* creation
|
|
|
|
*/
|
2004-07-20 17:15:38 +00:00
|
|
|
node->nd_flags |= NGF_INVALID|NGF_CLOSING;
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2004-05-29 07:21:46 +00:00
|
|
|
/* If node has its pre-shutdown method, then call it first*/
|
|
|
|
if (node->nd_type && node->nd_type->close)
|
|
|
|
(*node->nd_type->close)(node);
|
|
|
|
|
2001-01-11 22:22:52 +00:00
|
|
|
/* Notify all remaining connected nodes to disconnect */
|
|
|
|
while ((hook = LIST_FIRST(&node->nd_hooks)) != NULL)
|
|
|
|
ng_destroy_hook(hook);
|
2001-01-08 05:34:06 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Drain the input queue forceably.
|
2001-01-08 05:34:06 +00:00
|
|
|
* it has no hooks so what's it going to do, bleed on someone?
|
|
|
|
* Theoretically we came here from a queue entry that was added
|
|
|
|
* Just before the queue was closed, so it should be empty anyway.
|
2001-02-01 20:51:23 +00:00
|
|
|
* Also removes us from worklist if needed.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
ng_flush_input_queue(&node->nd_input_queue);
|
2001-01-06 00:46:47 +00:00
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Ask the type if it has anything to do in this case */
|
2001-01-08 05:34:06 +00:00
|
|
|
if (node->nd_type && node->nd_type->shutdown) {
|
|
|
|
(*node->nd_type->shutdown)(node);
|
2001-01-30 20:51:52 +00:00
|
|
|
if (NG_NODE_IS_VALID(node)) {
|
|
|
|
/*
|
|
|
|
* Well, blow me down if the node code hasn't declared
|
|
|
|
* that it doesn't want to die.
|
|
|
|
* Presumably it is a persistant node.
|
|
|
|
* If we REALLY want it to go away,
|
|
|
|
* e.g. hardware going away,
|
2004-07-20 17:15:38 +00:00
|
|
|
* Our caller should set NGF_REALLY_DIE in nd_flags.
|
2005-11-15 10:54:20 +00:00
|
|
|
*/
|
2004-07-20 17:15:38 +00:00
|
|
|
node->nd_flags &= ~(NGF_INVALID|NGF_CLOSING);
|
2001-01-30 20:51:52 +00:00
|
|
|
NG_NODE_UNREF(node); /* Assume they still have theirs */
|
|
|
|
return;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
} else { /* do the default thing */
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_UNREF(node);
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
ng_unname(node); /* basically a NOP these days */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove extra reference, possibly the last
|
|
|
|
* Possible other holders of references may include
|
|
|
|
* timeout callouts, but theoretically the node's supposed to
|
|
|
|
* have cancelled them. Possibly hardware dependencies may
|
|
|
|
* force a driver to 'linger' with a reference.
|
|
|
|
*/
|
|
|
|
NG_NODE_UNREF(node);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-03-10 16:31:00 +00:00
|
|
|
* Remove a reference to the node, possibly the last.
|
|
|
|
* deadnode always acts as it it were the last.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-03-10 16:31:00 +00:00
|
|
|
int
|
2001-01-08 05:34:06 +00:00
|
|
|
ng_unref_node(node_p node)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2005-11-15 10:54:20 +00:00
|
|
|
int v;
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
if (node == &ng_deadnode) {
|
2001-03-10 16:31:00 +00:00
|
|
|
return (0);
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
do {
|
2001-03-10 16:31:00 +00:00
|
|
|
v = node->nd_refs - 1;
|
|
|
|
} while (! atomic_cmpset_int(&node->nd_refs, v + 1, v));
|
2000-12-02 13:27:58 +00:00
|
|
|
|
2001-03-10 16:31:00 +00:00
|
|
|
if (v == 0) { /* we were the last */
|
2001-01-06 00:46:47 +00:00
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
node->nd_type->refs--; /* XXX maybe should get types lock? */
|
|
|
|
LIST_REMOVE(node, nd_nodes);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_idhash_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_REMOVE(node, nd_idnodes);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_idhash_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-08 06:28:30 +00:00
|
|
|
mtx_destroy(&node->nd_input_queue.q_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_NODE(node);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-03-10 16:31:00 +00:00
|
|
|
return (v);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
1999-11-01 00:31:14 +00:00
|
|
|
/************************************************************************
|
|
|
|
Node ID handling
|
|
|
|
************************************************************************/
|
|
|
|
static node_p
|
2001-01-06 00:46:47 +00:00
|
|
|
ng_ID2noderef(ng_ID_t ID)
|
1999-11-01 00:31:14 +00:00
|
|
|
{
|
2001-01-08 05:34:06 +00:00
|
|
|
node_p node;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_idhash_mtx);
|
2001-01-21 23:32:00 +00:00
|
|
|
NG_IDHASH_FIND(ID, node);
|
2001-01-08 05:34:06 +00:00
|
|
|
if(node)
|
|
|
|
NG_NODE_REF(node);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_idhash_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
return(node);
|
1999-11-01 00:31:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ng_ID_t
|
|
|
|
ng_node2ID(node_p node)
|
|
|
|
{
|
2001-01-10 23:19:32 +00:00
|
|
|
return (node ? NG_NODE_ID(node) : 0);
|
1999-11-01 00:31:14 +00:00
|
|
|
}
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/************************************************************************
|
|
|
|
Node name handling
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Assign a node a name. Once assigned, the name cannot be changed.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_name_node(node_p node, const char *name)
|
|
|
|
{
|
|
|
|
int i;
|
2001-01-06 00:46:47 +00:00
|
|
|
node_p node2;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Check the name is valid */
|
2004-01-26 14:05:31 +00:00
|
|
|
for (i = 0; i < NG_NODESIZ; i++) {
|
1999-10-21 09:06:11 +00:00
|
|
|
if (name[i] == '\0' || name[i] == '.' || name[i] == ':')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i == 0 || name[i] != '\0') {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
1999-11-01 00:31:14 +00:00
|
|
|
if (ng_decodeidname(name) != 0) { /* valid IDs not allowed here */
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check the name isn't already being used */
|
2001-01-06 00:46:47 +00:00
|
|
|
if ((node2 = ng_name2noderef(node, name)) != NULL) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_UNREF(node2);
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EADDRINUSE);
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/* copy it */
|
2004-01-26 14:05:31 +00:00
|
|
|
strlcpy(NG_NODE_NAME(node), name, NG_NODESIZ);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find a node by absolute name. The name should NOT end with ':'
|
|
|
|
* The name "." means "this node" and "[xxx]" means "the node
|
|
|
|
* with ID (ie, at address) xxx".
|
|
|
|
*
|
|
|
|
* Returns the node if found, else NULL.
|
2001-01-06 00:46:47 +00:00
|
|
|
* Eventually should add something faster than a sequential search.
|
2001-01-08 05:34:06 +00:00
|
|
|
* Note it aquires a reference on the node so you can be sure it's still there.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
|
|
|
node_p
|
2001-01-06 00:46:47 +00:00
|
|
|
ng_name2noderef(node_p here, const char *name)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
1999-11-01 00:31:14 +00:00
|
|
|
node_p node;
|
|
|
|
ng_ID_t temp;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* "." means "this node" */
|
2001-01-06 00:46:47 +00:00
|
|
|
if (strcmp(name, ".") == 0) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_REF(here);
|
2001-01-06 00:46:47 +00:00
|
|
|
return(here);
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Check for name-by-ID */
|
1999-11-01 00:31:14 +00:00
|
|
|
if ((temp = ng_decodeidname(name)) != 0) {
|
2001-01-06 00:46:47 +00:00
|
|
|
return (ng_ID2noderef(temp));
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find node by name */
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_FOREACH(node, &ng_nodelist, nd_nodes) {
|
2001-01-10 23:19:32 +00:00
|
|
|
if (NG_NODE_IS_VALID(node)
|
|
|
|
&& NG_NODE_HAS_NAME(node)
|
|
|
|
&& (strcmp(NG_NODE_NAME(node), name) == 0)) {
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
2001-01-10 23:19:32 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
if (node)
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_REF(node);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (node);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2003-01-01 18:49:04 +00:00
|
|
|
* Decode an ID name, eg. "[f03034de]". Returns 0 if the
|
1999-11-01 00:31:14 +00:00
|
|
|
* string is not valid, otherwise returns the value.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
1999-11-01 00:31:14 +00:00
|
|
|
static ng_ID_t
|
1999-10-21 09:06:11 +00:00
|
|
|
ng_decodeidname(const char *name)
|
|
|
|
{
|
1999-11-02 23:18:01 +00:00
|
|
|
const int len = strlen(name);
|
1999-11-24 01:03:08 +00:00
|
|
|
char *eptr;
|
1999-11-02 23:18:01 +00:00
|
|
|
u_long val;
|
|
|
|
|
|
|
|
/* Check for proper length, brackets, no leading junk */
|
2001-01-10 23:19:32 +00:00
|
|
|
if ((len < 3)
|
|
|
|
|| (name[0] != '[')
|
|
|
|
|| (name[len - 1] != ']')
|
|
|
|
|| (!isxdigit(name[1]))) {
|
|
|
|
return ((ng_ID_t)0);
|
|
|
|
}
|
1999-11-02 23:18:01 +00:00
|
|
|
|
|
|
|
/* Decode number */
|
|
|
|
val = strtoul(name + 1, &eptr, 16);
|
2001-01-10 23:19:32 +00:00
|
|
|
if ((eptr - name != len - 1)
|
|
|
|
|| (val == ULONG_MAX)
|
|
|
|
|| (val == 0)) {
|
1999-11-09 00:31:04 +00:00
|
|
|
return ((ng_ID_t)0);
|
2001-01-10 23:19:32 +00:00
|
|
|
}
|
1999-11-02 23:18:01 +00:00
|
|
|
return (ng_ID_t)val;
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove a name from a node. This should only be called
|
|
|
|
* when shutting down and removing the node.
|
2001-01-30 20:51:52 +00:00
|
|
|
* IF we allow name changing this may be more resurected.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
ng_unname(node_p node)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************
|
|
|
|
Hook routines
|
|
|
|
Names are not optional. Hooks are always connected, except for a
|
2001-01-11 22:22:52 +00:00
|
|
|
brief moment within these routines. On invalidation or during creation
|
|
|
|
they are connected to the 'dead' hook.
|
1999-10-21 09:06:11 +00:00
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove a hook reference
|
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
void
|
1999-10-21 09:06:11 +00:00
|
|
|
ng_unref_hook(hook_p hook)
|
|
|
|
{
|
2005-11-15 10:54:20 +00:00
|
|
|
int v;
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
if (hook == &ng_deadhook) {
|
|
|
|
return;
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
do {
|
|
|
|
v = hook->hk_refs;
|
|
|
|
} while (! atomic_cmpset_int(&hook->hk_refs, v, v - 1));
|
2000-12-02 13:27:58 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
if (v == 1) { /* we were the last */
|
2001-01-14 23:25:54 +00:00
|
|
|
if (_NG_HOOK_NODE(hook)) { /* it'll probably be ng_deadnode */
|
|
|
|
_NG_NODE_UNREF((_NG_HOOK_NODE(hook)));
|
2001-01-08 05:34:06 +00:00
|
|
|
hook->hk_node = NULL;
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
NG_FREE_HOOK(hook);
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add an unconnected hook to a node. Only used internally.
|
2001-01-11 22:22:52 +00:00
|
|
|
* Assumes node is locked. (XXX not yet true )
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ng_add_hook(node_p node, const char *name, hook_p *hookp)
|
|
|
|
{
|
|
|
|
hook_p hook;
|
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
/* Check that the given name is good */
|
|
|
|
if (name == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
1999-12-03 21:17:30 +00:00
|
|
|
if (ng_findhook(node, name) != NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-12-03 21:17:30 +00:00
|
|
|
return (EEXIST);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate the hook and link it up */
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_ALLOC_HOOK(hook);
|
1999-10-21 09:06:11 +00:00
|
|
|
if (hook == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (ENOMEM);
|
|
|
|
}
|
2001-01-11 22:22:52 +00:00
|
|
|
hook->hk_refs = 1; /* add a reference for us to return */
|
2001-01-08 05:34:06 +00:00
|
|
|
hook->hk_flags = HK_INVALID;
|
2001-01-11 22:22:52 +00:00
|
|
|
hook->hk_peer = &ng_deadhook; /* start off this way */
|
2001-01-08 05:34:06 +00:00
|
|
|
hook->hk_node = node;
|
|
|
|
NG_NODE_REF(node); /* each hook counts as a reference */
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-11 22:22:52 +00:00
|
|
|
/* Set hook name */
|
2004-01-26 14:05:31 +00:00
|
|
|
strlcpy(NG_HOOK_NAME(hook), name, NG_HOOKSIZ);
|
2001-01-11 22:22:52 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if the node type code has something to say about it
|
|
|
|
* If it fails, the unref of the hook will also unref the node.
|
|
|
|
*/
|
2001-01-11 19:27:54 +00:00
|
|
|
if (node->nd_type->newhook != NULL) {
|
|
|
|
if ((error = (*node->nd_type->newhook)(node, hook, name))) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_HOOK_UNREF(hook); /* this frees the hook */
|
2001-01-06 00:46:47 +00:00
|
|
|
return (error);
|
|
|
|
}
|
2001-01-11 19:27:54 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
|
|
|
* The 'type' agrees so far, so go ahead and link it in.
|
|
|
|
* We'll ask again later when we actually connect the hooks.
|
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_INSERT_HEAD(&node->nd_hooks, hook, hk_hooks);
|
|
|
|
node->nd_numhooks++;
|
2001-01-11 22:22:52 +00:00
|
|
|
NG_HOOK_REF(hook); /* one for the node */
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
if (hookp)
|
|
|
|
*hookp = hook;
|
2001-01-11 22:22:52 +00:00
|
|
|
return (0);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
1999-12-03 21:17:30 +00:00
|
|
|
/*
|
|
|
|
* Find a hook
|
|
|
|
*
|
|
|
|
* Node types may supply their own optimized routines for finding
|
|
|
|
* hooks. If none is supplied, we just do a linear search.
|
2001-01-11 22:22:52 +00:00
|
|
|
* XXX Possibly we should add a reference to the hook?
|
1999-12-03 21:17:30 +00:00
|
|
|
*/
|
|
|
|
hook_p
|
|
|
|
ng_findhook(node_p node, const char *name)
|
|
|
|
{
|
|
|
|
hook_p hook;
|
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
if (node->nd_type->findhook != NULL)
|
|
|
|
return (*node->nd_type->findhook)(node, name);
|
|
|
|
LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) {
|
2001-01-10 23:19:32 +00:00
|
|
|
if (NG_HOOK_IS_VALID(hook)
|
2001-01-11 04:13:46 +00:00
|
|
|
&& (strcmp(NG_HOOK_NAME(hook), name) == 0))
|
1999-12-03 21:17:30 +00:00
|
|
|
return (hook);
|
|
|
|
}
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
|
|
|
* Destroy a hook
|
|
|
|
*
|
|
|
|
* As hooks are always attached, this really destroys two hooks.
|
|
|
|
* The one given, and the one attached to it. Disconnect the hooks
|
2001-01-11 22:22:52 +00:00
|
|
|
* from each other first. We reconnect the peer hook to the 'dead'
|
|
|
|
* hook so that it can still exist after we depart. We then
|
|
|
|
* send the peer its own destroy message. This ensures that we only
|
2005-11-15 10:54:20 +00:00
|
|
|
* interact with the peer's structures when it is locked processing that
|
2001-01-11 22:22:52 +00:00
|
|
|
* message. We hold a reference to the peer hook so we are guaranteed that
|
|
|
|
* the peer hook and node are still going to exist until
|
|
|
|
* we are finished there as the hook holds a ref on the node.
|
2005-11-15 10:54:20 +00:00
|
|
|
* We run this same code again on the peer hook, but that time it is already
|
|
|
|
* attached to the 'dead' hook.
|
2001-01-14 23:25:54 +00:00
|
|
|
*
|
2005-11-15 10:54:20 +00:00
|
|
|
* This routine is called at all stages of hook creation
|
2001-01-14 23:25:54 +00:00
|
|
|
* on error detection and must be able to handle any such stage.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
ng_destroy_hook(hook_p hook)
|
|
|
|
{
|
2005-11-02 15:23:47 +00:00
|
|
|
hook_p peer;
|
|
|
|
node_p node;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-14 23:25:54 +00:00
|
|
|
if (hook == &ng_deadhook) { /* better safe than sorry */
|
|
|
|
printf("ng_destroy_hook called on deadhook\n");
|
|
|
|
return;
|
|
|
|
}
|
2005-11-02 15:23:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Protect divorce process with mutex, to avoid races on
|
|
|
|
* simultaneous disconnect.
|
|
|
|
*/
|
|
|
|
mtx_lock(&ng_topo_mtx);
|
|
|
|
|
|
|
|
hook->hk_flags |= HK_INVALID;
|
|
|
|
|
|
|
|
peer = NG_HOOK_PEER(hook);
|
|
|
|
node = NG_HOOK_NODE(hook);
|
|
|
|
|
2001-01-11 22:22:52 +00:00
|
|
|
if (peer && (peer != &ng_deadhook)) {
|
|
|
|
/*
|
|
|
|
* Set the peer to point to ng_deadhook
|
|
|
|
* from this moment on we are effectively independent it.
|
|
|
|
* send it an rmhook message of it's own.
|
|
|
|
*/
|
|
|
|
peer->hk_peer = &ng_deadhook; /* They no longer know us */
|
|
|
|
hook->hk_peer = &ng_deadhook; /* Nor us, them */
|
2001-01-14 23:25:54 +00:00
|
|
|
if (NG_HOOK_NODE(peer) == &ng_deadnode) {
|
2005-11-15 10:54:20 +00:00
|
|
|
/*
|
2001-01-14 23:25:54 +00:00
|
|
|
* If it's already divorced from a node,
|
|
|
|
* just free it.
|
|
|
|
*/
|
2005-11-02 15:23:47 +00:00
|
|
|
mtx_unlock(&ng_topo_mtx);
|
2001-01-14 23:25:54 +00:00
|
|
|
} else {
|
2005-11-02 15:23:47 +00:00
|
|
|
mtx_unlock(&ng_topo_mtx);
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_rmhook_self(peer); /* Send it a surprise */
|
|
|
|
}
|
2001-01-11 23:05:34 +00:00
|
|
|
NG_HOOK_UNREF(peer); /* account for peer link */
|
|
|
|
NG_HOOK_UNREF(hook); /* account for peer link */
|
2005-11-02 15:23:47 +00:00
|
|
|
} else
|
|
|
|
mtx_unlock(&ng_topo_mtx);
|
|
|
|
|
|
|
|
mtx_assert(&ng_topo_mtx, MA_NOTOWNED);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove the hook from the node's list to avoid possible recursion
|
|
|
|
* in case the disconnection results in node shutdown.
|
|
|
|
*/
|
2001-01-14 23:25:54 +00:00
|
|
|
if (node == &ng_deadnode) { /* happens if called from ng_con_nodes() */
|
|
|
|
return;
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_REMOVE(hook, hk_hooks);
|
|
|
|
node->nd_numhooks--;
|
|
|
|
if (node->nd_type->disconnect) {
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
2001-01-14 23:25:54 +00:00
|
|
|
* The type handler may elect to destroy the node so don't
|
2005-11-15 10:54:20 +00:00
|
|
|
* trust its existance after this point. (except
|
2001-01-14 23:25:54 +00:00
|
|
|
* that we still hold a reference on it. (which we
|
|
|
|
* inherrited from the hook we are destroying)
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
(*node->nd_type->disconnect) (hook);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Note that because we will point to ng_deadnode, the original node
|
|
|
|
* is not decremented automatically so we do that manually.
|
|
|
|
*/
|
|
|
|
_NG_HOOK_NODE(hook) = &ng_deadnode;
|
|
|
|
NG_NODE_UNREF(node); /* We no longer point to it so adjust count */
|
|
|
|
NG_HOOK_UNREF(hook); /* Account for linkage (in list) to node */
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take two hooks on a node and merge the connection so that the given node
|
|
|
|
* is effectively bypassed.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_bypass(hook_p hook1, hook_p hook2)
|
|
|
|
{
|
2001-01-08 05:34:06 +00:00
|
|
|
if (hook1->hk_node != hook2->hk_node) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
|
|
|
hook1->hk_peer->hk_peer = hook2->hk_peer;
|
|
|
|
hook2->hk_peer->hk_peer = hook1->hk_peer;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-11 22:22:52 +00:00
|
|
|
hook1->hk_peer = &ng_deadhook;
|
|
|
|
hook2->hk_peer = &ng_deadhook;
|
|
|
|
|
2006-10-11 14:33:08 +00:00
|
|
|
NG_HOOK_UNREF(hook1);
|
|
|
|
NG_HOOK_UNREF(hook2);
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/* XXX If we ever cache methods on hooks update them as well */
|
|
|
|
ng_destroy_hook(hook1);
|
|
|
|
ng_destroy_hook(hook2);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Install a new netgraph type
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_newtype(struct ng_type *tp)
|
|
|
|
{
|
|
|
|
const size_t namelen = strlen(tp->name);
|
|
|
|
|
|
|
|
/* Check version and type name fields */
|
2000-12-18 20:03:32 +00:00
|
|
|
if ((tp->version != NG_ABI_VERSION)
|
|
|
|
|| (namelen == 0)
|
2004-01-26 14:05:31 +00:00
|
|
|
|| (namelen >= NG_TYPESIZ)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2004-06-30 22:51:29 +00:00
|
|
|
if (tp->version != NG_ABI_VERSION) {
|
|
|
|
printf("Netgraph: Node type rejected. ABI mismatch. Suggest recompile\n");
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for name collision */
|
|
|
|
if (ng_findtype(tp->name) != NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (EEXIST);
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
|
|
|
|
/* Link in new type */
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_typelist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
LIST_INSERT_HEAD(&ng_typelist, tp, types);
|
2001-01-24 21:29:57 +00:00
|
|
|
tp->refs = 1; /* first ref is linked list */
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2001-07-23 21:14:57 +00:00
|
|
|
/*
|
|
|
|
* unlink a netgraph type
|
|
|
|
* If no examples exist
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_rmtype(struct ng_type *tp)
|
|
|
|
{
|
|
|
|
/* Check for name collision */
|
|
|
|
if (tp->refs != 1) {
|
|
|
|
TRAP_ERROR();
|
|
|
|
return (EBUSY);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Unlink type */
|
|
|
|
mtx_lock(&ng_typelist_mtx);
|
|
|
|
LIST_REMOVE(tp, types);
|
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
|
|
|
* Look for a type of the name given
|
|
|
|
*/
|
|
|
|
struct ng_type *
|
|
|
|
ng_findtype(const char *typename)
|
|
|
|
{
|
|
|
|
struct ng_type *type;
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_typelist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
LIST_FOREACH(type, &ng_typelist, types) {
|
1999-10-21 09:06:11 +00:00
|
|
|
if (strcmp(type->name, typename) == 0)
|
|
|
|
break;
|
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (type);
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************
|
|
|
|
Composite routines
|
|
|
|
************************************************************************/
|
|
|
|
/*
|
2001-01-14 23:25:54 +00:00
|
|
|
* Connect two nodes using the specified hooks, using queued functions.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-30 20:51:52 +00:00
|
|
|
static void
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_con_part3(node_p node, hook_p hook, void *arg1, int arg2)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
|
|
|
|
2001-01-14 23:25:54 +00:00
|
|
|
/*
|
|
|
|
* When we run, we know that the node 'node' is locked for us.
|
|
|
|
* Our caller has a reference on the hook.
|
|
|
|
* Our caller has a reference on the node.
|
|
|
|
* (In this case our caller is ng_apply_item() ).
|
|
|
|
* The peer hook has a reference on the hook.
|
2001-01-30 20:51:52 +00:00
|
|
|
* We are all set up except for the final call to the node, and
|
|
|
|
* the clearing of the INVALID flag.
|
2001-01-14 23:25:54 +00:00
|
|
|
*/
|
|
|
|
if (NG_HOOK_NODE(hook) == &ng_deadnode) {
|
|
|
|
/*
|
|
|
|
* The node must have been freed again since we last visited
|
|
|
|
* here. ng_destry_hook() has this effect but nothing else does.
|
|
|
|
* We should just release our references and
|
|
|
|
* free anything we can think of.
|
|
|
|
* Since we know it's been destroyed, and it's our caller
|
|
|
|
* that holds the references, just return.
|
|
|
|
*/
|
2001-01-30 20:51:52 +00:00
|
|
|
return ;
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
if (hook->hk_node->nd_type->connect) {
|
2001-01-30 20:51:52 +00:00
|
|
|
if ((*hook->hk_node->nd_type->connect) (hook)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_destroy_hook(hook); /* also zaps peer */
|
2001-01-30 20:51:52 +00:00
|
|
|
printf("failed in ng_con_part3()\n");
|
|
|
|
return ;
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
/*
|
|
|
|
* XXX this is wrong for SMP. Possibly we need
|
|
|
|
* to separate out 'create' and 'invalid' flags.
|
|
|
|
* should only set flags on hooks we have locked under our node.
|
|
|
|
*/
|
|
|
|
hook->hk_flags &= ~HK_INVALID;
|
2001-01-30 20:51:52 +00:00
|
|
|
return ;
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
static void
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_con_part2(node_p node, hook_p hook, void *arg1, int arg2)
|
|
|
|
{
|
2005-11-02 15:23:47 +00:00
|
|
|
hook_p peer;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/*
|
2001-01-14 23:25:54 +00:00
|
|
|
* When we run, we know that the node 'node' is locked for us.
|
|
|
|
* Our caller has a reference on the hook.
|
|
|
|
* Our caller has a reference on the node.
|
|
|
|
* (In this case our caller is ng_apply_item() ).
|
|
|
|
* The peer hook has a reference on the hook.
|
|
|
|
* our node pointer points to the 'dead' node.
|
|
|
|
* First check the hook name is unique.
|
2001-01-30 20:51:52 +00:00
|
|
|
* Should not happen because we checked before queueing this.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-14 23:25:54 +00:00
|
|
|
if (ng_findhook(node, NG_HOOK_NAME(hook)) != NULL) {
|
|
|
|
TRAP_ERROR();
|
|
|
|
ng_destroy_hook(hook); /* should destroy peer too */
|
2001-01-30 20:51:52 +00:00
|
|
|
printf("failed in ng_con_part2()\n");
|
|
|
|
return ;
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
2001-01-11 22:22:52 +00:00
|
|
|
/*
|
2001-01-14 23:25:54 +00:00
|
|
|
* Check if the node type code has something to say about it
|
|
|
|
* If it fails, the unref of the hook will also unref the attached node,
|
|
|
|
* however since that node is 'ng_deadnode' this will do nothing.
|
|
|
|
* The peer hook will also be destroyed.
|
2001-01-11 22:22:52 +00:00
|
|
|
*/
|
2001-01-14 23:25:54 +00:00
|
|
|
if (node->nd_type->newhook != NULL) {
|
2001-01-30 20:51:52 +00:00
|
|
|
if ((*node->nd_type->newhook)(node, hook, hook->hk_name)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_destroy_hook(hook); /* should destroy peer too */
|
2001-01-30 20:51:52 +00:00
|
|
|
printf("failed in ng_con_part2()\n");
|
|
|
|
return ;
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The 'type' agrees so far, so go ahead and link it in.
|
|
|
|
* We'll ask again later when we actually connect the hooks.
|
|
|
|
*/
|
|
|
|
hook->hk_node = node; /* just overwrite ng_deadnode */
|
|
|
|
NG_NODE_REF(node); /* each hook counts as a reference */
|
|
|
|
LIST_INSERT_HEAD(&node->nd_hooks, hook, hk_hooks);
|
|
|
|
node->nd_numhooks++;
|
|
|
|
NG_HOOK_REF(hook); /* one for the node */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We now have a symetrical situation, where both hooks have been
|
2001-03-10 16:31:00 +00:00
|
|
|
* linked to their nodes, the newhook methods have been called
|
2001-01-14 23:25:54 +00:00
|
|
|
* And the references are all correct. The hooks are still marked
|
|
|
|
* as invalid, as we have not called the 'connect' methods
|
|
|
|
* yet.
|
2005-11-15 10:54:20 +00:00
|
|
|
* We can call the local one immediatly as we have the
|
2001-01-14 23:25:54 +00:00
|
|
|
* node locked, but we need to queue the remote one.
|
|
|
|
*/
|
|
|
|
if (hook->hk_node->nd_type->connect) {
|
2001-01-30 20:51:52 +00:00
|
|
|
if ((*hook->hk_node->nd_type->connect) (hook)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_destroy_hook(hook); /* also zaps peer */
|
2001-01-30 20:51:52 +00:00
|
|
|
printf("failed in ng_con_part2(A)\n");
|
|
|
|
return ;
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
}
|
2005-11-02 15:23:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Acquire topo mutex to avoid race with ng_destroy_hook().
|
|
|
|
*/
|
|
|
|
mtx_lock(&ng_topo_mtx);
|
|
|
|
peer = hook->hk_peer;
|
|
|
|
if (peer == &ng_deadhook) {
|
|
|
|
mtx_unlock(&ng_topo_mtx);
|
|
|
|
printf("failed in ng_con_part2(B)\n");
|
|
|
|
ng_destroy_hook(hook);
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
mtx_unlock(&ng_topo_mtx);
|
|
|
|
|
|
|
|
if (ng_send_fn(peer->hk_node, peer, &ng_con_part3, arg1, arg2)) {
|
|
|
|
printf("failed in ng_con_part2(C)\n");
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_destroy_hook(hook); /* also zaps peer */
|
|
|
|
return ;
|
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
hook->hk_flags &= ~HK_INVALID; /* need both to be able to work */
|
2001-01-30 20:51:52 +00:00
|
|
|
return ;
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-11-15 10:54:20 +00:00
|
|
|
* Connect this node with another node. We assume that this node is
|
2001-01-14 23:25:54 +00:00
|
|
|
* currently locked, as we are only called from an NGM_CONNECT message.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-14 23:25:54 +00:00
|
|
|
static int
|
1999-10-21 09:06:11 +00:00
|
|
|
ng_con_nodes(node_p node, const char *name, node_p node2, const char *name2)
|
|
|
|
{
|
2005-11-15 10:54:20 +00:00
|
|
|
int error;
|
|
|
|
hook_p hook;
|
|
|
|
hook_p hook2;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
if (ng_findhook(node2, name2) != NULL) {
|
|
|
|
return(EEXIST);
|
|
|
|
}
|
2001-01-11 22:22:52 +00:00
|
|
|
if ((error = ng_add_hook(node, name, &hook))) /* gives us a ref */
|
1999-10-21 09:06:11 +00:00
|
|
|
return (error);
|
2001-01-14 23:25:54 +00:00
|
|
|
/* Allocate the other hook and link it up */
|
|
|
|
NG_ALLOC_HOOK(hook2);
|
2005-01-24 13:32:19 +00:00
|
|
|
if (hook2 == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
|
|
|
ng_destroy_hook(hook); /* XXX check ref counts so far */
|
|
|
|
NG_HOOK_UNREF(hook); /* including our ref */
|
|
|
|
return (ENOMEM);
|
|
|
|
}
|
|
|
|
hook2->hk_refs = 1; /* start with a reference for us. */
|
|
|
|
hook2->hk_flags = HK_INVALID;
|
|
|
|
hook2->hk_peer = hook; /* Link the two together */
|
|
|
|
hook->hk_peer = hook2;
|
|
|
|
NG_HOOK_REF(hook); /* Add a ref for the peer to each*/
|
|
|
|
NG_HOOK_REF(hook2);
|
2005-11-15 10:54:20 +00:00
|
|
|
hook2->hk_node = &ng_deadnode;
|
2004-01-26 14:05:31 +00:00
|
|
|
strlcpy(NG_HOOK_NAME(hook2), name2, NG_HOOKSIZ);
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Queue the function above.
|
|
|
|
* Procesing continues in that function in the lock context of
|
|
|
|
* the other node.
|
|
|
|
*/
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_send_fn(node2, hook2, &ng_con_part2, NULL, 0);
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
NG_HOOK_UNREF(hook); /* Let each hook go if it wants to */
|
|
|
|
NG_HOOK_UNREF(hook2);
|
2001-01-30 20:51:52 +00:00
|
|
|
return (0);
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Make a peer and connect.
|
|
|
|
* We assume that the local node is locked.
|
|
|
|
* The new node probably doesn't need a lock until
|
|
|
|
* it has a hook, because it cannot really have any work until then,
|
|
|
|
* but we should think about it a bit more.
|
|
|
|
*
|
|
|
|
* The problem may come if the other node also fires up
|
|
|
|
* some hardware or a timer or some other source of activation,
|
|
|
|
* also it may already get a command msg via it's ID.
|
|
|
|
*
|
|
|
|
* We could use the same method as ng_con_nodes() but we'd have
|
2005-11-15 10:54:20 +00:00
|
|
|
* to add ability to remove the node when failing. (Not hard, just
|
2001-01-14 23:25:54 +00:00
|
|
|
* make arg1 point to the node to remove).
|
|
|
|
* Unless of course we just ignore failure to connect and leave
|
|
|
|
* an unconnected node?
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ng_mkpeer(node_p node, const char *name, const char *name2, char *type)
|
|
|
|
{
|
2005-11-15 10:54:20 +00:00
|
|
|
node_p node2;
|
|
|
|
hook_p hook1, hook2;
|
|
|
|
int error;
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
if ((error = ng_make_node(type, &node2))) {
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((error = ng_add_hook(node, name, &hook1))) { /* gives us a ref */
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_rmnode(node2, NULL, NULL, 0);
|
2001-01-14 23:25:54 +00:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((error = ng_add_hook(node2, name2, &hook2))) {
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_rmnode(node2, NULL, NULL, 0);
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_destroy_hook(hook1);
|
|
|
|
NG_HOOK_UNREF(hook1);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (error);
|
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Actually link the two hooks together.
|
|
|
|
*/
|
|
|
|
hook1->hk_peer = hook2;
|
|
|
|
hook2->hk_peer = hook1;
|
|
|
|
|
|
|
|
/* Each hook is referenced by the other */
|
|
|
|
NG_HOOK_REF(hook1);
|
|
|
|
NG_HOOK_REF(hook2);
|
|
|
|
|
|
|
|
/* Give each node the opportunity to veto the pending connection */
|
|
|
|
if (hook1->hk_node->nd_type->connect) {
|
|
|
|
error = (*hook1->hk_node->nd_type->connect) (hook1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((error == 0) && hook2->hk_node->nd_type->connect) {
|
|
|
|
error = (*hook2->hk_node->nd_type->connect) (hook2);
|
|
|
|
|
|
|
|
}
|
2001-01-11 22:22:52 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* drop the references we were holding on the two hooks.
|
|
|
|
*/
|
2001-01-14 23:25:54 +00:00
|
|
|
if (error) {
|
|
|
|
ng_destroy_hook(hook2); /* also zaps hook1 */
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_rmnode(node2, NULL, NULL, 0);
|
2001-01-14 23:25:54 +00:00
|
|
|
} else {
|
|
|
|
/* As a last act, allow the hooks to be used */
|
|
|
|
hook1->hk_flags &= ~HK_INVALID;
|
|
|
|
hook2->hk_flags &= ~HK_INVALID;
|
|
|
|
}
|
|
|
|
NG_HOOK_UNREF(hook1);
|
2001-01-11 22:22:52 +00:00
|
|
|
NG_HOOK_UNREF(hook2);
|
|
|
|
return (error);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/************************************************************************
|
|
|
|
Utility routines to send self messages
|
|
|
|
************************************************************************/
|
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
/* Shut this node down as soon as everyone is clear of it */
|
|
|
|
/* Should add arg "immediatly" to jump the queue */
|
2001-01-06 00:46:47 +00:00
|
|
|
int
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_rmnode_self(node_p node)
|
2001-01-06 00:46:47 +00:00
|
|
|
{
|
2001-01-30 20:51:52 +00:00
|
|
|
int error;
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
if (node == &ng_deadnode)
|
|
|
|
return (0);
|
2004-07-20 17:15:38 +00:00
|
|
|
node->nd_flags |= NGF_INVALID;
|
|
|
|
if (node->nd_flags & NGF_CLOSING)
|
2001-01-30 20:51:52 +00:00
|
|
|
return (0);
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
error = ng_send_fn(node, NULL, &ng_rmnode, NULL, 0);
|
|
|
|
return (error);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
static void
|
2001-01-14 23:25:54 +00:00
|
|
|
ng_rmhook_part2(node_p node, hook_p hook, void *arg1, int arg2)
|
|
|
|
{
|
|
|
|
ng_destroy_hook(hook);
|
2001-01-30 20:51:52 +00:00
|
|
|
return ;
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
|
2001-01-11 19:27:54 +00:00
|
|
|
int
|
|
|
|
ng_rmhook_self(hook_p hook)
|
|
|
|
{
|
2001-01-14 23:25:54 +00:00
|
|
|
int error;
|
2001-01-11 19:27:54 +00:00
|
|
|
node_p node = NG_HOOK_NODE(hook);
|
|
|
|
|
2001-01-14 23:25:54 +00:00
|
|
|
if (node == &ng_deadnode)
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
error = ng_send_fn(node, hook, &ng_rmhook_part2, NULL, 0);
|
|
|
|
return (error);
|
2001-01-11 19:27:54 +00:00
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/***********************************************************************
|
1999-10-21 09:06:11 +00:00
|
|
|
* Parse and verify a string of the form: <NODE:><PATH>
|
|
|
|
*
|
|
|
|
* Such a string can refer to a specific node or a specific hook
|
|
|
|
* on a specific node, depending on how you look at it. In the
|
|
|
|
* latter case, the PATH component must not end in a dot.
|
|
|
|
*
|
|
|
|
* Both <NODE:> and <PATH> are optional. The <PATH> is a string
|
|
|
|
* of hook names separated by dots. This breaks out the original
|
|
|
|
* string, setting *nodep to "NODE" (or NULL if none) and *pathp
|
|
|
|
* to "PATH" (or NULL if degenerate). Also, *hookp will point to
|
|
|
|
* the final hook component of <PATH>, if any, otherwise NULL.
|
|
|
|
*
|
|
|
|
* This returns -1 if the path is malformed. The char ** are optional.
|
2001-01-06 00:46:47 +00:00
|
|
|
***********************************************************************/
|
1999-10-21 09:06:11 +00:00
|
|
|
int
|
|
|
|
ng_path_parse(char *addr, char **nodep, char **pathp, char **hookp)
|
|
|
|
{
|
2005-11-15 10:54:20 +00:00
|
|
|
char *node, *path, *hook;
|
|
|
|
int k;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Extract absolute NODE, if any
|
|
|
|
*/
|
|
|
|
for (path = addr; *path && *path != ':'; path++);
|
|
|
|
if (*path) {
|
|
|
|
node = addr; /* Here's the NODE */
|
|
|
|
*path++ = '\0'; /* Here's the PATH */
|
|
|
|
|
|
|
|
/* Node name must not be empty */
|
|
|
|
if (!*node)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* A name of "." is OK; otherwise '.' not allowed */
|
|
|
|
if (strcmp(node, ".") != 0) {
|
|
|
|
for (k = 0; node[k]; k++)
|
|
|
|
if (node[k] == '.')
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
node = NULL; /* No absolute NODE */
|
|
|
|
path = addr; /* Here's the PATH */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Snoop for illegal characters in PATH */
|
|
|
|
for (k = 0; path[k]; k++)
|
|
|
|
if (path[k] == ':')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Check for no repeated dots in PATH */
|
|
|
|
for (k = 0; path[k]; k++)
|
|
|
|
if (path[k] == '.' && path[k + 1] == '.')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Remove extra (degenerate) dots from beginning or end of PATH */
|
|
|
|
if (path[0] == '.')
|
|
|
|
path++;
|
|
|
|
if (*path && path[strlen(path) - 1] == '.')
|
|
|
|
path[strlen(path) - 1] = 0;
|
|
|
|
|
|
|
|
/* If PATH has a dot, then we're not talking about a hook */
|
|
|
|
if (*path) {
|
|
|
|
for (hook = path, k = 0; path[k]; k++)
|
|
|
|
if (path[k] == '.') {
|
|
|
|
hook = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
path = hook = NULL;
|
|
|
|
|
|
|
|
/* Done */
|
|
|
|
if (nodep)
|
|
|
|
*nodep = node;
|
|
|
|
if (pathp)
|
|
|
|
*pathp = path;
|
|
|
|
if (hookp)
|
|
|
|
*hookp = hook;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Given a path, which may be absolute or relative, and a starting node,
|
2001-01-06 00:46:47 +00:00
|
|
|
* return the destination node.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
|
|
|
int
|
2001-01-06 00:46:47 +00:00
|
|
|
ng_path2noderef(node_p here, const char *address,
|
|
|
|
node_p *destp, hook_p *lasthook)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2004-01-26 14:05:31 +00:00
|
|
|
char fullpath[NG_PATHSIZ];
|
1999-10-21 09:06:11 +00:00
|
|
|
char *nodename, *path, pbuf[2];
|
2001-01-06 00:46:47 +00:00
|
|
|
node_p node, oldnode;
|
1999-10-21 09:06:11 +00:00
|
|
|
char *cp;
|
2000-04-28 17:09:00 +00:00
|
|
|
hook_p hook = NULL;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Initialize */
|
2001-01-08 05:34:06 +00:00
|
|
|
if (destp == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return EINVAL;
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
*destp = NULL;
|
|
|
|
|
|
|
|
/* Make a writable copy of address for ng_path_parse() */
|
|
|
|
strncpy(fullpath, address, sizeof(fullpath) - 1);
|
|
|
|
fullpath[sizeof(fullpath) - 1] = '\0';
|
|
|
|
|
|
|
|
/* Parse out node and sequence of hooks */
|
|
|
|
if (ng_path_parse(fullpath, &nodename, &path, NULL) < 0) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
if (path == NULL) {
|
|
|
|
pbuf[0] = '.'; /* Needs to be writable */
|
|
|
|
pbuf[1] = '\0';
|
|
|
|
path = pbuf;
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* For an absolute address, jump to the starting node.
|
|
|
|
* Note that this holds a reference on the node for us.
|
|
|
|
* Don't forget to drop the reference if we don't need it.
|
|
|
|
*/
|
1999-10-21 09:06:11 +00:00
|
|
|
if (nodename) {
|
2001-01-06 00:46:47 +00:00
|
|
|
node = ng_name2noderef(here, nodename);
|
1999-10-21 09:06:11 +00:00
|
|
|
if (node == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (ENOENT);
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
} else {
|
|
|
|
if (here == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
node = here;
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_REF(node);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
2005-11-15 10:54:20 +00:00
|
|
|
* Now follow the sequence of hooks
|
2001-01-06 00:46:47 +00:00
|
|
|
* XXX
|
|
|
|
* We actually cannot guarantee that the sequence
|
|
|
|
* is not being demolished as we crawl along it
|
|
|
|
* without extra-ordinary locking etc.
|
|
|
|
* So this is a bit dodgy to say the least.
|
|
|
|
* We can probably hold up some things by holding
|
|
|
|
* the nodelist mutex for the time of this
|
|
|
|
* crawl if we wanted.. At least that way we wouldn't have to
|
|
|
|
* worry about the nodes dissappearing, but the hooks would still
|
|
|
|
* be a problem.
|
|
|
|
*/
|
1999-10-21 09:06:11 +00:00
|
|
|
for (cp = path; node != NULL && *cp != '\0'; ) {
|
|
|
|
char *segment;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Break out the next path segment. Replace the dot we just
|
|
|
|
* found with a NUL; "cp" points to the next segment (or the
|
|
|
|
* NUL at the end).
|
|
|
|
*/
|
|
|
|
for (segment = cp; *cp != '\0'; cp++) {
|
|
|
|
if (*cp == '.') {
|
|
|
|
*cp++ = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Empty segment */
|
|
|
|
if (*segment == '\0')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* We have a segment, so look for a hook by that name */
|
1999-12-03 21:17:30 +00:00
|
|
|
hook = ng_findhook(node, segment);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Can't get there from here... */
|
|
|
|
if (hook == NULL
|
2001-01-08 05:34:06 +00:00
|
|
|
|| NG_HOOK_PEER(hook) == NULL
|
|
|
|
|| NG_HOOK_NOT_VALID(hook)
|
|
|
|
|| NG_HOOK_NOT_VALID(NG_HOOK_PEER(hook))) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_UNREF(node);
|
2005-11-15 10:54:20 +00:00
|
|
|
#if 0
|
2001-01-08 05:34:06 +00:00
|
|
|
printf("hooknotvalid %s %s %d %d %d %d ",
|
|
|
|
path,
|
|
|
|
segment,
|
|
|
|
hook == NULL,
|
2005-11-15 10:54:20 +00:00
|
|
|
NG_HOOK_PEER(hook) == NULL,
|
|
|
|
NG_HOOK_NOT_VALID(hook),
|
|
|
|
NG_HOOK_NOT_VALID(NG_HOOK_PEER(hook)));
|
2001-01-08 05:34:06 +00:00
|
|
|
#endif
|
1999-10-21 09:06:11 +00:00
|
|
|
return (ENOENT);
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
2005-11-15 10:54:20 +00:00
|
|
|
* Hop on over to the next node
|
2001-01-06 00:46:47 +00:00
|
|
|
* XXX
|
2005-11-15 10:54:20 +00:00
|
|
|
* Big race conditions here as hooks and nodes go away
|
2001-01-06 00:46:47 +00:00
|
|
|
* *** Idea.. store an ng_ID_t in each hook and use that
|
|
|
|
* instead of the direct hook in this crawl?
|
|
|
|
*/
|
|
|
|
oldnode = node;
|
2001-01-08 05:34:06 +00:00
|
|
|
if ((node = NG_PEER_NODE(hook)))
|
|
|
|
NG_NODE_REF(node); /* XXX RACE */
|
|
|
|
NG_NODE_UNREF(oldnode); /* XXX another race */
|
|
|
|
if (NG_NODE_NOT_VALID(node)) {
|
|
|
|
NG_NODE_UNREF(node); /* XXX more races */
|
2001-01-06 00:46:47 +00:00
|
|
|
node = NULL;
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If node somehow missing, fail here (probably this is not needed) */
|
|
|
|
if (node == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
return (ENXIO);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Done */
|
|
|
|
*destp = node;
|
2000-05-02 17:09:46 +00:00
|
|
|
if (lasthook != NULL)
|
2001-01-08 05:34:06 +00:00
|
|
|
*lasthook = (hook ? NG_HOOK_PEER(hook) : NULL);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/***************************************************************\
|
|
|
|
* Input queue handling.
|
|
|
|
* All activities are submitted to the node via the input queue
|
|
|
|
* which implements a multiple-reader/single-writer gate.
|
|
|
|
* Items which cannot be handled immeditly are queued.
|
|
|
|
*
|
|
|
|
* read-write queue locking inline functions *
|
|
|
|
\***************************************************************/
|
|
|
|
|
2005-10-11 13:48:38 +00:00
|
|
|
static __inline item_p ng_dequeue(struct ng_queue * ngq, int *rw);
|
2001-01-06 00:46:47 +00:00
|
|
|
static __inline item_p ng_acquire_read(struct ng_queue * ngq,
|
|
|
|
item_p item);
|
|
|
|
static __inline item_p ng_acquire_write(struct ng_queue * ngq,
|
|
|
|
item_p item);
|
|
|
|
static __inline void ng_leave_read(struct ng_queue * ngq);
|
|
|
|
static __inline void ng_leave_write(struct ng_queue * ngq);
|
|
|
|
static __inline void ng_queue_rw(struct ng_queue * ngq,
|
|
|
|
item_p item, int rw);
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* Definition of the bits fields in the ng_queue flag word.
|
|
|
|
* Defined here rather than in netgraph.h because no-one should fiddle
|
|
|
|
* with them.
|
|
|
|
*
|
2001-02-01 20:51:23 +00:00
|
|
|
* The ordering here may be important! don't shuffle these.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
/*-
|
|
|
|
Safety Barrier--------+ (adjustable to suit taste) (not used yet)
|
|
|
|
|
|
|
|
|
V
|
|
|
|
+-------+-------+-------+-------+-------+-------+-------+-------+
|
2005-11-02 14:27:24 +00:00
|
|
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
|
|
|
| |A|c|t|i|v|e| |R|e|a|d|e|r| |C|o|u|n|t| | | | | | | | | |P|A|
|
|
|
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |O|W|
|
2001-01-06 00:46:47 +00:00
|
|
|
+-------+-------+-------+-------+-------+-------+-------+-------+
|
2005-11-02 14:27:24 +00:00
|
|
|
\___________________________ ____________________________/ | |
|
|
|
|
V | |
|
|
|
|
[active reader count] | |
|
2001-01-06 00:46:47 +00:00
|
|
|
| |
|
2005-11-02 14:27:24 +00:00
|
|
|
Operation Pending -------------------------------+ |
|
2001-01-06 00:46:47 +00:00
|
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
Active Writer ---------------------------------------+
|
2001-02-01 20:51:23 +00:00
|
|
|
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2005-11-02 14:27:24 +00:00
|
|
|
#define WRITER_ACTIVE 0x00000001
|
|
|
|
#define OP_PENDING 0x00000002
|
|
|
|
#define READER_INCREMENT 0x00000004
|
|
|
|
#define READER_MASK 0xfffffffc /* Not valid if WRITER_ACTIVE is set */
|
|
|
|
#define SAFETY_BARRIER 0x00100000 /* 128K items queued should be enough */
|
2001-02-01 20:51:23 +00:00
|
|
|
|
|
|
|
/* Defines of more elaborate states on the queue */
|
2005-11-02 14:27:24 +00:00
|
|
|
/* Mask of bits a new read cares about */
|
|
|
|
#define NGQ_RMASK (WRITER_ACTIVE|OP_PENDING)
|
2001-02-01 20:51:23 +00:00
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
/* Mask of bits a new write cares about */
|
2001-02-01 20:51:23 +00:00
|
|
|
#define NGQ_WMASK (NGQ_RMASK|READER_MASK)
|
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
/* Test to decide if there is something on the queue. */
|
|
|
|
#define QUEUE_ACTIVE(QP) ((QP)->q_flags & OP_PENDING)
|
|
|
|
|
|
|
|
/* How to decide what the next queued item is. */
|
|
|
|
#define HEAD_IS_READER(QP) NGI_QUEUED_READER((QP)->queue)
|
|
|
|
#define HEAD_IS_WRITER(QP) NGI_QUEUED_WRITER((QP)->queue) /* notused */
|
|
|
|
|
|
|
|
/* Read the status to decide if the next item on the queue can now run. */
|
|
|
|
#define QUEUED_READER_CAN_PROCEED(QP) \
|
|
|
|
(((QP)->q_flags & (NGQ_RMASK & ~OP_PENDING)) == 0)
|
|
|
|
#define QUEUED_WRITER_CAN_PROCEED(QP) \
|
|
|
|
(((QP)->q_flags & (NGQ_WMASK & ~OP_PENDING)) == 0)
|
2001-02-01 20:51:23 +00:00
|
|
|
|
|
|
|
/* Is there a chance of getting ANY work off the queue? */
|
2005-11-02 14:27:24 +00:00
|
|
|
#define NEXT_QUEUED_ITEM_CAN_PROCEED(QP) \
|
|
|
|
(QUEUE_ACTIVE(QP) && \
|
|
|
|
((HEAD_IS_READER(QP)) ? QUEUED_READER_CAN_PROCEED(QP) : \
|
|
|
|
QUEUED_WRITER_CAN_PROCEED(QP)))
|
|
|
|
|
2001-02-01 20:51:23 +00:00
|
|
|
|
2005-10-11 13:48:38 +00:00
|
|
|
#define NGQRW_R 0
|
|
|
|
#define NGQRW_W 1
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* Taking into account the current state of the queue and node, possibly take
|
|
|
|
* the next entry off the queue and return it. Return NULL if there was
|
|
|
|
* nothing we could return, either because there really was nothing there, or
|
|
|
|
* because the node was in a state where it cannot yet process the next item
|
|
|
|
* on the queue.
|
|
|
|
*
|
|
|
|
* This MUST MUST MUST be called with the mutex held.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
static __inline item_p
|
2005-10-11 13:48:38 +00:00
|
|
|
ng_dequeue(struct ng_queue *ngq, int *rw)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2001-01-06 00:46:47 +00:00
|
|
|
item_p item;
|
|
|
|
u_int add_arg;
|
2001-02-01 20:51:23 +00:00
|
|
|
|
2004-12-19 14:58:13 +00:00
|
|
|
mtx_assert(&ngq->q_mtx, MA_OWNED);
|
2005-11-15 10:54:20 +00:00
|
|
|
/*
|
2005-11-02 14:27:24 +00:00
|
|
|
* If there is nothing queued, then just return.
|
|
|
|
* No point in continuing.
|
|
|
|
* XXXGL: assert this?
|
|
|
|
*/
|
|
|
|
if (!QUEUE_ACTIVE(ngq)) {
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR4(KTR_NET, "%20s: node [%x] (%p) queue empty; "
|
|
|
|
"queue flags 0x%lx", __func__,
|
|
|
|
ngq->q_node->nd_ID, ngq->q_node, ngq->q_flags);
|
2005-11-02 14:27:24 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
2004-12-19 14:58:13 +00:00
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
/*
|
|
|
|
* From here, we can assume there is a head item.
|
|
|
|
* We need to find out what it is and if it can be dequeued, given
|
|
|
|
* the current state of the node.
|
|
|
|
*/
|
|
|
|
if (HEAD_IS_READER(ngq)) {
|
|
|
|
if (!QUEUED_READER_CAN_PROCEED(ngq)) {
|
|
|
|
/*
|
|
|
|
* It's a reader but we can't use it.
|
|
|
|
* We are stalled so make sure we don't
|
|
|
|
* get called again until something changes.
|
|
|
|
*/
|
|
|
|
ng_worklist_remove(ngq->q_node);
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR4(KTR_NET, "%20s: node [%x] (%p) queued reader "
|
|
|
|
"can't proceed; queue flags 0x%lx", __func__,
|
|
|
|
ngq->q_node->nd_ID, ngq->q_node, ngq->q_flags);
|
2005-11-02 14:27:24 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
2001-02-01 20:51:23 +00:00
|
|
|
* Head of queue is a reader and we have no write active.
|
2005-11-15 10:54:20 +00:00
|
|
|
* We don't care how many readers are already active.
|
2005-11-02 14:27:24 +00:00
|
|
|
* Add the correct increment for the reader count.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2005-11-02 14:27:24 +00:00
|
|
|
add_arg = READER_INCREMENT;
|
2005-10-11 13:48:38 +00:00
|
|
|
*rw = NGQRW_R;
|
2005-11-02 14:27:24 +00:00
|
|
|
} else if (QUEUED_WRITER_CAN_PROCEED(ngq)) {
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* There is a pending write, no readers and no active writer.
|
|
|
|
* This means we can go ahead with the pending writer. Note
|
|
|
|
* the fact that we now have a writer, ready for when we take
|
|
|
|
* it off the queue.
|
|
|
|
*
|
|
|
|
* We don't need to worry about a possible collision with the
|
|
|
|
* fasttrack reader.
|
|
|
|
*
|
|
|
|
* The fasttrack thread may take a long time to discover that we
|
|
|
|
* are running so we would have an inconsistent state in the
|
|
|
|
* flags for a while. Since we ignore the reader count
|
|
|
|
* entirely when the WRITER_ACTIVE flag is set, this should
|
|
|
|
* not matter (in fact it is defined that way). If it tests
|
2005-11-02 14:27:24 +00:00
|
|
|
* the flag before this operation, the OP_PENDING flag
|
2001-01-06 00:46:47 +00:00
|
|
|
* will make it fail, and if it tests it later, the
|
2001-02-01 20:51:23 +00:00
|
|
|
* WRITER_ACTIVE flag will do the same. If it is SO slow that
|
2001-01-06 00:46:47 +00:00
|
|
|
* we have actually completed the operation, and neither flag
|
2005-11-02 14:27:24 +00:00
|
|
|
* is set by the time that it tests the flags, then it is
|
|
|
|
* actually ok for it to continue. If it completes and we've
|
|
|
|
* finished and the read pending is set it still fails.
|
2001-01-06 00:46:47 +00:00
|
|
|
*
|
|
|
|
* So we can just ignore it, as long as we can ensure that the
|
|
|
|
* transition from WRITE_PENDING state to the WRITER_ACTIVE
|
|
|
|
* state is atomic.
|
|
|
|
*
|
|
|
|
* After failing, first it will be held back by the mutex, then
|
|
|
|
* when it can proceed, it will queue its request, then it
|
|
|
|
* would arrive at this function. Usually it will have to
|
2001-02-01 20:51:23 +00:00
|
|
|
* leave empty handed because the ACTIVE WRITER bit will be
|
2001-01-06 00:46:47 +00:00
|
|
|
* set.
|
2001-02-01 20:51:23 +00:00
|
|
|
*
|
2005-11-02 14:27:24 +00:00
|
|
|
* Adjust the flags for the new active writer.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2005-11-02 14:27:24 +00:00
|
|
|
add_arg = WRITER_ACTIVE;
|
2005-10-11 13:48:38 +00:00
|
|
|
*rw = NGQRW_W;
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* We want to write "active writer, no readers " Now go make
|
|
|
|
* it true. In fact there may be a number in the readers
|
|
|
|
* count but we know it is not true and will be fixed soon.
|
|
|
|
* We will fix the flags for the next pending entry in a
|
|
|
|
* moment.
|
|
|
|
*/
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* We can't dequeue anything.. return and say so. Probably we
|
|
|
|
* have a write pending and the readers count is non zero. If
|
|
|
|
* we got here because a reader hit us just at the wrong
|
|
|
|
* moment with the fasttrack code, and put us in a strange
|
2005-11-02 14:27:24 +00:00
|
|
|
* state, then it will be coming through in just a moment,
|
|
|
|
* (just as soon as we release the mutex) and keep things
|
|
|
|
* moving.
|
|
|
|
* Make sure we remove ourselves from the work queue. It
|
|
|
|
* would be a waste of effort to do all this again.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2001-02-01 20:51:23 +00:00
|
|
|
ng_worklist_remove(ngq->q_node);
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR4(KTR_NET, "%20s: node [%x] (%p) can't dequeue anything; "
|
|
|
|
"queue flags 0x%lx", __func__,
|
|
|
|
ngq->q_node->nd_ID, ngq->q_node, ngq->q_flags);
|
2005-11-02 14:27:24 +00:00
|
|
|
return (NULL);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2000-12-12 18:52:14 +00:00
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* Now we dequeue the request (whatever it may be) and correct the
|
|
|
|
* pending flags and the next and last pointers.
|
2000-12-12 18:52:14 +00:00
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
item = ngq->queue;
|
|
|
|
ngq->queue = item->el_next;
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR6(KTR_NET, "%20s: node [%x] (%p) dequeued item %p with flags 0x%lx; "
|
|
|
|
"queue flags 0x%lx", __func__,
|
|
|
|
ngq->q_node->nd_ID,ngq->q_node, item, item->el_flags, ngq->q_flags);
|
2001-01-06 00:46:47 +00:00
|
|
|
if (ngq->last == &(item->el_next)) {
|
|
|
|
/*
|
|
|
|
* that was the last entry in the queue so set the 'last
|
2005-11-02 14:27:24 +00:00
|
|
|
* pointer up correctly and make sure the pending flag is
|
2001-01-06 00:46:47 +00:00
|
|
|
* clear.
|
|
|
|
*/
|
2005-11-02 14:27:24 +00:00
|
|
|
add_arg += -OP_PENDING;
|
2001-01-06 00:46:47 +00:00
|
|
|
ngq->last = &(ngq->queue);
|
|
|
|
/*
|
2001-02-01 20:51:23 +00:00
|
|
|
* Whatever flag was set will be cleared and
|
|
|
|
* the new acive field will be set by the add as well,
|
|
|
|
* so we don't need to change add_arg.
|
|
|
|
* But we know we don't need to be on the work list.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2001-02-01 20:51:23 +00:00
|
|
|
atomic_add_long(&ngq->q_flags, add_arg);
|
|
|
|
ng_worklist_remove(ngq->q_node);
|
2000-12-12 18:52:14 +00:00
|
|
|
} else {
|
2005-11-15 10:54:20 +00:00
|
|
|
/*
|
2005-11-02 14:27:24 +00:00
|
|
|
* Since there is still something on the queue
|
|
|
|
* we don't need to change the PENDING flag.
|
2001-02-01 20:51:23 +00:00
|
|
|
*/
|
|
|
|
atomic_add_long(&ngq->q_flags, add_arg);
|
|
|
|
/*
|
|
|
|
* If we see more doable work, make sure we are
|
|
|
|
* on the work queue.
|
|
|
|
*/
|
2005-11-02 14:27:24 +00:00
|
|
|
if (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq)) {
|
2001-02-01 20:51:23 +00:00
|
|
|
ng_setisr(ngq->q_node);
|
|
|
|
}
|
2000-12-12 18:52:14 +00:00
|
|
|
}
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR6(KTR_NET, "%20s: node [%x] (%p) returning item %p as %s; "
|
|
|
|
"queue flags 0x%lx", __func__,
|
|
|
|
ngq->q_node->nd_ID, ngq->q_node, item, *rw ? "WRITER" : "READER" ,
|
2006-01-11 15:29:48 +00:00
|
|
|
ngq->q_flags);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (item);
|
|
|
|
}
|
2000-12-12 18:52:14 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Queue a packet to be picked up by someone else.
|
|
|
|
* We really don't care who, but we can't or don't want to hang around
|
|
|
|
* to process it ourselves. We are probably an interrupt routine..
|
2005-11-02 14:27:24 +00:00
|
|
|
* If the queue could be run, flag the netisr handler to start.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
|
|
|
static __inline void
|
|
|
|
ng_queue_rw(struct ng_queue * ngq, item_p item, int rw)
|
|
|
|
{
|
2004-12-19 14:58:13 +00:00
|
|
|
mtx_assert(&ngq->q_mtx, MA_OWNED);
|
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
if (rw == NGQRW_W)
|
|
|
|
NGI_SET_WRITER(item);
|
|
|
|
else
|
|
|
|
NGI_SET_READER(item);
|
2001-01-06 00:46:47 +00:00
|
|
|
item->el_next = NULL; /* maybe not needed */
|
|
|
|
*ngq->last = item;
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR5(KTR_NET, "%20s: node [%x] (%p) queued item %p as %s", __func__,
|
|
|
|
ngq->q_node->nd_ID, ngq->q_node, item, rw ? "WRITER" : "READER" );
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* If it was the first item in the queue then we need to
|
|
|
|
* set the last pointer and the type flags.
|
|
|
|
*/
|
2006-01-11 15:29:48 +00:00
|
|
|
if (ngq->last == &(ngq->queue)) {
|
2005-11-02 14:27:24 +00:00
|
|
|
atomic_add_long(&ngq->q_flags, OP_PENDING);
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR3(KTR_NET, "%20s: node [%x] (%p) set OP_PENDING", __func__,
|
|
|
|
ngq->q_node->nd_ID, ngq->q_node);
|
2006-01-11 15:29:48 +00:00
|
|
|
}
|
2005-11-02 14:27:24 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
ngq->last = &(item->el_next);
|
2005-11-02 14:27:24 +00:00
|
|
|
/*
|
|
|
|
* We can take the worklist lock with the node locked
|
|
|
|
* BUT NOT THE REVERSE!
|
|
|
|
*/
|
|
|
|
if (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq))
|
|
|
|
ng_setisr(ngq->q_node);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* This function 'cheats' in that it first tries to 'grab' the use of the
|
|
|
|
* node, without going through the mutex. We can do this becasue of the
|
|
|
|
* semantics of the lock. The semantics include a clause that says that the
|
|
|
|
* value of the readers count is invalid if the WRITER_ACTIVE flag is set. It
|
|
|
|
* also says that the WRITER_ACTIVE flag cannot be set if the readers count
|
|
|
|
* is not zero. Note that this talks about what is valid to SET the
|
|
|
|
* WRITER_ACTIVE flag, because from the moment it is set, the value if the
|
|
|
|
* reader count is immaterial, and not valid. The two 'pending' flags have a
|
|
|
|
* similar effect, in that If they are orthogonal to the two active fields in
|
|
|
|
* how they are set, but if either is set, the attempted 'grab' need to be
|
|
|
|
* backed out because there is earlier work, and we maintain ordering in the
|
|
|
|
* queue. The result of this is that the reader request can try obtain use of
|
|
|
|
* the node with only a single atomic addition, and without any of the mutex
|
|
|
|
* overhead. If this fails the operation degenerates to the same as for other
|
|
|
|
* cases.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static __inline item_p
|
|
|
|
ng_acquire_read(struct ng_queue *ngq, item_p item)
|
|
|
|
{
|
2005-11-02 15:23:47 +00:00
|
|
|
KASSERT(ngq != &ng_deadnode.nd_input_queue,
|
|
|
|
("%s: working on deadnode", __func__));
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/* ######### Hack alert ######### */
|
|
|
|
atomic_add_long(&ngq->q_flags, READER_INCREMENT);
|
2001-02-01 20:51:23 +00:00
|
|
|
if ((ngq->q_flags & NGQ_RMASK) == 0) {
|
2001-01-06 00:46:47 +00:00
|
|
|
/* Successfully grabbed node */
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR4(KTR_NET, "%20s: node [%x] (%p) fast acquired item %p",
|
|
|
|
__func__, ngq->q_node->nd_ID, ngq->q_node, item);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (item);
|
|
|
|
}
|
|
|
|
/* undo the damage if we didn't succeed */
|
|
|
|
atomic_subtract_long(&ngq->q_flags, READER_INCREMENT);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/* ######### End Hack alert ######### */
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin((&ngq->q_mtx));
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* Try again. Another processor (or interrupt for that matter) may
|
|
|
|
* have removed the last queued item that was stopping us from
|
|
|
|
* running, between the previous test, and the moment that we took
|
|
|
|
* the mutex. (Or maybe a writer completed.)
|
2005-11-02 14:27:24 +00:00
|
|
|
* Even if another fast-track reader hits during this period
|
|
|
|
* we don't care as multiple readers is OK.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-02-01 20:51:23 +00:00
|
|
|
if ((ngq->q_flags & NGQ_RMASK) == 0) {
|
2001-01-06 00:46:47 +00:00
|
|
|
atomic_add_long(&ngq->q_flags, READER_INCREMENT);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin((&ngq->q_mtx));
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR4(KTR_NET, "%20s: node [%x] (%p) slow acquired item %p",
|
|
|
|
__func__, ngq->q_node->nd_ID, ngq->q_node, item);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (item);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* and queue the request for later.
|
|
|
|
*/
|
|
|
|
ng_queue_rw(ngq, item, NGQRW_R);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&(ngq->q_mtx));
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
|
|
|
|
return (NULL);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
static __inline item_p
|
|
|
|
ng_acquire_write(struct ng_queue *ngq, item_p item)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2005-11-02 15:23:47 +00:00
|
|
|
KASSERT(ngq != &ng_deadnode.nd_input_queue,
|
|
|
|
("%s: working on deadnode", __func__));
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
restart:
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&(ngq->q_mtx));
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* If there are no readers, no writer, and no pending packets, then
|
|
|
|
* we can just go ahead. In all other situations we need to queue the
|
|
|
|
* request
|
|
|
|
*/
|
2001-02-01 20:51:23 +00:00
|
|
|
if ((ngq->q_flags & NGQ_WMASK) == 0) {
|
2005-11-02 14:27:24 +00:00
|
|
|
/* collision could happen *HERE* */
|
2001-01-06 00:46:47 +00:00
|
|
|
atomic_add_long(&ngq->q_flags, WRITER_ACTIVE);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin((&ngq->q_mtx));
|
2001-01-06 00:46:47 +00:00
|
|
|
if (ngq->q_flags & READER_MASK) {
|
|
|
|
/* Collision with fast-track reader */
|
2001-02-01 20:51:23 +00:00
|
|
|
atomic_subtract_long(&ngq->q_flags, WRITER_ACTIVE);
|
2001-01-06 00:46:47 +00:00
|
|
|
goto restart;
|
|
|
|
}
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR4(KTR_NET, "%20s: node [%x] (%p) acquired item %p",
|
|
|
|
__func__, ngq->q_node->nd_ID, ngq->q_node, item);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (item);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* and queue the request for later.
|
|
|
|
*/
|
|
|
|
ng_queue_rw(ngq, item, NGQRW_W);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&(ngq->q_mtx));
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
|
|
|
|
return (NULL);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
ng_leave_read(struct ng_queue *ngq)
|
|
|
|
{
|
|
|
|
atomic_subtract_long(&ngq->q_flags, READER_INCREMENT);
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
ng_leave_write(struct ng_queue *ngq)
|
|
|
|
{
|
|
|
|
atomic_subtract_long(&ngq->q_flags, WRITER_ACTIVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ng_flush_input_queue(struct ng_queue * ngq)
|
|
|
|
{
|
|
|
|
item_p item;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
mtx_lock_spin(&ngq->q_mtx);
|
|
|
|
while (ngq->queue) {
|
2001-01-06 00:46:47 +00:00
|
|
|
item = ngq->queue;
|
|
|
|
ngq->queue = item->el_next;
|
|
|
|
if (ngq->last == &(item->el_next)) {
|
|
|
|
ngq->last = &(ngq->queue);
|
2005-11-02 14:27:24 +00:00
|
|
|
atomic_add_long(&ngq->q_flags, -OP_PENDING);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&ngq->q_mtx);
|
2005-11-02 14:27:24 +00:00
|
|
|
|
|
|
|
/* If the item is supplying a callback, call it with an error */
|
2005-10-13 11:55:50 +00:00
|
|
|
if (item->apply != NULL) {
|
|
|
|
(item->apply)(item->context, ENOENT);
|
|
|
|
item->apply = NULL;
|
|
|
|
}
|
2004-07-18 22:57:46 +00:00
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
mtx_lock_spin(&ngq->q_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2001-02-01 20:51:23 +00:00
|
|
|
/*
|
|
|
|
* Take us off the work queue if we are there.
|
|
|
|
* We definatly have no work to be done.
|
|
|
|
*/
|
|
|
|
ng_worklist_remove(ngq->q_node);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&ngq->q_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Externally visible method for sending or queueing messages or data.
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
/*
|
2001-01-30 20:51:52 +00:00
|
|
|
* The module code should have filled out the item correctly by this stage:
|
2001-01-06 00:46:47 +00:00
|
|
|
* Common:
|
|
|
|
* reference to destination node.
|
|
|
|
* Reference to destination rcv hook if relevant.
|
|
|
|
* Data:
|
|
|
|
* pointer to mbuf
|
|
|
|
* Control_Message:
|
|
|
|
* pointer to msg.
|
|
|
|
* ID of original sender node. (return address)
|
2001-01-30 20:51:52 +00:00
|
|
|
* Function:
|
|
|
|
* Function pointer
|
|
|
|
* void * argument
|
|
|
|
* integer argument
|
2001-01-06 00:46:47 +00:00
|
|
|
*
|
|
|
|
* The nodes have several routines and macros to help with this task:
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2005-05-16 17:07:03 +00:00
|
|
|
ng_snd_item(item_p item, int flags)
|
2001-01-06 00:46:47 +00:00
|
|
|
{
|
2001-01-30 20:51:52 +00:00
|
|
|
hook_p hook = NGI_HOOK(item);
|
2001-02-01 20:51:23 +00:00
|
|
|
node_p node = NGI_NODE(item);
|
2005-05-16 17:07:03 +00:00
|
|
|
int queue, rw;
|
2001-02-01 20:51:23 +00:00
|
|
|
struct ng_queue * ngq = &node->nd_input_queue;
|
2005-10-12 10:18:44 +00:00
|
|
|
int error = 0;
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
2005-11-15 10:54:20 +00:00
|
|
|
_ngi_check(item, __FILE__, __LINE__);
|
2001-01-06 00:46:47 +00:00
|
|
|
#endif
|
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
queue = (flags & NG_QUEUE) ? 1 : 0;
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
if (item == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
return (EINVAL); /* failed to get queue element */
|
|
|
|
}
|
2001-02-01 20:51:23 +00:00
|
|
|
if (node == NULL) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_ITEM(item);
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
return (EINVAL); /* No address */
|
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
switch(item->el_flags & NGQF_TYPE) {
|
|
|
|
case NGQF_DATA:
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* DATA MESSAGE
|
|
|
|
* Delivered to a node via a non-optional hook.
|
|
|
|
* Both should be present in the item even though
|
|
|
|
* the node is derivable from the hook.
|
|
|
|
* References are held on both by the item.
|
|
|
|
*/
|
2004-06-25 21:11:14 +00:00
|
|
|
|
|
|
|
/* Protect nodes from sending NULL pointers
|
|
|
|
* to each other
|
|
|
|
*/
|
2004-06-26 01:22:29 +00:00
|
|
|
if (NGI_M(item) == NULL)
|
2004-06-25 21:11:14 +00:00
|
|
|
return (EINVAL);
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
CHECK_DATA_MBUF(NGI_M(item));
|
|
|
|
if (hook == NULL) {
|
|
|
|
NG_FREE_ITEM(item);
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
return(EINVAL);
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
if ((NG_HOOK_NOT_VALID(hook))
|
|
|
|
|| (NG_NODE_NOT_VALID(NG_HOOK_NODE(hook)))) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
return (ENOTCONN);
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
if ((hook->hk_flags & HK_QUEUE)) {
|
2001-01-06 00:46:47 +00:00
|
|
|
queue = 1;
|
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
break;
|
|
|
|
case NGQF_MESG:
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* CONTROL MESSAGE
|
|
|
|
* Delivered to a node.
|
|
|
|
* Hook is optional.
|
|
|
|
* References are held by the item on the node and
|
|
|
|
* the hook if it is present.
|
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
if (hook && (hook->hk_flags & HK_QUEUE)) {
|
2001-01-06 00:46:47 +00:00
|
|
|
queue = 1;
|
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
break;
|
|
|
|
case NGQF_FN:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
TRAP_ERROR();
|
|
|
|
return (EINVAL);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2005-08-26 15:14:33 +00:00
|
|
|
switch(item->el_flags & NGQF_RW) {
|
|
|
|
case NGQF_READER:
|
|
|
|
rw = NGQRW_R;
|
|
|
|
break;
|
|
|
|
case NGQF_WRITER:
|
|
|
|
rw = NGQRW_W;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("%s: invalid item flags %lx", __func__, item->el_flags);
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
2005-08-26 15:14:33 +00:00
|
|
|
* If the node specifies single threading, force writer semantics.
|
|
|
|
* Similarly, the node may say one hook always produces writers.
|
2005-10-11 13:48:38 +00:00
|
|
|
* These are overrides.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
2004-07-20 17:15:38 +00:00
|
|
|
if ((node->nd_flags & NGF_FORCE_WRITER)
|
2005-10-11 13:48:38 +00:00
|
|
|
|| (hook && (hook->hk_flags & HK_FORCE_WRITER)))
|
2001-01-06 00:46:47 +00:00
|
|
|
rw = NGQRW_W;
|
2005-08-26 15:14:33 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
if (queue) {
|
|
|
|
/* Put it on the queue for that node*/
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
2005-11-15 10:54:20 +00:00
|
|
|
_ngi_check(item, __FILE__, __LINE__);
|
2001-01-06 00:46:47 +00:00
|
|
|
#endif
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&(ngq->q_mtx));
|
2001-01-06 00:46:47 +00:00
|
|
|
ng_queue_rw(ngq, item, rw);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&(ngq->q_mtx));
|
2005-07-05 17:35:20 +00:00
|
|
|
|
|
|
|
if (flags & NG_PROGRESS)
|
|
|
|
return (EINPROGRESS);
|
|
|
|
else
|
|
|
|
return (0);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We already decided how we will be queueud or treated.
|
|
|
|
* Try get the appropriate operating permission.
|
|
|
|
*/
|
2005-10-12 10:18:44 +00:00
|
|
|
if (rw == NGQRW_R)
|
2001-01-06 00:46:47 +00:00
|
|
|
item = ng_acquire_read(ngq, item);
|
2005-10-12 10:18:44 +00:00
|
|
|
else
|
2001-01-06 00:46:47 +00:00
|
|
|
item = ng_acquire_write(ngq, item);
|
|
|
|
|
2005-11-02 14:27:24 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
if (item == NULL) {
|
2005-07-05 17:35:20 +00:00
|
|
|
if (flags & NG_PROGRESS)
|
|
|
|
return (EINPROGRESS);
|
|
|
|
else
|
|
|
|
return (0);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
2005-11-15 10:54:20 +00:00
|
|
|
_ngi_check(item, __FILE__, __LINE__);
|
2001-01-06 00:46:47 +00:00
|
|
|
#endif
|
2005-11-02 14:27:24 +00:00
|
|
|
|
2001-03-10 16:31:00 +00:00
|
|
|
NGI_GET_NODE(item, node); /* zaps stored node */
|
|
|
|
|
2005-10-12 10:18:44 +00:00
|
|
|
error = ng_apply_item(node, item, rw); /* drops r/w lock when done */
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2001-03-10 16:31:00 +00:00
|
|
|
/*
|
2005-11-15 10:54:20 +00:00
|
|
|
* If the node goes away when we remove the reference,
|
2001-08-21 13:20:02 +00:00
|
|
|
* whatever we just did caused it.. whatever we do, DO NOT
|
2001-03-10 16:31:00 +00:00
|
|
|
* access the node again!
|
|
|
|
*/
|
|
|
|
if (NG_NODE_UNREF(node) == 0) {
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
mtx_lock_spin(&(ngq->q_mtx));
|
2005-11-02 14:27:24 +00:00
|
|
|
if (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq))
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
ng_setisr(ngq->q_node);
|
|
|
|
mtx_unlock_spin(&(ngq->q_mtx));
|
2001-03-10 16:31:00 +00:00
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
return (error);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have an item that was possibly queued somewhere.
|
|
|
|
* It should contain all the information needed
|
|
|
|
* to run it on the appropriate node/hook.
|
|
|
|
*/
|
|
|
|
static int
|
2005-10-11 13:48:38 +00:00
|
|
|
ng_apply_item(node_p node, item_p item, int rw)
|
2001-01-06 00:46:47 +00:00
|
|
|
{
|
|
|
|
hook_p hook;
|
2001-01-30 20:51:52 +00:00
|
|
|
int error = 0;
|
2001-01-06 00:46:47 +00:00
|
|
|
ng_rcvdata_t *rcvdata;
|
2001-01-31 20:46:00 +00:00
|
|
|
ng_rcvmsg_t *rcvmsg;
|
2005-07-05 17:35:20 +00:00
|
|
|
ng_apply_t *apply = NULL;
|
|
|
|
void *context = NULL;
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_GET_HOOK(item, hook); /* clears stored hook */
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
2005-11-15 10:54:20 +00:00
|
|
|
_ngi_check(item, __FILE__, __LINE__);
|
2001-01-06 00:46:47 +00:00
|
|
|
#endif
|
2005-07-05 17:35:20 +00:00
|
|
|
|
|
|
|
/*
|
2005-11-02 14:27:24 +00:00
|
|
|
* If the item has an "apply" callback, store it.
|
|
|
|
* Clear item's callback immediately, to avoid an extra call if
|
|
|
|
* the item is reused by the destination node.
|
2005-07-05 17:35:20 +00:00
|
|
|
*/
|
|
|
|
if (item->apply != NULL) {
|
|
|
|
apply = item->apply;
|
|
|
|
context = item->context;
|
|
|
|
item->apply = NULL;
|
|
|
|
}
|
|
|
|
|
2001-01-14 23:25:54 +00:00
|
|
|
switch (item->el_flags & NGQF_TYPE) {
|
2001-01-06 00:46:47 +00:00
|
|
|
case NGQF_DATA:
|
|
|
|
/*
|
|
|
|
* Check things are still ok as when we were queued.
|
|
|
|
*/
|
|
|
|
if ((hook == NULL)
|
2001-01-08 05:34:06 +00:00
|
|
|
|| NG_HOOK_NOT_VALID(hook)
|
2001-01-31 20:46:00 +00:00
|
|
|
|| NG_NODE_NOT_VALID(node) ) {
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EIO;
|
|
|
|
NG_FREE_ITEM(item);
|
2001-01-31 20:46:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If no receive method, just silently drop it.
|
|
|
|
* Give preference to the hook over-ride method
|
|
|
|
*/
|
2005-11-15 10:54:20 +00:00
|
|
|
if ((!(rcvdata = hook->hk_rcvdata))
|
2001-01-31 20:46:00 +00:00
|
|
|
&& (!(rcvdata = NG_HOOK_NODE(hook)->nd_type->rcvdata))) {
|
|
|
|
error = 0;
|
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
break;
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2001-01-31 20:46:00 +00:00
|
|
|
error = (*rcvdata)(hook, item);
|
2001-01-06 00:46:47 +00:00
|
|
|
break;
|
|
|
|
case NGQF_MESG:
|
|
|
|
if (hook) {
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_HOOK_NOT_VALID(hook)) {
|
2001-01-30 20:51:52 +00:00
|
|
|
/*
|
|
|
|
* The hook has been zapped then we can't
|
|
|
|
* use it. Immediatly drop its reference.
|
|
|
|
* The message may not need it.
|
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_HOOK_UNREF(hook);
|
2001-01-06 00:46:47 +00:00
|
|
|
hook = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Similarly, if the node is a zombie there is
|
|
|
|
* nothing we can do with it, drop everything.
|
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_NODE_NOT_VALID(node)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Call the appropriate message handler for the object.
|
|
|
|
* It is up to the message handler to free the message.
|
|
|
|
* If it's a generic message, handle it generically,
|
|
|
|
* otherwise call the type's message handler
|
|
|
|
* (if it exists)
|
|
|
|
* XXX (race). Remember that a queued message may
|
|
|
|
* reference a node or hook that has just been
|
|
|
|
* invalidated. It will exist as the queue code
|
|
|
|
* is holding a reference, but..
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct ng_mesg *msg = NGI_MSG(item);
|
|
|
|
|
2005-11-15 10:54:20 +00:00
|
|
|
/*
|
2001-01-31 20:46:00 +00:00
|
|
|
* check if the generic handler owns it.
|
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
if ((msg->header.typecookie == NGM_GENERIC_COOKIE)
|
|
|
|
&& ((msg->header.flags & NGF_RESP) == 0)) {
|
|
|
|
error = ng_generic_msg(node, item, hook);
|
2001-01-31 20:46:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Now see if there is a handler (hook or node specific)
|
|
|
|
* in the target node. If none, silently discard.
|
|
|
|
*/
|
|
|
|
if (((!hook) || (!(rcvmsg = hook->hk_rcvmsg)))
|
|
|
|
&& (!(rcvmsg = node->nd_type->rcvmsg))) {
|
|
|
|
TRAP_ERROR();
|
2005-11-15 10:54:20 +00:00
|
|
|
error = 0;
|
2001-01-31 20:46:00 +00:00
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
break;
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2001-01-31 20:46:00 +00:00
|
|
|
error = (*rcvmsg)(node, item, hook);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
break;
|
2001-01-14 23:25:54 +00:00
|
|
|
case NGQF_FN:
|
|
|
|
/*
|
|
|
|
* We have to implicitly trust the hook,
|
|
|
|
* as some of these are used for system purposes
|
2001-01-30 20:51:52 +00:00
|
|
|
* where the hook is invalid. In the case of
|
|
|
|
* the shutdown message we allow it to hit
|
|
|
|
* even if the node is invalid.
|
2001-01-14 23:25:54 +00:00
|
|
|
*/
|
2005-11-15 10:54:20 +00:00
|
|
|
if ((NG_NODE_NOT_VALID(node))
|
2001-01-30 20:51:52 +00:00
|
|
|
&& (NGI_FN(item) != &ng_rmnode)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
|
|
|
error = EINVAL;
|
2005-03-10 19:27:08 +00:00
|
|
|
NG_FREE_ITEM(item);
|
2001-01-14 23:25:54 +00:00
|
|
|
break;
|
|
|
|
}
|
2001-01-30 20:51:52 +00:00
|
|
|
(*NGI_FN(item))(node, hook, NGI_ARG1(item), NGI_ARG2(item));
|
2001-01-14 23:25:54 +00:00
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
break;
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* We held references on some of the resources
|
|
|
|
* that we took from the item. Now that we have
|
|
|
|
* finished doing everything, drop those references.
|
|
|
|
*/
|
|
|
|
if (hook) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_HOOK_UNREF(hook);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
2005-10-11 13:48:38 +00:00
|
|
|
if (rw == NGQRW_R) {
|
2001-01-08 05:34:06 +00:00
|
|
|
ng_leave_read(&node->nd_input_queue);
|
2001-01-06 00:46:47 +00:00
|
|
|
} else {
|
2001-01-08 05:34:06 +00:00
|
|
|
ng_leave_write(&node->nd_input_queue);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2005-07-05 17:35:20 +00:00
|
|
|
|
|
|
|
/* Apply callback. */
|
|
|
|
if (apply != NULL)
|
|
|
|
(*apply)(context, error);
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Implement the 'generic' control messages
|
|
|
|
***********************************************************************/
|
|
|
|
static int
|
|
|
|
ng_generic_msg(node_p here, item_p item, hook_p lasthook)
|
|
|
|
{
|
|
|
|
int error = 0;
|
|
|
|
struct ng_mesg *msg;
|
|
|
|
struct ng_mesg *resp = NULL;
|
|
|
|
|
|
|
|
NGI_GET_MSG(item, msg);
|
|
|
|
if (msg->header.typecookie != NGM_GENERIC_COOKIE) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
switch (msg->header.cmd) {
|
|
|
|
case NGM_SHUTDOWN:
|
2001-01-30 20:51:52 +00:00
|
|
|
ng_rmnode(here, NULL, NULL, 0);
|
2001-01-06 00:46:47 +00:00
|
|
|
break;
|
|
|
|
case NGM_MKPEER:
|
|
|
|
{
|
|
|
|
struct ngm_mkpeer *const mkp = (struct ngm_mkpeer *) msg->data;
|
|
|
|
|
|
|
|
if (msg->header.arglen != sizeof(*mkp)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
mkp->type[sizeof(mkp->type) - 1] = '\0';
|
|
|
|
mkp->ourhook[sizeof(mkp->ourhook) - 1] = '\0';
|
|
|
|
mkp->peerhook[sizeof(mkp->peerhook) - 1] = '\0';
|
|
|
|
error = ng_mkpeer(here, mkp->ourhook, mkp->peerhook, mkp->type);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case NGM_CONNECT:
|
|
|
|
{
|
|
|
|
struct ngm_connect *const con =
|
|
|
|
(struct ngm_connect *) msg->data;
|
|
|
|
node_p node2;
|
|
|
|
|
|
|
|
if (msg->header.arglen != sizeof(*con)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
con->path[sizeof(con->path) - 1] = '\0';
|
|
|
|
con->ourhook[sizeof(con->ourhook) - 1] = '\0';
|
|
|
|
con->peerhook[sizeof(con->peerhook) - 1] = '\0';
|
|
|
|
/* Don't forget we get a reference.. */
|
|
|
|
error = ng_path2noderef(here, con->path, &node2, NULL);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
error = ng_con_nodes(here, con->ourhook, node2, con->peerhook);
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_UNREF(node2);
|
2001-01-06 00:46:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case NGM_NAME:
|
|
|
|
{
|
|
|
|
struct ngm_name *const nam = (struct ngm_name *) msg->data;
|
|
|
|
|
|
|
|
if (msg->header.arglen != sizeof(*nam)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
nam->name[sizeof(nam->name) - 1] = '\0';
|
|
|
|
error = ng_name_node(here, nam->name);
|
|
|
|
break;
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
case NGM_RMHOOK:
|
|
|
|
{
|
|
|
|
struct ngm_rmhook *const rmh = (struct ngm_rmhook *) msg->data;
|
|
|
|
hook_p hook;
|
|
|
|
|
|
|
|
if (msg->header.arglen != sizeof(*rmh)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
rmh->ourhook[sizeof(rmh->ourhook) - 1] = '\0';
|
1999-12-03 21:17:30 +00:00
|
|
|
if ((hook = ng_findhook(here, rmh->ourhook)) != NULL)
|
1999-10-21 09:06:11 +00:00
|
|
|
ng_destroy_hook(hook);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case NGM_NODEINFO:
|
|
|
|
{
|
|
|
|
struct nodeinfo *ni;
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_MKRESPONSE(resp, msg, sizeof(*ni), M_NOWAIT);
|
1999-10-21 09:06:11 +00:00
|
|
|
if (resp == NULL) {
|
|
|
|
error = ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fill in node info */
|
2001-01-06 00:46:47 +00:00
|
|
|
ni = (struct nodeinfo *) resp->data;
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_NODE_HAS_NAME(here))
|
2004-01-26 14:05:31 +00:00
|
|
|
strcpy(ni->name, NG_NODE_NAME(here));
|
|
|
|
strcpy(ni->type, here->nd_type->name);
|
1999-11-01 00:31:14 +00:00
|
|
|
ni->id = ng_node2ID(here);
|
2001-01-08 05:34:06 +00:00
|
|
|
ni->hooks = here->nd_numhooks;
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case NGM_LISTHOOKS:
|
|
|
|
{
|
2001-01-08 05:34:06 +00:00
|
|
|
const int nhooks = here->nd_numhooks;
|
1999-10-21 09:06:11 +00:00
|
|
|
struct hooklist *hl;
|
|
|
|
struct nodeinfo *ni;
|
|
|
|
hook_p hook;
|
|
|
|
|
|
|
|
/* Get response struct */
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_MKRESPONSE(resp, msg, sizeof(*hl)
|
1999-10-21 09:06:11 +00:00
|
|
|
+ (nhooks * sizeof(struct linkinfo)), M_NOWAIT);
|
2001-01-06 00:46:47 +00:00
|
|
|
if (resp == NULL) {
|
1999-10-21 09:06:11 +00:00
|
|
|
error = ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
hl = (struct hooklist *) resp->data;
|
1999-10-21 09:06:11 +00:00
|
|
|
ni = &hl->nodeinfo;
|
|
|
|
|
|
|
|
/* Fill in node info */
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_NODE_HAS_NAME(here))
|
2004-01-26 14:05:31 +00:00
|
|
|
strcpy(ni->name, NG_NODE_NAME(here));
|
|
|
|
strcpy(ni->type, here->nd_type->name);
|
1999-11-01 00:31:14 +00:00
|
|
|
ni->id = ng_node2ID(here);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Cycle through the linked list of hooks */
|
|
|
|
ni->hooks = 0;
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_FOREACH(hook, &here->nd_hooks, hk_hooks) {
|
1999-10-21 09:06:11 +00:00
|
|
|
struct linkinfo *const link = &hl->link[ni->hooks];
|
|
|
|
|
|
|
|
if (ni->hooks >= nhooks) {
|
|
|
|
log(LOG_ERR, "%s: number of %s changed\n",
|
2001-12-10 08:09:49 +00:00
|
|
|
__func__, "hooks");
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_HOOK_NOT_VALID(hook))
|
1999-10-21 09:06:11 +00:00
|
|
|
continue;
|
2004-01-26 14:05:31 +00:00
|
|
|
strcpy(link->ourhook, NG_HOOK_NAME(hook));
|
|
|
|
strcpy(link->peerhook, NG_PEER_HOOK_NAME(hook));
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_PEER_NODE_NAME(hook)[0] != '\0')
|
2004-01-26 14:05:31 +00:00
|
|
|
strcpy(link->nodeinfo.name,
|
|
|
|
NG_PEER_NODE_NAME(hook));
|
|
|
|
strcpy(link->nodeinfo.type,
|
|
|
|
NG_PEER_NODE(hook)->nd_type->name);
|
2001-01-08 05:34:06 +00:00
|
|
|
link->nodeinfo.id = ng_node2ID(NG_PEER_NODE(hook));
|
|
|
|
link->nodeinfo.hooks = NG_PEER_NODE(hook)->nd_numhooks;
|
1999-10-21 09:06:11 +00:00
|
|
|
ni->hooks++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case NGM_LISTNAMES:
|
|
|
|
case NGM_LISTNODES:
|
|
|
|
{
|
|
|
|
const int unnamed = (msg->header.cmd == NGM_LISTNODES);
|
|
|
|
struct namelist *nl;
|
|
|
|
node_p node;
|
|
|
|
int num = 0;
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Count number of nodes */
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_FOREACH(node, &ng_nodelist, nd_nodes) {
|
2001-01-10 23:19:32 +00:00
|
|
|
if (NG_NODE_IS_VALID(node)
|
|
|
|
&& (unnamed || NG_NODE_HAS_NAME(node))) {
|
1999-10-21 09:06:11 +00:00
|
|
|
num++;
|
2001-01-10 23:19:32 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Get response struct */
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_MKRESPONSE(resp, msg, sizeof(*nl)
|
1999-10-21 09:06:11 +00:00
|
|
|
+ (num * sizeof(struct nodeinfo)), M_NOWAIT);
|
2001-01-06 00:46:47 +00:00
|
|
|
if (resp == NULL) {
|
1999-10-21 09:06:11 +00:00
|
|
|
error = ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
nl = (struct namelist *) resp->data;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Cycle through the linked list of nodes */
|
|
|
|
nl->numnames = 0;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
LIST_FOREACH(node, &ng_nodelist, nd_nodes) {
|
1999-10-21 09:06:11 +00:00
|
|
|
struct nodeinfo *const np = &nl->nodeinfo[nl->numnames];
|
|
|
|
|
2006-06-07 12:42:15 +00:00
|
|
|
if (NG_NODE_NOT_VALID(node))
|
|
|
|
continue;
|
|
|
|
if (!unnamed && (! NG_NODE_HAS_NAME(node)))
|
|
|
|
continue;
|
1999-10-21 09:06:11 +00:00
|
|
|
if (nl->numnames >= num) {
|
|
|
|
log(LOG_ERR, "%s: number of %s changed\n",
|
2001-12-10 08:09:49 +00:00
|
|
|
__func__, "nodes");
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
if (NG_NODE_HAS_NAME(node))
|
2004-01-26 14:05:31 +00:00
|
|
|
strcpy(np->name, NG_NODE_NAME(node));
|
|
|
|
strcpy(np->type, node->nd_type->name);
|
1999-11-01 00:31:14 +00:00
|
|
|
np->id = ng_node2ID(node);
|
2001-01-08 05:34:06 +00:00
|
|
|
np->hooks = node->nd_numhooks;
|
1999-10-21 09:06:11 +00:00
|
|
|
nl->numnames++;
|
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case NGM_LISTTYPES:
|
|
|
|
{
|
|
|
|
struct typelist *tl;
|
|
|
|
struct ng_type *type;
|
|
|
|
int num = 0;
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
/* Count number of types */
|
2001-01-10 23:19:32 +00:00
|
|
|
LIST_FOREACH(type, &ng_typelist, types) {
|
1999-10-21 09:06:11 +00:00
|
|
|
num++;
|
2001-01-10 23:19:32 +00:00
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Get response struct */
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_MKRESPONSE(resp, msg, sizeof(*tl)
|
1999-10-21 09:06:11 +00:00
|
|
|
+ (num * sizeof(struct typeinfo)), M_NOWAIT);
|
2001-01-06 00:46:47 +00:00
|
|
|
if (resp == NULL) {
|
1999-10-21 09:06:11 +00:00
|
|
|
error = ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
tl = (struct typelist *) resp->data;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
/* Cycle through the linked list of types */
|
|
|
|
tl->numtypes = 0;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_typelist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
LIST_FOREACH(type, &ng_typelist, types) {
|
1999-10-21 09:06:11 +00:00
|
|
|
struct typeinfo *const tp = &tl->typeinfo[tl->numtypes];
|
|
|
|
|
|
|
|
if (tl->numtypes >= num) {
|
|
|
|
log(LOG_ERR, "%s: number of %s changed\n",
|
2001-12-10 08:09:49 +00:00
|
|
|
__func__, "types");
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
2004-01-26 14:05:31 +00:00
|
|
|
strcpy(tp->type_name, type->name);
|
2001-01-24 21:29:57 +00:00
|
|
|
tp->numnodes = type->refs - 1; /* don't count list */
|
1999-10-21 09:06:11 +00:00
|
|
|
tl->numtypes++;
|
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-11-30 02:45:32 +00:00
|
|
|
case NGM_BINARY2ASCII:
|
|
|
|
{
|
2000-08-10 22:50:38 +00:00
|
|
|
int bufSize = 20 * 1024; /* XXX hard coded constant */
|
1999-11-30 02:45:32 +00:00
|
|
|
const struct ng_parse_type *argstype;
|
|
|
|
const struct ng_cmdlist *c;
|
2001-01-06 00:46:47 +00:00
|
|
|
struct ng_mesg *binary, *ascii;
|
1999-11-30 02:45:32 +00:00
|
|
|
|
|
|
|
/* Data area must contain a valid netgraph message */
|
|
|
|
binary = (struct ng_mesg *)msg->data;
|
2005-11-15 10:54:20 +00:00
|
|
|
if (msg->header.arglen < sizeof(struct ng_mesg) ||
|
|
|
|
(msg->header.arglen - sizeof(struct ng_mesg) <
|
|
|
|
binary->header.arglen)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-11-30 02:45:32 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get a response message with lots of room */
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_MKRESPONSE(resp, msg, sizeof(*ascii) + bufSize, M_NOWAIT);
|
|
|
|
if (resp == NULL) {
|
1999-11-30 02:45:32 +00:00
|
|
|
error = ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
ascii = (struct ng_mesg *)resp->data;
|
1999-11-30 02:45:32 +00:00
|
|
|
|
|
|
|
/* Copy binary message header to response message payload */
|
|
|
|
bcopy(binary, ascii, sizeof(*binary));
|
|
|
|
|
|
|
|
/* Find command by matching typecookie and command number */
|
2001-01-08 05:34:06 +00:00
|
|
|
for (c = here->nd_type->cmdlist;
|
1999-11-30 02:45:32 +00:00
|
|
|
c != NULL && c->name != NULL; c++) {
|
|
|
|
if (binary->header.typecookie == c->cookie
|
|
|
|
&& binary->header.cmd == c->cmd)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c == NULL || c->name == NULL) {
|
|
|
|
for (c = ng_generic_cmds; c->name != NULL; c++) {
|
|
|
|
if (binary->header.typecookie == c->cookie
|
|
|
|
&& binary->header.cmd == c->cmd)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c->name == NULL) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_MSG(resp);
|
1999-11-30 02:45:32 +00:00
|
|
|
error = ENOSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert command name to ASCII */
|
|
|
|
snprintf(ascii->header.cmdstr, sizeof(ascii->header.cmdstr),
|
|
|
|
"%s", c->name);
|
|
|
|
|
|
|
|
/* Convert command arguments to ASCII */
|
|
|
|
argstype = (binary->header.flags & NGF_RESP) ?
|
|
|
|
c->respType : c->mesgType;
|
2001-01-10 23:19:32 +00:00
|
|
|
if (argstype == NULL) {
|
1999-11-30 02:45:32 +00:00
|
|
|
*ascii->data = '\0';
|
2001-01-10 23:19:32 +00:00
|
|
|
} else {
|
1999-11-30 02:45:32 +00:00
|
|
|
if ((error = ng_unparse(argstype,
|
|
|
|
(u_char *)binary->data,
|
|
|
|
ascii->data, bufSize)) != 0) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_MSG(resp);
|
1999-11-30 02:45:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the result as struct ng_mesg plus ASCII string */
|
|
|
|
bufSize = strlen(ascii->data) + 1;
|
|
|
|
ascii->header.arglen = bufSize;
|
2001-01-06 00:46:47 +00:00
|
|
|
resp->header.arglen = sizeof(*ascii) + bufSize;
|
1999-11-30 02:45:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case NGM_ASCII2BINARY:
|
|
|
|
{
|
|
|
|
int bufSize = 2000; /* XXX hard coded constant */
|
|
|
|
const struct ng_cmdlist *c;
|
|
|
|
const struct ng_parse_type *argstype;
|
2001-01-06 00:46:47 +00:00
|
|
|
struct ng_mesg *ascii, *binary;
|
2000-04-12 17:29:33 +00:00
|
|
|
int off = 0;
|
1999-11-30 02:45:32 +00:00
|
|
|
|
|
|
|
/* Data area must contain at least a struct ng_mesg + '\0' */
|
|
|
|
ascii = (struct ng_mesg *)msg->data;
|
2005-11-15 10:54:20 +00:00
|
|
|
if ((msg->header.arglen < sizeof(*ascii) + 1) ||
|
|
|
|
(ascii->header.arglen < 1) ||
|
|
|
|
(msg->header.arglen < sizeof(*ascii) +
|
|
|
|
ascii->header.arglen)) {
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-11-30 02:45:32 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ascii->data[ascii->header.arglen - 1] = '\0';
|
|
|
|
|
|
|
|
/* Get a response message with lots of room */
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_MKRESPONSE(resp, msg, sizeof(*binary) + bufSize, M_NOWAIT);
|
|
|
|
if (resp == NULL) {
|
1999-11-30 02:45:32 +00:00
|
|
|
error = ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
binary = (struct ng_mesg *)resp->data;
|
1999-11-30 02:45:32 +00:00
|
|
|
|
|
|
|
/* Copy ASCII message header to response message payload */
|
|
|
|
bcopy(ascii, binary, sizeof(*ascii));
|
|
|
|
|
|
|
|
/* Find command by matching ASCII command string */
|
2001-01-08 05:34:06 +00:00
|
|
|
for (c = here->nd_type->cmdlist;
|
1999-11-30 02:45:32 +00:00
|
|
|
c != NULL && c->name != NULL; c++) {
|
|
|
|
if (strcmp(ascii->header.cmdstr, c->name) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c == NULL || c->name == NULL) {
|
|
|
|
for (c = ng_generic_cmds; c->name != NULL; c++) {
|
|
|
|
if (strcmp(ascii->header.cmdstr, c->name) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c->name == NULL) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_MSG(resp);
|
1999-11-30 02:45:32 +00:00
|
|
|
error = ENOSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert command name to binary */
|
|
|
|
binary->header.cmd = c->cmd;
|
|
|
|
binary->header.typecookie = c->cookie;
|
|
|
|
|
|
|
|
/* Convert command arguments to binary */
|
|
|
|
argstype = (binary->header.flags & NGF_RESP) ?
|
|
|
|
c->respType : c->mesgType;
|
2001-01-10 23:19:32 +00:00
|
|
|
if (argstype == NULL) {
|
1999-11-30 02:45:32 +00:00
|
|
|
bufSize = 0;
|
2001-01-10 23:19:32 +00:00
|
|
|
} else {
|
1999-11-30 02:45:32 +00:00
|
|
|
if ((error = ng_parse(argstype, ascii->data,
|
|
|
|
&off, (u_char *)binary->data, &bufSize)) != 0) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_MSG(resp);
|
1999-11-30 02:45:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the result */
|
|
|
|
binary->header.arglen = bufSize;
|
2001-01-06 00:46:47 +00:00
|
|
|
resp->header.arglen = sizeof(*binary) + bufSize;
|
1999-11-30 02:45:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2000-07-03 13:34:18 +00:00
|
|
|
case NGM_TEXT_CONFIG:
|
1999-10-21 09:06:11 +00:00
|
|
|
case NGM_TEXT_STATUS:
|
|
|
|
/*
|
|
|
|
* This one is tricky as it passes the command down to the
|
|
|
|
* actual node, even though it is a generic type command.
|
2001-01-06 00:46:47 +00:00
|
|
|
* This means we must assume that the item/msg is already freed
|
1999-10-21 09:06:11 +00:00
|
|
|
* when control passes back to us.
|
|
|
|
*/
|
2001-01-08 05:34:06 +00:00
|
|
|
if (here->nd_type->rcvmsg != NULL) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NGI_MSG(item) = msg; /* put it back as we found it */
|
2001-01-08 05:34:06 +00:00
|
|
|
return((*here->nd_type->rcvmsg)(here, item, lasthook));
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
/* Fall through if rcvmsg not supported */
|
|
|
|
default:
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
1999-10-21 09:06:11 +00:00
|
|
|
error = EINVAL;
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Sometimes a generic message may be statically allocated
|
|
|
|
* to avoid problems with allocating when in tight memeory situations.
|
|
|
|
* Don't free it if it is so.
|
|
|
|
* I break them appart here, because erros may cause a free if the item
|
|
|
|
* in which case we'd be doing it twice.
|
|
|
|
* they are kept together above, to simplify freeing.
|
|
|
|
*/
|
|
|
|
out:
|
|
|
|
NG_RESPOND_MSG(error, here, item, resp);
|
2001-01-30 20:51:52 +00:00
|
|
|
if (msg)
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_MSG(msg);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
2005-05-14 10:07:17 +00:00
|
|
|
/************************************************************************
|
|
|
|
Queue element get/free routines
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
uma_zone_t ng_qzone;
|
|
|
|
static int maxalloc = 512; /* limit the damage of a leak */
|
|
|
|
|
|
|
|
TUNABLE_INT("net.graph.maxalloc", &maxalloc);
|
|
|
|
SYSCTL_INT(_net_graph, OID_AUTO, maxalloc, CTLFLAG_RDTUN, &maxalloc,
|
|
|
|
0, "Maximum number of queue items to allocate");
|
|
|
|
|
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
static TAILQ_HEAD(, ng_item) ng_itemlist = TAILQ_HEAD_INITIALIZER(ng_itemlist);
|
|
|
|
static int allocated; /* number of items malloc'd */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get a queue entry.
|
|
|
|
* This is usually called when a packet first enters netgraph.
|
|
|
|
* By definition, this is usually from an interrupt, or from a user.
|
|
|
|
* Users are not so important, but try be quick for the times that it's
|
|
|
|
* an interrupt.
|
|
|
|
*/
|
|
|
|
static __inline item_p
|
2005-05-16 17:07:03 +00:00
|
|
|
ng_getqblk(int flags)
|
2005-05-14 10:07:17 +00:00
|
|
|
{
|
|
|
|
item_p item = NULL;
|
2005-05-16 17:07:03 +00:00
|
|
|
int wait;
|
|
|
|
|
|
|
|
wait = (flags & NG_WAITOK) ? M_WAITOK : M_NOWAIT;
|
2005-05-14 10:07:17 +00:00
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
item = uma_zalloc(ng_qzone, wait | M_ZERO);
|
2005-05-14 10:07:17 +00:00
|
|
|
|
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
if (item) {
|
|
|
|
mtx_lock(&ngq_mtx);
|
|
|
|
TAILQ_INSERT_TAIL(&ng_itemlist, item, all);
|
|
|
|
allocated++;
|
|
|
|
mtx_unlock(&ngq_mtx);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return (item);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Release a queue entry
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ng_free_item(item_p item)
|
|
|
|
{
|
2005-10-13 11:55:50 +00:00
|
|
|
KASSERT(item->apply == NULL, ("%s: leaking apply callback", __func__));
|
|
|
|
|
2005-05-14 10:07:17 +00:00
|
|
|
/*
|
|
|
|
* The item may hold resources on it's own. We need to free
|
|
|
|
* these before we can free the item. What they are depends upon
|
|
|
|
* what kind of item it is. it is important that nodes zero
|
|
|
|
* out pointers to resources that they remove from the item
|
|
|
|
* or we release them again here.
|
|
|
|
*/
|
|
|
|
switch (item->el_flags & NGQF_TYPE) {
|
|
|
|
case NGQF_DATA:
|
|
|
|
/* If we have an mbuf still attached.. */
|
|
|
|
NG_FREE_M(_NGI_M(item));
|
|
|
|
break;
|
|
|
|
case NGQF_MESG:
|
|
|
|
_NGI_RETADDR(item) = 0;
|
|
|
|
NG_FREE_MSG(_NGI_MSG(item));
|
|
|
|
break;
|
|
|
|
case NGQF_FN:
|
|
|
|
/* nothing to free really, */
|
|
|
|
_NGI_FN(item) = NULL;
|
|
|
|
_NGI_ARG1(item) = NULL;
|
|
|
|
_NGI_ARG2(item) = 0;
|
|
|
|
case NGQF_UNDEF:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* If we still have a node or hook referenced... */
|
|
|
|
_NGI_CLR_NODE(item);
|
|
|
|
_NGI_CLR_HOOK(item);
|
|
|
|
|
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
mtx_lock(&ngq_mtx);
|
|
|
|
TAILQ_REMOVE(&ng_itemlist, item, all);
|
|
|
|
allocated--;
|
|
|
|
mtx_unlock(&ngq_mtx);
|
|
|
|
#endif
|
|
|
|
uma_zfree(ng_qzone, item);
|
|
|
|
}
|
|
|
|
|
1999-10-21 09:06:11 +00:00
|
|
|
/************************************************************************
|
|
|
|
Module routines
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle the loading/unloading of a netgraph node type module
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ng_mod_event(module_t mod, int event, void *data)
|
|
|
|
{
|
|
|
|
struct ng_type *const type = data;
|
|
|
|
int s, error = 0;
|
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
case MOD_LOAD:
|
|
|
|
|
|
|
|
/* Register new netgraph node type */
|
|
|
|
s = splnet();
|
|
|
|
if ((error = ng_newtype(type)) != 0) {
|
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Call type specific code */
|
|
|
|
if (type->mod_event != NULL)
|
2001-01-06 00:46:47 +00:00
|
|
|
if ((error = (*type->mod_event)(mod, event, data))) {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_typelist_mtx);
|
2001-01-24 21:29:57 +00:00
|
|
|
type->refs--; /* undo it */
|
1999-10-21 09:06:11 +00:00
|
|
|
LIST_REMOVE(type, types);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MOD_UNLOAD:
|
|
|
|
s = splnet();
|
2001-01-24 21:29:57 +00:00
|
|
|
if (type->refs > 1) { /* make sure no nodes exist! */
|
1999-10-21 09:06:11 +00:00
|
|
|
error = EBUSY;
|
2001-01-24 21:29:57 +00:00
|
|
|
} else {
|
|
|
|
if (type->refs == 0) {
|
|
|
|
/* failed load, nothing to undo */
|
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
if (type->mod_event != NULL) { /* check with type */
|
|
|
|
error = (*type->mod_event)(mod, event, data);
|
|
|
|
if (error != 0) { /* type refuses.. */
|
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
LIST_REMOVE(type, types);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&ng_typelist_mtx);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if (type->mod_event != NULL)
|
|
|
|
error = (*type->mod_event)(mod, event, data);
|
|
|
|
else
|
2004-07-15 08:26:07 +00:00
|
|
|
error = EOPNOTSUPP; /* XXX ? */
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle loading and unloading for this code.
|
|
|
|
* The only thing we need to link into is the NETISR strucure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ngb_mod_event(module_t mod, int event, void *data)
|
|
|
|
{
|
2005-05-14 09:25:18 +00:00
|
|
|
int error = 0;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
case MOD_LOAD:
|
2005-05-14 09:25:18 +00:00
|
|
|
/* Initialize everything. */
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&ng_worklist_mtx, "ng_worklist", NULL, MTX_SPIN);
|
2003-12-08 01:18:04 +00:00
|
|
|
mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL,
|
|
|
|
MTX_DEF);
|
|
|
|
mtx_init(&ng_nodelist_mtx, "netgraph nodelist mutex", NULL,
|
|
|
|
MTX_DEF);
|
|
|
|
mtx_init(&ng_idhash_mtx, "netgraph idhash mutex", NULL,
|
|
|
|
MTX_DEF);
|
2005-11-02 15:23:47 +00:00
|
|
|
mtx_init(&ng_topo_mtx, "netgraph topology mutex", NULL,
|
|
|
|
MTX_DEF);
|
2005-05-14 09:25:18 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
mtx_init(&ngq_mtx, "netgraph item list mutex", NULL,
|
2003-12-08 01:18:04 +00:00
|
|
|
MTX_DEF);
|
2005-05-14 09:25:18 +00:00
|
|
|
#endif
|
|
|
|
ng_qzone = uma_zcreate("NetGraph items", sizeof(struct ng_item),
|
|
|
|
NULL, NULL, NULL, NULL, UMA_ALIGN_CACHE, 0);
|
|
|
|
uma_zone_set_max(ng_qzone, maxalloc);
|
2005-02-12 09:52:36 +00:00
|
|
|
netisr_register(NETISR_NETGRAPH, (netisr_t *)ngintr, NULL,
|
|
|
|
NETISR_MPSAFE);
|
1999-10-21 09:06:11 +00:00
|
|
|
break;
|
|
|
|
case MOD_UNLOAD:
|
|
|
|
/* You cant unload it because an interface may be using it. */
|
|
|
|
error = EBUSY;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error = EOPNOTSUPP;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
static moduledata_t netgraph_mod = {
|
|
|
|
"netgraph",
|
|
|
|
ngb_mod_event,
|
|
|
|
(NULL)
|
|
|
|
};
|
2005-01-06 17:45:03 +00:00
|
|
|
DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_MIDDLE);
|
2001-02-23 16:34:22 +00:00
|
|
|
SYSCTL_NODE(_net, OID_AUTO, graph, CTLFLAG_RW, 0, "netgraph Family");
|
|
|
|
SYSCTL_INT(_net_graph, OID_AUTO, abi_version, CTLFLAG_RD, 0, NG_ABI_VERSION,"");
|
|
|
|
SYSCTL_INT(_net_graph, OID_AUTO, msg_version, CTLFLAG_RD, 0, NG_VERSION, "");
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
void
|
|
|
|
dumphook (hook_p hook, char *file, int line)
|
|
|
|
{
|
|
|
|
printf("hook: name %s, %d refs, Last touched:\n",
|
|
|
|
_NG_HOOK_NAME(hook), hook->hk_refs);
|
|
|
|
printf(" Last active @ %s, line %d\n",
|
|
|
|
hook->lastfile, hook->lastline);
|
|
|
|
if (line) {
|
|
|
|
printf(" problem discovered at file %s, line %d\n", file, line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
dumpnode(node_p node, char *file, int line)
|
|
|
|
{
|
|
|
|
printf("node: ID [%x]: type '%s', %d hooks, flags 0x%x, %d refs, %s:\n",
|
2001-01-14 23:25:54 +00:00
|
|
|
_NG_NODE_ID(node), node->nd_type->name,
|
2001-01-08 05:34:06 +00:00
|
|
|
node->nd_numhooks, node->nd_flags,
|
|
|
|
node->nd_refs, node->nd_name);
|
|
|
|
printf(" Last active @ %s, line %d\n",
|
|
|
|
node->lastfile, node->lastline);
|
|
|
|
if (line) {
|
|
|
|
printf(" problem discovered at file %s, line %d\n", file, line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
void
|
|
|
|
dumpitem(item_p item, char *file, int line)
|
|
|
|
{
|
2005-05-14 09:25:18 +00:00
|
|
|
printf(" ACTIVE item, last used at %s, line %d",
|
|
|
|
item->lastfile, item->lastline);
|
|
|
|
switch(item->el_flags & NGQF_TYPE) {
|
|
|
|
case NGQF_DATA:
|
|
|
|
printf(" - [data]\n");
|
|
|
|
break;
|
|
|
|
case NGQF_MESG:
|
|
|
|
printf(" - retaddr[%d]:\n", _NGI_RETADDR(item));
|
|
|
|
break;
|
|
|
|
case NGQF_FN:
|
|
|
|
printf(" - fn@%p (%p, %p, %p, %d (%x))\n",
|
|
|
|
item->body.fn.fn_fn,
|
2005-09-02 19:52:54 +00:00
|
|
|
_NGI_NODE(item),
|
|
|
|
_NGI_HOOK(item),
|
2005-05-14 09:25:18 +00:00
|
|
|
item->body.fn.fn_arg1,
|
|
|
|
item->body.fn.fn_arg2,
|
|
|
|
item->body.fn.fn_arg2);
|
|
|
|
break;
|
|
|
|
case NGQF_UNDEF:
|
|
|
|
printf(" - UNDEFINED!\n");
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
if (line) {
|
|
|
|
printf(" problem discovered at file %s, line %d\n", file, line);
|
2005-09-02 19:52:54 +00:00
|
|
|
if (_NGI_NODE(item)) {
|
2001-01-08 05:34:06 +00:00
|
|
|
printf("node %p ([%x])\n",
|
2005-09-02 19:52:54 +00:00
|
|
|
_NGI_NODE(item), ng_node2ID(_NGI_NODE(item)));
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ng_dumpitems(void)
|
|
|
|
{
|
|
|
|
item_p item;
|
|
|
|
int i = 1;
|
|
|
|
TAILQ_FOREACH(item, &ng_itemlist, all) {
|
|
|
|
printf("[%d] ", i++);
|
|
|
|
dumpitem(item, NULL, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ng_dumpnodes(void)
|
|
|
|
{
|
|
|
|
node_p node;
|
|
|
|
int i = 1;
|
2004-06-24 01:47:31 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
SLIST_FOREACH(node, &ng_allnodes, nd_all) {
|
|
|
|
printf("[%d] ", i++);
|
|
|
|
dumpnode(node, NULL, 0);
|
|
|
|
}
|
2004-06-24 01:47:31 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ng_dumphooks(void)
|
|
|
|
{
|
|
|
|
hook_p hook;
|
|
|
|
int i = 1;
|
2004-06-24 01:47:31 +00:00
|
|
|
mtx_lock(&ng_nodelist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
SLIST_FOREACH(hook, &ng_allhooks, hk_all) {
|
|
|
|
printf("[%d] ", i++);
|
|
|
|
dumphook(hook, NULL, 0);
|
|
|
|
}
|
2004-06-24 01:47:31 +00:00
|
|
|
mtx_unlock(&ng_nodelist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_debug_ng_dump_items(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
int val;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
val = allocated;
|
|
|
|
i = 1;
|
|
|
|
error = sysctl_handle_int(oidp, &val, sizeof(int), req);
|
2001-01-14 23:25:54 +00:00
|
|
|
if (error != 0 || req->newptr == NULL)
|
|
|
|
return (error);
|
|
|
|
if (val == 42) {
|
2001-01-08 05:34:06 +00:00
|
|
|
ng_dumpitems();
|
|
|
|
ng_dumpnodes();
|
|
|
|
ng_dumphooks();
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2001-01-14 23:25:54 +00:00
|
|
|
return (0);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
2001-01-14 23:25:54 +00:00
|
|
|
SYSCTL_PROC(_debug, OID_AUTO, ng_dump_items, CTLTYPE_INT | CTLFLAG_RW,
|
|
|
|
0, sizeof(int), sysctl_debug_ng_dump_items, "I", "Number of allocated items");
|
2001-01-08 05:34:06 +00:00
|
|
|
#endif /* NETGRAPH_DEBUG */
|
2001-01-06 00:46:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Worklist routines
|
|
|
|
**********************************************************************/
|
|
|
|
/* NETISR thread enters here */
|
1999-10-21 09:06:11 +00:00
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* Pick a node off the list of nodes with work,
|
|
|
|
* try get an item to process off it.
|
|
|
|
* If there are no more, remove the node from the list.
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
static void
|
|
|
|
ngintr(void)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2001-01-06 00:46:47 +00:00
|
|
|
item_p item;
|
|
|
|
node_p node = NULL;
|
|
|
|
|
|
|
|
for (;;) {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&ng_worklist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
node = TAILQ_FIRST(&ng_worklist);
|
|
|
|
if (!node) {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&ng_worklist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2004-07-20 17:15:38 +00:00
|
|
|
node->nd_flags &= ~NGF_WORKQ;
|
2001-01-08 05:34:06 +00:00
|
|
|
TAILQ_REMOVE(&ng_worklist, node, nd_work);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&ng_worklist_mtx);
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR3(KTR_NET, "%20s: node [%x] (%p) taken off worklist",
|
|
|
|
__func__, node->nd_ID, node);
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* We have the node. We also take over the reference
|
|
|
|
* that the list had on it.
|
|
|
|
* Now process as much as you can, until it won't
|
|
|
|
* let you have another item off the queue.
|
|
|
|
* All this time, keep the reference
|
|
|
|
* that lets us be sure that the node still exists.
|
|
|
|
* Let the reference go at the last minute.
|
2001-02-01 20:51:23 +00:00
|
|
|
* ng_dequeue will put us back on the worklist
|
|
|
|
* if there is more too do. This may be of use if there
|
2005-11-15 10:54:20 +00:00
|
|
|
* are Multiple Processors and multiple Net threads in the
|
2001-02-01 20:51:23 +00:00
|
|
|
* future.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
|
|
|
for (;;) {
|
2005-10-11 13:48:38 +00:00
|
|
|
int rw;
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&node->nd_input_queue.q_mtx);
|
2005-10-11 13:48:38 +00:00
|
|
|
item = ng_dequeue(&node->nd_input_queue, &rw);
|
2001-01-06 00:46:47 +00:00
|
|
|
if (item == NULL) {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&node->nd_input_queue.q_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
break; /* go look for another node */
|
|
|
|
} else {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&node->nd_input_queue.q_mtx);
|
2001-03-10 16:31:00 +00:00
|
|
|
NGI_GET_NODE(item, node); /* zaps stored node */
|
2005-10-11 13:48:38 +00:00
|
|
|
ng_apply_item(node, item, rw);
|
2001-03-10 16:31:00 +00:00
|
|
|
NG_NODE_UNREF(node);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2000-12-12 18:52:14 +00:00
|
|
|
}
|
2001-02-28 18:49:09 +00:00
|
|
|
NG_NODE_UNREF(node);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
2000-12-12 18:52:14 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
static void
|
|
|
|
ng_worklist_remove(node_p node)
|
|
|
|
{
|
2006-01-11 15:29:48 +00:00
|
|
|
mtx_assert(&node->nd_input_queue.q_mtx, MA_OWNED);
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&ng_worklist_mtx);
|
2004-07-20 17:15:38 +00:00
|
|
|
if (node->nd_flags & NGF_WORKQ) {
|
|
|
|
node->nd_flags &= ~NGF_WORKQ;
|
2001-01-08 05:34:06 +00:00
|
|
|
TAILQ_REMOVE(&ng_worklist, node, nd_work);
|
2001-02-24 14:29:47 +00:00
|
|
|
mtx_unlock_spin(&ng_worklist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_UNREF(node);
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR3(KTR_NET, "%20s: node [%x] (%p) removed from worklist",
|
|
|
|
__func__, node->nd_ID, node);
|
2001-02-24 14:29:47 +00:00
|
|
|
} else {
|
|
|
|
mtx_unlock_spin(&ng_worklist_mtx);
|
2001-01-06 00:46:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-02-24 14:29:47 +00:00
|
|
|
/*
|
|
|
|
* XXX
|
|
|
|
* It's posible that a debugging NG_NODE_REF may need
|
|
|
|
* to be outside the mutex zone
|
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
static void
|
|
|
|
ng_setisr(node_p node)
|
|
|
|
{
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
|
2005-07-21 22:15:37 +00:00
|
|
|
mtx_assert(&node->nd_input_queue.q_mtx, MA_OWNED);
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
|
2004-07-20 17:15:38 +00:00
|
|
|
if ((node->nd_flags & NGF_WORKQ) == 0) {
|
2000-12-12 18:52:14 +00:00
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* If we are not already on the work queue,
|
|
|
|
* then put us on.
|
2000-12-12 18:52:14 +00:00
|
|
|
*/
|
2004-07-20 17:15:38 +00:00
|
|
|
node->nd_flags |= NGF_WORKQ;
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
mtx_lock_spin(&ng_worklist_mtx);
|
2001-01-08 05:34:06 +00:00
|
|
|
TAILQ_INSERT_TAIL(&ng_worklist, node, nd_work);
|
Problem description:
At the end of ng_snd_item(), node queue is processed. In certain
netgraph setups deep recursive calls can occur.
For example this happens, when two nodes are connected and can send
items to each other in both directions. If, for some reason, both nodes
have a lot of items in their queues, then the processing thread will
recurse between these two nodes, delivering items left and right, going
deeper in the stack. Other setups can suffer from deep recursion, too.
The following factors can influence risk of deep netgraph call:
- periodical write-access events on node
- combination of slow link and fast one in one graph
- net.inet.ip.fastforwarding
Changes made:
- In ng_acquire_{read,write}() do not dequeue another item. Instead,
call ng_setisr() for this node.
- At the end of ng_snd_item(), do not process queue. Call ng_setisr(),
if there are any dequeueable items on node queue.
- In ng_setisr() narrow worklist mutex holding.
- In ng_setisr() assert queue mutex.
Theoretically, the first two changes should negatively affect performance.
To check this, some profiling was made:
1) In general real tasks, no noticable performance difference was found.
2) The following test was made: two multithreaded nodes and one
single-threaded were connected into a ring. A large queues of packets
were sent around this ring. Time to pass the ring N times was measured.
This is a very vacuous test: no items/mbufs are allocated, no upcalls or
downcalls outside of netgraph. It doesn't represent a real load, it is
a stress test for ng_acquire_{read,write}() and item queueing functions.
Surprisingly, the performance impact was positive! New code is 13% faster
on UP and 17% faster on SMP, in this particular test.
The problem was originally found, described, analyzed and original patch
was written by Roselyn Lee from Vernier Networks. Thanks!
Submitted by: Roselyn Lee <rosel verniernetworks com>
2005-07-21 12:08:37 +00:00
|
|
|
mtx_unlock_spin(&ng_worklist_mtx);
|
2001-02-24 14:29:47 +00:00
|
|
|
NG_NODE_REF(node); /* XXX fafe in mutex? */
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR3(KTR_NET, "%20s: node [%x] (%p) put on worklist", __func__,
|
|
|
|
node->nd_ID, node);
|
2006-01-11 15:29:48 +00:00
|
|
|
} else
|
2006-01-12 22:41:32 +00:00
|
|
|
CTR3(KTR_NET, "%20s: node [%x] (%p) already on worklist",
|
|
|
|
__func__, node->nd_ID, node);
|
2001-01-06 00:46:47 +00:00
|
|
|
schednetisr(NETISR_NETGRAPH);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Externally useable functions to set up a queue item ready for sending
|
|
|
|
***********************************************************************/
|
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
#ifdef NETGRAPH_DEBUG
|
|
|
|
#define ITEM_DEBUG_CHECKS \
|
2001-01-06 00:46:47 +00:00
|
|
|
do { \
|
2001-01-30 20:51:52 +00:00
|
|
|
if (NGI_NODE(item) ) { \
|
2001-01-06 00:46:47 +00:00
|
|
|
printf("item already has node"); \
|
2004-07-10 21:45:58 +00:00
|
|
|
kdb_enter("has node"); \
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_CLR_NODE(item); \
|
2001-01-06 00:46:47 +00:00
|
|
|
} \
|
2001-01-30 20:51:52 +00:00
|
|
|
if (NGI_HOOK(item) ) { \
|
2001-01-06 00:46:47 +00:00
|
|
|
printf("item already has hook"); \
|
2004-07-10 21:45:58 +00:00
|
|
|
kdb_enter("has hook"); \
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_CLR_HOOK(item); \
|
2001-01-06 00:46:47 +00:00
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
#else
|
2001-01-08 05:34:06 +00:00
|
|
|
#define ITEM_DEBUG_CHECKS
|
2001-01-06 00:46:47 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
2004-06-30 22:51:29 +00:00
|
|
|
* Put mbuf into the item.
|
2001-01-06 00:46:47 +00:00
|
|
|
* Hook and node references will be removed when the item is dequeued.
|
|
|
|
* (or equivalent)
|
|
|
|
* (XXX) Unsafe because no reference held by peer on remote node.
|
|
|
|
* remote node might go away in this timescale.
|
|
|
|
* We know the hooks can't go away because that would require getting
|
|
|
|
* a writer item on both nodes and we must have at least a reader
|
2005-11-02 14:27:24 +00:00
|
|
|
* here to be able to do this.
|
2001-01-06 00:46:47 +00:00
|
|
|
* Note that the hook loaded is the REMOTE hook.
|
|
|
|
*
|
|
|
|
* This is possibly in the critical path for new data.
|
|
|
|
*/
|
|
|
|
item_p
|
2005-05-16 17:07:03 +00:00
|
|
|
ng_package_data(struct mbuf *m, int flags)
|
2001-01-06 00:46:47 +00:00
|
|
|
{
|
|
|
|
item_p item;
|
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
if ((item = ng_getqblk(flags)) == NULL) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_M(m);
|
|
|
|
return (NULL);
|
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
ITEM_DEBUG_CHECKS;
|
2005-08-26 15:14:33 +00:00
|
|
|
item->el_flags = NGQF_DATA | NGQF_READER;
|
2001-01-06 00:46:47 +00:00
|
|
|
item->el_next = NULL;
|
|
|
|
NGI_M(item) = m;
|
|
|
|
return (item);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate a queue item and put items into it..
|
|
|
|
* Evaluate the address as this will be needed to queue it and
|
|
|
|
* to work out what some of the fields should be.
|
|
|
|
* Hook and node references will be removed when the item is dequeued.
|
|
|
|
* (or equivalent)
|
|
|
|
*/
|
|
|
|
item_p
|
2005-05-16 17:07:03 +00:00
|
|
|
ng_package_msg(struct ng_mesg *msg, int flags)
|
2001-01-06 00:46:47 +00:00
|
|
|
{
|
|
|
|
item_p item;
|
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
if ((item = ng_getqblk(flags)) == NULL) {
|
2001-01-30 20:51:52 +00:00
|
|
|
NG_FREE_MSG(msg);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (NULL);
|
2000-12-12 18:52:14 +00:00
|
|
|
}
|
2001-01-08 05:34:06 +00:00
|
|
|
ITEM_DEBUG_CHECKS;
|
2005-08-26 15:14:33 +00:00
|
|
|
/* Messages items count as writers unless explicitly exempted. */
|
|
|
|
if (msg->header.cmd & NGM_READONLY)
|
|
|
|
item->el_flags = NGQF_MESG | NGQF_READER;
|
|
|
|
else
|
|
|
|
item->el_flags = NGQF_MESG | NGQF_WRITER;
|
2001-01-06 00:46:47 +00:00
|
|
|
item->el_next = NULL;
|
|
|
|
/*
|
|
|
|
* Set the current lasthook into the queue item
|
|
|
|
*/
|
|
|
|
NGI_MSG(item) = msg;
|
2002-08-22 00:30:03 +00:00
|
|
|
NGI_RETADDR(item) = 0;
|
2001-01-06 00:46:47 +00:00
|
|
|
return (item);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-01-30 20:51:52 +00:00
|
|
|
#define SET_RETADDR(item, here, retaddr) \
|
2001-01-14 23:25:54 +00:00
|
|
|
do { /* Data or fn items don't have retaddrs */ \
|
|
|
|
if ((item->el_flags & NGQF_TYPE) == NGQF_MESG) { \
|
2001-01-06 00:46:47 +00:00
|
|
|
if (retaddr) { \
|
|
|
|
NGI_RETADDR(item) = retaddr; \
|
|
|
|
} else { \
|
|
|
|
/* \
|
|
|
|
* The old return address should be ok. \
|
|
|
|
* If there isn't one, use the address \
|
|
|
|
* here. \
|
|
|
|
*/ \
|
|
|
|
if (NGI_RETADDR(item) == 0) { \
|
|
|
|
NGI_RETADDR(item) \
|
|
|
|
= ng_node2ID(here); \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
} while (0)
|
2000-12-12 18:52:14 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
int
|
|
|
|
ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr)
|
|
|
|
{
|
2001-01-30 20:51:52 +00:00
|
|
|
hook_p peer;
|
|
|
|
node_p peernode;
|
2001-01-08 05:34:06 +00:00
|
|
|
ITEM_DEBUG_CHECKS;
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Quick sanity check..
|
2001-01-08 05:34:06 +00:00
|
|
|
* Since a hook holds a reference on it's node, once we know
|
|
|
|
* that the peer is still connected (even if invalid,) we know
|
|
|
|
* that the peer node is present, though maybe invalid.
|
2001-01-06 00:46:47 +00:00
|
|
|
*/
|
|
|
|
if ((hook == NULL)
|
2001-01-08 05:34:06 +00:00
|
|
|
|| NG_HOOK_NOT_VALID(hook)
|
|
|
|
|| (NG_HOOK_PEER(hook) == NULL)
|
|
|
|
|| NG_HOOK_NOT_VALID(NG_HOOK_PEER(hook))
|
|
|
|
|| NG_NODE_NOT_VALID(NG_PEER_NODE(hook))) {
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_FREE_ITEM(item);
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-02-26 09:31:54 +00:00
|
|
|
return (ENETDOWN);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Transfer our interest to the other (peer) end.
|
|
|
|
*/
|
2001-01-30 20:51:52 +00:00
|
|
|
peer = NG_HOOK_PEER(hook);
|
|
|
|
NG_HOOK_REF(peer);
|
|
|
|
NGI_SET_HOOK(item, peer);
|
|
|
|
peernode = NG_PEER_NODE(hook);
|
|
|
|
NG_NODE_REF(peernode);
|
|
|
|
NGI_SET_NODE(item, peernode);
|
2001-07-14 05:51:33 +00:00
|
|
|
SET_RETADDR(item, here, retaddr);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2005-11-15 10:54:20 +00:00
|
|
|
ng_address_path(node_p here, item_p item, char *address, ng_ID_t retaddr)
|
2001-01-06 00:46:47 +00:00
|
|
|
{
|
2005-11-15 10:54:20 +00:00
|
|
|
node_p dest = NULL;
|
2001-01-06 00:46:47 +00:00
|
|
|
hook_p hook = NULL;
|
2005-11-15 10:54:20 +00:00
|
|
|
int error;
|
2001-01-06 00:46:47 +00:00
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
ITEM_DEBUG_CHECKS;
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Note that ng_path2noderef increments the reference count
|
|
|
|
* on the node for us if it finds one. So we don't have to.
|
|
|
|
*/
|
|
|
|
error = ng_path2noderef(here, address, &dest, &hook);
|
|
|
|
if (error) {
|
|
|
|
NG_FREE_ITEM(item);
|
2001-01-08 05:34:06 +00:00
|
|
|
return (error);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_NODE(item, dest);
|
|
|
|
if ( hook) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_HOOK_REF(hook); /* don't let it go while on the queue */
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_HOOK(item, hook);
|
|
|
|
}
|
|
|
|
SET_RETADDR(item, here, retaddr);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (0);
|
|
|
|
}
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
int
|
|
|
|
ng_address_ID(node_p here, item_p item, ng_ID_t ID, ng_ID_t retaddr)
|
|
|
|
{
|
|
|
|
node_p dest;
|
|
|
|
|
2001-01-08 05:34:06 +00:00
|
|
|
ITEM_DEBUG_CHECKS;
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Find the target node.
|
|
|
|
*/
|
|
|
|
dest = ng_ID2noderef(ID); /* GETS REFERENCE! */
|
|
|
|
if (dest == NULL) {
|
|
|
|
NG_FREE_ITEM(item);
|
2001-01-14 23:25:54 +00:00
|
|
|
TRAP_ERROR();
|
2001-01-06 00:46:47 +00:00
|
|
|
return(EINVAL);
|
|
|
|
}
|
|
|
|
/* Fill out the contents */
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_NODE(item, dest);
|
|
|
|
NGI_CLR_HOOK(item);
|
|
|
|
SET_RETADDR(item, here, retaddr);
|
1999-10-21 09:06:11 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-01-06 00:46:47 +00:00
|
|
|
* special case to send a message to self (e.g. destroy node)
|
|
|
|
* Possibly indicate an arrival hook too.
|
|
|
|
* Useful for removing that hook :-)
|
1999-10-21 09:06:11 +00:00
|
|
|
*/
|
2001-01-06 00:46:47 +00:00
|
|
|
item_p
|
|
|
|
ng_package_msg_self(node_p here, hook_p hook, struct ng_mesg *msg)
|
1999-10-21 09:06:11 +00:00
|
|
|
{
|
2001-01-06 00:46:47 +00:00
|
|
|
item_p item;
|
1999-10-21 09:06:11 +00:00
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Find the target node.
|
|
|
|
* If there is a HOOK argument, then use that in preference
|
|
|
|
* to the address.
|
|
|
|
*/
|
2005-05-16 17:07:03 +00:00
|
|
|
if ((item = ng_getqblk(NG_NOFLAGS)) == NULL) {
|
2001-01-30 20:51:52 +00:00
|
|
|
NG_FREE_MSG(msg);
|
2001-01-06 00:46:47 +00:00
|
|
|
return (NULL);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
|
|
|
|
/* Fill out the contents */
|
2005-08-26 15:14:33 +00:00
|
|
|
item->el_flags = NGQF_MESG | NGQF_WRITER;
|
2001-01-06 00:46:47 +00:00
|
|
|
item->el_next = NULL;
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_NODE_REF(here);
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_NODE(item, here);
|
|
|
|
if (hook) {
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_HOOK_REF(hook);
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_HOOK(item, hook);
|
|
|
|
}
|
2001-01-06 00:46:47 +00:00
|
|
|
NGI_MSG(item) = msg;
|
|
|
|
NGI_RETADDR(item) = ng_node2ID(here);
|
|
|
|
return (item);
|
1999-10-21 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
int
|
2005-05-13 11:35:02 +00:00
|
|
|
ng_send_fn1(node_p node, hook_p hook, ng_item_fn *fn, void * arg1, int arg2,
|
2005-05-16 17:07:03 +00:00
|
|
|
int flags)
|
2001-01-14 23:25:54 +00:00
|
|
|
{
|
|
|
|
item_p item;
|
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
if ((item = ng_getqblk(flags)) == NULL) {
|
2001-01-14 23:25:54 +00:00
|
|
|
return (ENOMEM);
|
|
|
|
}
|
|
|
|
item->el_flags = NGQF_FN | NGQF_WRITER;
|
2001-02-28 18:49:09 +00:00
|
|
|
NG_NODE_REF(node); /* and one for the item */
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_NODE(item, node);
|
|
|
|
if (hook) {
|
2001-01-14 23:25:54 +00:00
|
|
|
NG_HOOK_REF(hook);
|
2001-01-30 20:51:52 +00:00
|
|
|
NGI_SET_HOOK(item, hook);
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
NGI_FN(item) = fn;
|
|
|
|
NGI_ARG1(item) = arg1;
|
|
|
|
NGI_ARG2(item) = arg2;
|
2005-05-16 17:07:03 +00:00
|
|
|
return(ng_snd_item(item, flags));
|
2001-01-14 23:25:54 +00:00
|
|
|
}
|
|
|
|
|
2005-11-15 10:54:20 +00:00
|
|
|
/*
|
2002-03-05 20:26:20 +00:00
|
|
|
* Official timeout routines for Netgraph nodes.
|
|
|
|
*/
|
|
|
|
static void
|
2005-01-26 09:01:50 +00:00
|
|
|
ng_callout_trampoline(void *arg)
|
2002-03-05 20:26:20 +00:00
|
|
|
{
|
|
|
|
item_p item = arg;
|
|
|
|
|
|
|
|
ng_snd_item(item, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-02 21:24:30 +00:00
|
|
|
int
|
2004-12-01 11:56:32 +00:00
|
|
|
ng_callout(struct callout *c, node_p node, hook_p hook, int ticks,
|
2002-03-05 20:26:20 +00:00
|
|
|
ng_item_fn *fn, void * arg1, int arg2)
|
|
|
|
{
|
2005-09-08 14:32:19 +00:00
|
|
|
item_p item, oitem;
|
2002-03-05 20:26:20 +00:00
|
|
|
|
2005-05-16 17:07:03 +00:00
|
|
|
if ((item = ng_getqblk(NG_NOFLAGS)) == NULL)
|
2004-11-02 21:24:30 +00:00
|
|
|
return (ENOMEM);
|
|
|
|
|
2002-03-05 20:26:20 +00:00
|
|
|
item->el_flags = NGQF_FN | NGQF_WRITER;
|
|
|
|
NG_NODE_REF(node); /* and one for the item */
|
|
|
|
NGI_SET_NODE(item, node);
|
|
|
|
if (hook) {
|
|
|
|
NG_HOOK_REF(hook);
|
|
|
|
NGI_SET_HOOK(item, hook);
|
|
|
|
}
|
|
|
|
NGI_FN(item) = fn;
|
|
|
|
NGI_ARG1(item) = arg1;
|
|
|
|
NGI_ARG2(item) = arg2;
|
2005-09-08 14:32:19 +00:00
|
|
|
oitem = c->c_arg;
|
|
|
|
if (callout_reset(c, ticks, &ng_callout_trampoline, item) == 1 &&
|
|
|
|
oitem != NULL)
|
|
|
|
NG_FREE_ITEM(oitem);
|
2004-11-02 21:24:30 +00:00
|
|
|
return (0);
|
2002-03-05 20:26:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* A special modified version of untimeout() */
|
2005-11-15 10:54:20 +00:00
|
|
|
int
|
2004-12-01 11:56:32 +00:00
|
|
|
ng_uncallout(struct callout *c, node_p node)
|
2002-03-05 20:26:20 +00:00
|
|
|
{
|
|
|
|
item_p item;
|
2004-11-02 21:24:30 +00:00
|
|
|
int rval;
|
2005-08-21 19:48:51 +00:00
|
|
|
|
|
|
|
KASSERT(c != NULL, ("ng_uncallout: NULL callout"));
|
|
|
|
KASSERT(node != NULL, ("ng_uncallout: NULL node"));
|
|
|
|
|
2004-11-04 21:30:18 +00:00
|
|
|
rval = callout_stop(c);
|
2004-11-02 21:24:30 +00:00
|
|
|
item = c->c_arg;
|
|
|
|
/* Do an extra check */
|
2005-01-26 09:01:50 +00:00
|
|
|
if ((rval > 0) && (c->c_func == &ng_callout_trampoline) &&
|
2004-11-02 21:24:30 +00:00
|
|
|
(NGI_NODE(item) == node)) {
|
2002-03-05 20:26:20 +00:00
|
|
|
/*
|
|
|
|
* We successfully removed it from the queue before it ran
|
2005-11-15 10:54:20 +00:00
|
|
|
* So now we need to unreference everything that was
|
2002-03-05 20:26:20 +00:00
|
|
|
* given extra references. (NG_FREE_ITEM does this).
|
|
|
|
*/
|
|
|
|
NG_FREE_ITEM(item);
|
|
|
|
}
|
2005-09-08 14:32:19 +00:00
|
|
|
c->c_arg = NULL;
|
2004-11-02 21:24:30 +00:00
|
|
|
|
|
|
|
return (rval);
|
2002-03-05 20:26:20 +00:00
|
|
|
}
|
|
|
|
|
2001-01-06 00:46:47 +00:00
|
|
|
/*
|
|
|
|
* Set the address, if none given, give the node here.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ng_replace_retaddr(node_p here, item_p item, ng_ID_t retaddr)
|
|
|
|
{
|
|
|
|
if (retaddr) {
|
|
|
|
NGI_RETADDR(item) = retaddr;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* The old return address should be ok.
|
|
|
|
* If there isn't one, use the address here.
|
|
|
|
*/
|
|
|
|
NGI_RETADDR(item) = ng_node2ID(here);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TESTING
|
|
|
|
#ifdef TESTING
|
|
|
|
/* just test all the macros */
|
|
|
|
void
|
|
|
|
ng_macro_test(item_p item);
|
|
|
|
void
|
|
|
|
ng_macro_test(item_p item)
|
|
|
|
{
|
|
|
|
node_p node = NULL;
|
|
|
|
hook_p hook = NULL;
|
|
|
|
struct mbuf *m;
|
|
|
|
struct ng_mesg *msg;
|
|
|
|
ng_ID_t retaddr;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
NGI_GET_M(item, m);
|
|
|
|
NGI_GET_MSG(item, msg);
|
|
|
|
retaddr = NGI_RETADDR(item);
|
2004-06-30 22:51:29 +00:00
|
|
|
NG_SEND_DATA(error, hook, m, NULL);
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_SEND_DATA_ONLY(error, hook, m);
|
|
|
|
NG_FWD_NEW_DATA(error, item, hook, m);
|
2001-01-08 05:34:06 +00:00
|
|
|
NG_FWD_ITEM_HOOK(error, item, hook);
|
2001-01-06 00:46:47 +00:00
|
|
|
NG_SEND_MSG_HOOK(error, node, msg, hook, retaddr);
|
|
|
|
NG_SEND_MSG_ID(error, node, msg, retaddr, retaddr);
|
|
|
|
NG_SEND_MSG_PATH(error, node, msg, ".:", retaddr);
|
|
|
|
NG_FWD_MSG_HOOK(error, node, item, hook, retaddr);
|
|
|
|
}
|
|
|
|
#endif /* TESTING */
|
1999-10-21 09:06:11 +00:00
|
|
|
|