[dpdk-dev] [PATCH v2] vhost/crypto: fix bugs

[Fan Zhang]

Fixes: 256b132f41b2 ("vhost/crypto: add session message handler")
Fixes: 7b5ad7beee17 ("vhost/crypto: update makefile")
Fixes: 2ce5bd8c442d ("examples/vhost_crypto: add vhost crypto sample 
application")

This patch fixes the bugs introduced in the above patches.

Signed-off-by: Fan Zhang <roy.fan.zh...@intel.com>
---
v2:
- change from "%llu" to "%"PRIu64

 examples/vhost_crypto/main.c    |  5 -----
 lib/librte_vhost/Makefile       |  3 ++-
 lib/librte_vhost/vhost_crypto.c | 17 +++++++++--------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c
index bc867240d..860200e29 100644
--- a/examples/vhost_crypto/main.c
+++ b/examples/vhost_crypto/main.c
@@ -95,11 +95,6 @@ parse_cryptodev_id(const char *q_arg)
 
        /* parse decimal string */
        pm = strtoul(q_arg, &end, 10);
-       if ((pm == '\0') || (end == NULL) || (*end != '\0')) {
-               RTE_LOG(ERR, USER1, "Invalid Cryptodev ID %s\n", q_arg);
-               return -1;
-       }
-
        if (pm > rte_cryptodev_count()) {
                RTE_LOG(ERR, USER1, "Invalid Cryptodev ID %s\n", q_arg);
                return -1;
diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
index 2cc65f95e..92c267475 100644
--- a/lib/librte_vhost/Makefile
+++ b/lib/librte_vhost/Makefile
@@ -18,7 +18,8 @@ LDLIBS += -lpthread
 ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y)
 LDLIBS += -lnuma
 endif
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net
+LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net \
+                                       -lrte_cryptodev -lrte_hash
 
 # all source are stored in SRCS-y
 SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index d84513e7f..b67b63cc1 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -381,8 +381,8 @@ vhost_crypto_create_sess(struct vhost_crypto *vcrypto,
                return;
        }
 
-       VC_LOG_DBG("Session (key %lu, session %p) created.",
-                       vcrypto->last_session_id, session);
+       VC_LOG_DBG("Session %"PRIu64" created for vid %i.",
+                       vcrypto->last_session_id, vcrypto->dev->vid);
 
        sess_param->session_id = vcrypto->last_session_id;
        vcrypto->last_session_id++;
@@ -399,17 +399,18 @@ vhost_crypto_close_sess(struct vhost_crypto *vcrypto, 
uint64_t session_id)
                        (void **)&session);
 
        if (unlikely(ret < 0)) {
-               VC_LOG_ERR("Failed to delete session (key %lu).", session_id);
+               VC_LOG_ERR("Failed to delete session %"PRIu64".",
+                               session_id);
                return -VIRTIO_CRYPTO_INVSESS;
        }
 
        if (rte_cryptodev_sym_session_clear(vcrypto->cid, session) < 0) {
-               VC_LOG_DBG("Failed to delete session");
+               VC_LOG_DBG("Failed to clear session");
                return -VIRTIO_CRYPTO_ERR;
        }
 
        if (rte_cryptodev_sym_session_free(session) < 0) {
-               VC_LOG_DBG("Failed to delete session");
+               VC_LOG_DBG("Failed to free session");
                return -VIRTIO_CRYPTO_ERR;
        }
 
@@ -418,8 +419,8 @@ vhost_crypto_close_sess(struct vhost_crypto *vcrypto, 
uint64_t session_id)
                return -VIRTIO_CRYPTO_ERR;
        }
 
-       VC_LOG_DBG("Session (key %lu, session %p) deleted.", sess_id,
-                       session);
+       VC_LOG_DBG("Session %"PRIu64" deleted for vid %i.", sess_id,
+                       vcrypto->dev->vid);
 
        return 0;
 }
@@ -932,7 +933,7 @@ vhost_crypto_process_one_req(struct vhost_crypto *vcrypto,
                                        &session_id, (void **)&session);
                        if (unlikely(err < 0)) {
                                err = VIRTIO_CRYPTO_ERR;
-                               VC_LOG_ERR("Failed to retrieve session id %lu",
+                               VC_LOG_ERR("Failed to obtain session %"PRIu64,
                                                session_id);
                                goto error_exit;
                        }
-- 
2.13.6