From: Fan Zhang <roy.fan.zhang@intel.com>
To: dev@dpdk.org
Cc: jianjay.zhou@huawei.com, roy.fan.zhang@intel.com,
maxime.coquelin@redhat.com, jianfeng.tan@intel.com,
pawelx.wodkowski@intel.com
Subject: [dpdk-dev] [PATCH] lib/librte_vhost: fix bugs
Date: Mon, 9 Apr 2018 16:34:28 +0100 [thread overview]
Message-ID: <20180409153429.20123-1-roy.fan.zhang@intel.com> (raw)
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.zhang@intel.com>
---
examples/vhost_crypto/main.c | 5 -----
lib/librte_vhost/Makefile | 3 ++-
lib/librte_vhost/vhost_crypto.c | 8 ++++----
3 files changed, 6 insertions(+), 10 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..2acfc908c 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -381,7 +381,7 @@ vhost_crypto_create_sess(struct vhost_crypto *vcrypto,
return;
}
- VC_LOG_DBG("Session (key %lu, session %p) created.",
+ VC_LOG_DBG("Session (key %llu, session %p) created.",
vcrypto->last_session_id, session);
sess_param->session_id = vcrypto->last_session_id;
@@ -399,7 +399,7 @@ 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 (key %llu).", session_id);
return -VIRTIO_CRYPTO_INVSESS;
}
@@ -418,7 +418,7 @@ 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,
+ VC_LOG_DBG("Session (key %llu, session %p) deleted.", sess_id,
session);
return 0;
@@ -932,7 +932,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 retrieve session id %llu",
session_id);
goto error_exit;
}
--
2.13.6
next reply other threads:[~2018-04-09 15:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-09 15:34 Fan Zhang [this message]
2018-04-09 15:34 ` [dpdk-dev] [PATCH] lib/librte_vhost: remove packet dump Fan Zhang
2018-04-11 8:47 ` Maxime Coquelin
2018-04-11 8:59 ` Maxime Coquelin
2018-04-11 14:36 ` Maxime Coquelin
2018-04-09 15:45 ` [dpdk-dev] [PATCH] lib/librte_vhost: fix bugs Maxime Coquelin
2018-04-09 15:53 ` Maxime Coquelin
2018-04-09 16:38 ` [dpdk-dev] [PATCH v2] vhost/crypto: " Fan Zhang
2018-04-09 17:57 ` [dpdk-dev] [PATCH] examples/vhost_crypto: fix parsing Fan Zhang
2018-04-10 9:40 ` Maxime Coquelin
2018-04-09 18:01 ` [dpdk-dev] [PATCH] vhost/crypto: fix makefile Fan Zhang
2018-04-10 9:41 ` Maxime Coquelin
2018-04-09 18:21 ` [dpdk-dev] [PATCH] vhost/crypto: fix session id printf Fan Zhang
2018-04-10 9:41 ` Maxime Coquelin
2018-04-11 9:22 ` [dpdk-dev] [PATCH] vhost/crypto: fix incorrect formatting Fan Zhang
2018-04-11 9:56 ` Maxime Coquelin
2018-04-10 7:32 ` [dpdk-dev] [PATCH] lib/librte_vhost: fix bugs Wodkowski, PawelX
2018-04-10 7:43 ` Maxime Coquelin
2018-04-10 7:47 ` Wodkowski, PawelX
2018-04-10 7:55 ` Maxime Coquelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180409153429.20123-1-roy.fan.zhang@intel.com \
--to=roy.fan.zhang@intel.com \
--cc=dev@dpdk.org \
--cc=jianfeng.tan@intel.com \
--cc=jianjay.zhou@huawei.com \
--cc=maxime.coquelin@redhat.com \
--cc=pawelx.wodkowski@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).