module: icp: remove unused headers. Migrate {ops => sched}_impl
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #12901
This commit is contained in:
наб
Brian Behlendorf
parent
1949be46c3
commit
42dbc2025a
|
|
@ -1,183 +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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
|
|
||||||
/* All Rights Reserved */
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _SYS_BITMAP_H
|
|
||||||
#define _SYS_BITMAP_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(_ASM_INLINES) && \
|
|
||||||
(defined(__i386) || defined(__amd64))
|
|
||||||
#include <asm/bitmap.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Operations on bitmaps of arbitrary size
|
|
||||||
* A bitmap is a vector of 1 or more ulong_t's.
|
|
||||||
* The user of the package is responsible for range checks and keeping
|
|
||||||
* track of sizes.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef _LP64
|
|
||||||
#define BT_ULSHIFT 6 /* log base 2 of BT_NBIPUL, to extract word index */
|
|
||||||
#define BT_ULSHIFT32 5 /* log base 2 of BT_NBIPUL, to extract word index */
|
|
||||||
#else
|
|
||||||
#define BT_ULSHIFT 5 /* log base 2 of BT_NBIPUL, to extract word index */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define BT_NBIPUL (1 << BT_ULSHIFT) /* n bits per ulong_t */
|
|
||||||
#define BT_ULMASK (BT_NBIPUL - 1) /* to extract bit index */
|
|
||||||
|
|
||||||
#ifdef _LP64
|
|
||||||
#define BT_NBIPUL32 (1 << BT_ULSHIFT32) /* n bits per ulong_t */
|
|
||||||
#define BT_ULMASK32 (BT_NBIPUL32 - 1) /* to extract bit index */
|
|
||||||
#define BT_ULMAXMASK 0xffffffffffffffff /* used by bt_getlowbit */
|
|
||||||
#else
|
|
||||||
#define BT_ULMAXMASK 0xffffffff
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* bitmap is a ulong_t *, bitindex an index_t
|
|
||||||
*
|
|
||||||
* The macros BT_WIM and BT_BIW internal; there is no need
|
|
||||||
* for users of this package to use them.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* word in map
|
|
||||||
*/
|
|
||||||
#define BT_WIM(bitmap, bitindex) \
|
|
||||||
((bitmap)[(bitindex) >> BT_ULSHIFT])
|
|
||||||
/*
|
|
||||||
* bit in word
|
|
||||||
*/
|
|
||||||
#define BT_BIW(bitindex) \
|
|
||||||
(1UL << ((bitindex) & BT_ULMASK))
|
|
||||||
|
|
||||||
#ifdef _LP64
|
|
||||||
#define BT_WIM32(bitmap, bitindex) \
|
|
||||||
((bitmap)[(bitindex) >> BT_ULSHIFT32])
|
|
||||||
|
|
||||||
#define BT_BIW32(bitindex) \
|
|
||||||
(1UL << ((bitindex) & BT_ULMASK32))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These are public macros
|
|
||||||
*
|
|
||||||
* BT_BITOUL == n bits to n ulong_t's
|
|
||||||
*/
|
|
||||||
#define BT_BITOUL(nbits) \
|
|
||||||
(((nbits) + BT_NBIPUL - 1l) / BT_NBIPUL)
|
|
||||||
#define BT_SIZEOFMAP(nbits) \
|
|
||||||
(BT_BITOUL(nbits) * sizeof (ulong_t))
|
|
||||||
#define BT_TEST(bitmap, bitindex) \
|
|
||||||
((BT_WIM((bitmap), (bitindex)) & BT_BIW(bitindex)) ? 1 : 0)
|
|
||||||
#define BT_SET(bitmap, bitindex) \
|
|
||||||
{ BT_WIM((bitmap), (bitindex)) |= BT_BIW(bitindex); }
|
|
||||||
#define BT_CLEAR(bitmap, bitindex) \
|
|
||||||
{ BT_WIM((bitmap), (bitindex)) &= ~BT_BIW(bitindex); }
|
|
||||||
|
|
||||||
#ifdef _LP64
|
|
||||||
#define BT_BITOUL32(nbits) \
|
|
||||||
(((nbits) + BT_NBIPUL32 - 1l) / BT_NBIPUL32)
|
|
||||||
#define BT_SIZEOFMAP32(nbits) \
|
|
||||||
(BT_BITOUL32(nbits) * sizeof (uint_t))
|
|
||||||
#define BT_TEST32(bitmap, bitindex) \
|
|
||||||
((BT_WIM32((bitmap), (bitindex)) & BT_BIW32(bitindex)) ? 1 : 0)
|
|
||||||
#define BT_SET32(bitmap, bitindex) \
|
|
||||||
{ BT_WIM32((bitmap), (bitindex)) |= BT_BIW32(bitindex); }
|
|
||||||
#define BT_CLEAR32(bitmap, bitindex) \
|
|
||||||
{ BT_WIM32((bitmap), (bitindex)) &= ~BT_BIW32(bitindex); }
|
|
||||||
#endif /* _LP64 */
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* BIT_ONLYONESET is a private macro not designed for bitmaps of
|
|
||||||
* arbitrary size. u must be an unsigned integer/long. It returns
|
|
||||||
* true if one and only one bit is set in u.
|
|
||||||
*/
|
|
||||||
#define BIT_ONLYONESET(u) \
|
|
||||||
((((u) == 0) ? 0 : ((u) & ((u) - 1)) == 0))
|
|
||||||
|
|
||||||
#ifndef _ASM
|
|
||||||
|
|
||||||
/*
|
|
||||||
* return next available bit index from map with specified number of bits
|
|
||||||
*/
|
|
||||||
extern index_t bt_availbit(ulong_t *bitmap, size_t nbits);
|
|
||||||
/*
|
|
||||||
* find the highest order bit that is on, and is within or below
|
|
||||||
* the word specified by wx
|
|
||||||
*/
|
|
||||||
extern int bt_gethighbit(ulong_t *mapp, int wx);
|
|
||||||
extern int bt_range(ulong_t *bitmap, size_t *pos1, size_t *pos2,
|
|
||||||
size_t end_pos);
|
|
||||||
extern int bt_getlowbit(ulong_t *bitmap, size_t start, size_t stop);
|
|
||||||
extern void bt_copy(ulong_t *, ulong_t *, ulong_t);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* find the parity
|
|
||||||
*/
|
|
||||||
extern int odd_parity(ulong_t);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Atomically set/clear bits
|
|
||||||
* Atomic exclusive operations will set "result" to "-1"
|
|
||||||
* if the bit is already set/cleared. "result" will be set
|
|
||||||
* to 0 otherwise.
|
|
||||||
*/
|
|
||||||
#define BT_ATOMIC_SET(bitmap, bitindex) \
|
|
||||||
{ atomic_or_ulong(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); }
|
|
||||||
#define BT_ATOMIC_CLEAR(bitmap, bitindex) \
|
|
||||||
{ atomic_and_ulong(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); }
|
|
||||||
|
|
||||||
#define BT_ATOMIC_SET_EXCL(bitmap, bitindex, result) \
|
|
||||||
{ result = atomic_set_long_excl(&(BT_WIM(bitmap, bitindex)), \
|
|
||||||
(bitindex) % BT_NBIPUL); }
|
|
||||||
#define BT_ATOMIC_CLEAR_EXCL(bitmap, bitindex, result) \
|
|
||||||
{ result = atomic_clear_long_excl(&(BT_WIM(bitmap, bitindex)), \
|
|
||||||
(bitindex) % BT_NBIPUL); }
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Extracts bits between index h (high, inclusive) and l (low, exclusive) from
|
|
||||||
* u, which must be an unsigned integer.
|
|
||||||
*/
|
|
||||||
#define BITX(u, h, l) (((u) >> (l)) & ((1LU << ((h) - (l) + 1LU)) - 1LU))
|
|
||||||
|
|
||||||
#endif /* _ASM */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _SYS_BITMAP_H */
|
|
||||||
|
|
@ -1,137 +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_CRYPTO_ELFSIGN_H
|
|
||||||
#define _SYS_CRYPTO_ELFSIGN_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Consolidation Private Interface for elfsign/libpkcs11/kcfd
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/zfs_context.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Project Private structures and types used for communication between kcfd
|
|
||||||
* and KCF over the door.
|
|
||||||
*/
|
|
||||||
|
|
||||||
typedef enum ELFsign_status_e {
|
|
||||||
ELFSIGN_UNKNOWN,
|
|
||||||
ELFSIGN_SUCCESS,
|
|
||||||
ELFSIGN_FAILED,
|
|
||||||
ELFSIGN_NOTSIGNED,
|
|
||||||
ELFSIGN_INVALID_CERTPATH,
|
|
||||||
ELFSIGN_INVALID_ELFOBJ,
|
|
||||||
ELFSIGN_RESTRICTED
|
|
||||||
} ELFsign_status_t;
|
|
||||||
|
|
||||||
#define KCF_KCFD_VERSION1 1
|
|
||||||
#define SIG_MAX_LENGTH 1024
|
|
||||||
|
|
||||||
#define ELF_SIGNATURE_SECTION ".SUNW_signature"
|
|
||||||
|
|
||||||
typedef struct kcf_door_arg_s {
|
|
||||||
short da_version;
|
|
||||||
boolean_t da_iskernel;
|
|
||||||
|
|
||||||
union {
|
|
||||||
char filename[MAXPATHLEN]; /* For request */
|
|
||||||
|
|
||||||
struct kcf_door_result_s { /* For response */
|
|
||||||
ELFsign_status_t status;
|
|
||||||
uint32_t siglen;
|
|
||||||
uchar_t signature[1];
|
|
||||||
} result;
|
|
||||||
} da_u;
|
|
||||||
} kcf_door_arg_t;
|
|
||||||
|
|
||||||
typedef uint32_t filesig_vers_t;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File Signature Structure
|
|
||||||
* Applicable to ELF and other file formats
|
|
||||||
*/
|
|
||||||
struct filesignatures {
|
|
||||||
uint32_t filesig_cnt; /* count of signatures */
|
|
||||||
uint32_t filesig_pad; /* unused */
|
|
||||||
union {
|
|
||||||
char filesig_data[1];
|
|
||||||
struct filesig { /* one of these for each signature */
|
|
||||||
uint32_t filesig_size;
|
|
||||||
filesig_vers_t filesig_version;
|
|
||||||
union {
|
|
||||||
struct filesig_version1 {
|
|
||||||
uint32_t filesig_v1_dnsize;
|
|
||||||
uint32_t filesig_v1_sigsize;
|
|
||||||
uint32_t filesig_v1_oidsize;
|
|
||||||
char filesig_v1_data[1];
|
|
||||||
} filesig_v1;
|
|
||||||
struct filesig_version3 {
|
|
||||||
uint64_t filesig_v3_time;
|
|
||||||
uint32_t filesig_v3_dnsize;
|
|
||||||
uint32_t filesig_v3_sigsize;
|
|
||||||
uint32_t filesig_v3_oidsize;
|
|
||||||
char filesig_v3_data[1];
|
|
||||||
} filesig_v3;
|
|
||||||
} _u2;
|
|
||||||
} filesig_sig;
|
|
||||||
uint64_t filesig_align;
|
|
||||||
} _u1;
|
|
||||||
};
|
|
||||||
#define filesig_sig _u1.filesig_sig
|
|
||||||
|
|
||||||
#define filesig_v1_dnsize _u2.filesig_v1.filesig_v1_dnsize
|
|
||||||
#define filesig_v1_sigsize _u2.filesig_v1.filesig_v1_sigsize
|
|
||||||
#define filesig_v1_oidsize _u2.filesig_v1.filesig_v1_oidsize
|
|
||||||
#define filesig_v1_data _u2.filesig_v1.filesig_v1_data
|
|
||||||
|
|
||||||
#define filesig_v3_time _u2.filesig_v3.filesig_v3_time
|
|
||||||
#define filesig_v3_dnsize _u2.filesig_v3.filesig_v3_dnsize
|
|
||||||
#define filesig_v3_sigsize _u2.filesig_v3.filesig_v3_sigsize
|
|
||||||
#define filesig_v3_oidsize _u2.filesig_v3.filesig_v3_oidsize
|
|
||||||
#define filesig_v3_data _u2.filesig_v3.filesig_v3_data
|
|
||||||
|
|
||||||
#define filesig_ALIGN(s) (((s) + sizeof (uint64_t) - 1) & \
|
|
||||||
(-sizeof (uint64_t)))
|
|
||||||
#define filesig_next(ptr) (struct filesig *)((void *)((char *)(ptr) + \
|
|
||||||
filesig_ALIGN((ptr)->filesig_size)))
|
|
||||||
|
|
||||||
#define FILESIG_UNKNOWN 0 /* unrecognized version */
|
|
||||||
#define FILESIG_VERSION1 1 /* version1, all but sig section */
|
|
||||||
#define FILESIG_VERSION2 2 /* version1 format, SHF_ALLOC only */
|
|
||||||
#define FILESIG_VERSION3 3 /* version3, all but sig section */
|
|
||||||
#define FILESIG_VERSION4 4 /* version3 format, SHF_ALLOC only */
|
|
||||||
|
|
||||||
#define _PATH_KCFD_DOOR "/etc/svc/volatile/kcfd_door"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _SYS_CRYPTO_ELFSIGN_H */
|
|
||||||
|
|
@ -1,33 +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_CRYPTO_OPS_IMPL_H
|
|
||||||
#define _SYS_CRYPTO_OPS_IMPL_H
|
|
||||||
|
|
||||||
#define KCF_SET_PROVIDER_MECHNUM(fmtype, pd, mechp) \
|
|
||||||
(mechp)->cm_type = \
|
|
||||||
KCF_TO_PROV_MECHNUM(pd, fmtype);
|
|
||||||
|
|
||||||
#endif /* _SYS_CRYPTO_OPS_IMPL_H */
|
|
||||||
|
|
@ -39,7 +39,6 @@ extern "C" {
|
||||||
#include <sys/crypto/spi.h>
|
#include <sys/crypto/spi.h>
|
||||||
#include <sys/crypto/impl.h>
|
#include <sys/crypto/impl.h>
|
||||||
#include <sys/crypto/common.h>
|
#include <sys/crypto/common.h>
|
||||||
#include <sys/crypto/ops_impl.h>
|
|
||||||
|
|
||||||
#define KCF_KMFLAG(crq) (((crq) == NULL) ? KM_SLEEP : KM_NOSLEEP)
|
#define KCF_KMFLAG(crq) (((crq) == NULL) ? KM_SLEEP : KM_NOSLEEP)
|
||||||
|
|
||||||
|
|
@ -125,6 +124,11 @@ typedef struct kcf_context {
|
||||||
#define KCF_CONTEXT_DONE(rv) \
|
#define KCF_CONTEXT_DONE(rv) \
|
||||||
((rv) != CRYPTO_BUSY && (rv) != CRYPTO_BUFFER_TOO_SMALL)
|
((rv) != CRYPTO_BUSY && (rv) != CRYPTO_BUFFER_TOO_SMALL)
|
||||||
|
|
||||||
|
|
||||||
|
#define KCF_SET_PROVIDER_MECHNUM(fmtype, pd, mechp) \
|
||||||
|
(mechp)->cm_type = \
|
||||||
|
KCF_TO_PROV_MECHNUM(pd, fmtype);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* A crypto_ctx_template_t is internally a pointer to this struct
|
* A crypto_ctx_template_t is internally a pointer to this struct
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue