From patchwork Mon Sep 19 08:16:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 9338791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 22B7D6077A for ; Mon, 19 Sep 2016 08:27:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1270E29028 for ; Mon, 19 Sep 2016 08:27:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06CB029131; Mon, 19 Sep 2016 08:27:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5AA0029028 for ; Mon, 19 Sep 2016 08:27:34 +0000 (UTC) Received: from localhost ([::1]:53624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bltvJ-0005os-4W for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Sep 2016 04:27:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bltoN-0000AG-US for qemu-devel@nongnu.org; Mon, 19 Sep 2016 04:20:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bltoJ-0001w3-6R for qemu-devel@nongnu.org; Mon, 19 Sep 2016 04:20:22 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:43894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bltoI-0001uz-8O for qemu-devel@nongnu.org; Mon, 19 Sep 2016 04:20:19 -0400 Received: from 172.24.1.137 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.137]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CHY01322; Mon, 19 Sep 2016 16:16:44 +0800 (CST) Received: from localhost (10.177.18.62) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Mon, 19 Sep 2016 16:16:38 +0800 From: Gonglei To: , Date: Mon, 19 Sep 2016 16:16:22 +0800 Message-ID: <1474272982-275836-11-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1474272982-275836-1-git-send-email-arei.gonglei@huawei.com> References: <1474272982-275836-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.18.62] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.57DF9EEC.0100, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: d8abef6ff7d77b4de7aa336005a971fb X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH v3 10/10] cryptodev: introduce an unified wrapper for crypto operation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: weidong.huang@huawei.com, claudio.fontana@huawei.com, mst@redhat.com, xin.zeng@intel.com, hanweidong@huawei.com, luonengjun@huawei.com, agraf@suse.de, nmorey@kalray.eu, mike.caraman@nxp.com, Gonglei , stefanha@redhat.com, jianjay.zhou@huawei.com, pbonzini@redhat.com, vincent.jardin@6wind.com, wu.wubin@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We use an opaque point to the VirtIOCryptoReq which can support different packets based on different algorithms. Signed-off-by: Gonglei --- crypto/cryptodev-gcrypt.c | 2 +- crypto/cryptodev.c | 28 ++++++++++++++++++++++++++-- hw/virtio/virtio-crypto.c | 10 +++++----- include/crypto/cryptodev.h | 13 +++++++------ 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/crypto/cryptodev-gcrypt.c b/crypto/cryptodev-gcrypt.c index 66a0e5e..413afa9 100644 --- a/crypto/cryptodev-gcrypt.c +++ b/crypto/cryptodev-gcrypt.c @@ -266,7 +266,7 @@ static int qcrypto_cryptodev_backend_gcrypt_sym_operation( return -VIRTIO_CRYPTO_OP_ERR; } } - return 0; + return VIRTIO_CRYPTO_OP_OK; } static void qcrypto_cryptodev_backend_gcrypt_cleanup( diff --git a/crypto/cryptodev.c b/crypto/cryptodev.c index 0b3d55e..23c389b 100644 --- a/crypto/cryptodev.c +++ b/crypto/cryptodev.c @@ -30,6 +30,8 @@ #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h" +#include "hw/virtio/virtio-crypto.h" + static QTAILQ_HEAD(, QCryptoCryptoDevBackendClientState) crypto_clients; @@ -103,7 +105,7 @@ int qcrypto_cryptodev_backend_sym_close_session( return -1; } -int qcrypto_cryptodev_backend_sym_operation( +static int qcrypto_cryptodev_backend_sym_operation( QCryptoCryptoDevBackend *backend, QCryptoCryptoDevBackendSymOpInfo *op_info, uint32_t queue_index, Error **errp) @@ -115,7 +117,29 @@ int qcrypto_cryptodev_backend_sym_operation( return bc->do_sym_op(backend, op_info, queue_index, errp); } - return -1; + return -VIRTIO_CRYPTO_OP_ERR; +} + +int qcrypto_cryptodev_backend_crypto_operation( + QCryptoCryptoDevBackend *backend, + void *opaque, + uint32_t queue_index, Error **errp) +{ + VirtIOCryptoReq *req = opaque; + + if (req->flags == QCRYPTO_CRYPTODEV_BACKEND_ALG_SYM) { + QCryptoCryptoDevBackendSymOpInfo *op_info; + op_info = req->u.sym_op_info; + + return qcrypto_cryptodev_backend_sym_operation(backend, + op_info, queue_index, errp); + } else { + error_setg(errp, "Unsupported cryptodev alg type: %" PRIu32 "", + req->flags); + return -VIRTIO_CRYPTO_OP_NOTSUPP; + } + + return -VIRTIO_CRYPTO_OP_ERR; } static void diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index a82a06e..bee5a61 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -670,15 +670,15 @@ virtio_crypto_handle_request(VirtIOCryptoReq *request) request->flags = QCRYPTO_CRYPTODEV_BACKEND_ALG_SYM; request->u.sym_op_info = sym_op_info; request->idata_hva = idata_hva; - ret = qcrypto_cryptodev_backend_sym_operation(vcrypto->cryptodev, - sym_op_info, queue_index, &local_err); + ret = qcrypto_cryptodev_backend_crypto_operation(vcrypto->cryptodev, + request, queue_index, &local_err); if (ret < 0) { - status = VIRTIO_CRYPTO_OP_ERR; + status = -ret; if (local_err) { error_report_err(local_err); } - } else { /* ret >= 0 */ - status = VIRTIO_CRYPTO_OP_OK; + } else { /* ret == VIRTIO_CRYPTO_OP_OK */ + status = ret; } virtio_crypto_req_complete(request, status); virtio_crypto_free_request(request); diff --git a/include/crypto/cryptodev.h b/include/crypto/cryptodev.h index 7fcdc2f..8dbf613 100644 --- a/include/crypto/cryptodev.h +++ b/include/crypto/cryptodev.h @@ -256,20 +256,21 @@ int qcrypto_cryptodev_backend_sym_close_session( uint64_t session_id, Error **errp); /** - * qcrypto_cryptodev_backend_sym_operation: + * qcrypto_cryptodev_backend_crypto_operation: * @backend: the cryptodev backend object - * @op_info: parameters needed by symmetric crypto operation + * @opaque: pointer to a VirtIOCryptoReq object * @queue_index: queue index of cryptodev backend client * @errp: pointer to a NULL-initialized error object * - * Do symmetric crypto operation, such as encryption and + * Do crypto operation, such as encryption and * decryption * - * Returns: 0 on success, or Negative on error + * Returns: VIRTIO_CRYPTO_OP_OK on success, + * or -VIRTIO_CRYPTO_OP_* on error */ -int qcrypto_cryptodev_backend_sym_operation( +int qcrypto_cryptodev_backend_crypto_operation( QCryptoCryptoDevBackend *backend, - QCryptoCryptoDevBackendSymOpInfo *op_info, + void *opaque, uint32_t queue_index, Error **errp); #endif /* QCRYPTO_CRYPTODEV_H */