OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cryptodev: Introduce server type in QAPI

Browse Source 
Introduce cryptodev service type in cryptodev.json, then apply this
to related codes. Now we can remove VIRTIO_CRYPTO_SERVICE_xxx
dependence from QEMU cryptodev.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230301105847.253084-5-pizhenwei@bytedance.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
zhenwei pi 2023-03-01 18:58:39 +08:00 committed by Michael S. Tsirkin
parent 999c789f00
commit bc304a6442
5 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backends/cryptodev-builtin.c
View File

@ -79,10 +79,10 @@ static void cryptodev_builtin_init(
backend->conf.peers.ccs[0] = cc; backend->conf.peers.ccs[0] = cc;
backend->conf.crypto_services = backend->conf.crypto_services =
1u << VIRTIO_CRYPTO_SERVICE_CIPHER | 1u << QCRYPTODEV_BACKEND_SERVICE_CIPHER |
1u << VIRTIO_CRYPTO_SERVICE_HASH | 1u << QCRYPTODEV_BACKEND_SERVICE_HASH |
1u << VIRTIO_CRYPTO_SERVICE_MAC | 1u << QCRYPTODEV_BACKEND_SERVICE_MAC |
1u << VIRTIO_CRYPTO_SERVICE_AKCIPHER; 1u << QCRYPTODEV_BACKEND_SERVICE_AKCIPHER;
backend->conf.cipher_algo_l = 1u << VIRTIO_CRYPTO_CIPHER_AES_CBC; backend->conf.cipher_algo_l = 1u << VIRTIO_CRYPTO_CIPHER_AES_CBC;
backend->conf.hash_algo = 1u << VIRTIO_CRYPTO_HASH_SHA1; backend->conf.hash_algo = 1u << VIRTIO_CRYPTO_HASH_SHA1;
backend->conf.akcipher_algo = 1u << VIRTIO_CRYPTO_AKCIPHER_RSA; backend->conf.akcipher_algo = 1u << VIRTIO_CRYPTO_AKCIPHER_RSA;

2
backends/cryptodev-lkcf.c
View File

@ -230,7 +230,7 @@ static void cryptodev_lkcf_init(CryptoDevBackend *backend, Error **errp)
backend->conf.peers.ccs[0] = cc; backend->conf.peers.ccs[0] = cc;
backend->conf.crypto_services = backend->conf.crypto_services =
1u << VIRTIO_CRYPTO_SERVICE_AKCIPHER; 1u << QCRYPTODEV_BACKEND_SERVICE_AKCIPHER;
backend->conf.akcipher_algo = 1u << VIRTIO_CRYPTO_AKCIPHER_RSA; backend->conf.akcipher_algo = 1u << VIRTIO_CRYPTO_AKCIPHER_RSA;
lkcf->running = true; lkcf->running = true;

6
backends/cryptodev-vhost-user.c
View File

@ -221,9 +221,9 @@ static void cryptodev_vhost_user_init(
cryptodev_vhost_user_event, NULL, s, NULL, true); cryptodev_vhost_user_event, NULL, s, NULL, true);
backend->conf.crypto_services = backend->conf.crypto_services =
1u << VIRTIO_CRYPTO_SERVICE_CIPHER | 1u << QCRYPTODEV_BACKEND_SERVICE_CIPHER |
1u << VIRTIO_CRYPTO_SERVICE_HASH | 1u << QCRYPTODEV_BACKEND_SERVICE_HASH |
1u << VIRTIO_CRYPTO_SERVICE_MAC; 1u << QCRYPTODEV_BACKEND_SERVICE_MAC;
backend->conf.cipher_algo_l = 1u << VIRTIO_CRYPTO_CIPHER_AES_CBC; backend->conf.cipher_algo_l = 1u << VIRTIO_CRYPTO_CIPHER_AES_CBC;
backend->conf.hash_algo = 1u << VIRTIO_CRYPTO_HASH_SHA1; backend->conf.hash_algo = 1u << VIRTIO_CRYPTO_HASH_SHA1;

27
hw/virtio/virtio-crypto.c
View File

@ -997,12 +997,35 @@ static void virtio_crypto_reset(VirtIODevice *vdev)
} }
} }
static uint32_t virtio_crypto_init_services(uint32_t qservices)
{
uint32_t vservices = 0;
if (qservices & (1 << QCRYPTODEV_BACKEND_SERVICE_CIPHER)) {
vservices |= (1 << VIRTIO_CRYPTO_SERVICE_CIPHER);
}
if (qservices & (1 << QCRYPTODEV_BACKEND_SERVICE_HASH)) {
vservices |= (1 << VIRTIO_CRYPTO_SERVICE_HASH);
}
if (qservices & (1 << QCRYPTODEV_BACKEND_SERVICE_MAC)) {
vservices |= (1 << VIRTIO_CRYPTO_SERVICE_MAC);
}
if (qservices & (1 << QCRYPTODEV_BACKEND_SERVICE_AEAD)) {
vservices |= (1 << VIRTIO_CRYPTO_SERVICE_AEAD);
}
if (qservices & (1 << QCRYPTODEV_BACKEND_SERVICE_AKCIPHER)) {
vservices |= (1 << VIRTIO_CRYPTO_SERVICE_AKCIPHER);
}
return vservices;
}
static void virtio_crypto_init_config(VirtIODevice *vdev) static void virtio_crypto_init_config(VirtIODevice *vdev)
{ {
VirtIOCrypto *vcrypto = VIRTIO_CRYPTO(vdev); VirtIOCrypto *vcrypto = VIRTIO_CRYPTO(vdev);
vcrypto->conf.crypto_services = vcrypto->conf.crypto_services = virtio_crypto_init_services(
vcrypto->conf.cryptodev->conf.crypto_services; vcrypto->conf.cryptodev->conf.crypto_services);
vcrypto->conf.cipher_algo_l = vcrypto->conf.cipher_algo_l =
vcrypto->conf.cryptodev->conf.cipher_algo_l; vcrypto->conf.cryptodev->conf.cipher_algo_l;
vcrypto->conf.cipher_algo_h = vcrypto->conf.cipher_algo_h =

11
qapi/cryptodev.json
View File

@ -18,6 +18,17 @@
'prefix': 'QCRYPTODEV_BACKEND_ALG', 'prefix': 'QCRYPTODEV_BACKEND_ALG',
'data': ['sym', 'asym']} 'data': ['sym', 'asym']}
##
# @QCryptodevBackendServiceType:
#
# The supported service types of a crypto device.
#
# Since: 8.0
##
{ 'enum': 'QCryptodevBackendServiceType',
'prefix': 'QCRYPTODEV_BACKEND_SERVICE',
'data': ['cipher', 'hash', 'mac', 'aead', 'akcipher']}
## ##
# @QCryptodevBackendType: # @QCryptodevBackendType:
# #