From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpAIu-0006Dx-4U for qemu-devel@nongnu.org; Wed, 28 Sep 2016 04:33:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpAIp-0007KZ-Uh for qemu-devel@nongnu.org; Wed, 28 Sep 2016 04:33:23 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:2121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpAIo-0007JY-MR for qemu-devel@nongnu.org; Wed, 28 Sep 2016 04:33:19 -0400 From: Gonglei Date: Wed, 28 Sep 2016 16:25:46 +0800 Message-ID: <1475051152-400276-8-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1475051152-400276-1-git-send-email-arei.gonglei@huawei.com> References: <1475051152-400276-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v4 07/13] virtio-crypto: set capacity of algorithms supported List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org Cc: luonengjun@huawei.com, mst@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, berrange@redhat.com, weidong.huang@huawei.com, wu.wubin@huawei.com, mike.caraman@nxp.com, agraf@suse.de, xin.zeng@intel.com, claudio.fontana@huawei.com, nmorey@kalray.eu, vincent.jardin@6wind.com, jianjay.zhou@huawei.com, hanweidong@huawei.com, peter.huangpeng@huawei.com, Gonglei Expose the capacity of algorithms supported by virtio crypto device to the frontend driver using pci configuration space. Signed-off-by: Gonglei --- hw/virtio/virtio-crypto.c | 32 +++++++++++++++++++++++++++++++- include/hw/virtio/virtio-crypto.h | 14 ++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index e639fb3..e74a15f 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -89,6 +89,22 @@ static void virtio_crypto_reset(VirtIODevice *vdev) } } +static void virtio_crypto_init_config(VirtIODevice *vdev) +{ + VirtIOCrypto *vcrypto = VIRTIO_CRYPTO(vdev); + + vcrypto->conf.crypto_services = + vcrypto->conf.cryptodev->conf.crypto_services; + vcrypto->conf.cipher_algo_l = + vcrypto->conf.cryptodev->conf.cipher_algo_l; + vcrypto->conf.cipher_algo_h = + vcrypto->conf.cryptodev->conf.cipher_algo_h; + vcrypto->conf.hash_algo = vcrypto->conf.cryptodev->conf.hash_algo; + vcrypto->conf.mac_algo_l = vcrypto->conf.cryptodev->conf.mac_algo_l; + vcrypto->conf.mac_algo_h = vcrypto->conf.cryptodev->conf.mac_algo_h; + vcrypto->conf.aead_algo = vcrypto->conf.cryptodev->conf.aead_algo; +} + static void virtio_crypto_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -122,6 +138,7 @@ static void virtio_crypto_device_realize(DeviceState *dev, Error **errp) } else { vcrypto->status |= VIRTIO_CRYPTO_S_HW_READY; } + virtio_crypto_init_config(vdev); register_savevm(dev, "virtio-crypto", -1, 1, virtio_crypto_save, virtio_crypto_load, vcrypto); } @@ -142,7 +159,20 @@ static Property virtio_crypto_properties[] = { static void virtio_crypto_get_config(VirtIODevice *vdev, uint8_t *config) { - + VirtIOCrypto *c = VIRTIO_CRYPTO(vdev); + struct virtio_crypto_config crypto_cfg; + + crypto_cfg.status = c->status; + crypto_cfg.max_dataqueues = c->max_queues; + crypto_cfg.crypto_services = c->conf.crypto_services; + crypto_cfg.cipher_algo_l = c->conf.cipher_algo_l; + crypto_cfg.cipher_algo_h = c->conf.cipher_algo_h; + crypto_cfg.hash_algo = c->conf.hash_algo; + crypto_cfg.mac_algo_l = c->conf.mac_algo_l; + crypto_cfg.mac_algo_h = c->conf.mac_algo_h; + crypto_cfg.aead_algo = c->conf.aead_algo; + + memcpy(config, &crypto_cfg, c->config_size); } static void virtio_crypto_set_config(VirtIODevice *vdev, const uint8_t *config) diff --git a/include/hw/virtio/virtio-crypto.h b/include/hw/virtio/virtio-crypto.h index 484062c..8aa2fe9 100644 --- a/include/hw/virtio/virtio-crypto.h +++ b/include/hw/virtio/virtio-crypto.h @@ -38,6 +38,20 @@ do { printf("virtio_crypto: " fmt , ## __VA_ARGS__); } while (0) typedef struct VirtIOCryptoConf { QCryptoCryptoDevBackend *cryptodev; + + /* Supported service mask */ + uint32_t crypto_services; + + /* Detailed algorithms mask */ + uint32_t cipher_algo_l; + uint32_t cipher_algo_h; + uint32_t hash_algo; + uint32_t mac_algo_l; + uint32_t mac_algo_h; + uint32_t asym_algo; + uint32_t kdf_algo; + uint32_t aead_algo; + uint32_t primitive_algo; } VirtIOCryptoConf; struct VirtIOCrypto; -- 1.7.12.4