[PATCH v2 2/4] virtio-crypto: move helpers into virtio_crypto_common.c

[zhenwei pi]

Move virtcrypto_clear_request and virtcrypto_dataq_callback into
virtio_crypto_common.c to make code clear. Then the xx_core.c
supports:
  - probe/remove/irq affinity seting for a virtio device
  - basic virtio related operations

xx_common.c supports:
  - common helpers/functions for algos

Signed-off-by: zhenwei pi <pizhen...@bytedance.com>
---
 drivers/crypto/virtio/virtio_crypto_common.c | 31 +++++++++++++++++++
 drivers/crypto/virtio/virtio_crypto_common.h |  2 ++
 drivers/crypto/virtio/virtio_crypto_core.c   | 32 --------------------
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_crypto_common.c 
b/drivers/crypto/virtio/virtio_crypto_common.c
index 93df73c40dd3..4a23524896fe 100644
--- a/drivers/crypto/virtio/virtio_crypto_common.c
+++ b/drivers/crypto/virtio/virtio_crypto_common.c
@@ -8,6 +8,14 @@
 
 #include "virtio_crypto_common.h"
 
+void virtcrypto_clear_request(struct virtio_crypto_request *vc_req)
+{
+       if (vc_req) {
+               kfree_sensitive(vc_req->req_data);
+               kfree(vc_req->sgs);
+       }
+}
+
 static void virtio_crypto_ctrlq_callback(struct virtio_crypto_ctrl_request 
*vc_ctrl_req)
 {
        complete(&vc_ctrl_req->compl);
@@ -59,3 +67,26 @@ void virtcrypto_ctrlq_callback(struct virtqueue *vq)
        } while (!virtqueue_enable_cb(vq));
        spin_unlock_irqrestore(&vcrypto->ctrl_lock, flags);
 }
+
+void virtcrypto_dataq_callback(struct virtqueue *vq)
+{
+       struct virtio_crypto *vcrypto = vq->vdev->priv;
+       struct virtio_crypto_request *vc_req;
+       unsigned long flags;
+       unsigned int len;
+       unsigned int qid = vq->index;
+
+       spin_lock_irqsave(&vcrypto->data_vq[qid].lock, flags);
+       do {
+               virtqueue_disable_cb(vq);
+               while ((vc_req = virtqueue_get_buf(vq, &len)) != NULL) {
+                       spin_unlock_irqrestore(
+                               &vcrypto->data_vq[qid].lock, flags);
+                       if (vc_req->alg_cb)
+                               vc_req->alg_cb(vc_req, len);
+                       spin_lock_irqsave(
+                               &vcrypto->data_vq[qid].lock, flags);
+               }
+       } while (!virtqueue_enable_cb(vq));
+       spin_unlock_irqrestore(&vcrypto->data_vq[qid].lock, flags);
+}
diff --git a/drivers/crypto/virtio/virtio_crypto_common.h 
b/drivers/crypto/virtio/virtio_crypto_common.h
index b90ac0ce30d2..b33c0d4423eb 100644
--- a/drivers/crypto/virtio/virtio_crypto_common.h
+++ b/drivers/crypto/virtio/virtio_crypto_common.h
@@ -150,4 +150,6 @@ int virtio_crypto_ctrl_vq_request(struct virtio_crypto 
*vcrypto, struct scatterl
                                  unsigned int out_sgs, unsigned int in_sgs,
                                  struct virtio_crypto_ctrl_request 
*vc_ctrl_req);
 
+void virtcrypto_dataq_callback(struct virtqueue *vq);
+
 #endif /* _VIRTIO_CRYPTO_COMMON_H */
diff --git a/drivers/crypto/virtio/virtio_crypto_core.c 
b/drivers/crypto/virtio/virtio_crypto_core.c
index e668d4b1bc6a..d8edefcb966c 100644
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -13,38 +13,6 @@
 #include "virtio_crypto_common.h"
 
 
-void
-virtcrypto_clear_request(struct virtio_crypto_request *vc_req)
-{
-       if (vc_req) {
-               kfree_sensitive(vc_req->req_data);
-               kfree(vc_req->sgs);
-       }
-}
-
-static void virtcrypto_dataq_callback(struct virtqueue *vq)
-{
-       struct virtio_crypto *vcrypto = vq->vdev->priv;
-       struct virtio_crypto_request *vc_req;
-       unsigned long flags;
-       unsigned int len;
-       unsigned int qid = vq->index;
-
-       spin_lock_irqsave(&vcrypto->data_vq[qid].lock, flags);
-       do {
-               virtqueue_disable_cb(vq);
-               while ((vc_req = virtqueue_get_buf(vq, &len)) != NULL) {
-                       spin_unlock_irqrestore(
-                               &vcrypto->data_vq[qid].lock, flags);
-                       if (vc_req->alg_cb)
-                               vc_req->alg_cb(vc_req, len);
-                       spin_lock_irqsave(
-                               &vcrypto->data_vq[qid].lock, flags);
-               }
-       } while (!virtqueue_enable_cb(vq));
-       spin_unlock_irqrestore(&vcrypto->data_vq[qid].lock, flags);
-}
-
 static int virtcrypto_find_vqs(struct virtio_crypto *vi)
 {
        vq_callback_t **callbacks;
-- 
2.20.1

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization