0ff2145648
used in the event that we can't malloc a buffer of the appropriate size in the traditional way. rf_AllocIOBuffer() and rf_FreeIOBuffer() deal with allocating/freeing these structures. These buffers are stored in a list on the 'iobuf' list. iobuf_count keeps track of how many buffers are available, and numEmergencyBuffers is the effective "high-water" mark for the freelist. The buffers allocated by rf_AllocIOBuffer() are stripe-unit sized, which is the maximum size requested by any of the callers. Add an iobufs entry to RF_DagHeader_s. Use it for keeping track of buffers that get allocated from the free-list. Add a "generic list" pool (VoidPointerListElement Pool) for elements used to maintain a list of allocated memory. [It is somewhat less than ideal to add another little pool to handle this...] Teach rf_AllocBuffer() to use the new rf_AllocIOBuffer(). Modify other Mallocs to use rf_AllocIOBuffer(), and to update dag_h->iobufs as appropriate. Update rf_FreeDAG() to handle cleanup of dag_h->iobufs. While here, add some missing pool_destroy() calls for a number of pools. With these changes, it should (in theory) be possible to swap on RAID 5 sets again. That said, I've not had any success there yet -- but the last issue I saw at least wasn't in RAIDframe. :-} [There is room for this code to become a bit more consise, but I wanted to do a checkpoint here with something known to work :) ]
119 lines
4.8 KiB
C
119 lines
4.8 KiB
C
/* $NetBSD: rf_netbsd.h,v 1.19 2004/03/20 04:22:05 oster Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
* by Greg Oster; Jason R. Thorpe.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the NetBSD
|
|
* Foundation, Inc. and its contributors.
|
|
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _RF__RF_NETBSDSTUFF_H_
|
|
#define _RF__RF_NETBSDSTUFF_H_
|
|
|
|
#include <sys/fcntl.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/namei.h>
|
|
#include <sys/vnode.h>
|
|
#include <sys/pool.h>
|
|
|
|
#include <dev/raidframe/raidframevar.h>
|
|
|
|
struct raidcinfo {
|
|
struct vnode *ci_vp; /* component device's vnode */
|
|
dev_t ci_dev; /* component device's dev_t */
|
|
RF_ComponentLabel_t ci_label; /* components RAIDframe label */
|
|
#if 0
|
|
size_t ci_size; /* size */
|
|
char *ci_path; /* path to component */
|
|
size_t ci_pathlen; /* length of component path */
|
|
#endif
|
|
};
|
|
|
|
|
|
/* a little structure to serve as a container for all the various
|
|
global pools used in RAIDframe */
|
|
|
|
struct RF_Pools_s {
|
|
struct pool alloclist; /* AllocList */
|
|
struct pool asm_hdr; /* Access Stripe Map Header */
|
|
struct pool asmap; /* Access Stripe Map */
|
|
struct pool asmhle; /* Access Stripe Map Header List Elements */
|
|
struct pool callback; /* Callback descriptors */
|
|
struct pool cbuf; /* Component buffers */
|
|
struct pool dagh; /* DAG headers */
|
|
struct pool dagnode; /* DAG nodes */
|
|
struct pool daglist; /* DAG lists */
|
|
struct pool dagpcache; /* DAG pointer/param cache */
|
|
struct pool dqd; /* Disk Queue Data */
|
|
struct pool fss; /* Failed Stripe Structures */
|
|
struct pool funclist; /* Function Lists */
|
|
struct pool mcpair; /* Mutex/Cond Pairs */
|
|
struct pool pda; /* Physical Disk Access structures */
|
|
struct pool pss; /* Parity Stripe Status */
|
|
struct pool pss_issued; /* Parity Stripe Status Issued */
|
|
struct pool rad; /* Raid Access Descriptors */
|
|
struct pool recond; /* reconstruction descriptors */
|
|
struct pool reconbuffer; /* reconstruction buffer (header) pool */
|
|
struct pool revent; /* reconstruct events */
|
|
struct pool stripelock; /* StripeLock */
|
|
struct pool vfple; /* VoidFunctionPtr List Elements */
|
|
struct pool vple; /* VoidPointer List Elements */
|
|
};
|
|
|
|
extern struct RF_Pools_s rf_pools;
|
|
void rf_pool_init(struct pool *, size_t, char *, size_t, size_t);
|
|
|
|
typedef struct RF_IOBufHeader_s {
|
|
struct RF_IOBufHeader_s *next;
|
|
} RF_IOBufHeader_t;
|
|
|
|
|
|
/* XXX probably belongs in a different .h file. */
|
|
typedef struct RF_AutoConfig_s {
|
|
char devname[56]; /* the name of this component */
|
|
int flag; /* a general-purpose flag */
|
|
dev_t dev; /* the device for this component */
|
|
struct vnode *vp; /* Mr. Vnode Pointer */
|
|
RF_ComponentLabel_t *clabel; /* the label */
|
|
struct RF_AutoConfig_s *next; /* the next autoconfig structure
|
|
in this set. */
|
|
} RF_AutoConfig_t;
|
|
|
|
typedef struct RF_ConfigSet_s {
|
|
struct RF_AutoConfig_s *ac; /* all of the autoconfig structures for
|
|
this config set. */
|
|
int rootable; /* Set to 1 if this set can be root */
|
|
struct RF_ConfigSet_s *next;
|
|
} RF_ConfigSet_t;
|
|
|
|
#endif /* _RF__RF_NETBSDSTUFF_H_ */
|