mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
module: icp: rip out modhash. Replace the one user with AVL
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #12901
This commit is contained in:
наб
@@ -34,6 +34,7 @@
|
||||
#include <sys/crypto/common.h>
|
||||
#include <sys/crypto/api.h>
|
||||
#include <sys/crypto/spi.h>
|
||||
#include <sys/avl.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -245,6 +246,7 @@ typedef struct kcf_mech_entry {
|
||||
crypto_mech_name_t me_name; /* mechanism name */
|
||||
crypto_mech_type_t me_mechid; /* Internal id for mechanism */
|
||||
kcf_prov_mech_desc_t *me_sw_prov; /* provider */
|
||||
avl_node_t me_node;
|
||||
} kcf_mech_entry_t;
|
||||
|
||||
/*
|
||||
@@ -300,7 +302,7 @@ extern const kcf_mech_entry_tab_t kcf_mech_tabs_tab[];
|
||||
|
||||
#define KCF_MECH2CLASS(mech_type) ((kcf_ops_class_t)((mech_type) >> 32))
|
||||
|
||||
#define KCF_MECH2INDEX(mech_type) ((int)(mech_type))
|
||||
#define KCF_MECH2INDEX(mech_type) ((int)((mech_type) & 0xFFFFFFFF))
|
||||
|
||||
#define KCF_TO_PROV_MECH_INDX(pd, mech_type) \
|
||||
((pd)->pd_mech_indx[KCF_MECH2CLASS(mech_type)] \
|
||||
|
||||
@@ -1,147 +0,0 @@
|
||||
/*
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
*
|
||||
* When distributing Covered Code, include this CDDL HEADER in each
|
||||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
* If applicable, add the following below this CDDL HEADER, with the
|
||||
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_MODHASH_H
|
||||
#define _SYS_MODHASH_H
|
||||
|
||||
/*
|
||||
* Generic hash implementation for the kernel.
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
|
||||
/*
|
||||
* Opaque data types for storing keys and values
|
||||
*/
|
||||
typedef void *mod_hash_val_t;
|
||||
typedef void *mod_hash_key_t;
|
||||
|
||||
/*
|
||||
* Opaque data type for reservation
|
||||
*/
|
||||
typedef void *mod_hash_hndl_t;
|
||||
|
||||
/*
|
||||
* Opaque type for hash itself.
|
||||
*/
|
||||
struct mod_hash;
|
||||
typedef struct mod_hash mod_hash_t;
|
||||
|
||||
/*
|
||||
* String hash table
|
||||
*/
|
||||
mod_hash_t *mod_hash_create_strhash_nodtr(char *, size_t,
|
||||
void (*)(mod_hash_val_t));
|
||||
mod_hash_t *mod_hash_create_strhash(char *, size_t, void (*)(mod_hash_val_t));
|
||||
void mod_hash_destroy_strhash(mod_hash_t *);
|
||||
int mod_hash_strkey_cmp(mod_hash_key_t, mod_hash_key_t);
|
||||
void mod_hash_strkey_dtor(mod_hash_key_t);
|
||||
void mod_hash_strval_dtor(mod_hash_val_t);
|
||||
uint_t mod_hash_bystr(void *, mod_hash_key_t);
|
||||
|
||||
/*
|
||||
* Pointer hash table
|
||||
*/
|
||||
mod_hash_t *mod_hash_create_ptrhash(char *, size_t, void (*)(mod_hash_val_t),
|
||||
size_t);
|
||||
void mod_hash_destroy_ptrhash(mod_hash_t *);
|
||||
int mod_hash_ptrkey_cmp(mod_hash_key_t, mod_hash_key_t);
|
||||
uint_t mod_hash_byptr(void *, mod_hash_key_t);
|
||||
|
||||
/*
|
||||
* ID hash table
|
||||
*/
|
||||
mod_hash_t *mod_hash_create_idhash(char *, size_t, void (*)(mod_hash_val_t));
|
||||
void mod_hash_destroy_idhash(mod_hash_t *);
|
||||
int mod_hash_idkey_cmp(mod_hash_key_t, mod_hash_key_t);
|
||||
uint_t mod_hash_byid(void *, mod_hash_key_t);
|
||||
uint_t mod_hash_iddata_gen(size_t);
|
||||
|
||||
/*
|
||||
* Hash management functions
|
||||
*/
|
||||
mod_hash_t *mod_hash_create_extended(char *, size_t, void (*)(mod_hash_key_t),
|
||||
void (*)(mod_hash_val_t), uint_t (*)(void *, mod_hash_key_t), void *,
|
||||
int (*)(mod_hash_key_t, mod_hash_key_t), int);
|
||||
|
||||
void mod_hash_destroy_hash(mod_hash_t *);
|
||||
void mod_hash_clear(mod_hash_t *);
|
||||
|
||||
/*
|
||||
* Null key and value destructors
|
||||
*/
|
||||
void mod_hash_null_keydtor(mod_hash_key_t);
|
||||
void mod_hash_null_valdtor(mod_hash_val_t);
|
||||
|
||||
/*
|
||||
* Basic hash operations
|
||||
*/
|
||||
|
||||
/*
|
||||
* Error codes for insert, remove, find, destroy.
|
||||
*/
|
||||
#define MH_ERR_NOMEM -1
|
||||
#define MH_ERR_DUPLICATE -2
|
||||
#define MH_ERR_NOTFOUND -3
|
||||
|
||||
/*
|
||||
* Return codes for hash walkers
|
||||
*/
|
||||
#define MH_WALK_CONTINUE 0
|
||||
#define MH_WALK_TERMINATE 1
|
||||
|
||||
/*
|
||||
* Basic hash operations
|
||||
*/
|
||||
int mod_hash_insert(mod_hash_t *, mod_hash_key_t, mod_hash_val_t);
|
||||
int mod_hash_replace(mod_hash_t *, mod_hash_key_t, mod_hash_val_t);
|
||||
int mod_hash_remove(mod_hash_t *, mod_hash_key_t, mod_hash_val_t *);
|
||||
int mod_hash_destroy(mod_hash_t *, mod_hash_key_t);
|
||||
int mod_hash_find(mod_hash_t *, mod_hash_key_t, mod_hash_val_t *);
|
||||
int mod_hash_find_cb(mod_hash_t *, mod_hash_key_t, mod_hash_val_t *,
|
||||
void (*)(mod_hash_key_t, mod_hash_val_t));
|
||||
int mod_hash_find_cb_rval(mod_hash_t *, mod_hash_key_t, mod_hash_val_t *,
|
||||
int (*)(mod_hash_key_t, mod_hash_val_t), int *);
|
||||
void mod_hash_walk(mod_hash_t *,
|
||||
uint_t (*)(mod_hash_key_t, mod_hash_val_t *, void *), void *);
|
||||
|
||||
/*
|
||||
* Reserving hash operations
|
||||
*/
|
||||
int mod_hash_reserve(mod_hash_t *, mod_hash_hndl_t *);
|
||||
int mod_hash_reserve_nosleep(mod_hash_t *, mod_hash_hndl_t *);
|
||||
void mod_hash_cancel(mod_hash_t *, mod_hash_hndl_t *);
|
||||
int mod_hash_insert_reserve(mod_hash_t *, mod_hash_key_t, mod_hash_val_t,
|
||||
mod_hash_hndl_t);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _SYS_MODHASH_H */
|
||||
@@ -1,108 +0,0 @@
|
||||
/*
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
*
|
||||
* When distributing Covered Code, include this CDDL HEADER in each
|
||||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
* If applicable, add the following below this CDDL HEADER, with the
|
||||
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_MODHASH_IMPL_H
|
||||
#define _SYS_MODHASH_IMPL_H
|
||||
|
||||
/*
|
||||
* Internal details for the kernel's generic hash implementation.
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/modhash.h>
|
||||
|
||||
struct mod_hash_entry {
|
||||
mod_hash_key_t mhe_key; /* stored hash key */
|
||||
mod_hash_val_t mhe_val; /* stored hash value */
|
||||
struct mod_hash_entry *mhe_next; /* next item in chain */
|
||||
};
|
||||
|
||||
struct mod_hash_stat {
|
||||
ulong_t mhs_hit; /* tried a 'find' and it succeeded */
|
||||
ulong_t mhs_miss; /* tried a 'find' but it failed */
|
||||
ulong_t mhs_coll; /* occur when insert fails because of dup's */
|
||||
ulong_t mhs_nelems; /* total number of stored key/value pairs */
|
||||
ulong_t mhs_nomem; /* number of times kmem_alloc failed */
|
||||
};
|
||||
|
||||
struct mod_hash {
|
||||
krwlock_t mh_contents; /* lock protecting contents */
|
||||
char *mh_name; /* hash name */
|
||||
int mh_sleep; /* kmem_alloc flag */
|
||||
size_t mh_nchains; /* # of elements in mh_entries */
|
||||
|
||||
/* key and val destructor */
|
||||
void (*mh_kdtor)(mod_hash_key_t);
|
||||
void (*mh_vdtor)(mod_hash_val_t);
|
||||
|
||||
/* key comparator */
|
||||
int (*mh_keycmp)(mod_hash_key_t, mod_hash_key_t);
|
||||
|
||||
/* hash algorithm, and algorithm-private data */
|
||||
uint_t (*mh_hashalg)(void *, mod_hash_key_t);
|
||||
void *mh_hashalg_data;
|
||||
|
||||
struct mod_hash *mh_next; /* next hash in list */
|
||||
|
||||
struct mod_hash_stat mh_stat;
|
||||
|
||||
struct mod_hash_entry *mh_entries[1];
|
||||
};
|
||||
|
||||
/*
|
||||
* MH_SIZE()
|
||||
* Compute the size of a mod_hash_t, in bytes, given the number of
|
||||
* elements it contains.
|
||||
*/
|
||||
#define MH_SIZE(n) \
|
||||
(sizeof (mod_hash_t) + ((n) - 1) * (sizeof (struct mod_hash_entry *)))
|
||||
|
||||
/*
|
||||
* Module initialization; called once.
|
||||
*/
|
||||
void mod_hash_fini(void);
|
||||
void mod_hash_init(void);
|
||||
|
||||
/*
|
||||
* Internal routines. Use directly with care.
|
||||
*/
|
||||
uint_t i_mod_hash(mod_hash_t *, mod_hash_key_t);
|
||||
int i_mod_hash_insert_nosync(mod_hash_t *, mod_hash_key_t, mod_hash_val_t,
|
||||
mod_hash_hndl_t);
|
||||
int i_mod_hash_remove_nosync(mod_hash_t *, mod_hash_key_t, mod_hash_val_t *);
|
||||
int i_mod_hash_find_nosync(mod_hash_t *, mod_hash_key_t, mod_hash_val_t *);
|
||||
void i_mod_hash_walk_nosync(mod_hash_t *, uint_t (*)(mod_hash_key_t,
|
||||
mod_hash_val_t *, void *), void *);
|
||||
void i_mod_hash_clear_nosync(mod_hash_t *hash);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _SYS_MODHASH_IMPL_H */
|
||||
Reference in New Issue
Block a user