[dpdk-dev] [PATCH v9 04/11] crypto/virtio: support session related ops

[Jay Zhou]

This patch implements session related operations, which includes creating
and destroying the session. For now, it only supports the session-oriented
API implementation. The control queue used to create or destroy sessions
for symmetric algorithms.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_crypto_algs.h |  27 ++
 drivers/crypto/virtio/virtio_cryptodev.c   | 737 -
 drivers/crypto/virtio/virtio_cryptodev.h   |   7 +
 3 files changed, 768 insertions(+), 3 deletions(-)
 create mode 100644 drivers/crypto/virtio/virtio_crypto_algs.h

diff --git a/drivers/crypto/virtio/virtio_crypto_algs.h 
b/drivers/crypto/virtio/virtio_crypto_algs.h
new file mode 100644
index 000..df13b82
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_crypto_algs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#ifndef _VIRTIO_CRYPTO_ALGS_H_
+#define _VIRTIO_CRYPTO_ALGS_H_
+
+#include 
+#include 
+
+struct virtio_crypto_session {
+   uint64_t session_id;
+
+   struct {
+   uint16_t offset;
+   uint16_t length;
+   } iv;
+
+   struct {
+   uint32_t length;
+   phys_addr_t phys_addr;
+   } aad;
+
+   struct virtio_crypto_op_ctrl_req ctrl;
+};
+
+#endif /* _VIRTIO_CRYPTO_ALGS_H_ */
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 73f8b96..596a237 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1,14 +1,20 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
  */
+#include 
+#include 
+
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+
 #include "virtio_cryptodev.h"
 #include "virtqueue.h"
+#include "virtio_crypto_algs.h"
 
 int virtio_crypto_logtype_init;
 int virtio_crypto_logtype_session;
@@ -31,6 +37,14 @@ static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
 static int virtio_crypto_qp_release(struct rte_cryptodev *dev,
uint16_t queue_pair_id);
 static void virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev);
+static unsigned int virtio_crypto_sym_get_session_private_size(
+   struct rte_cryptodev *dev);
+static void virtio_crypto_sym_clear_session(struct rte_cryptodev *dev,
+   struct rte_cryptodev_sym_session *sess);
+static int virtio_crypto_sym_configure_session(struct rte_cryptodev *dev,
+   struct rte_crypto_sym_xform *xform,
+   struct rte_cryptodev_sym_session *session,
+   struct rte_mempool *mp);
 
 /*
  * The set of PCI devices this driver supports
@@ -43,6 +57,210 @@ static int virtio_crypto_qp_release(struct rte_cryptodev 
*dev,
 
 uint8_t cryptodev_virtio_driver_id;
 
+#define NUM_ENTRY_SYM_CREATE_SESSION 4
+
+static int
+virtio_crypto_send_command(struct virtqueue *vq,
+   struct virtio_crypto_op_ctrl_req *ctrl, uint8_t *cipher_key,
+   uint8_t *auth_key, struct virtio_crypto_session *session)
+{
+   uint8_t idx = 0;
+   uint8_t needed = 1;
+   uint32_t head = 0;
+   uint32_t len_cipher_key = 0;
+   uint32_t len_auth_key = 0;
+   uint32_t len_ctrl_req = sizeof(struct virtio_crypto_op_ctrl_req);
+   uint32_t len_session_input = sizeof(struct virtio_crypto_session_input);
+   uint32_t len_total = 0;
+   uint32_t input_offset = 0;
+   void *virt_addr_started = NULL;
+   phys_addr_t phys_addr_started;
+   struct vring_desc *desc;
+   uint32_t desc_offset;
+   struct virtio_crypto_session_input *input;
+   int ret;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (session == NULL) {
+   VIRTIO_CRYPTO_SESSION_LOG_ERR("session is NULL.");
+   return -EINVAL;
+   }
+   /* cipher only is supported, it is available if auth_key is NULL */
+   if (!cipher_key) {
+   VIRTIO_CRYPTO_SESSION_LOG_ERR("cipher key is NULL.");
+   return -EINVAL;
+   }
+
+   head = vq->vq_desc_head_idx;
+   VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_desc_head_idx = %d, vq = %p",
+   head, vq);
+
+   if (vq->vq_free_cnt < needed) {
+   VIRTIO_CRYPTO_SESSION_LOG_ERR("Not enough entry");
+   return -ENOSPC;
+   }
+
+   /* calculate the length of cipher key */
+   if (cipher_key) {
+   switch (ctrl->u.sym_create_session.op_type) {
+   case VIRTIO_CRYPTO_SYM_OP_CIPHER:
+   len_cipher_key
+   = ctrl->u.sym_create_session.u.cipher
+   .para.keylen;
+   break;
+   case VIRTIO_CRYPTO_SYM_OP_ALGORITHM_CHAINING:
+   len_cipher_key
+   = ctrl->u.sym_create_s

[dpdk-dev] [PATCH v9 07/11] crypto/virtio: support AES-CBC

[Jay Zhou]

The AES-CBC cipher only algorithm has been supported now.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_crypto_capabilities.h | 30 ++
 drivers/crypto/virtio/virtio_cryptodev.c   | 11 
 2 files changed, 41 insertions(+)
 create mode 100644 drivers/crypto/virtio/virtio_crypto_capabilities.h

diff --git a/drivers/crypto/virtio/virtio_crypto_capabilities.h 
b/drivers/crypto/virtio/virtio_crypto_capabilities.h
new file mode 100644
index 000..db6932f
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#ifndef _VIRTIO_CRYPTO_CAPABILITIES_H_
+#define _VIRTIO_CRYPTO_CAPABILITIES_H_
+
+#define VIRTIO_SYM_CAPABILITIES\
+   {   /* AES CBC */   \
+   .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
+   {.sym = {   \
+   .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,  \
+   {.cipher = {\
+   .algo = RTE_CRYPTO_CIPHER_AES_CBC,  \
+   .block_size = 16,   \
+   .key_size = {   \
+   .min = 16,  \
+   .max = 32,  \
+   .increment = 8  \
+   },  \
+   .iv_size = {\
+   .min = 16,  \
+   .max = 16,  \
+   .increment = 0  \
+   }   \
+   }, }\
+   }, }\
+   }
+
+#endif /* _VIRTIO_CRYPTO_CAPABILITIES_H_ */
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 6f92e99..f924b04 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -15,6 +15,7 @@
 #include "virtio_cryptodev.h"
 #include "virtqueue.h"
 #include "virtio_crypto_algs.h"
+#include "virtio_crypto_capabilities.h"
 
 int virtio_crypto_logtype_init;
 int virtio_crypto_logtype_session;
@@ -58,6 +59,11 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
{ .vendor_id = 0, /* sentinel */ },
 };
 
+static const struct rte_cryptodev_capabilities virtio_capabilities[] = {
+   VIRTIO_SYM_CAPABILITIES,
+   RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
+};
+
 uint8_t cryptodev_virtio_driver_id;
 
 #define NUM_ENTRY_SYM_CREATE_SESSION 4
@@ -746,6 +752,7 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
 
hw = cryptodev->data->dev_private;
hw->dev_id = cryptodev->data->dev_id;
+   hw->virtio_dev_capabilities = virtio_capabilities;
 
VIRTIO_CRYPTO_INIT_LOG_DBG("dev %d vendorID=0x%x deviceID=0x%x",
cryptodev->data->dev_id, pci_dev->id.vendor_id,
@@ -1139,6 +1146,9 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
struct rte_crypto_cipher_xform *cipher_xform)
 {
switch (cipher_xform->algo) {
+   case RTE_CRYPTO_CIPHER_AES_CBC:
+   para->algo = VIRTIO_CRYPTO_CIPHER_AES_CBC;
+   break;
default:
VIRTIO_CRYPTO_SESSION_LOG_ERR("Crypto: Unsupported "
"Cipher alg %u", cipher_xform->algo);
@@ -1402,6 +1412,7 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
info->max_nb_queue_pairs = hw->max_dataqueues;
info->sym.max_nb_sessions =
RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS;
+   info->capabilities = hw->virtio_dev_capabilities;
}
 }
 
-- 
1.8.3.1

[dpdk-dev] [PATCH v9 03/11] crypto/virtio: support basic PMD ops

[Jay Zhou]

This patch implements the basic operations of virtio crypto PMD, which
includes start, stop, close, information getting, queue setup and
release of the device.
The virtio crypto device has two types of queues, data queue and
control queue. It has one data queue at least and has one and only one
control queue. For example, if a virtio crypto device has N queues,
then [0, N-2] is the data queue index, N-1 is the control
queue index.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_cryptodev.c | 437 ++-
 drivers/crypto/virtio/virtio_cryptodev.h |  32 ++-
 drivers/crypto/virtio/virtio_rxtx.c  |  68 +
 3 files changed, 528 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 3fe2c80..73f8b96 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
  */
+#include 
 #include 
 #include 
 #include 
@@ -15,6 +16,22 @@
 int virtio_crypto_logtype_tx;
 int virtio_crypto_logtype_driver;
 
+static int virtio_crypto_dev_configure(struct rte_cryptodev *dev,
+   struct rte_cryptodev_config *config);
+static int virtio_crypto_dev_start(struct rte_cryptodev *dev);
+static void virtio_crypto_dev_stop(struct rte_cryptodev *dev);
+static int virtio_crypto_dev_close(struct rte_cryptodev *dev);
+static void virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
+   struct rte_cryptodev_info *dev_info);
+static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
+   uint16_t queue_pair_id,
+   const struct rte_cryptodev_qp_conf *qp_conf,
+   int socket_id,
+   struct rte_mempool *session_pool);
+static int virtio_crypto_qp_release(struct rte_cryptodev *dev,
+   uint16_t queue_pair_id);
+static void virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev);
+
 /*
  * The set of PCI devices this driver supports
  */
@@ -26,22 +43,251 @@
 
 uint8_t cryptodev_virtio_driver_id;
 
+void
+virtio_crypto_queue_release(struct virtqueue *vq)
+{
+   struct virtio_crypto_hw *hw;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (vq) {
+   hw = vq->hw;
+   /* Select and deactivate the queue */
+   VTPCI_OPS(hw)->del_queue(hw, vq);
+
+   rte_memzone_free(vq->mz);
+   rte_mempool_free(vq->mpool);
+   rte_free(vq);
+   }
+}
+
+#define MPOOL_MAX_NAME_SZ 32
+
+int
+virtio_crypto_queue_setup(struct rte_cryptodev *dev,
+   int queue_type,
+   uint16_t vtpci_queue_idx,
+   uint16_t nb_desc,
+   int socket_id,
+   struct virtqueue **pvq)
+{
+   char vq_name[VIRTQUEUE_MAX_NAME_SZ];
+   char mpool_name[MPOOL_MAX_NAME_SZ];
+   const struct rte_memzone *mz;
+   unsigned int vq_size, size;
+   struct virtio_crypto_hw *hw = dev->data->dev_private;
+   struct virtqueue *vq = NULL;
+   uint32_t i = 0;
+   uint32_t j;
+
+   PMD_INIT_FUNC_TRACE();
+
+   VIRTIO_CRYPTO_INIT_LOG_DBG("setting up queue: %u", vtpci_queue_idx);
+
+   /*
+* Read the virtqueue size from the Queue Size field
+* Always power of 2 and if 0 virtqueue does not exist
+*/
+   vq_size = VTPCI_OPS(hw)->get_queue_num(hw, vtpci_queue_idx);
+   if (vq_size == 0) {
+   VIRTIO_CRYPTO_INIT_LOG_ERR("virtqueue does not exist");
+   return -EINVAL;
+   }
+   VIRTIO_CRYPTO_INIT_LOG_DBG("vq_size: %u", vq_size);
+
+   if (!rte_is_power_of_2(vq_size)) {
+   VIRTIO_CRYPTO_INIT_LOG_ERR("virtqueue size is not powerof 2");
+   return -EINVAL;
+   }
+
+   if (queue_type == VTCRYPTO_DATAQ) {
+   snprintf(vq_name, sizeof(vq_name), "dev%d_dataqueue%d",
+   dev->data->dev_id, vtpci_queue_idx);
+   snprintf(mpool_name, sizeof(mpool_name),
+   "dev%d_dataqueue%d_mpool",
+   dev->data->dev_id, vtpci_queue_idx);
+   } else if (queue_type == VTCRYPTO_CTRLQ) {
+   snprintf(vq_name, sizeof(vq_name), "dev%d_controlqueue",
+   dev->data->dev_id);
+   snprintf(mpool_name, sizeof(mpool_name),
+   "dev%d_controlqueue_mpool",
+   dev->data->dev_id);
+   }
+   size = RTE_ALIGN_CEIL(sizeof(*vq) +
+   vq_size * sizeof(struct vq_desc_extra),
+   RTE_CACHE_LINE_SIZE);
+   vq = rte_zmalloc_socket(vq_name, size, RTE_CACHE_LINE_SIZE,
+   socket_id);
+   if (vq == NULL) {
+   VIRTIO_CRYPTO_INIT_LOG_ERR("Can not allocate virtqueue");
+   

[dpdk-dev] [PATCH v9 00/11] crypto: add virtio poll mode driver

[Jay Zhou]

This patch series introduce virtio crypto poll mode driver.

Since it is limited by the vhost crypto backend of the virtio-crypto,
this patch series only supports a limited subset of crypto services.
Only the following algorithms are tested:

Cipher algorithms:
  - RTE_CRYPTO_CIPHER_AES_CBC (128-bit, 192-bit and 256-bit keys)

Cipher then hash algorithms:
  - RTE_CRYPTO_CIPHER_AES_CBC with RTE_CRYPTO_AUTH_SHA1_HMAC

The qemu side has supported vhost crypto and the vhost user crypto server
side patches had been merged into dpdk-next-virtio too.

Firstly run DPDK vhost crypto sample as a server side and build QEMU with
vhost crypto enabled. 
QEMU can then be started using the following parameters:

qemu-system-x86_64 \
[...] \
-chardev socket,id=charcrypto0,path=/path/to/your/socket \
-object cryptodev-vhost-user,id=cryptodev0,chardev=charcrypto0 \
-device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0
[...]

Bind the uio_generic driver for the virtio-crypto device.
For example, :00:04.0 is the domain, bus, device and function
number of the virtio-crypto device:
modprobe uio_pci_generic
echo -n :00:04.0 > /sys/bus/pci/drivers/virtio-pci/unbind
echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id

The front-end virtio crypto PMD driver can be installed:
cd to the top-level DPDK directory
sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO\)=n,\1=y,' 
config/common_base
make config T=x86_64-native-linuxapp-gcc
make install T=x86_64-native-linuxapp-gcc

The unit test cases can be compiled as below:
cd to the top-level DPDK directory
export RTE_TARGET=x86_64-native-linuxapp-gcc
export RTE_SDK=`pwd`
cd to test/test
make
./test (MUST reserve enough huge pages memory)
type the command "cryptodev_virtio_autotest" to test

The result should be like this:
RTE>>cryptodev_virtio_autotest
 + --- +
 + Test Suite : Crypto VIRTIO Unit Test Suite
 + --- +
  0) TestCase AES-128-CBC Encryption PASS
  1) TestCase AES-128-CBC Decryption PASS
  2) TestCase AES-192-CBC Encryption PASS
  3) TestCase AES-192-CBC Decryption PASS
  4) TestCase AES-256-CBC Encryption PASS
  5) TestCase AES-256-CBC Decryption PASS
  6) TestCase AES-256-CBC OOP Encryption PASS
  7) TestCase AES-256-CBC OOP Decryption PASS
 + TestCase [ 0] : test_AES_cipheronly_virtio_all succeeded
 + --- +
 + Test Suite Summary
 + Tests Total :1
 + Tests Skipped :  0
 + Tests Executed : 1
 + Tests Unsupported:   0
 + Tests Passed :   1
 + Tests Failed :   0
 + --- +
Test OK

The performance can be tested as below:

reserve enough huge pages
cd to the top-level DPDK directory
export RTE_TARGET=x86_64-native-linuxapp-gcc
export RTE_SDK=`pwd`
cd to app/test-crypto-perf
type the command "make" to compile
run the tests with the following command:

./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \
--ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \
--cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \
--auth-op generate --auth-key-sz 64 --digest-sz 12 \
--total-ops 1 --burst-sz 64 --buffer-sz 2048

Please help to review, thanks!

Changes in v9:
 - fix compilation error when CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y
   and CONFIG_RTE_BUILD_SHARED_LIB=y

Changes in v8:
 - using the virtio_crypto.h in compat lib instead of
   the linux header file
 - add meson build

Changes in v7:
 - add detailed commit messages [Pablo]

Changes in v6:
 - split the patches in a more functional way [Pablo]

Changes in v5:
 - rebased on the newest dpdk-next-crypto

Changes in v4:
 - using dynamic logging [Pablo]
 - elaborate on the core code [Pablo]
 - delete algorithms which can not be tested [Pablo]
 - rebased on dpdk-next-crypto [Pablo]
 - fix doc compilation error [Pablo]
 - add release note for this PMD [Pablo]
 - add R-b from Fan Zhang
 - fix some typos

Changes in v3:
 - set up capabilities for virtio crypto PMD [Fan]
 - delete AES-CTR unit test cases since vhost_user crypto backend does not
   support [Fan]
 - fix a variable uninitialized in virtio_crypto_queue_setup() [Xin, Fan]
 - fix a bug in virtqueue_dequeue_burst_rx()

Changes in v2:
 - using pre-allocated mempool instead of rte_malloc to improve performance 
[Fan]
 - split the patch into a patchset [Fan]
 - using linux/virtio_crypto.h instead of creating a copy of the file [Fan]
 - update doc/guides/cryptodevs for describing virtio crypto PMD [Fan]
 - update copyright
 - delete virtio legacy mode code since virtio-crypto conforms to virtio-1.0
 - refine the function and variable names
 - fix errors and warnings reported by checkpatch

Jay Zhou (11):
  crypto/virtio: add virtio crypto PMD
  crypto/vir

[dpdk-dev] [PATCH v9 09/11] crypto/virtio: build with meson

[Jay Zhou]

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/meson.build|  2 +-
 drivers/crypto/virtio/meson.build | 12 
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/virtio/meson.build

diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 736c9f5..63649c9 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['dpaa_sec', 'dpaa2_sec',
-   'openssl', 'null', 'qat']
+   'openssl', 'null', 'qat', 'virtio']
 
 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
 config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
diff --git a/drivers/crypto/virtio/meson.build 
b/drivers/crypto/virtio/meson.build
new file mode 100644
index 000..cee77cc
--- /dev/null
+++ b/drivers/crypto/virtio/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+
+dep = dependency('libcrypto', required: false)
+if not dep.found()
+   build = false
+endif
+deps += ['bus_pci']
+sources = files('virtio_cryptodev.c', 'virtio_pci.c',
+   'virtio_rxtx.c', 'virtqueue.c')
+ext_deps += dep
+pkgconfig_extra_libs += '-lcrypto'
-- 
1.8.3.1

[dpdk-dev] [PATCH v9 08/11] crypto/virtio: support HMAC-SHA1

[Jay Zhou]

The AES-CBC with HMAC-SHA1 has been supported now.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_crypto_capabilities.h | 21 +
 drivers/crypto/virtio/virtio_cryptodev.c   |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/virtio/virtio_crypto_capabilities.h 
b/drivers/crypto/virtio/virtio_crypto_capabilities.h
index db6932f..03c30de 100644
--- a/drivers/crypto/virtio/virtio_crypto_capabilities.h
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -6,6 +6,27 @@
 #define _VIRTIO_CRYPTO_CAPABILITIES_H_
 
 #define VIRTIO_SYM_CAPABILITIES\
+   {   /* SHA1 HMAC */ \
+   .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
+   {.sym = {   \
+   .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,\
+   {.auth = {  \
+   .algo = RTE_CRYPTO_AUTH_SHA1_HMAC,  \
+   .block_size = 64,   \
+   .key_size = {   \
+   .min = 1,   \
+   .max = 64,  \
+   .increment = 1  \
+   },  \
+   .digest_size = {\
+   .min = 1,   \
+   .max = 20,  \
+   .increment = 1  \
+   },  \
+   .iv_size = { 0 }\
+   }, }\
+   }, }\
+   },  \
{   /* AES CBC */   \
.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
{.sym = {   \
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index f924b04..df88953 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1196,11 +1196,13 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
}
 
switch (auth_xform->algo) {
+   case RTE_CRYPTO_AUTH_SHA1_HMAC:
+   *algo = VIRTIO_CRYPTO_MAC_HMAC_SHA1;
+   break;
default:
VIRTIO_CRYPTO_SESSION_LOG_ERR(
"Crypto: Undefined Hash algo %u specified",
auth_xform->algo);
-   *algo = VIRTIO_CRYPTO_NO_MAC;
return -1;
}
 
-- 
1.8.3.1

[dpdk-dev] [PATCH v9 11/11] doc: add virtio crypto PMD guide

[Jay Zhou]

This patch adds the guide for virtio crypto PMD.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 MAINTAINERS   |   2 +
 doc/guides/cryptodevs/features/virtio.ini |  26 +++
 doc/guides/cryptodevs/index.rst   |   1 +
 doc/guides/cryptodevs/virtio.rst  | 117 ++
 doc/guides/rel_notes/release_18_05.rst|   5 +-
 5 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/cryptodevs/features/virtio.ini
 create mode 100644 doc/guides/cryptodevs/virtio.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index d171f10..1e9bd7d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -761,6 +761,8 @@ F: doc/guides/cryptodevs/features/snow3g.ini
 Virtio
 M: Jay Zhou 
 F: drivers/crypto/virtio/
+F: doc/guides/cryptodevs/virtio.rst
+F: doc/guides/cryptodevs/features/virtio.ini
 
 ZUC
 M: Pablo de Lara 
diff --git a/doc/guides/cryptodevs/features/virtio.ini 
b/doc/guides/cryptodevs/features/virtio.ini
new file mode 100644
index 000..168fc17
--- /dev/null
+++ b/doc/guides/cryptodevs/features/virtio.ini
@@ -0,0 +1,26 @@
+; Supported features of the 'virtio' crypto driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Symmetric crypto   = Y
+Sym operation chaining = Y
+
+;
+; Supported crypto algorithms of the 'virtio' crypto driver.
+;
+[Cipher]
+AES CBC (128)  = Y
+AES CBC (192)  = Y
+AES CBC (256)  = Y
+
+;
+; Supported authentication algorithms of the 'virtio' crypto driver.
+;
+[Auth]
+SHA1 HMAC  = Y
+
+;
+; Supported AEAD algorithms of the 'virtio' crypto driver.
+;
+[AEAD]
diff --git a/doc/guides/cryptodevs/index.rst b/doc/guides/cryptodevs/index.rst
index 8a921dd..0529583 100644
--- a/doc/guides/cryptodevs/index.rst
+++ b/doc/guides/cryptodevs/index.rst
@@ -23,4 +23,5 @@ Crypto Device Drivers
 scheduler
 snow3g
 qat
+virtio
 zuc
diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst
new file mode 100644
index 000..f3aa7c6
--- /dev/null
+++ b/doc/guides/cryptodevs/virtio.rst
@@ -0,0 +1,117 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+
+Virtio Crypto Poll Mode Driver
+==
+
+The virtio crypto PMD provides poll mode driver support for the virtio crypto
+device.
+
+Features
+
+
+The virtio crypto PMD has support for:
+
+Cipher algorithms:
+
+* ``RTE_CRYPTO_CIPHER_AES_CBC``
+
+Hash algorithms:
+
+* ``RTE_CRYPTO_AUTH_SHA1_HMAC``
+
+Limitations
+---
+
+*  Only supports the session-oriented API implementation (session-less APIs are
+   not supported).
+*  Only supports modern mode since virtio crypto conforms to virtio-1.0.
+*  Only has two types of queues: data queue and control queue. These two queues
+   only support indirect buffers to communication with the virtio backend.
+*  Only supports AES_CBC cipher only algorithm and AES_CBC with HMAC_SHA1
+   chaining algorithm since the vhost crypto backend only these algorithms
+   are supported.
+*  Does not support Link State interrupt.
+*  Does not support runtime configuration.
+
+Virtio crypto PMD Rx/Tx Callbacks
+-
+
+Rx callbacks:
+
+* ``virtio_crypto_pkt_rx_burst``
+
+Tx callbacks:
+
+* ``virtio_crypto_pkt_tx_burst``
+
+Installation
+
+
+Quick instructions are as follows:
+
+Firstly run DPDK vhost crypto sample as a server side and build QEMU with
+vhost crypto enabled.
+QEMU can then be started using the following parameters:
+
+.. code-block:: console
+
+qemu-system-x86_64 \
+[...] \
+-chardev socket,id=charcrypto0,path=/path/to/your/socket \
+-object cryptodev-vhost-user,id=cryptodev0,chardev=charcrypto0 \
+-device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0
+[...]
+
+Secondly bind the uio_generic driver for the virtio-crypto device.
+For example, :00:04.0 is the domain, bus, device and function
+number of the virtio-crypto device:
+
+.. code-block:: console
+
+modprobe uio_pci_generic
+echo -n :00:04.0 > /sys/bus/pci/drivers/virtio-pci/unbind
+echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id
+
+Finally the front-end virtio crypto PMD driver can be installed:
+
+.. code-block:: console
+
+cd to the top-level DPDK directory
+sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO\)=n,\1=y,' 
config/common_base
+make config T=x86_64-native-linuxapp-gcc
+make install T=x86_64-native-linuxapp-gcc
+
+Tests
+-
+
+The unit test cases can be tested as below:
+
+.. code-block:: console
+
+reserve enough huge pages
+cd to the top-level DPDK directory
+export RTE_TARGET=x86_64-native-linuxapp-gcc
+export RTE_SDK=`pwd`
+cd to test/test
+type the command "make" to compile
+run the tests with "./test"
+type the command "cryptodev_virtio_autotest" to test
+
+The performance can be tested as below:
+
+.. code-bloc

[dpdk-dev] [PATCH v9 02/11] crypto/virtio: support virtio device init

[Jay Zhou]

This patch implements the initialization of the virtio crypto device.
The virtio crypto device conforms to virtio-1.0, so this patch only
supports modern mode operation.
The cryptodev is created at the virtio crypto pci device probing stage.
The function of virtio_crypto_pkt_tx_burst() is used to burst transfer
packets and virtio_crypto_pkt_rx_burst() is used to burst receive packets.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/Makefile   |   3 +
 drivers/crypto/virtio/virtio_cryptodev.c | 245 +++-
 drivers/crypto/virtio/virtio_cryptodev.h |  13 +
 drivers/crypto/virtio/virtio_logs.h  |  91 ++
 drivers/crypto/virtio/virtio_pci.c   | 462 +++
 drivers/crypto/virtio/virtio_pci.h   | 252 +
 drivers/crypto/virtio/virtio_ring.h  | 137 +
 drivers/crypto/virtio/virtio_rxtx.c  |  26 ++
 drivers/crypto/virtio/virtqueue.c|  43 +++
 drivers/crypto/virtio/virtqueue.h| 171 
 10 files changed, 1441 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/virtio/virtio_logs.h
 create mode 100644 drivers/crypto/virtio/virtio_pci.c
 create mode 100644 drivers/crypto/virtio/virtio_pci.h
 create mode 100644 drivers/crypto/virtio/virtio_ring.h
 create mode 100644 drivers/crypto/virtio/virtio_rxtx.c
 create mode 100644 drivers/crypto/virtio/virtqueue.c
 create mode 100644 drivers/crypto/virtio/virtqueue.h

diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile
index 2f04f0c..786afb8 100644
--- a/drivers/crypto/virtio/Makefile
+++ b/drivers/crypto/virtio/Makefile
@@ -18,6 +18,9 @@ LIBABIVER := 1
 #
 # all source are stored in SRCS-y
 #
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c
 
 # this lib depends upon:
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 3e54942..3fe2c80 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -3,27 +3,240 @@
  */
 #include 
 #include 
+#include 
 #include 
+#include 
 #include "virtio_cryptodev.h"
+#include "virtqueue.h"
+
+int virtio_crypto_logtype_init;
+int virtio_crypto_logtype_session;
+int virtio_crypto_logtype_rx;
+int virtio_crypto_logtype_tx;
+int virtio_crypto_logtype_driver;
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static const struct rte_pci_id pci_id_virtio_crypto_map[] = {
+   { RTE_PCI_DEVICE(VIRTIO_CRYPTO_PCI_VENDORID,
+   VIRTIO_CRYPTO_PCI_DEVICEID) },
+   { .vendor_id = 0, /* sentinel */ },
+};
 
 uint8_t cryptodev_virtio_driver_id;
 
+/*
+ * dev_ops for virtio, bare necessities for basic operation
+ */
+static struct rte_cryptodev_ops virtio_crypto_dev_ops = {
+   /* Device related operations */
+   .dev_configure   = NULL,
+   .dev_start   = NULL,
+   .dev_stop= NULL,
+   .dev_close   = NULL,
+   .dev_infos_get   = NULL,
+
+   .stats_get   = NULL,
+   .stats_reset = NULL,
+
+   .queue_pair_setup= NULL,
+   .queue_pair_release  = NULL,
+   .queue_pair_start= NULL,
+   .queue_pair_stop = NULL,
+   .queue_pair_count= NULL,
+
+   /* Crypto related operations */
+   .session_get_size   = NULL,
+   .session_configure  = NULL,
+   .session_clear  = NULL,
+   .qp_attach_session = NULL,
+   .qp_detach_session = NULL
+};
+
+static int
+virtio_negotiate_features(struct virtio_crypto_hw *hw, uint64_t req_features)
+{
+   uint64_t host_features;
+
+   PMD_INIT_FUNC_TRACE();
+
+   /* Prepare guest_features: feature that driver wants to support */
+   VIRTIO_CRYPTO_INIT_LOG_DBG("guest_features before negotiate = %" PRIx64,
+   req_features);
+
+   /* Read device(host) feature bits */
+   host_features = VTPCI_OPS(hw)->get_features(hw);
+   VIRTIO_CRYPTO_INIT_LOG_DBG("host_features before negotiate = %" PRIx64,
+   host_features);
+
+   /*
+* Negotiate features: Subset of device feature bits are written back
+* guest feature bits.
+*/
+   hw->guest_features = req_features;
+   hw->guest_features = vtpci_cryptodev_negotiate_features(hw,
+   host_features);
+   VIRTIO_CRYPTO_INIT_LOG_DBG("features after negotiate = %" PRIx64,
+   hw->guest_features);
+
+   if (hw->modern) {
+   if (!vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) {
+   VIRTIO_CRYPTO_

[dpdk-dev] [PATCH v9 06/11] crypto/virtio: support stats related ops

[Jay Zhou]

This patch implements the statistics of the packets.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_cryptodev.c | 66 +++-
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 596a237..6f92e99 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -29,6 +29,9 @@ static int virtio_crypto_dev_configure(struct rte_cryptodev 
*dev,
 static int virtio_crypto_dev_close(struct rte_cryptodev *dev);
 static void virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
struct rte_cryptodev_info *dev_info);
+static void virtio_crypto_dev_stats_get(struct rte_cryptodev *dev,
+   struct rte_cryptodev_stats *stats);
+static void virtio_crypto_dev_stats_reset(struct rte_cryptodev *dev);
 static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
uint16_t queue_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
@@ -501,8 +504,8 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
.dev_close   = virtio_crypto_dev_close,
.dev_infos_get   = virtio_crypto_dev_info_get,
 
-   .stats_get   = NULL,
-   .stats_reset = NULL,
+   .stats_get   = virtio_crypto_dev_stats_get,
+   .stats_reset = virtio_crypto_dev_stats_reset,
 
.queue_pair_setup= virtio_crypto_qp_setup,
.queue_pair_release  = virtio_crypto_qp_release,
@@ -518,6 +521,65 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
.qp_detach_session = NULL
 };
 
+static void
+virtio_crypto_update_stats(struct rte_cryptodev *dev,
+   struct rte_cryptodev_stats *stats)
+{
+   unsigned int i;
+   struct virtio_crypto_hw *hw = dev->data->dev_private;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (stats == NULL) {
+   VIRTIO_CRYPTO_DRV_LOG_ERR("invalid pointer");
+   return;
+   }
+
+   for (i = 0; i < hw->max_dataqueues; i++) {
+   const struct virtqueue *data_queue
+   = dev->data->queue_pairs[i];
+   if (data_queue == NULL)
+   continue;
+
+   stats->enqueued_count += data_queue->packets_sent_total;
+   stats->enqueue_err_count += data_queue->packets_sent_failed;
+
+   stats->dequeued_count += data_queue->packets_received_total;
+   stats->dequeue_err_count
+   += data_queue->packets_received_failed;
+   }
+}
+
+static void
+virtio_crypto_dev_stats_get(struct rte_cryptodev *dev,
+   struct rte_cryptodev_stats *stats)
+{
+   PMD_INIT_FUNC_TRACE();
+
+   virtio_crypto_update_stats(dev, stats);
+}
+
+static void
+virtio_crypto_dev_stats_reset(struct rte_cryptodev *dev)
+{
+   unsigned int i;
+   struct virtio_crypto_hw *hw = dev->data->dev_private;
+
+   PMD_INIT_FUNC_TRACE();
+
+   for (i = 0; i < hw->max_dataqueues; i++) {
+   struct virtqueue *data_queue = dev->data->queue_pairs[i];
+   if (data_queue == NULL)
+   continue;
+
+   data_queue->packets_sent_total = 0;
+   data_queue->packets_sent_failed = 0;
+
+   data_queue->packets_received_total = 0;
+   data_queue->packets_received_failed = 0;
+   }
+}
+
 static int
 virtio_crypto_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
-- 
1.8.3.1

[dpdk-dev] [PATCH v9 01/11] crypto/virtio: add virtio crypto PMD

[Jay Zhou]

The virtio crypto device is a virtual cryptography device
as well as a kind of virtual hardware accelerator for
virtual machines. The linux kernel virtio-crypto driver
has been merged, and this patch introduces virtio crypto
PMD to achieve better performance.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 MAINTAINERS|  4 +++
 config/common_base | 14 +
 doc/guides/rel_notes/release_18_05.rst |  4 +++
 drivers/crypto/Makefile|  1 +
 drivers/crypto/virtio/Makefile | 29 +
 .../virtio/rte_pmd_virtio_crypto_version.map   |  3 ++
 drivers/crypto/virtio/virtio_cryptodev.c   | 36 ++
 drivers/crypto/virtio/virtio_cryptodev.h   | 10 ++
 mk/rte.app.mk  |  1 +
 9 files changed, 102 insertions(+)
 create mode 100644 drivers/crypto/virtio/Makefile
 create mode 100644 drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
 create mode 100644 drivers/crypto/virtio/virtio_cryptodev.c
 create mode 100644 drivers/crypto/virtio/virtio_cryptodev.h

diff --git a/MAINTAINERS b/MAINTAINERS
index e54c1f0..d171f10 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -758,6 +758,10 @@ F: drivers/crypto/snow3g/
 F: doc/guides/cryptodevs/snow3g.rst
 F: doc/guides/cryptodevs/features/snow3g.ini
 
+Virtio
+M: Jay Zhou 
+F: drivers/crypto/virtio/
+
 ZUC
 M: Pablo de Lara 
 F: drivers/crypto/zuc/
diff --git a/config/common_base b/config/common_base
index 9e3fbaa..8a150f8 100644
--- a/config/common_base
+++ b/config/common_base
@@ -493,6 +493,20 @@ CONFIG_RTE_LIBRTE_PMD_QAT_DEBUG_DRIVER=n
 CONFIG_RTE_QAT_PMD_MAX_NB_SESSIONS=2048
 
 #
+# Compile PMD for virtio crypto devices
+#
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=n
+#
+# Number of maximum virtio crypto devices
+#
+CONFIG_RTE_MAX_VIRTIO_CRYPTO=32
+#
+# Number of sessions to create in the session memory pool
+# on a single virtio crypto device.
+#
+CONFIG_RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS=1024
+
+#
 # Compile PMD for AESNI backed device
 #
 CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
diff --git a/doc/guides/rel_notes/release_18_05.rst 
b/doc/guides/rel_notes/release_18_05.rst
index e455cf6..cb05b89 100644
--- a/doc/guides/rel_notes/release_18_05.rst
+++ b/doc/guides/rel_notes/release_18_05.rst
@@ -82,6 +82,10 @@ New Features
 
   Linux uevent is supported as backend of this device event notification 
framework.
 
+* **Added the virtio crypto PMD.**
+
+  Added a new poll mode driver for virtio crypto devices.
+
 
 API Changes
 ---
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 9fbd986..e9e8b1f 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -21,5 +21,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec
 endif
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio
 
 include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile
new file mode 100644
index 000..2f04f0c
--- /dev/null
+++ b/drivers/crypto/virtio/Makefile
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_pmd_virtio_crypto.a
+
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+
+EXPORT_MAP := rte_pmd_virtio_crypto_version.map
+
+LIBABIVER := 1
+
+#
+# all source are stored in SRCS-y
+#
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c
+
+# this lib depends upon:
+LDLIBS += -lcrypto
+LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
+LDLIBS += -lrte_cryptodev
+LDLIBS += -lrte_pci -lrte_bus_pci
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map 
b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
new file mode 100644
index 000..de8e412
--- /dev/null
+++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
@@ -0,0 +1,3 @@
+DPDK_18.05 {
+   local: *;
+};
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
new file mode 100644
index 000..3e54942
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+#include 
+#include 
+#include 
+#include "virtio_cryptodev.h"
+
+uint8_t cryptodev_virtio_driver_id;
+
+static int
+crypto_virtio_pci_probe(
+   struct rte_pci_driver *pci_drv __rte_unused,
+   struct rte_pci_device *pci_dev __rte_unused)
+{
+   return 0;
+}
+
+static int
+crypto_virtio_pci_remove(
+   struct rte_pci_device *pci_dev __rte_unused)
+{
+   return 0;
+}
+
+static struct rte_pci_driver rte_virtio_crypto_driver = {
+   .probe = crypto_virtio_pci_probe,
+   .remove = crypto_virtio_pci_remove
+

[dpdk-dev] [PATCH v9 05/11] crypto/virtio: support crypto enqueue/dequeue burst API

[Jay Zhou]

This patch implements the functions of virtio_crypto_pkt_tx_burst()
and virtio_crypto_pkt_rx_burst(). The encryption and decryption requests
are placed in the data queue and are ultimately handled by
the backend crypto accelerators.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_cryptodev.h |   2 +
 drivers/crypto/virtio/virtio_rxtx.c  | 441 ++-
 2 files changed, 433 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.h 
b/drivers/crypto/virtio/virtio_cryptodev.h
index 5f740ca..aa40b5f 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.h
+++ b/drivers/crypto/virtio/virtio_cryptodev.h
@@ -17,6 +17,8 @@
 
 #define NUM_ENTRY_VIRTIO_CRYPTO_OP 7
 
+extern uint8_t cryptodev_virtio_driver_id;
+
 enum virtio_crypto_cmd_id {
VIRTIO_CRYPTO_CMD_CIPHER = 0,
VIRTIO_CRYPTO_CMD_AUTH = 1,
diff --git a/drivers/crypto/virtio/virtio_rxtx.c 
b/drivers/crypto/virtio/virtio_rxtx.c
index 3b038a7..4503928 100644
--- a/drivers/crypto/virtio/virtio_rxtx.c
+++ b/drivers/crypto/virtio/virtio_rxtx.c
@@ -1,8 +1,353 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
  */
+#include 
+
 #include "virtqueue.h"
 #include "virtio_cryptodev.h"
+#include "virtio_crypto_algs.h"
+
+static void
+vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
+{
+   struct vring_desc *dp, *dp_tail;
+   struct vq_desc_extra *dxp;
+   uint16_t desc_idx_last = desc_idx;
+
+   dp = &vq->vq_ring.desc[desc_idx];
+   dxp = &vq->vq_descx[desc_idx];
+   vq->vq_free_cnt = (uint16_t)(vq->vq_free_cnt + dxp->ndescs);
+   if ((dp->flags & VRING_DESC_F_INDIRECT) == 0) {
+   while (dp->flags & VRING_DESC_F_NEXT) {
+   desc_idx_last = dp->next;
+   dp = &vq->vq_ring.desc[dp->next];
+   }
+   }
+   dxp->ndescs = 0;
+
+   /*
+* We must append the existing free chain, if any, to the end of
+* newly freed chain. If the virtqueue was completely used, then
+* head would be VQ_RING_DESC_CHAIN_END (ASSERTed above).
+*/
+   if (vq->vq_desc_tail_idx == VQ_RING_DESC_CHAIN_END) {
+   vq->vq_desc_head_idx = desc_idx;
+   } else {
+   dp_tail = &vq->vq_ring.desc[vq->vq_desc_tail_idx];
+   dp_tail->next = desc_idx;
+   }
+
+   vq->vq_desc_tail_idx = desc_idx_last;
+   dp->next = VQ_RING_DESC_CHAIN_END;
+}
+
+static uint16_t
+virtqueue_dequeue_burst_rx(struct virtqueue *vq,
+   struct rte_crypto_op **rx_pkts, uint16_t num)
+{
+   struct vring_used_elem *uep;
+   struct rte_crypto_op *cop;
+   uint16_t used_idx, desc_idx;
+   uint16_t i;
+   struct virtio_crypto_inhdr *inhdr;
+   struct virtio_crypto_op_cookie *op_cookie;
+
+   /* Caller does the check */
+   for (i = 0; i < num ; i++) {
+   used_idx = (uint16_t)(vq->vq_used_cons_idx
+   & (vq->vq_nentries - 1));
+   uep = &vq->vq_ring.used->ring[used_idx];
+   desc_idx = (uint16_t)uep->id;
+   cop = (struct rte_crypto_op *)
+   vq->vq_descx[desc_idx].crypto_op;
+   if (unlikely(cop == NULL)) {
+   VIRTIO_CRYPTO_RX_LOG_DBG("vring descriptor with no "
+   "mbuf cookie at %u",
+   vq->vq_used_cons_idx);
+   break;
+   }
+
+   op_cookie = (struct virtio_crypto_op_cookie *)
+   vq->vq_descx[desc_idx].cookie;
+   inhdr = &(op_cookie->inhdr);
+   switch (inhdr->status) {
+   case VIRTIO_CRYPTO_OK:
+   cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+   break;
+   case VIRTIO_CRYPTO_ERR:
+   cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
+   vq->packets_received_failed++;
+   break;
+   case VIRTIO_CRYPTO_BADMSG:
+   cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+   vq->packets_received_failed++;
+   break;
+   case VIRTIO_CRYPTO_NOTSUPP:
+   cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+   vq->packets_received_failed++;
+   break;
+   case VIRTIO_CRYPTO_INVSESS:
+   cop->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
+   vq->packets_received_failed++;
+   break;
+   default:
+   break;
+   }
+
+   vq->packets_received_total++;
+
+   rx_pkts[i] = cop;
+   rte_mempool_put(vq->mpool, op_cookie);
+
+

[dpdk-dev] [PATCH v9 10/11] test/crypto: add function tests for virtio crypto PMD

[Jay Zhou]

Only RTE_CRYPTO_CIPHER_AES_CBC cipher
algorithm are tested as unit test, it is supported both by the
cryptodev-backend-builtin and cryptodev-vhost-user of qemu side.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 test/test/test_cryptodev.c  | 48 +
 test/test/test_cryptodev.h  |  1 +
 test/test/test_cryptodev_aes_test_vectors.h | 24 ++-
 test/test/test_cryptodev_blockcipher.c  |  9 +-
 test/test/test_cryptodev_blockcipher.h  |  1 +
 5 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index d1d7925..2f31ec9 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -1820,6 +1820,25 @@ struct crypto_unittest_params {
 }
 
 static int
+test_AES_cipheronly_virtio_all(void)
+{
+   struct crypto_testsuite_params *ts_params = &testsuite_params;
+   int status;
+
+   status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+   ts_params->op_mpool,
+   ts_params->session_mpool,
+   ts_params->valid_devs[0],
+   rte_cryptodev_driver_id_get(
+   RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)),
+   BLKCIPHER_AES_CIPHERONLY_TYPE);
+
+   TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+   return TEST_SUCCESS;
+}
+
+static int
 test_AES_chain_dpaa_sec_all(void)
 {
struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -8879,6 +8898,18 @@ struct test_crypto_vector {
}
 };
 
+static struct unit_test_suite cryptodev_virtio_testsuite = {
+   .suite_name = "Crypto VIRTIO Unit Test Suite",
+   .setup = testsuite_setup,
+   .teardown = testsuite_teardown,
+   .unit_test_cases = {
+   TEST_CASE_ST(ut_setup, ut_teardown,
+   test_AES_cipheronly_virtio_all),
+
+   TEST_CASES_END() /**< NULL terminate unit test array */
+   }
+};
+
 static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
.suite_name = "Crypto Device AESNI MB Unit Test Suite",
.setup = testsuite_setup,
@@ -9808,6 +9839,22 @@ struct test_crypto_vector {
 }
 
 static int
+test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+   gbl_driver_id = rte_cryptodev_driver_id_get(
+   RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
+
+   if (gbl_driver_id == -1) {
+   RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if "
+   "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled 
"
+   "in config file to run this testsuite.\n");
+   return TEST_FAILED;
+   }
+
+   return unit_test_suite_runner(&cryptodev_virtio_testsuite);
+}
+
+static int
 test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
 {
gbl_driver_id = rte_cryptodev_driver_id_get(
@@ -10040,3 +10087,4 @@ struct test_crypto_vector {
 REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec);
 REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
 REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
+REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
diff --git a/test/test/test_cryptodev.h b/test/test/test_cryptodev.h
index 9a01403..a630ee8 100644
--- a/test/test/test_cryptodev.h
+++ b/test/test/test_cryptodev.h
@@ -63,6 +63,7 @@
 #define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
 #define CRYPTODEV_NAME_MRVL_PMDcrypto_mrvl
 #define CRYPTODEV_NAME_CCP_PMD crypto_ccp
+#define CRYPTODEV_NAME_VIRTIO_PMD  crypto_virtio
 
 /**
  * Write (spread) data from buffer to mbuf data
diff --git a/test/test/test_cryptodev_aes_test_vectors.h 
b/test/test/test_cryptodev_aes_test_vectors.h
index 6f2422a..724c1e0 100644
--- a/test/test/test_cryptodev_aes_test_vectors.h
+++ b/test/test/test_cryptodev_aes_test_vectors.h
@@ -1544,7 +1544,8 @@
BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_MRVL |
-   BLOCKCIPHER_TEST_TARGET_PMD_CCP
+   BLOCKCIPHER_TEST_TARGET_PMD_CCP |
+   BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO
},
{
.test_descr = "AES-128-CBC Decryption",
@@ -1557,7 +1558,8 @@
BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_MRVL |
-   BLOCKCIPHER_TEST_TARGET_PMD_CCP
+   BLOCKCIPHER_TEST_TARGET_PMD_CCP |
+   BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO
},
{
.test_descr = "AES-192-CBC Encryption",
@@ -1569,7 +1571,8 @@
BLOCKCIPHER_TEST_TARGE

Re: [dpdk-dev] [PATCH v2] ethdev: check Rx/Tx offloads

[Thomas Monjalon]

13/04/2018 19:31, Ferruh Yigit:
> On 3/28/2018 9:57 AM, Wei Dai wrote:
> > This patch check if a requested offloading
> > is supported in the device capability.
> > A per port offloading feature should be enabled or
> > disabled at same time in both rte_eth_dev_configure( )
> > and rte_eth_rx_queue_setup( )/rte_eth_tx_queue_setup( ).
> > This patch check if a per port offloading flag has
> > same configuration in rte_eth_dev_configure( ) and
> > rte_eth_rx_queue_setup( )/rte_eth_tx_queue_setup( ).
> > This patch can make such checking in a common way in
> > rte_ethdev layer to avoid same checking in underlying PMD.
> 
> I think it is good idea to move common check to the abstraction layer as much 
> as
> possible.
> 
> But for this case we are targeting an API change in rc2, I believe better wait
> that API change for this update.

I think Wei could implement some filtering of offload flags:
If an offload is already enabled at port level, we can filter out them
when enabling again at queue level.
By removing such repetition in ethdev, before calling the PMD op,
the PMD does not need to bother for offloads enabled twice.

Re: [dpdk-dev] [PATCH v9 09/11] crypto/virtio: build with meson

[De Lara Guarch, Pablo]

Hi Jay,

> -Original Message-
> From: Jay Zhou [mailto:jianjay.z...@huawei.com]
> Sent: Sunday, April 15, 2018 9:51 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo ; Zhang, Roy Fan
> ; tho...@monjalon.net;
> arei.gong...@huawei.com; Zeng, Xin ;
> weidong.hu...@huawei.com; wangxinxin.w...@huawei.com;
> longpe...@huawei.com; jianjay.z...@huawei.com
> Subject: [PATCH v9 09/11] crypto/virtio: build with meson
> 
> Signed-off-by: Jay Zhou 
> Reviewed-by: Fan Zhang 
> Acked-by: Fan Zhang 
> ---
>  drivers/crypto/meson.build|  2 +-
>  drivers/crypto/virtio/meson.build | 12 
>  2 files changed, 13 insertions(+), 1 deletion(-)  create mode 100644
> drivers/crypto/virtio/meson.build
> 
> diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index
> 736c9f5..63649c9 100644
> --- a/drivers/crypto/meson.build
> +++ b/drivers/crypto/meson.build
> @@ -2,7 +2,7 @@
>  # Copyright(c) 2017 Intel Corporation
> 
>  drivers = ['dpaa_sec', 'dpaa2_sec',
> - 'openssl', 'null', 'qat']
> + 'openssl', 'null', 'qat', 'virtio']
> 
>  std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
> config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> diff --git a/drivers/crypto/virtio/meson.build 
> b/drivers/crypto/virtio/meson.build
> new file mode 100644
> index 000..cee77cc
> --- /dev/null
> +++ b/drivers/crypto/virtio/meson.build
> @@ -0,0 +1,12 @@
> +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 HUAWEI
> +TECHNOLOGIES CO., LTD.
> +
> +dep = dependency('libcrypto', required: false) if not dep.found()
> + build = false
> +endif
> +deps += ['bus_pci']
> +sources = files('virtio_cryptodev.c', 'virtio_pci.c',
> + 'virtio_rxtx.c', 'virtqueue.c')
> +ext_deps += dep
> +pkgconfig_extra_libs += '-lcrypto'
> --
> 1.8.3.1
> 

Could you add this build from the first patch? Basically, every time you make a 
change in the Makefile, you should do the same in meson.build.

Thanks,
Pablo

Re: [dpdk-dev] [PATCH v3] bus/fslmc: use PRIu64 instead of llX in format specifier

[Thomas Monjalon]

13/04/2018 14:44, Hemant Agrawal:
> 
> On 4/13/2018 4:52 PM, Gowrishankar wrote:
> > From: Gowrishankar Muthukrishnan 
> > 
> > Instead of llX, use C99 standard "PRIu64" in format specifier. Former one
> > breaks compile in ppc64le.
> > 
> > Fixes: c2c167fdb3 ("bus/fslmc: support memory event callbacks for VFIO")
> > 
> > Signed-off-by: Gowrishankar Muthukrishnan 
> > 
> > --
> > v3:
> >   - correction to prefix address with 0x
> > v2:
> >   - corrected format specifier wrt address and size.
> > Thanks Shreyansh, Hemant and Thomas.
> > 
> Acked-by: Hemant Agrawal 

Applied, thanks

Re: [dpdk-dev] [PATCH] eal/ppc: fix secondary process to map hugepages in correct order

[Thomas Monjalon]

16/02/2017 08:22, Chao Zhu:
> Thomas,
> 
> We have several different internal fixes and didn't get a conclusion. Let me 
> summarize them and give a final patch sets.
> Thanks for your reminder!

This patch is now classified as rejected.

Re: [dpdk-dev] [PATCH v2] ip_frag: fix double free of chained mbufs

[Thomas Monjalon]

> > The first mbuf and the last mbuf to be visited in the preceding loop
> > are not set to NULL in the fragmentation table.  This creates the
> > possibility of a double free when the fragmentation table is later freed
> > with rte_ip_frag_table_destroy().
> > 
> > Fixes: 95908f52393d ("ip_frag: free mbufs on reassembly table destroy")

Cc: sta...@dpdk.org
Reminder: this Cc must be saved in the commit message for later backport.

> > Signed-off-by: Allain Legacy 
> 
> Acked-by: Konstantin Ananyev 

Applied, thanks

Re: [dpdk-dev] [PATCH] lib/librte_hash: fix incorrect comment for lookup

[Thomas Monjalon]

> > rte_hash_lookup_with_hash() has wrong comment for its 'sig' param.
> > 
> > Fixes: 1a9f648be291 ("hash: fix for multi-process apps")
> > 
> > Signed-off-by: Shreyansh Jain 
> 
> Acked-by: Pablo de Lara 
> 
> Also, this should be backported to the stable branch, so I CC sta...@dpdk.org.

Applied, thanks

Re: [dpdk-dev] [PATCH v2] doc: reduce initial offload API scope to drivers

[Thomas Monjalon]

15/04/2018 07:28, Shahaf Shuler:
> Saturday, April 14, 2018 12:21 AM, Ferruh Yigit:
> > Subject: [PATCH v2] doc: reduce initial offload API scope to drivers
> > 
> > Do ethdev new offloading API switch in two steps.
> > 
> > In v18.05 target is implementing the new ethdev-PMD offload interface,
> > which means converting all PMDs to new offloading API.
> > 
> > Next target is removing the old ethdev offload API.
> > It will effect applications and will force them to implement new offloading
> > API.
> > 
> > Fixes: 3004d3454192 ("doc: update deprecation of ethdev offload API")
> > Cc: shah...@mellanox.com
> > 
> > Signed-off-by: Ferruh Yigit 
> > ---
> > v2:
> > * Update commit log and deprecation notice for clarification
> > ---
> 
> Acked-by: Shahaf Shuler 

Applied, thanks

Re: [dpdk-dev] [PATCH v4] net/ixgbe: add access and locking APIs for MDIO

[Zhang, Qi Z]

> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Shweta Choudaha
> Sent: Saturday, April 14, 2018 12:35 AM
> To: dev@dpdk.org
> Cc: Lu, Wenzhuo ; Ananyev, Konstantin
> ; Zhang, Helin ;
> Yigit, Ferruh ; shweta.choud...@att.com
> Subject: [dpdk-dev] [PATCH v4] net/ixgbe: add access and locking APIs for
> MDIO
> 
> From: Shweta Choudaha 
> 
> Add ixgbe MDIO lock/unlock and access APIs to read and write registers using
> specific device address. This provides MDIO access to any devices that are not
> associated with the autoprobed PHY.Export these APIs via the map file
> 
> Signed-off-by: Shweta Choudaha 
> Reviewed-by: Chas Williams 
> Reviewed-by: Luca Boccassi 

Acked-by: Qi Zhang 

Re: [dpdk-dev] [PATCH 1/3] net/szedata2: do not affect Ethernet interfaces

[Yasufumi Ogawa]

On 2018/04/12 16:38, Matej Vido wrote:

On 11.04.2018 12:51, Ferruh Yigit wrote:

On 4/11/2018 10:36 AM, Matej Vido wrote:

On 10.04.2018 17:28, Ferruh Yigit wrote:

On 4/6/2018 3:12 PM, Matej Vido wrote:

NFB cards employ multiple Ethernet ports.
Until now, Ethernet port-related operations were performed on all 
of them

(since the whole card was represented as a single port).
With new NFB-200G2QL card, this is no longer viable.

Since there is no fixed mapping between the queues and Ethernet ports,
and since a single card can be represented as two ports in DPDK,
there is no way of telling which (if any) physical ports should be
associated with individual ports in DPDK.

This is also described in documentation in more detail.

Signed-off-by: Matej Vido 
Signed-off-by: Jan Remes 
---
   config/common_base |   5 -
   .../nics/img/szedata2_nfb200g_architecture.svg | 171 
+++

Hi Matej,

This patch fails to apply [1], can you please confirm you can apply it?

[1]
$ git apply --check
dpdk-dev-1-3-net-szedata2-do-not-affect-Ethernet-interfaces.patch
error: corrupt patch at line 270

Hi Ferruh,

I've got same error on patch downloaded from patchwork. It seems that
the difference between the downloaded patch and the patch generated from
git is that the long lines in svg file are split into multiple lines in
the patch downloaded from patchwork. I suppose this could be the
problem. Any idea how to send a patch containing svg file correctly?

cc'ed Ogawa-san for support,

I remember he fixed similar issue in the past for spp, but I don't 
remember how?
Anyways I've hopefully fixed this by redrawing the image to avoid those 
long lines. I'm sending v2.


Thanks,
Matej

Hi Matej, Ferruh,

I also encountered the same problem for 998 chars limitation of SMTP. I 
fixed it by replacing objects with simpler ones.


You can check this error by using '--validate' option of git send-email.

Thanks,
Yasufumi



Thanks,
Matej








--
Yasufumi Ogawa
NTT Network Service Systems Labs

Re: [dpdk-dev] [PATCH v7 7/8] examples/vhost_crypto: add vhost crypto sample application

[Thomas Monjalon]

Hi,

05/04/2018 18:01, Fan Zhang:
> This patch adds vhost_crypto sample application to DPDK.
> 
> Signed-off-by: Fan Zhang 
> ---
>  examples/vhost_crypto/Makefile|  32 +++
>  examples/vhost_crypto/main.c  | 541 
> ++
>  examples/vhost_crypto/meson.build |  14 +
>  3 files changed, 587 insertions(+)

There are 3 misses:

- not in examples/Makefile
- not in MAINTAINERS
- no documentation in doc/guides/sample_app_ug/

It won't be accepted in master as-is.

[dpdk-dev] [PATCH v7] vfio: change to use generic multi-process channel

[Jianfeng Tan]

Previously, vfio uses its own private channel for the secondary
process to get container fd and group fd from the primary process.

This patch changes to use the generic mp channel.

Test:
  1. Bind two NICs to vfio-pci.

  2. Start the primary and secondary process.
$ (symmetric_mp) -c 2 -- -p 3 --num-procs=2 --proc-id=0
$ (symmetric_mp) -c 4 --proc-type=auto -- -p 3 \
--num-procs=2 --proc-id=1

Cc: anatoly.bura...@intel.com

Signed-off-by: Jianfeng Tan 
Acked-by: Anatoly Burakov 
---
 lib/librte_eal/linuxapp/eal/eal.c  |  22 +-
 lib/librte_eal/linuxapp/eal/eal_vfio.c | 178 +--
 lib/librte_eal/linuxapp/eal/eal_vfio.h |  17 +-
 lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c | 410 -
 4 files changed, 148 insertions(+), 479 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal.c 
b/lib/librte_eal/linuxapp/eal/eal.c
index 99c2242..21afa73 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -696,24 +696,8 @@ rte_eal_iopl_init(void)
 #ifdef VFIO_PRESENT
 static int rte_eal_vfio_setup(void)
 {
-   int vfio_enabled = 0;
-
if (rte_vfio_enable("vfio"))
return -1;
-   vfio_enabled = rte_vfio_is_enabled("vfio");
-
-   if (vfio_enabled) {
-
-   /* if we are primary process, create a thread to communicate 
with
-* secondary processes. the thread will use a socket to wait for
-* requests from secondary process to send open file 
descriptors,
-* because VFIO does not allow multiple open descriptors on a 
group or
-* VFIO container.
-*/
-   if (internal_config.process_type == RTE_PROC_PRIMARY &&
-   vfio_mp_sync_setup() < 0)
-   return -1;
-   }
 
return 0;
 }
@@ -970,6 +954,12 @@ rte_eal_init(int argc, char **argv)
return -1;
}
 
+#ifdef VFIO_PRESENT
+   /* Register mp action after probe() so that we got enough info */
+   if (rte_vfio_is_enabled("vfio") && vfio_mp_sync_setup() < 0)
+   return -1;
+#endif
+
/* initialize default service/lcore mappings and start running. Ignore
 * -ENOTSUP, as it indicates no service coremask passed to EAL.
 */
diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c 
b/lib/librte_eal/linuxapp/eal/eal_vfio.c
index 16ee730..957a537 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+ * Copyright(c) 2010-2018 Intel Corporation
  */
 
 #include 
@@ -290,6 +290,10 @@ rte_vfio_get_group_fd(int iommu_group_num)
int vfio_group_fd;
char filename[PATH_MAX];
struct vfio_group *cur_grp;
+   struct rte_mp_msg mp_req, *mp_rep;
+   struct rte_mp_reply mp_reply;
+   struct timespec ts = {.tv_sec = 5, .tv_nsec = 0};
+   struct vfio_mp_param *p = (struct vfio_mp_param *)mp_req.param;
 
/* check if we already have the group descriptor open */
for (i = 0; i < VFIO_MAX_GROUPS; i++)
@@ -350,50 +354,34 @@ rte_vfio_get_group_fd(int iommu_group_num)
return vfio_group_fd;
}
/* if we're in a secondary process, request group fd from the primary
-* process via our socket
+* process via mp channel.
 */
-   else {
-   int socket_fd, ret;
-
-   socket_fd = vfio_mp_sync_connect_to_primary();
-
-   if (socket_fd < 0) {
-   RTE_LOG(ERR, EAL, "  cannot connect to primary 
process!\n");
-   return -1;
-   }
-   if (vfio_mp_sync_send_request(socket_fd, SOCKET_REQ_GROUP) < 0) 
{
-   RTE_LOG(ERR, EAL, "  cannot request container fd!\n");
-   close(socket_fd);
-   return -1;
-   }
-   if (vfio_mp_sync_send_request(socket_fd, iommu_group_num) < 0) {
-   RTE_LOG(ERR, EAL, "  cannot send group number!\n");
-   close(socket_fd);
-   return -1;
-   }
-   ret = vfio_mp_sync_receive_request(socket_fd);
-   switch (ret) {
-   case SOCKET_NO_FD:
-   close(socket_fd);
-   return 0;
-   case SOCKET_OK:
-   vfio_group_fd = vfio_mp_sync_receive_fd(socket_fd);
-   /* if we got the fd, store it and return it */
-   if (vfio_group_fd > 0) {
-   close(socket_fd);
-   cur_grp->group_num = iommu_group_num;
-   cur_grp->fd = vfio_group_fd;
-   vfio_cfg.vfio_active_groups++;
-

[dpdk-dev] [PATCH v7 01/22] kvargs: build before EAL

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/Makefile  | 3 +--
 lib/librte_eal/common/Makefile| 2 +-
 lib/librte_kvargs/Makefile| 3 ++-
 lib/librte_kvargs/rte_kvargs.c| 2 +-
 lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h (100%)

diff --git a/lib/Makefile b/lib/Makefile
index ec965a606..fc7a55a37 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,7 @@
 include $(RTE_SDK)/mk/rte.vars.mk
 
 DIRS-y += librte_compat
+DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
 DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
 DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
 DEPDIRS-librte_pci := librte_eal
@@ -71,8 +72,6 @@ DEPDIRS-librte_flow_classify :=  librte_net librte_table 
librte_acl
 DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched
 DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net
 DEPDIRS-librte_sched += librte_timer
-DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
-DEPDIRS-librte_kvargs := librte_eal
 DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor
 DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ether
 DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port
diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
index 48f870f24..dbd19331b 100644
--- a/lib/librte_eal/common/Makefile
+++ b/lib/librte_eal/common/Makefile
@@ -9,7 +9,7 @@ INC += rte_errno.h rte_launch.h rte_lcore.h
 INC += rte_log.h rte_memory.h rte_memzone.h
 INC += rte_per_lcore.h rte_random.h
 INC += rte_tailq.h rte_interrupts.h rte_alarm.h
-INC += rte_string_fns.h rte_version.h
+INC += rte_version.h
 INC += rte_eal_memconfig.h rte_malloc_heap.h
 INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h
 INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h
diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile
index 4eaa9334d..e026ecc21 100644
--- a/lib/librte_kvargs/Makefile
+++ b/lib/librte_kvargs/Makefile
@@ -37,7 +37,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 LIB = librte_kvargs.a
 
 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
 
 EXPORT_MAP := rte_kvargs_version.map
 
@@ -48,6 +48,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c
 
 # install includes
 INCS := rte_kvargs.h
+INCS += rte_string_fns.h
 SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS)
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index d92a5f9dc..0a1abf579 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -7,8 +7,8 @@
 #include 
 
 #include 
-#include 
 
+#include "rte_string_fns.h"
 #include "rte_kvargs.h"
 
 /*
diff --git a/lib/librte_eal/common/include/rte_string_fns.h 
b/lib/librte_kvargs/rte_string_fns.h
similarity index 100%
rename from lib/librte_eal/common/include/rte_string_fns.h
rename to lib/librte_kvargs/rte_string_fns.h
-- 
2.11.0

[dpdk-dev] [PATCH v7 00/22] Device querying

[Gaetan Rivet]

This patchset introduces a new EAL API for querying devices,
filtered by arbitrary properties.

The following elements are introduced to this end:

 * A new object, "rte_class", is used to describe
   the device class abstraction layer (eth, crypto, ...).

 * Both rte_bus and rte_class now offer a way to
   list their devices and filter the result
   using locally defined properties.

 * The rte_dev API now has an rte_dev_iterator, which
   is the way for the user to define the device filter
   and iterate upon the resulting set.

As an example, the "eth" device class is implemented.

Additionally, the device filters for

  + rte_bus_pci
  + rte_bus_vdev
  + rte_class_eth

are implemented and can be used with some
properties each, to show how to extend those.

Some example of filters:

  "bus=pci/class=eth"
  "bus=pci"
  "class=eth"
  "class=eth,name=net_ring0"
  "bus=pci,id=00:00.0"
  "bus=vdev,driver=net_ring"

---

v2:

  * Reworked the dev_iterate callback to simplify
its implementation.

Now dev_iterate implementation do not need to learn
about the intricacies of the rte_dev_iterator.
The rte_dev_iterator is managed purely by the
rte_dev_iterator_next function. Buses and classes then
do not have to care about settings things right.

Additionally, dev_iterate implementations do not
have to sanitize their dev string anymore, they
are prepared by the rte_dev layer prior, which also
reduces the number of dynamic allocations.

v3:

  * Introduced central constructor priority list.
  * Removed lightweight kvarg parsing utility,
using librte_kvargs instead.
  * Reversed dependencies of librte_kvargs and
librte_eal.
  * Fixed a few bugs.
  * @Bruce: I have noted the request for meson support.
I will install it and attempt it once the bulk of the work is done.

v4:

  * Fixed a few bugs, added relevant acks,
fixed some typos.
  * Made each matching functions actually check for a proper
list of accepted properties.
  * rte_kvargs now includes rte_eal directly and keeps rte_log.
  * added generic string comparison function to rte_kvargs,
as some kind of comparison should probably be shared by many layers.

v5:

  * Rebased on master
  * Use strcspn instead of custom function.
  * Introduce private generic rte_eth_dev iterator.
This could be generalized to other iterators
(port_next, owner_id-aware, etc).
  * Attempted to support meson.build.
Got lost in the implicit variables declared
when inversing dependencies between kvargs and EAL.
Removed anything related to meson.
  * Postponed genericization of work from
device query to device declaration.
Much bigger than anticipated, will let this
part get in first and iterate over it.

v6:

  * Rebased on master
  * Introduce RTE_PRIORITY_LAST, to explicitly set
the lowest constructor priority.
  * Fix copyright notice for eth_privage.* files.

v7:

  * Rebased on master
  * Fix rte_kvargs_strcmp return value.
  * Fix layer parsing error
devstr "bus=pci/onemorelayer" now tells
that the additional layer is not recognized.

Gaetan Rivet (22):
  kvargs: build before EAL
  eal: list acceptable init priorities
  eal: add last init priority
  eal: introduce dtor macros
  eal: introduce device class abstraction
  eal/class: register destructor
  eal/dev: add device iterator interface
  eal/class: add device iteration
  eal/bus: add device iteration
  eal/dev: implement device iteration initialization
  eal/dev: implement device iteration
  kvargs: add generic string matching callback
  bus/pci: fix find device implementation
  bus/pci: implement device iteration and comparison
  bus/pci: add device matching field id
  bus/vdev: fix find device implementation
  bus/vdev: implement device iteration
  bus/vdev: add device matching field driver
  ethdev: add private generic device iterator
  ethdev: register ether layer as a class
  ethdev: add device matching field name
  app/testpmd: add show device command

 app/test-pmd/cmdline.c |  52 
 drivers/bus/pci/Makefile   |   2 +-
 drivers/bus/pci/pci_common.c   |  87 +-
 drivers/bus/pci/rte_bus_pci.h  |   3 +
 drivers/bus/vdev/Makefile  |   3 +-
 drivers/bus/vdev/rte_bus_vdev.h|   3 +
 drivers/bus/vdev/vdev.c|  66 -
 lib/Makefile   |   7 +-
 lib/librte_eal/bsdapp/eal/Makefile |   2 +
 lib/librte_eal/common/Makefile |   4 +-
 lib/librte_eal/common/eal_common_class.c   |  62 
 lib/librte_eal/common/eal_common_dev.c | 317 +
 lib/librte_eal/common/eal_common_log.c |   2 +-
 lib/librte_eal/common/include/rte_bus.h|   3 +-
 lib/librte_eal/common/include/rte_class.h  | 127 +
 lib/librte_eal/common/include/rt

[dpdk-dev] [PATCH v7 02/22] eal: list acceptable init priorities

[Gaetan Rivet]

Build a central list to quickly see each used priorities for
constructors, allowing to verify that they are both above 100 and in the
proper order.

Signed-off-by: Gaetan Rivet 
Acked-by: Neil Horman 
Acked-by: Shreyansh Jain 
---
 lib/librte_eal/common/eal_common_log.c | 2 +-
 lib/librte_eal/common/include/rte_bus.h| 2 +-
 lib/librte_eal/common/include/rte_common.h | 8 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_log.c 
b/lib/librte_eal/common/eal_common_log.c
index a27192620..36b9d6e08 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -260,7 +260,7 @@ static const struct logtype logtype_strings[] = {
 };
 
 /* Logging should be first initializer (before drivers and bus) */
-RTE_INIT_PRIO(rte_log_init, 101);
+RTE_INIT_PRIO(rte_log_init, LOG);
 static void
 rte_log_init(void)
 {
diff --git a/lib/librte_eal/common/include/rte_bus.h 
b/lib/librte_eal/common/include/rte_bus.h
index 6fb08341a..eb9eded4e 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -325,7 +325,7 @@ enum rte_iova_mode rte_bus_get_iommu_class(void);
  * The constructor has higher priority than PMD constructors.
  */
 #define RTE_REGISTER_BUS(nm, bus) \
-RTE_INIT_PRIO(businitfn_ ##nm, 110); \
+RTE_INIT_PRIO(businitfn_ ##nm, BUS); \
 static void businitfn_ ##nm(void) \
 {\
(bus).name = RTE_STR(nm);\
diff --git a/lib/librte_eal/common/include/rte_common.h 
b/lib/librte_eal/common/include/rte_common.h
index 6c5bc5a76..8f04518f7 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -81,6 +81,12 @@ typedef uint16_t unaligned_uint16_t;
  */
 #define RTE_SET_USED(x) (void)(x)
 
+#define RTE_PRIORITY_LOG 101
+#define RTE_PRIORITY_BUS 110
+
+#define RTE_PRIO(prio) \
+   RTE_PRIORITY_ ## prio
+
 /**
  * Run function before main() with low priority.
  *
@@ -102,7 +108,7 @@ static void __attribute__((constructor, used)) func(void)
  *   Lowest number is the first to run.
  */
 #define RTE_INIT_PRIO(func, prio) \
-static void __attribute__((constructor(prio), used)) func(void)
+static void __attribute__((constructor(RTE_PRIO(prio)), used)) func(void)
 
 /**
  * Force a function to be inlined
-- 
2.11.0

[dpdk-dev] [PATCH v7 03/22] eal: add last init priority

[Gaetan Rivet]

Add the priority RTE_PRIORITY_LAST, used for initialization routines
meant to be run after all other constructors.

This priority becomes the default priority for all DPDK constructors.

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/include/rte_common.h | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_common.h 
b/lib/librte_eal/common/include/rte_common.h
index 8f04518f7..69e5ed1e3 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -83,22 +83,12 @@ typedef uint16_t unaligned_uint16_t;
 
 #define RTE_PRIORITY_LOG 101
 #define RTE_PRIORITY_BUS 110
+#define RTE_PRIORITY_LAST 65535
 
 #define RTE_PRIO(prio) \
RTE_PRIORITY_ ## prio
 
 /**
- * Run function before main() with low priority.
- *
- * The constructor will be run after prioritized constructors.
- *
- * @param func
- *   Constructor function.
- */
-#define RTE_INIT(func) \
-static void __attribute__((constructor, used)) func(void)
-
-/**
  * Run function before main() with high priority.
  *
  * @param func
@@ -111,6 +101,17 @@ static void __attribute__((constructor, used)) func(void)
 static void __attribute__((constructor(RTE_PRIO(prio)), used)) func(void)
 
 /**
+ * Run function before main() with low priority.
+ *
+ * The constructor will be run after prioritized constructors.
+ *
+ * @param func
+ *   Constructor function.
+ */
+#define RTE_INIT(func) \
+   RTE_INIT_PRIO(func, LAST)
+
+/**
  * Force a function to be inlined
  */
 #define __rte_always_inline inline __attribute__((always_inline))
-- 
2.11.0

[dpdk-dev] [PATCH v7 04/22] eal: introduce dtor macros

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/include/rte_common.h | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_common.h 
b/lib/librte_eal/common/include/rte_common.h
index 69e5ed1e3..d48e0ec56 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -112,6 +112,29 @@ static void __attribute__((constructor(RTE_PRIO(prio)), 
used)) func(void)
RTE_INIT_PRIO(func, LAST)
 
 /**
+ * Run after main() with low priority.
+ *
+ * @param func
+ *   Destructor function name.
+ * @param prio
+ *   Priority number must be above 100.
+ *   Lowest number is the last to run.
+ */
+#define RTE_FINI_PRIO(func, prio) \
+static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
+
+/**
+ * Run after main() with high priority.
+ *
+ * The destructor will be run *before* prioritized destructors.
+ *
+ * @param func
+ *   Destructor function name.
+ */
+#define RTE_FINI(func) \
+   RTE_FINI_PRIO(func, LAST)
+
+/**
  * Force a function to be inlined
  */
 #define __rte_always_inline inline __attribute__((always_inline))
-- 
2.11.0

[dpdk-dev] [PATCH v7 05/22] eal: introduce device class abstraction

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/bsdapp/eal/Makefile |   1 +
 lib/librte_eal/common/Makefile |   2 +-
 lib/librte_eal/common/eal_common_class.c   |  62 +++
 lib/librte_eal/common/include/rte_class.h  | 121 +
 lib/librte_eal/common/include/rte_common.h |   1 +
 lib/librte_eal/linuxapp/eal/Makefile   |   1 +
 lib/librte_eal/rte_eal_version.map |   2 +
 7 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 lib/librte_eal/common/eal_common_class.c
 create mode 100644 lib/librte_eal/common/include/rte_class.h

diff --git a/lib/librte_eal/bsdapp/eal/Makefile 
b/lib/librte_eal/bsdapp/eal/Makefile
index 200285e01..de0e6d166 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -51,6 +51,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hypervisor.c
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_string_fns.c
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hexdump.c
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_devargs.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_class.c
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_bus.c
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_dev.c
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_options.c
diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
index dbd19331b..f9d17e7ec 100644
--- a/lib/librte_eal/common/Makefile
+++ b/lib/librte_eal/common/Makefile
@@ -11,7 +11,7 @@ INC += rte_per_lcore.h rte_random.h
 INC += rte_tailq.h rte_interrupts.h rte_alarm.h
 INC += rte_version.h
 INC += rte_eal_memconfig.h rte_malloc_heap.h
-INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h
+INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h rte_class.h
 INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h
 INC += rte_malloc.h rte_keepalive.h rte_time.h
 INC += rte_service.h rte_service_component.h
diff --git a/lib/librte_eal/common/eal_common_class.c 
b/lib/librte_eal/common/eal_common_class.c
new file mode 100644
index 0..aed4dd8fb
--- /dev/null
+++ b/lib/librte_eal/common/eal_common_class.c
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+struct rte_class_list rte_class_list =
+   TAILQ_HEAD_INITIALIZER(rte_class_list);
+
+__rte_experimental void
+rte_class_register(struct rte_class *class)
+{
+   RTE_VERIFY(class);
+   RTE_VERIFY(class->name && strlen(class->name));
+
+   TAILQ_INSERT_TAIL(&rte_class_list, class, next);
+   RTE_LOG(DEBUG, EAL, "Registered [%s] device class.\n", class->name);
+}
+
+__rte_experimental void
+rte_class_unregister(struct rte_class *class)
+{
+   TAILQ_REMOVE(&rte_class_list, class, next);
+   RTE_LOG(DEBUG, EAL, "Unregistered [%s] device class.\n", class->name);
+}
+
+struct rte_class *
+rte_class_find(const struct rte_class *start, rte_class_cmp_t cmp,
+  const void *data)
+{
+   struct rte_class *cls;
+
+   if (start != NULL)
+   cls = TAILQ_NEXT(start, next);
+   else
+   cls = TAILQ_FIRST(&rte_class_list);
+   while (cls != NULL) {
+   if (cmp(cls, data) == 0)
+   break;
+   cls = TAILQ_NEXT(cls, next);
+   }
+   return cls;
+}
+
+static int
+cmp_class_name(const struct rte_class *class, const void *_name)
+{
+   const char *name = _name;
+
+   return strcmp(class->name, name);
+}
+
+struct rte_class *
+rte_class_find_by_name(const char *name)
+{
+   return rte_class_find(NULL, cmp_class_name, (const void *)name);
+}
diff --git a/lib/librte_eal/common/include/rte_class.h 
b/lib/librte_eal/common/include/rte_class.h
new file mode 100644
index 0..b5e550a34
--- /dev/null
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -0,0 +1,121 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#ifndef _RTE_CLASS_H_
+#define _RTE_CLASS_H_
+
+/**
+ * @file
+ *
+ * DPDK device class interface.
+ *
+ * This file exposes API and interfaces of device classes.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+
+#include 
+
+/** Double linked list of classes */
+TAILQ_HEAD(rte_class_list, rte_class);
+
+/**
+ * A structure describing a generic device class.
+ */
+struct rte_class {
+   TAILQ_ENTRY(rte_class) next; /**< Next device class in linked list */
+   const char *name; /**< Name of the class */
+};
+
+/**
+ * Class comparison function.
+ *
+ * @param cls
+ * Class under test.
+ *
+ * @param data
+ * Data to compare against.
+ *
+ * @return
+ * 0 if the class matches the data.
+ * !0 if the class does not match.
+ * <0 if ordering is possible and the class is lower than the data.
+ * >0 if ordering is possible and the class is greater than the data.
+ */
+typedef int (*rte_class_cmp_t)(const struct rte_class *cls, const void *data);
+

[dpdk-dev] [PATCH v7 07/22] eal/dev: add device iterator interface

[Gaetan Rivet]

A device iterator allows iterating over a set of devices.
This set is defined by the two descriptions offered,

  * rte_bus
  * rte_class

Only one description can be provided, or both. It is not allowed to
provide no description at all.

Each layer of abstraction then performs a filter based on the
description provided. This filtering allows iterating on their internal
set of devices, stopping when a match is valid and returning the current
iteration context.

This context allows starting the next iteration from the same point and
going forward.

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/include/rte_dev.h | 47 +
 1 file changed, 47 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_dev.h 
b/lib/librte_eal/common/include/rte_dev.h
index 0955e9adb..a789defc3 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -282,6 +282,53 @@ __attribute__((used)) = str
 static const char DRV_EXP_TAG(name, kmod_dep_export)[] \
 __attribute__((used)) = str
 
+/**
+ * Iteration context.
+ *
+ * This context carries over the current iteration state.
+ */
+struct rte_dev_iterator {
+   const char *devstr; /**< device string. */
+   const char *busstr; /**< bus-related part of device string. */
+   const char *clsstr; /**< class-related part of device string. */
+   struct rte_bus *bus; /**< bus handle. */
+   struct rte_class *cls; /**< class handle. */
+   struct rte_device *device; /**< current position. */
+   void *class_device; /**< additional specialized context. */
+};
+
+/**
+ * Device iteration function.
+ *
+ * Find the next device matching properties passed in parameters.
+ * The function takes an additional ``start`` parameter, that is
+ * used as starting context when relevant.
+ *
+ * The function returns the current element in the iteration.
+ * This return value will potentially be used as a start parameter
+ * in subsequent calls to the function.
+ *
+ * The additional iterator parameter is only there if a specific
+ * implementation needs additional context. It must not be modified by
+ * the iteration function itself.
+ *
+ * @param start
+ *   Starting iteration context.
+ *
+ * @param devstr
+ *   Device description string.
+ *
+ * @param it
+ *   Device iterator.
+ *
+ * @return
+ *   The address of the current element matching the device description
+ *   string.
+ */
+typedef void *(*rte_dev_iterate_t)(const void *start,
+  const char *devstr,
+  const struct rte_dev_iterator *it);
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.11.0

[dpdk-dev] [PATCH v7 06/22] eal/class: register destructor

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/include/rte_class.h | 5 +
 1 file changed, 5 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_class.h 
b/lib/librte_eal/common/include/rte_class.h
index b5e550a34..e8176f5e1 100644
--- a/lib/librte_eal/common/include/rte_class.h
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -112,6 +112,11 @@ static void classinitfn_ ##nm(void) \
 {\
(cls).name = RTE_STR(nm);\
rte_class_register(&cls); \
+} \
+RTE_FINI_PRIO(classfinifn_ ##nm, CLASS); \
+static void classfinifn_ ##nm(void) \
+{ \
+   rte_class_unregister(&cls); \
 }
 
 #ifdef __cplusplus
-- 
2.11.0

[dpdk-dev] [PATCH v7 08/22] eal/class: add device iteration

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/include/rte_class.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_eal/common/include/rte_class.h 
b/lib/librte_eal/common/include/rte_class.h
index e8176f5e1..9d5b06807 100644
--- a/lib/librte_eal/common/include/rte_class.h
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -30,6 +30,7 @@ TAILQ_HEAD(rte_class_list, rte_class);
 struct rte_class {
TAILQ_ENTRY(rte_class) next; /**< Next device class in linked list */
const char *name; /**< Name of the class */
+   rte_dev_iterate_t dev_iterate; /**< Device iterator. */
 };
 
 /**
-- 
2.11.0

[dpdk-dev] [PATCH v7 12/22] kvargs: add generic string matching callback

[Gaetan Rivet]

This function can be used as a callback to
rte_kvargs_process.

This should reduce code duplication.

Signed-off-by: Gaetan Rivet 
---
 lib/Makefile |  1 +
 lib/librte_kvargs/rte_kvargs.c   | 10 ++
 lib/librte_kvargs/rte_kvargs.h   | 28 
 lib/librte_kvargs/rte_kvargs_version.map |  7 +++
 4 files changed, 46 insertions(+)

diff --git a/lib/Makefile b/lib/Makefile
index 1b17526f7..4206485d3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,6 +5,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 
 DIRS-y += librte_compat
 DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
+DEPDIRS-librte_kvargs := librte_compat
 DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
 DEPDIRS-librte_eal := librte_kvargs
 DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index 0a1abf579..056754214 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -180,3 +180,13 @@ rte_kvargs_parse(const char *args, const char * const 
valid_keys[])
 
return kvlist;
 }
+
+__rte_experimental
+int
+rte_kvargs_strcmp(const char *key __rte_unused,
+ const char *value, void *opaque)
+{
+   const char *str = opaque;
+
+   return -abs(strcmp(str, value));
+}
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h
index 51b8120b8..c07c6fea5 100644
--- a/lib/librte_kvargs/rte_kvargs.h
+++ b/lib/librte_kvargs/rte_kvargs.h
@@ -25,6 +25,8 @@
 extern "C" {
 #endif
 
+#include 
+
 /** Maximum number of key/value associations */
 #define RTE_KVARGS_MAX 32
 
@@ -121,6 +123,32 @@ int rte_kvargs_process(const struct rte_kvargs *kvlist,
 unsigned rte_kvargs_count(const struct rte_kvargs *kvlist,
const char *key_match);
 
+/**
+ * Generic kvarg handler for string comparison.
+ *
+ * This function can be used for a generic string comparison processing
+ * on a list of kvargs.
+ *
+ * @param key
+ *   kvarg pair key.
+ *
+ * @param value
+ *   kvarg pair value.
+ *
+ * @param opaque
+ *   Opaque pointer to a string.
+ *
+ * @return
+ *   0 if the strings match.
+ *   !0 otherwise or on error.
+ *
+ *   Unless strcmp, comparison ordering is not kept.
+ *   In order for rte_kvargs_process to stop processing on match error,
+ *   a negative value is returned even if strcmp had returned a positive one.
+ */
+__rte_experimental
+int rte_kvargs_strcmp(const char *key, const char *value, void *opaque);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/librte_kvargs/rte_kvargs_version.map 
b/lib/librte_kvargs/rte_kvargs_version.map
index 2030ec46c..e2f663a88 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -8,3 +8,10 @@ DPDK_2.0 {
 
local: *;
 };
+
+EXPERIMENTAL {
+   global:
+
+   rte_kvargs_strcmp;
+
+} DPDK_2.0;
-- 
2.11.0

[dpdk-dev] [PATCH v7 10/22] eal/dev: implement device iteration initialization

[Gaetan Rivet]

Parse a device description.
Split this description in their relevant part for each layers.
No dynamic allocation is performed.

Signed-off-by: Gaetan Rivet 
---
 lib/Makefile|   1 +
 lib/librte_eal/bsdapp/eal/Makefile  |   1 +
 lib/librte_eal/common/eal_common_dev.c  | 149 
 lib/librte_eal/common/include/rte_dev.h |  24 +
 lib/librte_eal/linuxapp/eal/Makefile|   1 +
 lib/librte_eal/rte_eal_version.map  |   1 +
 6 files changed, 177 insertions(+)

diff --git a/lib/Makefile b/lib/Makefile
index fc7a55a37..1b17526f7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 DIRS-y += librte_compat
 DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
 DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
+DEPDIRS-librte_eal := librte_kvargs
 DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
 DEPDIRS-librte_pci := librte_eal
 DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring
diff --git a/lib/librte_eal/bsdapp/eal/Makefile 
b/lib/librte_eal/bsdapp/eal/Makefile
index de0e6d166..35f98448c 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -18,6 +18,7 @@ CFLAGS += $(WERROR_FLAGS) -O3
 LDLIBS += -lexecinfo
 LDLIBS += -lpthread
 LDLIBS += -lgcc_s
+LDLIBS += -lrte_kvargs
 
 EXPORT_MAP := ../../rte_eal_version.map
 
diff --git a/lib/librte_eal/common/eal_common_dev.c 
b/lib/librte_eal/common/eal_common_dev.c
index 149e9ad72..9b6d8bab7 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -10,9 +10,12 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -368,3 +371,149 @@ dev_callback_process(char *device_name, enum 
rte_dev_event_type event)
}
rte_spinlock_unlock(&dev_event_lock);
 }
+
+static size_t
+dev_layer_count(const char *s)
+{
+   size_t i = s ? 1 : 0;
+
+   while (s != NULL && s[0] != '\0') {
+   i += s[0] == '/';
+   s++;
+   }
+   return i;
+}
+
+__rte_experimental
+int
+rte_dev_iterator_init(struct rte_dev_iterator *it,
+ const char *devstr)
+{
+   struct {
+   const char *key;
+   const char *str;
+   struct rte_kvargs *kvlist;
+   } layers[] = {
+   { "bus=",NULL, NULL, },
+   { "class=",  NULL, NULL, },
+   { "driver=", NULL, NULL, },
+   };
+   struct rte_kvargs_pair *kv = NULL;
+   struct rte_class *cls = NULL;
+   struct rte_bus *bus = NULL;
+   const char *s = devstr;
+   size_t nblayer;
+   size_t i = 0;
+
+   /* Having both busstr and clsstr NULL is illegal,
+* marking this iterator as invalid unless
+* everything goes well.
+*/
+   it->busstr = NULL;
+   it->clsstr = NULL;
+   /* Split each sub-lists. */
+   nblayer = dev_layer_count(devstr);
+   if (nblayer > RTE_DIM(layers)) {
+   RTE_LOG(ERR, EAL, "Invalid query: too many layers (%zu)\n",
+   nblayer);
+   rte_errno = EINVAL;
+   goto get_out;
+   }
+   while (s != NULL) {
+   char *copy;
+   char *end;
+
+   if (strncmp(layers[i].key, s,
+   strlen(layers[i].key)))
+   goto next_layer;
+   layers[i].str = s;
+   copy = strdup(s);
+   if (copy == NULL) {
+   RTE_LOG(ERR, EAL, "OOM\n");
+   rte_errno = ENOMEM;
+   goto get_out;
+   }
+   end = strchr(copy, '/');
+   end = end ? end : strchr(copy, '\0');
+   end[0] = '\0';
+   layers[i].kvlist = rte_kvargs_parse(copy, NULL);
+   free(copy);
+   if (layers[i].kvlist == NULL) {
+   RTE_LOG(ERR, EAL, "Could not parse %s\n", s);
+   rte_errno = EINVAL;
+   goto get_out;
+   }
+   s = strchr(s, '/');
+   if (s != NULL)
+   s++;
+next_layer:
+   if (i >= RTE_DIM(layers) ||
+   i >= nblayer) {
+   RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s);
+   rte_errno = EINVAL;
+   goto get_out;
+   }
+   i++;
+   }
+   /* Parse each sub-list. */
+   for (i = 0; i < RTE_DIM(layers); i++) {
+   if (layers[i].kvlist == NULL)
+   continue;
+   kv = &layers[i].kvlist->pairs[0];
+   if (strcmp(kv->key, "bus") == 0) {
+   bus = rte_bus_find_by_name(kv->value);
+   if (bus == NULL) {
+   RTE_LOG(ERR, EAL, "Could not find bus \"%s\"\n",
+   

[dpdk-dev] [PATCH v7 11/22] eal/dev: implement device iteration

[Gaetan Rivet]

Use the iteration hooks in the abstraction layers to perform the
requested filtering on the internal device lists.

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/eal_common_dev.c  | 168 
 lib/librte_eal/common/include/rte_dev.h |  26 +
 lib/librte_eal/rte_eal_version.map  |   1 +
 3 files changed, 195 insertions(+)

diff --git a/lib/librte_eal/common/eal_common_dev.c 
b/lib/librte_eal/common/eal_common_dev.c
index 9b6d8bab7..5a8cabfc4 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -45,6 +45,28 @@ static struct dev_event_cb_list dev_event_cbs;
 /* spinlock for device callbacks */
 static rte_spinlock_t dev_event_lock = RTE_SPINLOCK_INITIALIZER;
 
+struct dev_next_ctx {
+   struct rte_dev_iterator *it;
+   const char *busstr;
+   const char *clsstr;
+};
+
+#define CTX(it, busstr, clsstr) \
+   (&(const struct dev_next_ctx){ \
+   .it = it, \
+   .busstr = busstr, \
+   .clsstr = clsstr, \
+   })
+
+#define ITCTX(ptr) \
+   (((struct dev_next_ctx *)(intptr_t)ptr)->it)
+
+#define BUSCTX(ptr) \
+   (((struct dev_next_ctx *)(intptr_t)ptr)->busstr)
+
+#define CLSCTX(ptr) \
+   (((struct dev_next_ctx *)(intptr_t)ptr)->clsstr)
+
 static int cmp_detached_dev_name(const struct rte_device *dev,
const void *_name)
 {
@@ -517,3 +539,149 @@ rte_dev_iterator_init(struct rte_dev_iterator *it,
}
return -rte_errno;
 }
+
+static char *
+dev_str_sane_copy(const char *str)
+{
+   size_t end;
+   char *copy;
+
+   end = strcspn(str, ",/");
+   if (str[end] == ',') {
+   copy = strdup(&str[end + 1]);
+   } else {
+   /* '/' or '\0' */
+   copy = strdup("");
+   }
+   if (copy == NULL) {
+   rte_errno = ENOMEM;
+   } else {
+   char *slash;
+
+   slash = strchr(copy, '/');
+   if (slash != NULL)
+   slash[0] = '\0';
+   }
+   return copy;
+}
+
+static int
+class_next_dev_cmp(const struct rte_class *cls,
+  const void *ctx)
+{
+   struct rte_dev_iterator *it;
+   const char *clsstr = NULL;
+   void *dev;
+
+   if (cls->dev_iterate == NULL)
+   return 1;
+   it = ITCTX(ctx);
+   clsstr = CLSCTX(ctx);
+   dev = it->class_device;
+   /* it->clsstr != NULL means a class
+* was specified in the devstr.
+*/
+   if (it->clsstr != NULL && cls != it->cls)
+   return 1;
+   /* If an error occurred previously,
+* no need to test further.
+*/
+   if (rte_errno != 0)
+   return -1;
+   dev = cls->dev_iterate(dev, clsstr, it);
+   it->class_device = dev;
+   return dev == NULL;
+}
+
+static int
+bus_next_dev_cmp(const struct rte_bus *bus,
+const void *ctx)
+{
+   struct rte_device *dev = NULL;
+   struct rte_class *cls = NULL;
+   struct rte_dev_iterator *it;
+   const char *busstr = NULL;
+
+   if (bus->dev_iterate == NULL)
+   return 1;
+   it = ITCTX(ctx);
+   busstr = BUSCTX(ctx);
+   dev = it->device;
+   /* it->busstr != NULL means a bus
+* was specified in the devstr.
+*/
+   if (it->busstr != NULL && bus != it->bus)
+   return 1;
+   /* If an error occurred previously,
+* no need to test further.
+*/
+   if (rte_errno != 0)
+   return -1;
+   if (it->clsstr == NULL) {
+   dev = bus->dev_iterate(dev, busstr, it);
+   goto end;
+   }
+   /* clsstr != NULL */
+   if (dev == NULL) {
+next_dev_on_bus:
+   dev = bus->dev_iterate(dev, busstr, it);
+   it->device = dev;
+   }
+   if (dev == NULL)
+   return 1;
+   if (it->cls != NULL)
+   cls = TAILQ_PREV(it->cls, rte_class_list, next);
+   cls = rte_class_find(cls, class_next_dev_cmp, ctx);
+   if (cls != NULL) {
+   it->cls = cls;
+   goto end;
+   }
+   goto next_dev_on_bus;
+end:
+   it->device = dev;
+   return dev == NULL;
+}
+__rte_experimental
+struct rte_device *
+rte_dev_iterator_next(struct rte_dev_iterator *it)
+{
+   struct rte_bus *bus = NULL;
+   int old_errno = rte_errno;
+   char *busstr = NULL;
+   char *clsstr = NULL;
+
+   rte_errno = 0;
+   if (it->busstr == NULL && it->clsstr == NULL) {
+   /* Invalid iterator. */
+   rte_errno = EINVAL;
+   return NULL;
+   }
+   if (it->bus != NULL)
+   bus = TAILQ_PREV(it->bus, rte_bus_list, next);
+   if (it->busstr != NULL) {
+   busstr = dev_str_sane_copy(it->busstr);
+   if (busstr == NULL)
+   goto out;
+   }
+   if (it->clsstr != NULL) {
+   

[dpdk-dev] [PATCH v7 09/22] eal/bus: add device iteration

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/librte_eal/common/include/rte_bus.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_eal/common/include/rte_bus.h 
b/lib/librte_eal/common/include/rte_bus.h
index eb9eded4e..747baf140 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -211,6 +211,7 @@ struct rte_bus {
rte_bus_parse_t parse;   /**< Parse a device name */
struct rte_bus_conf conf;/**< Bus configuration */
rte_bus_get_iommu_class_t get_iommu_class; /**< Get iommu class */
+   rte_dev_iterate_t dev_iterate; /**< Device iterator. */
 };
 
 /**
-- 
2.11.0

[dpdk-dev] [PATCH v7 13/22] bus/pci: fix find device implementation

[Gaetan Rivet]

If start is set, and a device before it matches the data
passed for comparison, then this first device is returned.

This induces potentially infinite loops.

Fixes: c7fe1eea8a74 ("bus: simplify finding starting point")
Cc: sta...@dpdk.org

Signed-off-by: Gaetan Rivet 
---
 drivers/bus/pci/pci_common.c  | 21 -
 drivers/bus/pci/rte_bus_pci.h |  3 +++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 2a00f365a..2c45f8151 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -459,17 +459,20 @@ static struct rte_device *
 pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
const void *data)
 {
-   struct rte_pci_device *dev;
+   const struct rte_pci_device *pstart;
+   struct rte_pci_device *pdev;
 
-   FOREACH_DEVICE_ON_PCIBUS(dev) {
-   if (start && &dev->device == start) {
-   start = NULL; /* starting point found */
-   continue;
-   }
-   if (cmp(&dev->device, data) == 0)
-   return &dev->device;
+   if (start != NULL) {
+   pstart = RTE_DEV_TO_PCI_CONST(start);
+   pdev = TAILQ_NEXT(pstart, next);
+   } else {
+   pdev = TAILQ_FIRST(&rte_pci_bus.device_list);
+   }
+   while (pdev != NULL) {
+   if (cmp(&pdev->device, data) == 0)
+   return &pdev->device;
+   pdev = TAILQ_NEXT(pdev, next);
}
-
return NULL;
 }
 
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 357afb912..458e6d076 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -74,6 +74,9 @@ struct rte_pci_device {
  */
 #define RTE_DEV_TO_PCI(ptr) container_of(ptr, struct rte_pci_device, device)
 
+#define RTE_DEV_TO_PCI_CONST(ptr) \
+   container_of(ptr, const struct rte_pci_device, device)
+
 #define RTE_ETH_DEV_TO_PCI(eth_dev)RTE_DEV_TO_PCI((eth_dev)->device)
 
 /** Any PCI device identifier (vendor, device, ...) */
-- 
2.11.0

[dpdk-dev] [PATCH v7 14/22] bus/pci: implement device iteration and comparison

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 drivers/bus/pci/Makefile |  2 +-
 drivers/bus/pci/pci_common.c | 42 ++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
index 804a198d1..bbda567c1 100644
--- a/drivers/bus/pci/Makefile
+++ b/drivers/bus/pci/Makefile
@@ -53,7 +53,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal
 CFLAGS += -DALLOW_EXPERIMENTAL_API
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_pci
+LDLIBS += -lrte_ethdev -lrte_pci -lrte_kvargs
 
 include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile
 SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS))
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 2c45f8151..bd9ecddc6 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -13,6 +13,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -497,6 +498,46 @@ pci_unplug(struct rte_device *dev)
return ret;
 }
 
+enum pci_params {
+   RTE_PCI_PARAMS_MAX,
+};
+
+static const char * const pci_params_keys[] = {
+   [RTE_PCI_PARAMS_MAX] = NULL,
+};
+
+static int
+pci_dev_match(const struct rte_device *dev,
+ const void *_kvlist)
+{
+   const struct rte_kvargs *kvlist = _kvlist;
+
+   (void) dev;
+   (void) kvlist;
+   return 0;
+}
+
+static void *
+pci_dev_iterate(const void *start,
+   const char *str,
+   const struct rte_dev_iterator *it __rte_unused)
+{
+   struct rte_device *dev;
+   struct rte_kvargs *kvargs = NULL;
+
+   if (str != NULL) {
+   kvargs = rte_kvargs_parse(str, pci_params_keys);
+   if (kvargs == NULL) {
+   RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+   rte_errno = EINVAL;
+   return NULL;
+   }
+   }
+   dev = pci_find_device(start, pci_dev_match, kvargs);
+   rte_kvargs_free(kvargs);
+   return dev;
+}
+
 struct rte_pci_bus rte_pci_bus = {
.bus = {
.scan = rte_pci_scan,
@@ -506,6 +547,7 @@ struct rte_pci_bus rte_pci_bus = {
.unplug = pci_unplug,
.parse = pci_parse,
.get_iommu_class = rte_pci_get_iommu_class,
+   .dev_iterate = pci_dev_iterate,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
-- 
2.11.0

[dpdk-dev] [PATCH v7 16/22] bus/vdev: fix find device implementation

[Gaetan Rivet]

If start is set and a device before it matches the data,
this device is returned.

This induces potentially infinite loops.

Fixes: c7fe1eea8a74 ("bus: simplify finding starting point")
Cc: sta...@dpdk.org

Signed-off-by: Gaetan Rivet 
---
 drivers/bus/vdev/rte_bus_vdev.h |  3 +++
 drivers/bus/vdev/vdev.c | 14 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h
index 646d6c090..f9b5eb596 100644
--- a/drivers/bus/vdev/rte_bus_vdev.h
+++ b/drivers/bus/vdev/rte_bus_vdev.h
@@ -25,6 +25,9 @@ struct rte_vdev_device {
 #define RTE_DEV_TO_VDEV(ptr) \
container_of(ptr, struct rte_vdev_device, device)
 
+#define RTE_DEV_TO_VDEV_CONST(ptr) \
+   container_of(ptr, const struct rte_vdev_device, device)
+
 static inline const char *
 rte_vdev_device_name(const struct rte_vdev_device *dev)
 {
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index f8dd1f5e6..c135554c0 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -358,15 +358,19 @@ static struct rte_device *
 vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
 const void *data)
 {
+   const struct rte_vdev_device *vstart;
struct rte_vdev_device *dev;
 
-   TAILQ_FOREACH(dev, &vdev_device_list, next) {
-   if (start && &dev->device == start) {
-   start = NULL;
-   continue;
-   }
+   if (start != NULL) {
+   vstart = RTE_DEV_TO_VDEV_CONST(start);
+   dev = TAILQ_NEXT(vstart, next);
+   } else {
+   dev = TAILQ_FIRST(&vdev_device_list);
+   }
+   while (dev != NULL) {
if (cmp(&dev->device, data) == 0)
return &dev->device;
+   dev = TAILQ_NEXT(dev, next);
}
return NULL;
 }
-- 
2.11.0

[dpdk-dev] [PATCH v7 15/22] bus/pci: add device matching field id

[Gaetan Rivet]

The PCI bus can now parse a matching field "id" as follows:

   "bus=pci,id=:00:00.0"

   or

   "bus=pci,id=00:00.0"

Signed-off-by: Gaetan Rivet 
---
 drivers/bus/pci/pci_common.c | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index bd9ecddc6..3666e4caa 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -499,21 +499,45 @@ pci_unplug(struct rte_device *dev)
 }
 
 enum pci_params {
+   RTE_PCI_PARAMS_ID,
RTE_PCI_PARAMS_MAX,
 };
 
 static const char * const pci_params_keys[] = {
+   [RTE_PCI_PARAMS_ID] = "id",
[RTE_PCI_PARAMS_MAX] = NULL,
 };
 
 static int
+pci_addr_kv_cmp(const char *key __rte_unused,
+   const char *value,
+   void *_addr2)
+{
+   struct rte_pci_addr _addr1;
+   struct rte_pci_addr *addr1 = &_addr1;
+   struct rte_pci_addr *addr2 = _addr2;
+
+   if (rte_pci_addr_parse(value, addr1))
+   return -1;
+   return rte_pci_addr_cmp(addr1, addr2);
+}
+
+static int
 pci_dev_match(const struct rte_device *dev,
  const void *_kvlist)
 {
const struct rte_kvargs *kvlist = _kvlist;
+   const struct rte_pci_device *pdev;
 
-   (void) dev;
-   (void) kvlist;
+   if (kvlist == NULL)
+   /* Empty string matches everything. */
+   return 0;
+   pdev = RTE_DEV_TO_PCI_CONST(dev);
+   /* if any field does not match. */
+   if (rte_kvargs_process(kvlist, "id",
+  &pci_addr_kv_cmp,
+  (void *)(intptr_t)&pdev->addr))
+   return 1;
return 0;
 }
 
-- 
2.11.0

[dpdk-dev] [PATCH v7 17/22] bus/vdev: implement device iteration

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 drivers/bus/vdev/Makefile |  2 +-
 drivers/bus/vdev/vdev.c   | 42 ++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile
index 24d424a38..52728833c 100644
--- a/drivers/bus/vdev/Makefile
+++ b/drivers/bus/vdev/Makefile
@@ -19,7 +19,7 @@ LIBABIVER := 1
 
 SRCS-y += vdev.c
 
-LDLIBS += -lrte_eal
+LDLIBS += -lrte_eal -lrte_kvargs
 
 #
 # Export include files
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index c135554c0..5bb87af28 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -387,6 +388,46 @@ vdev_unplug(struct rte_device *dev)
return rte_vdev_uninit(dev->name);
 }
 
+enum vdev_params {
+   RTE_VDEV_PARAMS_MAX,
+};
+
+static const char * const vdev_params_keys[] = {
+   [RTE_VDEV_PARAMS_MAX] = NULL,
+};
+
+static int
+vdev_dev_match(const struct rte_device *dev,
+  const void *_kvlist)
+{
+   const struct rte_kvargs *kvlist = _kvlist;
+
+   (void) kvlist;
+   (void) dev;
+   return 0;
+}
+
+static void *
+vdev_dev_iterate(const void *start,
+const char *str,
+const struct rte_dev_iterator *it __rte_unused)
+{
+   struct rte_kvargs *kvargs = NULL;
+   struct rte_device *dev;
+
+   if (str != NULL) {
+   kvargs = rte_kvargs_parse(str, vdev_params_keys);
+   if (kvargs == NULL) {
+   VDEV_LOG(ERR, "cannot parse argument list\n");
+   rte_errno = EINVAL;
+   return NULL;
+   }
+   }
+   dev = vdev_find_device(start, vdev_dev_match, kvargs);
+   rte_kvargs_free(kvargs);
+   return dev;
+}
+
 static struct rte_bus rte_vdev_bus = {
.scan = vdev_scan,
.probe = vdev_probe,
@@ -394,6 +435,7 @@ static struct rte_bus rte_vdev_bus = {
.plug = vdev_plug,
.unplug = vdev_unplug,
.parse = vdev_parse,
+   .dev_iterate = vdev_dev_iterate,
 };
 
 RTE_REGISTER_BUS(vdev, rte_vdev_bus);
-- 
2.11.0

[dpdk-dev] [PATCH v7 20/22] ethdev: register ether layer as a class

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 lib/Makefile |  2 +-
 lib/librte_ether/Makefile|  3 +-
 lib/librte_ether/rte_class_eth.c | 79 
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 lib/librte_ether/rte_class_eth.c

diff --git a/lib/Makefile b/lib/Makefile
index 4206485d3..47513f03f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,7 +23,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
 DEPDIRS-librte_cmdline := librte_eal
 DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether
 DEPDIRS-librte_ether := librte_net librte_eal librte_mempool librte_ring
-DEPDIRS-librte_ether += librte_mbuf
+DEPDIRS-librte_ether += librte_mbuf librte_kvargs
 DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev
 DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf
 DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev
diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index 2fa133fbc..d4c3a8d06 100644
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring
-LDLIBS += -lrte_mbuf
+LDLIBS += -lrte_mbuf -lrte_kvargs
 
 EXPORT_MAP := rte_ethdev_version.map
 
@@ -20,6 +20,7 @@ LIBABIVER := 9
 
 SRCS-y += eth_private.c
 SRCS-y += rte_ethdev.c
+SRCS-y += rte_class_eth.c
 SRCS-y += rte_flow.c
 SRCS-y += rte_tm.c
 SRCS-y += rte_mtr.c
diff --git a/lib/librte_ether/rte_class_eth.c b/lib/librte_ether/rte_class_eth.c
new file mode 100644
index 0..32c736d32
--- /dev/null
+++ b/lib/librte_ether/rte_class_eth.c
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Gaëtan Rivet
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "rte_ethdev.h"
+#include "rte_ethdev_core.h"
+#include "eth_private.h"
+
+enum eth_params {
+   RTE_ETH_PARAMS_MAX,
+};
+
+static const char * const eth_params_keys[] = {
+   [RTE_ETH_PARAMS_MAX] = NULL,
+};
+
+struct eth_dev_match_arg {
+   struct rte_device *device;
+   struct rte_kvargs *kvlist;
+};
+
+#define eth_dev_match_arg(d, k) \
+   (&(const struct eth_dev_match_arg) { \
+   .device = (d), \
+   .kvlist = (k), \
+   })
+
+static int
+eth_dev_match(const struct rte_eth_dev *edev,
+ const void *_arg)
+{
+   const struct eth_dev_match_arg *arg = _arg;
+   const struct rte_kvargs *kvlist = arg->kvlist;
+
+   if (edev->state == RTE_ETH_DEV_UNUSED)
+   return -1;
+   if (edev->device != arg->device)
+   return -1;
+   if (kvlist == NULL)
+   /* Empty string matches everything. */
+   return 0;
+   return 0;
+}
+
+static void *
+eth_dev_iterate(const void *start,
+   const char *str,
+   const struct rte_dev_iterator *it)
+{
+   struct rte_kvargs *kvargs = NULL;
+   struct rte_eth_dev *edev = NULL;
+
+   if (str != NULL) {
+   kvargs = rte_kvargs_parse(str, eth_params_keys);
+   if (kvargs == NULL) {
+   RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+   rte_errno = EINVAL;
+   return NULL;
+   }
+   }
+   edev = eth_find_device(start, eth_dev_match,
+  eth_dev_match_arg(it->device, kvargs));
+   rte_kvargs_free(kvargs);
+   return edev;
+}
+
+struct rte_class rte_class_eth = {
+   .dev_iterate = eth_dev_iterate,
+};
+
+RTE_REGISTER_CLASS(eth, rte_class_eth);
-- 
2.11.0

[dpdk-dev] [PATCH v7 18/22] bus/vdev: add device matching field driver

[Gaetan Rivet]

The vdev bus parses a field "driver", matching
a vdev driver name with one passed as follows:

   "bus=vdev,driver="

Signed-off-by: Gaetan Rivet 
---
 drivers/bus/vdev/Makefile |  1 +
 drivers/bus/vdev/vdev.c   | 14 --
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile
index 52728833c..db6bee98a 100644
--- a/drivers/bus/vdev/Makefile
+++ b/drivers/bus/vdev/Makefile
@@ -10,6 +10,7 @@ LIB = librte_bus_vdev.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -DALLOW_EXPERIMENTAL_API
 
 # versioning export map
 EXPORT_MAP := rte_bus_vdev_version.map
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 5bb87af28..84192d79b 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -389,10 +389,12 @@ vdev_unplug(struct rte_device *dev)
 }
 
 enum vdev_params {
+   RTE_VDEV_PARAMS_DRIVER,
RTE_VDEV_PARAMS_MAX,
 };
 
 static const char * const vdev_params_keys[] = {
+   [RTE_VDEV_PARAMS_DRIVER] = "driver",
[RTE_VDEV_PARAMS_MAX] = NULL,
 };
 
@@ -401,9 +403,17 @@ vdev_dev_match(const struct rte_device *dev,
   const void *_kvlist)
 {
const struct rte_kvargs *kvlist = _kvlist;
+   const struct rte_vdev_device *vdev;
 
-   (void) kvlist;
-   (void) dev;
+   if (kvlist == NULL)
+   /* Empty string matches everything. */
+   return 0;
+   vdev = RTE_DEV_TO_VDEV_CONST(dev);
+   /* if any field does not match. */
+   if (rte_kvargs_process(kvlist, "driver",
+   rte_kvargs_strcmp,
+   (void *)(intptr_t)vdev->device.driver->name))
+   return -1;
return 0;
 }
 
-- 
2.11.0

[dpdk-dev] [PATCH v7 19/22] ethdev: add private generic device iterator

[Gaetan Rivet]

This iterator can be customized with a comparison function that will
trigger a stopping condition.

It can be leveraged to write several different iterators that have
similar but non-identical purposes.

It is private to librte_ether.

Signed-off-by: Gaetan Rivet 
---
 lib/librte_ether/Makefile  |  1 +
 lib/librte_ether/eth_private.c | 31 +++
 lib/librte_ether/eth_private.h | 26 ++
 3 files changed, 58 insertions(+)
 create mode 100644 lib/librte_ether/eth_private.c
 create mode 100644 lib/librte_ether/eth_private.h

diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index c2f2f7d82..2fa133fbc 100644
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -18,6 +18,7 @@ EXPORT_MAP := rte_ethdev_version.map
 
 LIBABIVER := 9
 
+SRCS-y += eth_private.c
 SRCS-y += rte_ethdev.c
 SRCS-y += rte_flow.c
 SRCS-y += rte_tm.c
diff --git a/lib/librte_ether/eth_private.c b/lib/librte_ether/eth_private.c
new file mode 100644
index 0..d565568a0
--- /dev/null
+++ b/lib/librte_ether/eth_private.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Gaëtan Rivet
+ */
+
+#include "rte_ethdev.h"
+#include "eth_private.h"
+
+struct rte_eth_dev *
+eth_find_device(const struct rte_eth_dev *start, rte_eth_cmp_t cmp,
+   const void *data)
+{
+   struct rte_eth_dev *edev;
+   ptrdiff_t idx;
+
+   /* Avoid Undefined Behaviour */
+   if (start != NULL &&
+   (start < &rte_eth_devices[0] ||
+start > &rte_eth_devices[RTE_MAX_ETHPORTS]))
+   return NULL;
+   if (start != NULL)
+   idx = start - &rte_eth_devices[0] + 1;
+   else
+   idx = 0;
+   for (; idx < RTE_MAX_ETHPORTS; idx++) {
+   edev = &rte_eth_devices[idx];
+   if (cmp(edev, data) == 0)
+   return edev;
+   }
+   return NULL;
+}
+
diff --git a/lib/librte_ether/eth_private.h b/lib/librte_ether/eth_private.h
new file mode 100644
index 0..0f5c6d5c4
--- /dev/null
+++ b/lib/librte_ether/eth_private.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Gaëtan Rivet
+ */
+
+#ifndef _RTE_ETH_PRIVATE_H_
+#define _RTE_ETH_PRIVATE_H_
+
+#include "rte_ethdev.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Generic rte_eth_dev comparison function. */
+typedef int (*rte_eth_cmp_t)(const struct rte_eth_dev *, const void *);
+
+/* Generic rte_eth_dev iterator. */
+struct rte_eth_dev *
+eth_find_device(const struct rte_eth_dev *_start, rte_eth_cmp_t cmp,
+   const void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_ETH_PRIVATE_H_ */
-- 
2.11.0

[dpdk-dev] [PATCH v7 21/22] ethdev: add device matching field name

[Gaetan Rivet]

The eth device class can now parse a field name,
matching the eth_dev name with one passed as

   "class=eth,name=xx"

Signed-off-by: Gaetan Rivet 
---
 lib/librte_ether/rte_class_eth.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/lib/librte_ether/rte_class_eth.c b/lib/librte_ether/rte_class_eth.c
index 32c736d32..d8d8e8845 100644
--- a/lib/librte_ether/rte_class_eth.c
+++ b/lib/librte_ether/rte_class_eth.c
@@ -15,10 +15,12 @@
 #include "eth_private.h"
 
 enum eth_params {
+   RTE_ETH_PARAMS_NAME,
RTE_ETH_PARAMS_MAX,
 };
 
 static const char * const eth_params_keys[] = {
+   [RTE_ETH_PARAMS_NAME] = "name",
[RTE_ETH_PARAMS_MAX] = NULL,
 };
 
@@ -39,6 +41,7 @@ eth_dev_match(const struct rte_eth_dev *edev,
 {
const struct eth_dev_match_arg *arg = _arg;
const struct rte_kvargs *kvlist = arg->kvlist;
+   struct rte_eth_dev_data *data;
 
if (edev->state == RTE_ETH_DEV_UNUSED)
return -1;
@@ -47,6 +50,10 @@ eth_dev_match(const struct rte_eth_dev *edev,
if (kvlist == NULL)
/* Empty string matches everything. */
return 0;
+   data = edev->data;
+   if (rte_kvargs_process(kvlist, "name",
+   rte_kvargs_strcmp, data->name))
+   return -1;
return 0;
 }
 
-- 
2.11.0

Re: [dpdk-dev] [PATCH v7] vfio: change to use generic multi-process channel

[Tan, Jianfeng]

Sorry, forget the version change log. FYI:

v6->v7:
  - Rebase on master.
v5->v6: (Address comments from Anatoly)
  - Naming, return checking, logging.
  - Move vfio action register after rte_bus_probe().


On 4/15/2018 11:06 PM, Jianfeng Tan wrote:

Previously, vfio uses its own private channel for the secondary
process to get container fd and group fd from the primary process.

This patch changes to use the generic mp channel.

Test:
   1. Bind two NICs to vfio-pci.

   2. Start the primary and secondary process.
 $ (symmetric_mp) -c 2 -- -p 3 --num-procs=2 --proc-id=0
 $ (symmetric_mp) -c 4 --proc-type=auto -- -p 3 \
--num-procs=2 --proc-id=1

Cc: anatoly.bura...@intel.com

Signed-off-by: Jianfeng Tan 
Acked-by: Anatoly Burakov 
---
  lib/librte_eal/linuxapp/eal/eal.c  |  22 +-
  lib/librte_eal/linuxapp/eal/eal_vfio.c | 178 +--
  lib/librte_eal/linuxapp/eal/eal_vfio.h |  17 +-
  lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c | 410 -
  4 files changed, 148 insertions(+), 479 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal.c 
b/lib/librte_eal/linuxapp/eal/eal.c
index 99c2242..21afa73 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -696,24 +696,8 @@ rte_eal_iopl_init(void)
  #ifdef VFIO_PRESENT
  static int rte_eal_vfio_setup(void)
  {
-   int vfio_enabled = 0;
-
if (rte_vfio_enable("vfio"))
return -1;
-   vfio_enabled = rte_vfio_is_enabled("vfio");
-
-   if (vfio_enabled) {
-
-   /* if we are primary process, create a thread to communicate 
with
-* secondary processes. the thread will use a socket to wait for
-* requests from secondary process to send open file 
descriptors,
-* because VFIO does not allow multiple open descriptors on a 
group or
-* VFIO container.
-*/
-   if (internal_config.process_type == RTE_PROC_PRIMARY &&
-   vfio_mp_sync_setup() < 0)
-   return -1;
-   }
  
  	return 0;

  }
@@ -970,6 +954,12 @@ rte_eal_init(int argc, char **argv)
return -1;
}
  
+#ifdef VFIO_PRESENT

+   /* Register mp action after probe() so that we got enough info */
+   if (rte_vfio_is_enabled("vfio") && vfio_mp_sync_setup() < 0)
+   return -1;
+#endif
+
/* initialize default service/lcore mappings and start running. Ignore
 * -ENOTSUP, as it indicates no service coremask passed to EAL.
 */
diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c 
b/lib/librte_eal/linuxapp/eal/eal_vfio.c
index 16ee730..957a537 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
@@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+ * Copyright(c) 2010-2018 Intel Corporation
   */
  
  #include 

@@ -290,6 +290,10 @@ rte_vfio_get_group_fd(int iommu_group_num)
int vfio_group_fd;
char filename[PATH_MAX];
struct vfio_group *cur_grp;
+   struct rte_mp_msg mp_req, *mp_rep;
+   struct rte_mp_reply mp_reply;
+   struct timespec ts = {.tv_sec = 5, .tv_nsec = 0};
+   struct vfio_mp_param *p = (struct vfio_mp_param *)mp_req.param;
  
  	/* check if we already have the group descriptor open */

for (i = 0; i < VFIO_MAX_GROUPS; i++)
@@ -350,50 +354,34 @@ rte_vfio_get_group_fd(int iommu_group_num)
return vfio_group_fd;
}
/* if we're in a secondary process, request group fd from the primary
-* process via our socket
+* process via mp channel.
 */
-   else {
-   int socket_fd, ret;
-
-   socket_fd = vfio_mp_sync_connect_to_primary();
-
-   if (socket_fd < 0) {
-   RTE_LOG(ERR, EAL, "  cannot connect to primary 
process!\n");
-   return -1;
-   }
-   if (vfio_mp_sync_send_request(socket_fd, SOCKET_REQ_GROUP) < 0) 
{
-   RTE_LOG(ERR, EAL, "  cannot request container fd!\n");
-   close(socket_fd);
-   return -1;
-   }
-   if (vfio_mp_sync_send_request(socket_fd, iommu_group_num) < 0) {
-   RTE_LOG(ERR, EAL, "  cannot send group number!\n");
-   close(socket_fd);
-   return -1;
-   }
-   ret = vfio_mp_sync_receive_request(socket_fd);
-   switch (ret) {
-   case SOCKET_NO_FD:
-   close(socket_fd);
-   return 0;
-   case SOCKET_OK:
-   vfio_group_fd = vfio_mp_sync_receive_fd(socket_fd);
-   /* if we got the fd, store it and return it */
-   if (vfio_gro

[dpdk-dev] [PATCH v7 22/22] app/testpmd: add show device command

[Gaetan Rivet]

A new interactive command is offered:

   show device 

This commands lists all rte_device element matching the device
description. e.g.:

   show device bus=pci
   show device bus=vdev
   show device bus=vdev/class=eth
   show device bus=vdev,driver=net_ring/class=eth
   show device bus=vdev/class=eth,name=net_ring0

These devices may not be otherwise useful, some buses will spawn devices
to keep track of their assets without having a driver to use them.

Signed-off-by: Gaetan Rivet 
---
 app/test-pmd/cmdline.c | 52 ++
 1 file changed, 52 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 40b31ad7e..8ac5fb3ca 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6701,6 +6701,57 @@ cmdline_parse_inst_t cmd_showportall = {
},
 };
 
+/* *** SHOW DEVICE INFO *** */
+struct cmd_showdevice_result {
+   cmdline_fixed_string_t show;
+   cmdline_fixed_string_t device;
+   cmdline_fixed_string_t filter;
+};
+
+static void
+cmd_showdevice_dump_device(const struct rte_device *dev)
+{
+   const struct rte_driver *drv = dev->driver;
+
+   printf("0x%p: %s:%s\n", (const void *)dev, dev->name,
+   drv ? drv->name : "");
+}
+
+static void cmd_showdevice_parsed(void *parsed_result,
+   __attribute__((unused)) struct cmdline *cl,
+   __attribute__((unused)) void *data)
+{
+   struct cmd_showdevice_result *res = parsed_result;
+   struct rte_dev_iterator it;
+   const struct rte_device *dev;
+
+   RTE_DEV_FOREACH(dev, res->filter, &it)
+   cmd_showdevice_dump_device(dev);
+}
+
+cmdline_parse_token_string_t cmd_showdevice_show =
+   TOKEN_STRING_INITIALIZER(struct cmd_showdevice_result,
+   show, "show");
+cmdline_parse_token_string_t cmd_showdevice_device =
+   TOKEN_STRING_INITIALIZER(struct cmd_showdevice_result,
+   device, "device");
+cmdline_parse_token_string_t cmd_showdevice_filter =
+   TOKEN_STRING_INITIALIZER(struct cmd_showdevice_result,
+   filter, NULL);
+
+cmdline_parse_inst_t cmd_showdevice = {
+   .f = cmd_showdevice_parsed,
+   .data = NULL,
+   .help_str = "show device "
+   "",
+   .tokens = {
+   (void *)&cmd_showdevice_show,
+   (void *)&cmd_showdevice_device,
+   (void *)&cmd_showdevice_filter,
+   NULL,
+   },
+};
+
 /* *** SHOW PORT INFO *** */
 struct cmd_showport_result {
cmdline_fixed_string_t show;
@@ -16038,6 +16089,7 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_help_long,
(cmdline_parse_inst_t *)&cmd_quit,
(cmdline_parse_inst_t *)&cmd_load_from_file,
+   (cmdline_parse_inst_t *)&cmd_showdevice,
(cmdline_parse_inst_t *)&cmd_showport,
(cmdline_parse_inst_t *)&cmd_showqueue,
(cmdline_parse_inst_t *)&cmd_showportall,
-- 
2.11.0

Re: [dpdk-dev] [PATCH v5 02/21] eal: list acceptable init priorities

[Gaëtan Rivet]

Hello Neil,

On Sat, Apr 14, 2018 at 02:45:45PM -0400, Neil Horman wrote:
> On Fri, Apr 13, 2018 at 02:55:11PM +0200, Gaëtan Rivet wrote:
> > Hi Shreyansh,
> > 
> > On Fri, Apr 13, 2018 at 06:22:43PM +0530, Shreyansh Jain wrote:
> > > On Friday 13 April 2018 05:12 PM, Neil Horman wrote:
> > > > On Thu, Apr 12, 2018 at 11:57:47PM +0200, Gaëtan Rivet wrote:
> > > > > Hello Neil,
> > > > > 
> > > > > On Thu, Apr 12, 2018 at 07:28:26AM -0400, Neil Horman wrote:
> > > > > > On Wed, Apr 11, 2018 at 02:04:03AM +0200, Gaetan Rivet wrote:
> > > > > > > Build a central list to quickly see each used priorities for
> > > > > > > constructors, allowing to verify that they are both above 100 and 
> > > > > > > in the
> > > > > > > proper order.
> > > > > > > 
> > > > > > > Signed-off-by: Gaetan Rivet 
> > > > > > > Acked-by: Neil Horman 
> > > > > > > Acked-by: Shreyansh Jain 
> > > > > > > ---
> > > > > > >   lib/librte_eal/common/eal_common_log.c | 2 +-
> > > > > > >   lib/librte_eal/common/include/rte_bus.h| 2 +-
> > > > > > >   lib/librte_eal/common/include/rte_common.h | 8 +++-
> > > > > > >   3 files changed, 9 insertions(+), 3 deletions(-)
> > > > > > > 
> > > > > > > diff --git a/lib/librte_eal/common/eal_common_log.c 
> > > > > > > b/lib/librte_eal/common/eal_common_log.c
> > > > > > > index a27192620..36b9d6e08 100644
> > > > > > > --- a/lib/librte_eal/common/eal_common_log.c
> > > > > > > +++ b/lib/librte_eal/common/eal_common_log.c
> > > > > > > @@ -260,7 +260,7 @@ static const struct logtype logtype_strings[] 
> > > > > > > = {
> > > > > > >   };
> > > > > > >   /* Logging should be first initializer (before drivers and bus) 
> > > > > > > */
> > > > > > > -RTE_INIT_PRIO(rte_log_init, 101);
> > > > > > > +RTE_INIT_PRIO(rte_log_init, LOG);
> > > > > > >   static void
> > > > > > >   rte_log_init(void)
> > > > > > >   {
> > > > > > > diff --git a/lib/librte_eal/common/include/rte_bus.h 
> > > > > > > b/lib/librte_eal/common/include/rte_bus.h
> > > > > > > index 6fb08341a..eb9eded4e 100644
> > > > > > > --- a/lib/librte_eal/common/include/rte_bus.h
> > > > > > > +++ b/lib/librte_eal/common/include/rte_bus.h
> > > > > > > @@ -325,7 +325,7 @@ enum rte_iova_mode 
> > > > > > > rte_bus_get_iommu_class(void);
> > > > > > >* The constructor has higher priority than PMD constructors.
> > > > > > >*/
> > > > > > >   #define RTE_REGISTER_BUS(nm, bus) \
> > > > > > > -RTE_INIT_PRIO(businitfn_ ##nm, 110); \
> > > > > > > +RTE_INIT_PRIO(businitfn_ ##nm, BUS); \
> > > > > > >   static void businitfn_ ##nm(void) \
> > > > > > >   {\
> > > > > > >   (bus).name = RTE_STR(nm);\
> > > > > > > diff --git a/lib/librte_eal/common/include/rte_common.h 
> > > > > > > b/lib/librte_eal/common/include/rte_common.h
> > > > > > > index 6c5bc5a76..8f04518f7 100644
> > > > > > > --- a/lib/librte_eal/common/include/rte_common.h
> > > > > > > +++ b/lib/librte_eal/common/include/rte_common.h
> > > > > > > @@ -81,6 +81,12 @@ typedef uint16_t unaligned_uint16_t;
> > > > > > >*/
> > > > > > >   #define RTE_SET_USED(x) (void)(x)
> > > > > > > +#define RTE_PRIORITY_LOG 101
> > > > > > > +#define RTE_PRIORITY_BUS 110
> > > > > > > +
> > > > > > > +#define RTE_PRIO(prio) \
> > > > > > > + RTE_PRIORITY_ ## prio
> > > > > > > +
> > > > > > >   /**
> > > > > > >* Run function before main() with low priority.
> > > > > > >*
> > > > > > > @@ -102,7 +108,7 @@ static void __attribute__((constructor, 
> > > > > > > used)) func(void)
> > > > > > >*   Lowest number is the first to run.
> > > > > > >*/
> > > > > > >   #define RTE_INIT_PRIO(func, prio) \
> > > > > > > -static void __attribute__((constructor(prio), used)) func(void)
> > > > > > > +static void __attribute__((constructor(RTE_PRIO(prio)), used)) 
> > > > > > > func(void)
> > > > > > It just occured to me, that perhaps you should add a 
> > > > > > RTE_PRORITY_LAST priority,
> > > > > > and redefine RTE_INIT to RTE_INIT_PRIO(func, RTE_PRIORITY_LAST) for 
> > > > > > clarity.  I
> > > > > > presume that constructors with no explicit priority run last, but 
> > > > > > the gcc
> > > > > > manual doesn't explicitly say that.  It would be a heck of a bug to 
> > > > > > track down
> > > > > > if somehow unprioritized constructors ran early.
> > > > > > 
> > > > > > Neil
> > > > > > 
> > > > > 
> > > > > While certainly poorly documented, the behavior is well-defined. I 
> > > > > don't see
> > > > > a situation where the bug you describe could arise.
> > > > > 
> > > > > Adding RTE_PRIORITY_LAST is pretty harmless, but I'm not sure it's
> > > > > justified to add it. If you still think it is useful, I will do it.
> > > > > 
> > > > It was more just a way to unify the macros is all, probably not 
> > > > important.
> > > > 
> > > > > I'd be curious to hear if anyone has had issues of this kind.
> > > > > 
> > > > I've not had any, but I was suprised to see that the gcc manual didn't
> > > > explicitly call out the implied priority of unprioritized construct

[dpdk-dev] [PATCH v7 0/5] add ifcvf vdpa driver

[Xiao Wang]

IFCVF driver

The IFCVF vDPA (vhost data path acceleration) driver provides support for the
Intel FPGA 100G VF (IFCVF). IFCVF's datapath is virtio ring compatible, it
works as a HW vhost backend which can send/receive packets to/from virtio
directly by DMA. Besides, it supports dirty page logging and device state
report/restore. This driver enables its vDPA functionality with live migration
feature.

vDPA mode
=
IFCVF's vendor ID and device ID are same as that of virtio net pci device,
with its specific subsystem vendor ID and device ID. To let the device be
probed by IFCVF driver, adding "vdpa=1" parameter helps to specify that this
device is to be used in vDPA mode, rather than polling mode, virtio pmd will
skip when it detects this message.

Container per device

vDPA needs to create different containers for different devices, thus this
patch set adds some APIs in eal/vfio to support multiple container, e.g.
- rte_vfio_create_container
- rte_vfio_destroy_container
- rte_vfio_bind_group
- rte_vfio_unbind_group

By this extension, a device can be put into a new specific container, rather
than the previous default container.

IFCVF vDPA details
==
Key vDPA driver ops implemented:
- ifcvf_dev_config:
  Enable VF data path with virtio information provided by vhost lib, including
  IOMMU programming to enable VF DMA to VM's memory, VFIO interrupt setup to
  route HW interrupt to virtio driver, create notify relay thread to translate
  virtio driver's kick to a MMIO write onto HW, HW queues configuration.

  This function gets called to set up HW data path backend when virtio driver
  in VM gets ready.

- ifcvf_dev_close:
  Revoke all the setup in ifcvf_dev_config.

  This function gets called when virtio driver stops device in VM.

Change log
==
v7:
- Rebase on HEAD.
- Split the vfio patch into 2 parts, one for data structure extension, one for
  adding new API.
- Use static vfio_config array instead of dynamic alloating.
- Change rte_vfio_container_dma_map/unmap's parameters to use (va, iova, len).

v6:
- Rebase on master branch.
- Document "vdpa" devarg in virtio documentation.
- Rename ifcvf config option to CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD for
  consistensy, and add it into driver documentation.
- Add comments for ifcvf device ID.
- Minor code cleaning.

v5:
- Fix compilation in BSD, remove the rte_vfio.h including in BSD.

v4:
- Rebase on Zhihong's latest vDPA lib patch, with vDPA ops names change.
- Remove API "rte_vfio_get_group_fd", "rte_vfio_bind_group" will return the fd.
- Align the vfio_cfg search internal APIs naming.

v3:
- Add doc and release note for the new driver.
- Remove the vdev concept, make the driver as a PCI driver, it will get probed
  by PCI bus driver.
- Rebase on the v4 vDPA lib patch, register a vDPA device instead of a engine.
- Remove the PCI API exposure accordingly.
- Move the MAX_VFIO_CONTAINERS definition to config file.
- Let virtio pmd skips when a virtio device needs to work in vDPA mode.

v2:
- Rename function pci_get_kernel_driver_by_path to rte_pci_device_kdriver_name
  to make the API generic cross Linux and BSD, make it as EXPERIMENTAL.
- Rebase on Zhihong's vDPA v3 patch set.
- Minor code cleanup on vfio extension.


Xiao Wang (5):
  vfio: extend data structure for multi container
  vfio: add multi container support
  net/virtio: skip device probe in vdpa mode
  net/ifcvf: add ifcvf vdpa driver
  doc: add ifcvf driver document and release note

 config/common_base   |   8 +
 config/common_linuxapp   |   1 +
 doc/guides/nics/features/ifcvf.ini   |   8 +
 doc/guides/nics/ifcvf.rst|  98 
 doc/guides/nics/index.rst|   1 +
 doc/guides/nics/virtio.rst   |  13 +
 doc/guides/rel_notes/release_18_05.rst   |   9 +
 drivers/net/Makefile |   3 +
 drivers/net/ifc/Makefile |  36 ++
 drivers/net/ifc/base/ifcvf.c | 329 
 drivers/net/ifc/base/ifcvf.h | 160 ++
 drivers/net/ifc/base/ifcvf_osdep.h   |  52 ++
 drivers/net/ifc/ifcvf_vdpa.c | 842 +++
 drivers/net/ifc/rte_ifcvf_version.map|   4 +
 drivers/net/virtio/virtio_ethdev.c   |  43 ++
 lib/librte_eal/bsdapp/eal/eal.c  |  52 ++
 lib/librte_eal/common/include/rte_vfio.h | 119 +
 lib/librte_eal/linuxapp/eal/eal_vfio.c   | 723 +-
 lib/librte_eal/linuxapp/eal/eal_vfio.h   |  19 +-
 lib/librte_eal/rte_eal_version.map   |   6 +
 mk/rte.app.mk|   3 +
 21 files changed, 2377 insertions(+), 152 deletions(-)
 create mode 100644 doc/guides/nics/features/ifcvf.ini
 create mode 100644 doc/guides/nics/ifcvf.rst
 create mode 100644 drivers/net/ifc/Makefile
 create mode 100644 drivers/net/ifc/base/ifcvf.c
 create mode 100644 drivers/net/ifc/base/ifcvf.h
 create mode 100644 drivers/net/ifc/base/ifcvf_osdep.

[dpdk-dev] [PATCH v7 1/5] vfio: extend data structure for multi container

[Xiao Wang]

Currently eal vfio framework binds vfio group fd to the default
container fd during rte_vfio_setup_device, while in some cases,
e.g. vDPA (vhost data path acceleration), we want to put vfio group
to a separate container and program IOMMU via this container.

This patch extends the vfio_config structure to contain per-container
user_mem_maps and defines an array of vfio_config. The next patch will
base on this to add container API.

Signed-off-by: Junjie Chen 
Signed-off-by: Xiao Wang 
Reviewed-by: Maxime Coquelin 
Reviewed-by: Ferruh Yigit 
---
 config/common_base |   1 +
 lib/librte_eal/linuxapp/eal/eal_vfio.c | 407 ++---
 lib/librte_eal/linuxapp/eal/eal_vfio.h |  19 +-
 3 files changed, 275 insertions(+), 152 deletions(-)

diff --git a/config/common_base b/config/common_base
index c4236fd1f..4a76d2f14 100644
--- a/config/common_base
+++ b/config/common_base
@@ -87,6 +87,7 @@ CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
 CONFIG_RTE_EAL_IGB_UIO=n
 CONFIG_RTE_EAL_VFIO=n
 CONFIG_RTE_MAX_VFIO_GROUPS=64
+CONFIG_RTE_MAX_VFIO_CONTAINERS=64
 CONFIG_RTE_MALLOC_DEBUG=n
 CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
 CONFIG_RTE_USE_LIBBSD=n
diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c 
b/lib/librte_eal/linuxapp/eal/eal_vfio.c
index 589d7d478..46fba2d8d 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
@@ -22,8 +22,46 @@
 
 #define VFIO_MEM_EVENT_CLB_NAME "vfio_mem_event_clb"
 
+/*
+ * we don't need to store device fd's anywhere since they can be obtained from
+ * the group fd via an ioctl() call.
+ */
+struct vfio_group {
+   int group_no;
+   int fd;
+   int devices;
+};
+
+/* hot plug/unplug of VFIO groups may cause all DMA maps to be dropped. we can
+ * recreate the mappings for DPDK segments, but we cannot do so for memory that
+ * was registered by the user themselves, so we need to store the user mappings
+ * somewhere, to recreate them later.
+ */
+#define VFIO_MAX_USER_MEM_MAPS 256
+struct user_mem_map {
+   uint64_t addr;
+   uint64_t iova;
+   uint64_t len;
+};
+
+struct user_mem_maps {
+   rte_spinlock_recursive_t lock;
+   int n_maps;
+   struct user_mem_map maps[VFIO_MAX_USER_MEM_MAPS];
+};
+
+struct vfio_config {
+   int vfio_enabled;
+   int vfio_container_fd;
+   int vfio_active_groups;
+   const struct vfio_iommu_type *vfio_iommu_type;
+   struct vfio_group vfio_groups[VFIO_MAX_GROUPS];
+   struct user_mem_maps mem_maps;
+};
+
 /* per-process VFIO config */
-static struct vfio_config vfio_cfg;
+static struct vfio_config vfio_cfgs[VFIO_MAX_CONTAINERS];
+static struct vfio_config *default_vfio_cfg = &vfio_cfgs[0];
 
 static int vfio_type1_dma_map(int);
 static int vfio_type1_dma_mem_map(int, uint64_t, uint64_t, uint64_t, int);
@@ -31,8 +69,8 @@ static int vfio_spapr_dma_map(int);
 static int vfio_spapr_dma_mem_map(int, uint64_t, uint64_t, uint64_t, int);
 static int vfio_noiommu_dma_map(int);
 static int vfio_noiommu_dma_mem_map(int, uint64_t, uint64_t, uint64_t, int);
-static int vfio_dma_mem_map(uint64_t vaddr, uint64_t iova, uint64_t len,
-   int do_map);
+static int vfio_dma_mem_map(struct vfio_config *vfio_cfg, uint64_t vaddr,
+   uint64_t iova, uint64_t len, int do_map);
 
 /* IOMMU types we support */
 static const struct vfio_iommu_type iommu_types[] = {
@@ -59,25 +97,6 @@ static const struct vfio_iommu_type iommu_types[] = {
},
 };
 
-/* hot plug/unplug of VFIO groups may cause all DMA maps to be dropped. we can
- * recreate the mappings for DPDK segments, but we cannot do so for memory that
- * was registered by the user themselves, so we need to store the user mappings
- * somewhere, to recreate them later.
- */
-#define VFIO_MAX_USER_MEM_MAPS 256
-struct user_mem_map {
-   uint64_t addr;
-   uint64_t iova;
-   uint64_t len;
-};
-static struct {
-   rte_spinlock_recursive_t lock;
-   int n_maps;
-   struct user_mem_map maps[VFIO_MAX_USER_MEM_MAPS];
-} user_mem_maps = {
-   .lock = RTE_SPINLOCK_RECURSIVE_INITIALIZER
-};
-
 /* for sPAPR IOMMU, we will need to walk memseg list, but we cannot use
  * rte_memseg_walk() because by the time we enter callback we will be holding a
  * write lock, so regular rte-memseg_walk will deadlock. copying the same
@@ -206,14 +225,15 @@ merge_map(struct user_mem_map *left, struct user_mem_map 
*right)
 }
 
 static struct user_mem_map *
-find_user_mem_map(uint64_t addr, uint64_t iova, uint64_t len)
+find_user_mem_map(struct user_mem_maps *user_mem_maps, uint64_t addr,
+   uint64_t iova, uint64_t len)
 {
uint64_t va_end = addr + len;
uint64_t iova_end = iova + len;
int i;
 
-   for (i = 0; i < user_mem_maps.n_maps; i++) {
-   struct user_mem_map *map = &user_mem_maps.maps[i];
+   for (i = 0; i < user_mem_maps->n_maps; i++) {
+   struct user_mem_map *map = &user_mem_maps->maps[i];
   

[dpdk-dev] [PATCH v7 2/5] vfio: add multi container support

[Xiao Wang]

This patch adds APIs to support container create/destroy and device
bind/unbind with a container. It also provides API for IOMMU programing
on a specified container.

A driver could use "rte_vfio_create_container" helper to create a
new container from eal, use "rte_vfio_bind_group" to bind a device
to the newly created container. During rte_vfio_setup_device the
container bound with the device will be used for IOMMU setup.

Signed-off-by: Junjie Chen 
Signed-off-by: Xiao Wang 
Reviewed-by: Maxime Coquelin 
Reviewed-by: Ferruh Yigit 
---
 lib/librte_eal/bsdapp/eal/eal.c  |  52 +
 lib/librte_eal/common/include/rte_vfio.h | 119 
 lib/librte_eal/linuxapp/eal/eal_vfio.c   | 316 +++
 lib/librte_eal/rte_eal_version.map   |   6 +
 4 files changed, 493 insertions(+)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 727adc5d2..c5106d0d6 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -769,6 +769,14 @@ int rte_vfio_noiommu_is_enabled(void);
 int rte_vfio_clear_group(int vfio_group_fd);
 int rte_vfio_dma_map(uint64_t vaddr, uint64_t iova, uint64_t len);
 int rte_vfio_dma_unmap(uint64_t vaddr, uint64_t iova, uint64_t len);
+int rte_vfio_container_create(void);
+int rte_vfio_container_destroy(int container_fd);
+int rte_vfio_bind_group(int container_fd, int iommu_group_no);
+int rte_vfio_unbind_group(int container_fd, int iommu_group_no);
+int rte_vfio_container_dma_map(int container_fd, uint64_t vaddr,
+   uint64_t iova, uint64_t len);
+int rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr,
+   uint64_t iova, uint64_t len);
 
 int rte_vfio_setup_device(__rte_unused const char *sysfs_base,
  __rte_unused const char *dev_addr,
@@ -818,3 +826,47 @@ rte_vfio_dma_unmap(uint64_t __rte_unused vaddr, uint64_t 
__rte_unused iova,
 {
return -1;
 }
+
+int __rte_experimental
+rte_vfio_container_create(void)
+{
+   return -1;
+}
+
+int __rte_experimental
+rte_vfio_container_destroy(__rte_unused int container_fd)
+{
+   return -1;
+}
+
+int __rte_experimental
+rte_vfio_bind_group(__rte_unused int container_fd,
+   __rte_unused int iommu_group_no)
+{
+   return -1;
+}
+
+int __rte_experimental
+rte_vfio_unbind_group(__rte_unused int container_fd,
+   __rte_unused int iommu_group_no)
+{
+   return -1;
+}
+
+int __rte_experimental
+rte_vfio_container_dma_map(__rte_unused int container_fd,
+   __rte_unused uint64_t vaddr,
+   __rte_unused uint64_t iova,
+   __rte_unused uint64_t len)
+{
+   return -1;
+}
+
+int __rte_experimental
+rte_vfio_container_dma_unmap(__rte_unused int container_fd,
+   __rte_unused uint64_t vaddr,
+   __rte_unused uint64_t iova,
+   __rte_unused uint64_t len)
+{
+   return -1;
+}
diff --git a/lib/librte_eal/common/include/rte_vfio.h 
b/lib/librte_eal/common/include/rte_vfio.h
index d26ab01cb..0c1509b29 100644
--- a/lib/librte_eal/common/include/rte_vfio.h
+++ b/lib/librte_eal/common/include/rte_vfio.h
@@ -168,6 +168,125 @@ rte_vfio_dma_map(uint64_t vaddr, uint64_t iova, uint64_t 
len);
 int __rte_experimental
 rte_vfio_dma_unmap(uint64_t vaddr, uint64_t iova, uint64_t len);
 
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Create a new container for device binding.
+ *
+ * @return
+ *   the container fd if successful
+ *   <0 if failed
+ */
+int __rte_experimental
+rte_vfio_container_create(void);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Destroy the container, unbind all vfio groups within it.
+ *
+ * @param container_fd
+ *   the container fd to destroy
+ *
+ * @return
+ *0 if successful
+ *   <0 if failed
+ */
+int __rte_experimental
+rte_vfio_container_destroy(int container_fd);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Bind a IOMMU group to a container.
+ *
+ * @param container_fd
+ *   the container's fd
+ *
+ * @param iommu_group_no
+ *   the iommu_group_no to bind to container
+ *
+ * @return
+ *   group fd if successful
+ *   <0 if failed
+ */
+int __rte_experimental
+rte_vfio_bind_group(int container_fd, int iommu_group_no);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Unbind a IOMMU group from a container.
+ *
+ * @param container_fd
+ *   the container fd of container
+ *
+ * @param iommu_group_no
+ *   the iommu_group_no to delete from container
+ *
+ * @return
+ *0 if successful
+ *   <0 if failed
+ */
+int __rte_experimental
+rte_vfio_unbind_group(int container_fd, int iommu_group_no);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Perf

[dpdk-dev] [PATCH v7 3/5] net/virtio: skip device probe in vdpa mode

[Xiao Wang]

If we want a virtio device to work in vDPA (vhost data path acceleration)
mode, we could add a "vdpa=1" devarg for this device to specify the mode.

This patch let virtio pmd skip device probe when detecting this parameter.

Signed-off-by: Xiao Wang 
Reviewed-by: Maxime Coquelin 
Reviewed-by: Ferruh Yigit 
---
 doc/guides/nics/virtio.rst | 13 
 drivers/net/virtio/virtio_ethdev.c | 43 ++
 2 files changed, 56 insertions(+)

diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst
index ca09cd203..8922f9c0b 100644
--- a/doc/guides/nics/virtio.rst
+++ b/doc/guides/nics/virtio.rst
@@ -318,3 +318,16 @@ Here we use l3fwd-power as an example to show how to get 
started.
 
 $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \
--no-numa --parse-ptype
+
+
+Virtio PMD arguments
+
+
+The user can specify below argument in devargs.
+
+#.  ``vdpa``:
+
+A virtio device could also be driven by vDPA (vhost data path acceleration)
+driver, and works as a HW vhost backend. This argument is used to specify
+a virtio device needs to work in vDPA mode.
+(Default: 0 (disabled))
diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index 41042cb23..5833dad73 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "virtio_ethdev.h"
 #include "virtio_pci.h"
@@ -1713,9 +1714,51 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
 }
 
+static int vdpa_check_handler(__rte_unused const char *key,
+   const char *value, __rte_unused void *opaque)
+{
+   if (strcmp(value, "1"))
+   return -1;
+
+   return 0;
+}
+
+static int
+vdpa_mode_selected(struct rte_devargs *devargs)
+{
+   struct rte_kvargs *kvlist;
+   const char *key = "vdpa";
+   int ret = 0;
+
+   if (devargs == NULL)
+   return 0;
+
+   kvlist = rte_kvargs_parse(devargs->args, NULL);
+   if (kvlist == NULL)
+   return 0;
+
+   if (!rte_kvargs_count(kvlist, key))
+   goto exit;
+
+   /* vdpa mode selected when there's a key-value pair: vdpa=1 */
+   if (rte_kvargs_process(kvlist, key,
+   vdpa_check_handler, NULL) < 0) {
+   goto exit;
+   }
+   ret = 1;
+
+exit:
+   rte_kvargs_free(kvlist);
+   return ret;
+}
+
 static int eth_virtio_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
 {
+   /* virtio pmd skips probe if device needs to work in vdpa mode */
+   if (vdpa_mode_selected(pci_dev->device.devargs))
+   return 1;
+
return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct virtio_hw),
eth_virtio_dev_init);
 }
-- 
2.15.1

[dpdk-dev] [PATCH v7 4/5] net/ifcvf: add ifcvf vdpa driver

[Xiao Wang]

The IFCVF vDPA (vhost data path acceleration) driver provides support for
the Intel FPGA 100G VF (IFCVF). IFCVF's datapath is virtio ring compatible,
it works as a HW vhost backend which can send/receive packets to/from
virtio directly by DMA.

Different VF devices serve different virtio frontends which are in
different VMs, so each VF needs to have its own DMA address translation
service. During the driver probe a new container is created, with this
container vDPA driver can program DMA remapping table with the VM's memory
region information.

Key vDPA driver ops implemented:

- ifcvf_dev_config:
  Enable VF data path with virtio information provided by vhost lib,
  including IOMMU programming to enable VF DMA to VM's memory, VFIO
  interrupt setup to route HW interrupt to virtio driver, create notify
  relay thread to translate virtio driver's kick to a MMIO write onto HW,
  HW queues configuration.

- ifcvf_dev_close:
  Revoke all the setup in ifcvf_dev_config.

Live migration feature is supported by IFCVF and this driver enables
it. For the dirty page logging, VF helps to log for packet buffer write,
driver helps to make the used ring as dirty when device stops.

Because vDPA driver needs to set up MSI-X vector to interrupt the
guest, only vfio-pci is supported currently.

Signed-off-by: Xiao Wang 
Signed-off-by: Rosen Xu 
Reviewed-by: Maxime Coquelin 
Reviewed-by: Ferruh Yigit 
---
 config/common_base|   7 +
 config/common_linuxapp|   1 +
 drivers/net/Makefile  |   3 +
 drivers/net/ifc/Makefile  |  36 ++
 drivers/net/ifc/base/ifcvf.c  | 329 +
 drivers/net/ifc/base/ifcvf.h  | 160 +++
 drivers/net/ifc/base/ifcvf_osdep.h|  52 +++
 drivers/net/ifc/ifcvf_vdpa.c  | 842 ++
 drivers/net/ifc/rte_ifcvf_version.map |   4 +
 mk/rte.app.mk |   3 +
 10 files changed, 1437 insertions(+)
 create mode 100644 drivers/net/ifc/Makefile
 create mode 100644 drivers/net/ifc/base/ifcvf.c
 create mode 100644 drivers/net/ifc/base/ifcvf.h
 create mode 100644 drivers/net/ifc/base/ifcvf_osdep.h
 create mode 100644 drivers/net/ifc/ifcvf_vdpa.c
 create mode 100644 drivers/net/ifc/rte_ifcvf_version.map

diff --git a/config/common_base b/config/common_base
index 4a76d2f14..a08d370c5 100644
--- a/config/common_base
+++ b/config/common_base
@@ -809,6 +809,13 @@ CONFIG_RTE_LIBRTE_VHOST_DEBUG=n
 #
 CONFIG_RTE_LIBRTE_PMD_VHOST=n
 
+#
+# Compile IFCVF driver
+# To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO
+# should be enabled.
+#
+CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD=n
+
 #
 # Compile the test application
 #
diff --git a/config/common_linuxapp b/config/common_linuxapp
index d0437e5d6..14e56cb4d 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -15,6 +15,7 @@ CONFIG_RTE_LIBRTE_PMD_KNI=y
 CONFIG_RTE_LIBRTE_VHOST=y
 CONFIG_RTE_LIBRTE_VHOST_NUMA=y
 CONFIG_RTE_LIBRTE_PMD_VHOST=y
+CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD=y
 CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y
 CONFIG_RTE_LIBRTE_PMD_TAP=y
 CONFIG_RTE_LIBRTE_AVP_PMD=y
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index dc5047e04..9f9da6651 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -58,6 +58,9 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED)
 
 ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost
+ifeq ($(CONFIG_RTE_EAL_VFIO),y)
+DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc
+endif
 endif # $(CONFIG_RTE_LIBRTE_VHOST)
 
 ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y)
diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifc/Makefile
new file mode 100644
index 0..95bb8d769
--- /dev/null
+++ b/drivers/net/ifc/Makefile
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_ifcvf_vdpa.a
+
+LDLIBS += -lpthread
+LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci
+
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal
+
+#
+# Add extra flags for base driver source files to disable warnings in them
+#
+BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard 
$(SRCDIR)/base/*.c
+
+VPATH += $(SRCDIR)/base
+
+EXPORT_MAP := rte_ifcvf_version.map
+
+LIBABIVER := 1
+
+#
+# all source are stored in SRCS-y
+#
+SRCS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf_vdpa.c
+SRCS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf.c
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifc/base/ifcvf.c
new file mode 100644
index 0..d312ad99f
--- /dev/null
+++ b/drivers/net/ifc/base/ifcvf.c
@@ -0,0 +1,329 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include "ifcvf.h"
+#include "ifcvf_osdep.h"
+
+STATIC void *
+get_cap_addr(struct ifcvf_hw *hw, struct ifcvf_pci_cap *cap)
+{
+   u8 bar = cap->bar;
+ 

[dpdk-dev] [PATCH v7 5/5] doc: add ifcvf driver document and release note

[Xiao Wang]

Signed-off-by: Xiao Wang 
Reviewed-by: Maxime Coquelin 
Reviewed-by: Ferruh Yigit 
---
 doc/guides/nics/features/ifcvf.ini |  8 +++
 doc/guides/nics/ifcvf.rst  | 98 ++
 doc/guides/nics/index.rst  |  1 +
 doc/guides/rel_notes/release_18_05.rst |  9 
 4 files changed, 116 insertions(+)
 create mode 100644 doc/guides/nics/features/ifcvf.ini
 create mode 100644 doc/guides/nics/ifcvf.rst

diff --git a/doc/guides/nics/features/ifcvf.ini 
b/doc/guides/nics/features/ifcvf.ini
new file mode 100644
index 0..ef1fc4711
--- /dev/null
+++ b/doc/guides/nics/features/ifcvf.ini
@@ -0,0 +1,8 @@
+;
+; Supported features of the 'ifcvf' vDPA driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+x86-32   = Y
+x86-64   = Y
diff --git a/doc/guides/nics/ifcvf.rst b/doc/guides/nics/ifcvf.rst
new file mode 100644
index 0..d7e76353c
--- /dev/null
+++ b/doc/guides/nics/ifcvf.rst
@@ -0,0 +1,98 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2018 Intel Corporation.
+
+IFCVF vDPA driver
+=
+
+The IFCVF vDPA (vhost data path acceleration) driver provides support for the
+Intel FPGA 100G VF (IFCVF). IFCVF's datapath is virtio ring compatible, it
+works as a HW vhost backend which can send/receive packets to/from virtio
+directly by DMA. Besides, it supports dirty page logging and device state
+report/restore. This driver enables its vDPA functionality with live migration
+feature.
+
+
+Pre-Installation Configuration
+--
+
+Config File Options
+~~~
+
+The following option can be modified in the ``config`` file.
+
+- ``CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD`` (default ``y`` for linux)
+
+  Toggle compilation of the ``librte_ifcvf_vdpa`` driver.
+
+
+IFCVF vDPA Implementation
+-
+
+IFCVF's vendor ID and device ID are same as that of virtio net pci device,
+with its specific subsystem vendor ID and device ID. To let the device be
+probed by IFCVF driver, adding "vdpa=1" parameter helps to specify that this
+device is to be used in vDPA mode, rather than polling mode, virtio pmd will
+skip when it detects this message.
+
+Different VF devices serve different virtio frontends which are in different
+VMs, so each VF needs to have its own DMA address translation service. During
+the driver probe a new container is created for this device, with this
+container vDPA driver can program DMA remapping table with the VM's memory
+region information.
+
+Key IFCVF vDPA driver ops
+~
+
+- ifcvf_dev_config:
+  Enable VF data path with virtio information provided by vhost lib, including
+  IOMMU programming to enable VF DMA to VM's memory, VFIO interrupt setup to
+  route HW interrupt to virtio driver, create notify relay thread to translate
+  virtio driver's kick to a MMIO write onto HW, HW queues configuration.
+
+  This function gets called to set up HW data path backend when virtio driver
+  in VM gets ready.
+
+- ifcvf_dev_close:
+  Revoke all the setup in ifcvf_dev_config.
+
+  This function gets called when virtio driver stops device in VM.
+
+To create a vhost port with IFC VF
+~~
+
+- Create a vhost socket and assign a VF's device ID to this socket via
+  vhost API. When QEMU vhost connection gets ready, the assigned VF will
+  get configured automatically.
+
+
+Features
+
+
+Features of the IFCVF driver are:
+
+- Compatibility with virtio 0.95 and 1.0.
+- Live migration.
+
+
+Prerequisites
+-
+
+- Platform with IOMMU feature. IFC VF needs address translation service to
+  Rx/Tx directly with virtio driver in VM.
+
+
+Limitations
+---
+
+Dependency on vfio-pci
+~~
+
+vDPA driver needs to setup VF MSIX interrupts, each queue's interrupt vector
+is mapped to a callfd associated with a virtio ring. Currently only vfio-pci
+allows multiple interrupts, so the IFCVF driver is dependent on vfio-pci.
+
+Live Migration with VIRTIO_NET_F_GUEST_ANNOUNCE
+~~~
+
+IFC VF doesn't support RARP packet generation, virtio frontend supporting
+VIRTIO_NET_F_GUEST_ANNOUNCE feature can help to do that.
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index ea9110c81..9b98c620f 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -45,6 +45,7 @@ Network Interface Controller Drivers
 vmxnet3
 pcap_ring
 fail_safe
+ifcvf
 
 **Figures**
 
diff --git a/doc/guides/rel_notes/release_18_05.rst 
b/doc/guides/rel_notes/release_18_05.rst
index a5f816f8a..d84c7de8f 100644
--- a/doc/guides/rel_notes/release_18_05.rst
+++ b/doc/guides/rel_notes/release_18_05.rst
@@ -82,6 +82,15 @@ New Features
   backend connects to. This means that if the backend restarts, it can 
reconnect
   to virtio-user and continue communications.
 
+* **Added IFCVF vDPA driver

Re: [dpdk-dev] [PATCH v7 7/8] examples/vhost_crypto: add vhost crypto sample application

[Thomas Monjalon]

15/04/2018 16:34, Thomas Monjalon:
> Hi,
> 
> 05/04/2018 18:01, Fan Zhang:
> > This patch adds vhost_crypto sample application to DPDK.
> > 
> > Signed-off-by: Fan Zhang 
> > ---
> >  examples/vhost_crypto/Makefile|  32 +++
> >  examples/vhost_crypto/main.c  | 541 
> > ++
> >  examples/vhost_crypto/meson.build |  14 +
> >  3 files changed, 587 insertions(+)
> 
> There are 3 misses:
> 
> - not in examples/Makefile
> - not in MAINTAINERS
> - no documentation in doc/guides/sample_app_ug/
> 
> It won't be accepted in master as-is.

The doc is (curiously) in the next patch. I will move it here.
I will also fix the Makefile and the MAINTAINERS file:

ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto
endif

Vhost-user
M: Maxime Coquelin 
M: Jianfeng Tan 
T: git://dpdk.org/next/dpdk-next-virtio
F: lib/librte_vhost/
[...]
F: examples/vhost_crypto/


Ferruh, Maxime, I hope you agree with this last-minute fix.

Re: [dpdk-dev] [PATCH v5 2/5] vhost: support selective datapath

[Thomas Monjalon]

03/04/2018 10:02, Maxime Coquelin:
> On 04/02/2018 01:46 PM, Zhihong Wang wrote:
> >   lib/librte_vhost/Makefile  |   4 +-
> >   lib/librte_vhost/rte_vdpa.h|  87 +
> >   lib/librte_vhost/rte_vhost_version.map |   7 ++
> >   lib/librte_vhost/vdpa.c| 115 
> > +
> 
> With the fix you suggested:
> Reviewed-by: Maxime Coquelin 

This patch is not OK. It is updating the Makefile but not meson.build.
I am fixing/amending it in master:

--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -9,7 +9,8 @@ if has_libnuma == 1
 endif
 version = 4
 allow_experimental_apis = true
-sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vhost.c', 'vhost_user.c',
+sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vdpa.c',
+   'vhost.c', 'vhost_user.c',
'virtio_net.c', 'vhost_crypto.c')
-headers = files('rte_vhost.h', 'rte_vhost_crypto.h')
+headers = files('rte_vhost.h', 'rte_vdpa.h', 'rte_vhost_crypto.h')

Re: [dpdk-dev] Mellanox 100GbE MCX516A-CCAT

[Olga Shern]

Hi  Yasuhiro,

Please contact Mellanox support and open a case , supp...@mellanox.com 

Best Regards,
Olga

---
Olga Shern
SW Sr. Director DPDK 
Mellanox Technologies, Raanana, Israel 



-Original Message-
From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Yasuhiro Ohara
Sent: Saturday, April 14, 2018 9:26 AM
To: dev@dpdk.org
Subject: [dpdk-dev] Mellanox 100GbE MCX516A-CCAT


Hi,

I am trying to use Mellanox MCX516A-CCAT in DPDK.
ConnectX-5 EN network interface card, 100GbE dual-port QSFP28,
PCIe3.0 x16, tall bracket, ROHS R6

I noticed it is not supported yet,
()
but how far is it ?

If I setup mlx5 for MCX516A-CCAT, I get these errors.

PMD: net_mlx5: Forcing port 9 link to be up
PMD: net_mlx5: 0x7ff83ffaae00: error occurred while configuring control flows: 
Invalid argument
WARNING: port[9]: rte_eth_dev_start() failed: error: -11.

I guess this is -EAGAIN from below.
rte_ethdev.c: rte_eth_dev_start():
1026 diag = (*dev->dev_ops->dev_start)(dev);
mlx5_trigger.c: mlx5_dev_start():
170 err = priv_force_link_status_change(priv, ETH_LINK_UP);

My configuration:
dpdk-17.11.1.tar.xz
MLNX_OFED_LINUX-4.2-1.2.0.0 (--upstream-libs)
fw_ver: 16.22.1002

Initial log messages:
EAL: PCI device :af:00.1 on NUMA socket 1
EAL:   probe driver: 15b3:1017 net_mlx5
PMD: mlx5.c:615: mlx5_pci_probe(): PCI information matches, using device 
"mlx5_9" (SR-IOV: false)
PMD: mlx5.c:660: mlx5_pci_probe(): 1 port(s) detected
PMD: mlx5.c:860: mlx5_pci_probe(): Enhanced MPS is enabled
PMD: mlx5.c:887: mlx5_pci_probe(): port 1 MAC address is 50:6b:4b:08:6c:77

If I enable CONFIG_RTE_LIBRTE_MLX5_DEBUG=y, I get the following crash from an 
assertion.

dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_trigger.c:283: 
priv_dev_traffic_enable: Assertion `(mlx5_ctrl_flow(dev, &multicast, 
&multicast)) == 0' failed.

Thread 1 "progname" received signal SIGABRT, Aborted.
0x766c9428 in __GI_raise (sig=sig@entry=6)
at ../sysdeps/unix/sysv/linux/raise.c:54
54  ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0  0x766c9428 in __GI_raise (sig=sig@entry=6)
at ../sysdeps/unix/sysv/linux/raise.c:54
#1  0x766cb02a in __GI_abort () at abort.c:89
#2  0x766c1bd7 in __assert_fail_base (fmt=, 
assertion=assertion@entry=0x824ec0 "(mlx5_ctrl_flow(dev, &multicast, 
&multicast)) == 0", 
file=file@entry=0x824c68 
"/home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_trigger.c", 
line=line@entry=283, 
function=function@entry=0x824f30 <__PRETTY_FUNCTION__.38015> 
"priv_dev_traffic_enable") at assert.c:92
#3  0x766c1c82 in __GI___assert_fail (
assertion=assertion@entry=0x824ec0 "(mlx5_ctrl_flow(dev, &multicast, 
&multicast)) == 0", 
file=file@entry=0x824c68 
"/home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_trigger.c", 
line=line@entry=283, 
function=function@entry=0x824f30 <__PRETTY_FUNCTION__.38015> 
"priv_dev_traffic_enable") at assert.c:101
#4  0x006db033 in priv_dev_traffic_enable (
priv=priv@entry=0x7ff83ffea940, dev=dev@entry=0xd1b580 )
at /home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_trigger.c:283
#5  0x006db1aa in priv_link_start (priv=priv@entry=0x7ff83ffea940)
at /home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_ethdev.c:915
#6  0x006dc780 in priv_link_update (priv=priv@entry=0x7ff83ffea940, 
wait_to_complete=wait_to_complete@entry=0)
at /home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_ethdev.c:969
#7  0x006dded9 in priv_force_link_status_change (
priv=priv@entry=0x7ff83ffea940, status=status@entry=1)
at /home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_ethdev.c:1000
#8  0x006da92d in mlx5_dev_start (dev=0xd1b580 )
at /home/hspcr/dpdk-stable-17.11.1/drivers/net/mlx5/mlx5_trigger.c:170
#9  0x0051dfbd in rte_eth_dev_start ()

Mellanox(R) ConnectX(R)-4 100G MCX416A-CCAT (2x100G) seems to be working, by 
the way, in the same configuration.

Thanks for help in advance.

Best regards,
Yasu

Re: [dpdk-dev] [pull-request] next-net 18.05 PRE2-RC1

[Thomas Monjalon]

14/04/2018 01:06, Ferruh Yigit:
>   http://dpdk.org/git/next/dpdk-next-net 

Pulled with few fixes notified in related threads.

Re: [dpdk-dev] [PATCH v9 09/11] crypto/virtio: build with meson

[Zhoujian (jay)]

Hi Pablo,

> -Original Message-
> From: De Lara Guarch, Pablo [mailto:pablo.de.lara.gua...@intel.com]
> Sent: Sunday, April 15, 2018 8:09 PM
> To: Zhoujian (jay) ; dev@dpdk.org
> Cc: Zhang, Roy Fan ; tho...@monjalon.net; Gonglei
> (Arei) ; Zeng, Xin ;
> Huangweidong (C) ; wangxin (U)
> ; longpeng 
> Subject: RE: [PATCH v9 09/11] crypto/virtio: build with meson
> 
> Hi Jay,
> 
> > -Original Message-
> > From: Jay Zhou [mailto:jianjay.z...@huawei.com]
> > Sent: Sunday, April 15, 2018 9:51 AM
> > To: dev@dpdk.org
> > Cc: De Lara Guarch, Pablo ; Zhang, Roy
> > Fan ; tho...@monjalon.net;
> > arei.gong...@huawei.com; Zeng, Xin ;
> > weidong.hu...@huawei.com; wangxinxin.w...@huawei.com;
> > longpe...@huawei.com; jianjay.z...@huawei.com
> > Subject: [PATCH v9 09/11] crypto/virtio: build with meson
> >
> > Signed-off-by: Jay Zhou 
> > Reviewed-by: Fan Zhang 
> > Acked-by: Fan Zhang 
> > ---
> >  drivers/crypto/meson.build|  2 +-
> >  drivers/crypto/virtio/meson.build | 12 
> >  2 files changed, 13 insertions(+), 1 deletion(-)  create mode 100644
> > drivers/crypto/virtio/meson.build
> >
> > diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
> > index
> > 736c9f5..63649c9 100644
> > --- a/drivers/crypto/meson.build
> > +++ b/drivers/crypto/meson.build
> > @@ -2,7 +2,7 @@
> >  # Copyright(c) 2017 Intel Corporation
> >
> >  drivers = ['dpaa_sec', 'dpaa2_sec',
> > -   'openssl', 'null', 'qat']
> > +   'openssl', 'null', 'qat', 'virtio']
> >
> >  std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
> > config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> > diff --git a/drivers/crypto/virtio/meson.build
> > b/drivers/crypto/virtio/meson.build
> > new file mode 100644
> > index 000..cee77cc
> > --- /dev/null
> > +++ b/drivers/crypto/virtio/meson.build
> > @@ -0,0 +1,12 @@
> > +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 HUAWEI
> > +TECHNOLOGIES CO., LTD.
> > +
> > +dep = dependency('libcrypto', required: false) if not dep.found()
> > +   build = false
> > +endif
> > +deps += ['bus_pci']
> > +sources = files('virtio_cryptodev.c', 'virtio_pci.c',
> > +   'virtio_rxtx.c', 'virtqueue.c')
> > +ext_deps += dep
> > +pkgconfig_extra_libs += '-lcrypto'
> > --
> > 1.8.3.1
> >
> 
> Could you add this build from the first patch? Basically, every time you make
> a change in the Makefile, you should do the same in meson.build.

I'll split this patch into two parts and squash them into the first and the 
second
patch. Thanks for your suggestion.

Regards,
Jay

> 
> Thanks,
> Pablo

[dpdk-dev] [PATCH v10 06/10] crypto/virtio: support stats related ops

[Jay Zhou]

This patch implements the statistics of the packets.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_cryptodev.c | 66 +++-
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 596a237..6f92e99 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -29,6 +29,9 @@ static int virtio_crypto_dev_configure(struct rte_cryptodev 
*dev,
 static int virtio_crypto_dev_close(struct rte_cryptodev *dev);
 static void virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
struct rte_cryptodev_info *dev_info);
+static void virtio_crypto_dev_stats_get(struct rte_cryptodev *dev,
+   struct rte_cryptodev_stats *stats);
+static void virtio_crypto_dev_stats_reset(struct rte_cryptodev *dev);
 static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
uint16_t queue_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
@@ -501,8 +504,8 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
.dev_close   = virtio_crypto_dev_close,
.dev_infos_get   = virtio_crypto_dev_info_get,
 
-   .stats_get   = NULL,
-   .stats_reset = NULL,
+   .stats_get   = virtio_crypto_dev_stats_get,
+   .stats_reset = virtio_crypto_dev_stats_reset,
 
.queue_pair_setup= virtio_crypto_qp_setup,
.queue_pair_release  = virtio_crypto_qp_release,
@@ -518,6 +521,65 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
.qp_detach_session = NULL
 };
 
+static void
+virtio_crypto_update_stats(struct rte_cryptodev *dev,
+   struct rte_cryptodev_stats *stats)
+{
+   unsigned int i;
+   struct virtio_crypto_hw *hw = dev->data->dev_private;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (stats == NULL) {
+   VIRTIO_CRYPTO_DRV_LOG_ERR("invalid pointer");
+   return;
+   }
+
+   for (i = 0; i < hw->max_dataqueues; i++) {
+   const struct virtqueue *data_queue
+   = dev->data->queue_pairs[i];
+   if (data_queue == NULL)
+   continue;
+
+   stats->enqueued_count += data_queue->packets_sent_total;
+   stats->enqueue_err_count += data_queue->packets_sent_failed;
+
+   stats->dequeued_count += data_queue->packets_received_total;
+   stats->dequeue_err_count
+   += data_queue->packets_received_failed;
+   }
+}
+
+static void
+virtio_crypto_dev_stats_get(struct rte_cryptodev *dev,
+   struct rte_cryptodev_stats *stats)
+{
+   PMD_INIT_FUNC_TRACE();
+
+   virtio_crypto_update_stats(dev, stats);
+}
+
+static void
+virtio_crypto_dev_stats_reset(struct rte_cryptodev *dev)
+{
+   unsigned int i;
+   struct virtio_crypto_hw *hw = dev->data->dev_private;
+
+   PMD_INIT_FUNC_TRACE();
+
+   for (i = 0; i < hw->max_dataqueues; i++) {
+   struct virtqueue *data_queue = dev->data->queue_pairs[i];
+   if (data_queue == NULL)
+   continue;
+
+   data_queue->packets_sent_total = 0;
+   data_queue->packets_sent_failed = 0;
+
+   data_queue->packets_received_total = 0;
+   data_queue->packets_received_failed = 0;
+   }
+}
+
 static int
 virtio_crypto_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
-- 
1.8.3.1

[dpdk-dev] [PATCH v10 04/10] crypto/virtio: support session related ops

[Jay Zhou]

This patch implements session related operations, which includes creating
and destroying the session. For now, it only supports the session-oriented
API implementation. The control queue used to create or destroy sessions
for symmetric algorithms.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_crypto_algs.h |  27 ++
 drivers/crypto/virtio/virtio_cryptodev.c   | 737 -
 drivers/crypto/virtio/virtio_cryptodev.h   |   7 +
 3 files changed, 768 insertions(+), 3 deletions(-)
 create mode 100644 drivers/crypto/virtio/virtio_crypto_algs.h

diff --git a/drivers/crypto/virtio/virtio_crypto_algs.h 
b/drivers/crypto/virtio/virtio_crypto_algs.h
new file mode 100644
index 000..df13b82
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_crypto_algs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#ifndef _VIRTIO_CRYPTO_ALGS_H_
+#define _VIRTIO_CRYPTO_ALGS_H_
+
+#include 
+#include 
+
+struct virtio_crypto_session {
+   uint64_t session_id;
+
+   struct {
+   uint16_t offset;
+   uint16_t length;
+   } iv;
+
+   struct {
+   uint32_t length;
+   phys_addr_t phys_addr;
+   } aad;
+
+   struct virtio_crypto_op_ctrl_req ctrl;
+};
+
+#endif /* _VIRTIO_CRYPTO_ALGS_H_ */
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 73f8b96..596a237 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1,14 +1,20 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
  */
+#include 
+#include 
+
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+
 #include "virtio_cryptodev.h"
 #include "virtqueue.h"
+#include "virtio_crypto_algs.h"
 
 int virtio_crypto_logtype_init;
 int virtio_crypto_logtype_session;
@@ -31,6 +37,14 @@ static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
 static int virtio_crypto_qp_release(struct rte_cryptodev *dev,
uint16_t queue_pair_id);
 static void virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev);
+static unsigned int virtio_crypto_sym_get_session_private_size(
+   struct rte_cryptodev *dev);
+static void virtio_crypto_sym_clear_session(struct rte_cryptodev *dev,
+   struct rte_cryptodev_sym_session *sess);
+static int virtio_crypto_sym_configure_session(struct rte_cryptodev *dev,
+   struct rte_crypto_sym_xform *xform,
+   struct rte_cryptodev_sym_session *session,
+   struct rte_mempool *mp);
 
 /*
  * The set of PCI devices this driver supports
@@ -43,6 +57,210 @@ static int virtio_crypto_qp_release(struct rte_cryptodev 
*dev,
 
 uint8_t cryptodev_virtio_driver_id;
 
+#define NUM_ENTRY_SYM_CREATE_SESSION 4
+
+static int
+virtio_crypto_send_command(struct virtqueue *vq,
+   struct virtio_crypto_op_ctrl_req *ctrl, uint8_t *cipher_key,
+   uint8_t *auth_key, struct virtio_crypto_session *session)
+{
+   uint8_t idx = 0;
+   uint8_t needed = 1;
+   uint32_t head = 0;
+   uint32_t len_cipher_key = 0;
+   uint32_t len_auth_key = 0;
+   uint32_t len_ctrl_req = sizeof(struct virtio_crypto_op_ctrl_req);
+   uint32_t len_session_input = sizeof(struct virtio_crypto_session_input);
+   uint32_t len_total = 0;
+   uint32_t input_offset = 0;
+   void *virt_addr_started = NULL;
+   phys_addr_t phys_addr_started;
+   struct vring_desc *desc;
+   uint32_t desc_offset;
+   struct virtio_crypto_session_input *input;
+   int ret;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (session == NULL) {
+   VIRTIO_CRYPTO_SESSION_LOG_ERR("session is NULL.");
+   return -EINVAL;
+   }
+   /* cipher only is supported, it is available if auth_key is NULL */
+   if (!cipher_key) {
+   VIRTIO_CRYPTO_SESSION_LOG_ERR("cipher key is NULL.");
+   return -EINVAL;
+   }
+
+   head = vq->vq_desc_head_idx;
+   VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_desc_head_idx = %d, vq = %p",
+   head, vq);
+
+   if (vq->vq_free_cnt < needed) {
+   VIRTIO_CRYPTO_SESSION_LOG_ERR("Not enough entry");
+   return -ENOSPC;
+   }
+
+   /* calculate the length of cipher key */
+   if (cipher_key) {
+   switch (ctrl->u.sym_create_session.op_type) {
+   case VIRTIO_CRYPTO_SYM_OP_CIPHER:
+   len_cipher_key
+   = ctrl->u.sym_create_session.u.cipher
+   .para.keylen;
+   break;
+   case VIRTIO_CRYPTO_SYM_OP_ALGORITHM_CHAINING:
+   len_cipher_key
+   = ctrl->u.sym_create_s

[dpdk-dev] [PATCH v10 01/10] crypto/virtio: add virtio crypto PMD

[Jay Zhou]

The virtio crypto device is a virtual cryptography device
as well as a kind of virtual hardware accelerator for
virtual machines. The linux kernel virtio-crypto driver
has been merged, and this patch introduces virtio crypto
PMD to achieve better performance.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 MAINTAINERS|  4 +++
 config/common_base | 14 +
 doc/guides/rel_notes/release_18_05.rst |  4 +++
 drivers/crypto/Makefile|  1 +
 drivers/crypto/meson.build |  2 +-
 drivers/crypto/virtio/Makefile | 29 +
 drivers/crypto/virtio/meson.build  | 11 +++
 .../virtio/rte_pmd_virtio_crypto_version.map   |  3 ++
 drivers/crypto/virtio/virtio_cryptodev.c   | 36 ++
 drivers/crypto/virtio/virtio_cryptodev.h   | 10 ++
 mk/rte.app.mk  |  1 +
 11 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/virtio/Makefile
 create mode 100644 drivers/crypto/virtio/meson.build
 create mode 100644 drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
 create mode 100644 drivers/crypto/virtio/virtio_cryptodev.c
 create mode 100644 drivers/crypto/virtio/virtio_cryptodev.h

diff --git a/MAINTAINERS b/MAINTAINERS
index e54c1f0..d171f10 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -758,6 +758,10 @@ F: drivers/crypto/snow3g/
 F: doc/guides/cryptodevs/snow3g.rst
 F: doc/guides/cryptodevs/features/snow3g.ini
 
+Virtio
+M: Jay Zhou 
+F: drivers/crypto/virtio/
+
 ZUC
 M: Pablo de Lara 
 F: drivers/crypto/zuc/
diff --git a/config/common_base b/config/common_base
index 9e3fbaa..8a150f8 100644
--- a/config/common_base
+++ b/config/common_base
@@ -493,6 +493,20 @@ CONFIG_RTE_LIBRTE_PMD_QAT_DEBUG_DRIVER=n
 CONFIG_RTE_QAT_PMD_MAX_NB_SESSIONS=2048
 
 #
+# Compile PMD for virtio crypto devices
+#
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=n
+#
+# Number of maximum virtio crypto devices
+#
+CONFIG_RTE_MAX_VIRTIO_CRYPTO=32
+#
+# Number of sessions to create in the session memory pool
+# on a single virtio crypto device.
+#
+CONFIG_RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS=1024
+
+#
 # Compile PMD for AESNI backed device
 #
 CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
diff --git a/doc/guides/rel_notes/release_18_05.rst 
b/doc/guides/rel_notes/release_18_05.rst
index e455cf6..cb05b89 100644
--- a/doc/guides/rel_notes/release_18_05.rst
+++ b/doc/guides/rel_notes/release_18_05.rst
@@ -82,6 +82,10 @@ New Features
 
   Linux uevent is supported as backend of this device event notification 
framework.
 
+* **Added the virtio crypto PMD.**
+
+  Added a new poll mode driver for virtio crypto devices.
+
 
 API Changes
 ---
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 9fbd986..e9e8b1f 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -21,5 +21,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec
 endif
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio
 
 include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 736c9f5..63649c9 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['dpaa_sec', 'dpaa2_sec',
-   'openssl', 'null', 'qat']
+   'openssl', 'null', 'qat', 'virtio']
 
 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
 config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile
new file mode 100644
index 000..2f04f0c
--- /dev/null
+++ b/drivers/crypto/virtio/Makefile
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_pmd_virtio_crypto.a
+
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+
+EXPORT_MAP := rte_pmd_virtio_crypto_version.map
+
+LIBABIVER := 1
+
+#
+# all source are stored in SRCS-y
+#
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c
+
+# this lib depends upon:
+LDLIBS += -lcrypto
+LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
+LDLIBS += -lrte_cryptodev
+LDLIBS += -lrte_pci -lrte_bus_pci
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/virtio/meson.build 
b/drivers/crypto/virtio/meson.build
new file mode 100644
index 000..57d84c4
--- /dev/null
+++ b/drivers/crypto/virtio/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+
+dep = dependency('libcrypto', required: false)
+if not dep.found()
+   build = false
+endif
+deps += ['bus_pci']
+sources = files('virtio_cryptodev.c')
+ext_deps += dep
+pkgconfig_extra_libs += '-lcrypto'
diff --git 

[dpdk-dev] [PATCH v10 03/10] crypto/virtio: support basic PMD ops

[Jay Zhou]

This patch implements the basic operations of virtio crypto PMD, which
includes start, stop, close, information getting, queue setup and
release of the device.
The virtio crypto device has two types of queues, data queue and
control queue. It has one data queue at least and has one and only one
control queue. For example, if a virtio crypto device has N queues,
then [0, N-2] is the data queue index, N-1 is the control
queue index.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_cryptodev.c | 437 ++-
 drivers/crypto/virtio/virtio_cryptodev.h |  32 ++-
 drivers/crypto/virtio/virtio_rxtx.c  |  68 +
 3 files changed, 528 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 3fe2c80..73f8b96 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
  */
+#include 
 #include 
 #include 
 #include 
@@ -15,6 +16,22 @@
 int virtio_crypto_logtype_tx;
 int virtio_crypto_logtype_driver;
 
+static int virtio_crypto_dev_configure(struct rte_cryptodev *dev,
+   struct rte_cryptodev_config *config);
+static int virtio_crypto_dev_start(struct rte_cryptodev *dev);
+static void virtio_crypto_dev_stop(struct rte_cryptodev *dev);
+static int virtio_crypto_dev_close(struct rte_cryptodev *dev);
+static void virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
+   struct rte_cryptodev_info *dev_info);
+static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
+   uint16_t queue_pair_id,
+   const struct rte_cryptodev_qp_conf *qp_conf,
+   int socket_id,
+   struct rte_mempool *session_pool);
+static int virtio_crypto_qp_release(struct rte_cryptodev *dev,
+   uint16_t queue_pair_id);
+static void virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev);
+
 /*
  * The set of PCI devices this driver supports
  */
@@ -26,22 +43,251 @@
 
 uint8_t cryptodev_virtio_driver_id;
 
+void
+virtio_crypto_queue_release(struct virtqueue *vq)
+{
+   struct virtio_crypto_hw *hw;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (vq) {
+   hw = vq->hw;
+   /* Select and deactivate the queue */
+   VTPCI_OPS(hw)->del_queue(hw, vq);
+
+   rte_memzone_free(vq->mz);
+   rte_mempool_free(vq->mpool);
+   rte_free(vq);
+   }
+}
+
+#define MPOOL_MAX_NAME_SZ 32
+
+int
+virtio_crypto_queue_setup(struct rte_cryptodev *dev,
+   int queue_type,
+   uint16_t vtpci_queue_idx,
+   uint16_t nb_desc,
+   int socket_id,
+   struct virtqueue **pvq)
+{
+   char vq_name[VIRTQUEUE_MAX_NAME_SZ];
+   char mpool_name[MPOOL_MAX_NAME_SZ];
+   const struct rte_memzone *mz;
+   unsigned int vq_size, size;
+   struct virtio_crypto_hw *hw = dev->data->dev_private;
+   struct virtqueue *vq = NULL;
+   uint32_t i = 0;
+   uint32_t j;
+
+   PMD_INIT_FUNC_TRACE();
+
+   VIRTIO_CRYPTO_INIT_LOG_DBG("setting up queue: %u", vtpci_queue_idx);
+
+   /*
+* Read the virtqueue size from the Queue Size field
+* Always power of 2 and if 0 virtqueue does not exist
+*/
+   vq_size = VTPCI_OPS(hw)->get_queue_num(hw, vtpci_queue_idx);
+   if (vq_size == 0) {
+   VIRTIO_CRYPTO_INIT_LOG_ERR("virtqueue does not exist");
+   return -EINVAL;
+   }
+   VIRTIO_CRYPTO_INIT_LOG_DBG("vq_size: %u", vq_size);
+
+   if (!rte_is_power_of_2(vq_size)) {
+   VIRTIO_CRYPTO_INIT_LOG_ERR("virtqueue size is not powerof 2");
+   return -EINVAL;
+   }
+
+   if (queue_type == VTCRYPTO_DATAQ) {
+   snprintf(vq_name, sizeof(vq_name), "dev%d_dataqueue%d",
+   dev->data->dev_id, vtpci_queue_idx);
+   snprintf(mpool_name, sizeof(mpool_name),
+   "dev%d_dataqueue%d_mpool",
+   dev->data->dev_id, vtpci_queue_idx);
+   } else if (queue_type == VTCRYPTO_CTRLQ) {
+   snprintf(vq_name, sizeof(vq_name), "dev%d_controlqueue",
+   dev->data->dev_id);
+   snprintf(mpool_name, sizeof(mpool_name),
+   "dev%d_controlqueue_mpool",
+   dev->data->dev_id);
+   }
+   size = RTE_ALIGN_CEIL(sizeof(*vq) +
+   vq_size * sizeof(struct vq_desc_extra),
+   RTE_CACHE_LINE_SIZE);
+   vq = rte_zmalloc_socket(vq_name, size, RTE_CACHE_LINE_SIZE,
+   socket_id);
+   if (vq == NULL) {
+   VIRTIO_CRYPTO_INIT_LOG_ERR("Can not allocate virtqueue");
+   

[dpdk-dev] [PATCH v10 00/10] crypto: add virtio poll mode driver

[Jay Zhou]

This patch series introduce virtio crypto poll mode driver.

Since it is limited by the vhost crypto backend of the virtio-crypto,
this patch series only supports a limited subset of crypto services.
Only the following algorithms are tested:

Cipher algorithms:
  - RTE_CRYPTO_CIPHER_AES_CBC (128-bit, 192-bit and 256-bit keys)

Cipher then hash algorithms:
  - RTE_CRYPTO_CIPHER_AES_CBC with RTE_CRYPTO_AUTH_SHA1_HMAC

The qemu side has supported vhost crypto and the vhost user crypto server
side patches had been merged into dpdk-next-virtio too.

Firstly run DPDK vhost crypto sample as a server side and build QEMU with
vhost crypto enabled. 
QEMU can then be started using the following parameters:

qemu-system-x86_64 \
[...] \
-chardev socket,id=charcrypto0,path=/path/to/your/socket \
-object cryptodev-vhost-user,id=cryptodev0,chardev=charcrypto0 \
-device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0
[...]

Bind the uio_generic driver for the virtio-crypto device.
For example, :00:04.0 is the domain, bus, device and function
number of the virtio-crypto device:
modprobe uio_pci_generic
echo -n :00:04.0 > /sys/bus/pci/drivers/virtio-pci/unbind
echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id

The front-end virtio crypto PMD driver can be installed:
cd to the top-level DPDK directory
sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO\)=n,\1=y,' 
config/common_base
make config T=x86_64-native-linuxapp-gcc
make install T=x86_64-native-linuxapp-gcc

The unit test cases can be compiled as below:
cd to the top-level DPDK directory
export RTE_TARGET=x86_64-native-linuxapp-gcc
export RTE_SDK=`pwd`
cd to test/test
make
./test (MUST reserve enough huge pages memory)
type the command "cryptodev_virtio_autotest" to test

The result should be like this:
RTE>>cryptodev_virtio_autotest
 + --- +
 + Test Suite : Crypto VIRTIO Unit Test Suite
 + --- +
  0) TestCase AES-128-CBC Encryption PASS
  1) TestCase AES-128-CBC Decryption PASS
  2) TestCase AES-192-CBC Encryption PASS
  3) TestCase AES-192-CBC Decryption PASS
  4) TestCase AES-256-CBC Encryption PASS
  5) TestCase AES-256-CBC Decryption PASS
  6) TestCase AES-256-CBC OOP Encryption PASS
  7) TestCase AES-256-CBC OOP Decryption PASS
 + TestCase [ 0] : test_AES_cipheronly_virtio_all succeeded
 + --- +
 + Test Suite Summary
 + Tests Total :1
 + Tests Skipped :  0
 + Tests Executed : 1
 + Tests Unsupported:   0
 + Tests Passed :   1
 + Tests Failed :   0
 + --- +
Test OK

The performance can be tested as below:

reserve enough huge pages
cd to the top-level DPDK directory
export RTE_TARGET=x86_64-native-linuxapp-gcc
export RTE_SDK=`pwd`
cd to app/test-crypto-perf
type the command "make" to compile
run the tests with the following command:

./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \
--ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \
--cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \
--auth-op generate --auth-key-sz 64 --digest-sz 12 \
--total-ops 1 --burst-sz 64 --buffer-sz 2048

Please help to review, thanks!

Changes in v10:
 - squash the meson build files into the previous patches [Pablo]

Changes in v9:
 - fix compilation error when CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y
   and CONFIG_RTE_BUILD_SHARED_LIB=y

Changes in v8:
 - using the virtio_crypto.h in compat lib instead of
   the linux header file
 - add meson build

Changes in v7:
 - add detailed commit messages [Pablo]

Changes in v6:
 - split the patches in a more functional way [Pablo]

Changes in v5:
 - rebased on the newest dpdk-next-crypto

Changes in v4:
 - using dynamic logging [Pablo]
 - elaborate on the core code [Pablo]
 - delete algorithms which can not be tested [Pablo]
 - rebased on dpdk-next-crypto [Pablo]
 - fix doc compilation error [Pablo]
 - add release note for this PMD [Pablo]
 - add R-b from Fan Zhang
 - fix some typos

Changes in v3:
 - set up capabilities for virtio crypto PMD [Fan]
 - delete AES-CTR unit test cases since vhost_user crypto backend does not
   support [Fan]
 - fix a variable uninitialized in virtio_crypto_queue_setup() [Xin, Fan]
 - fix a bug in virtqueue_dequeue_burst_rx()

Changes in v2:
 - using pre-allocated mempool instead of rte_malloc to improve performance 
[Fan]
 - split the patch into a patchset [Fan]
 - using linux/virtio_crypto.h instead of creating a copy of the file [Fan]
 - update doc/guides/cryptodevs for describing virtio crypto PMD [Fan]
 - update copyright
 - delete virtio legacy mode code since virtio-crypto conforms to virtio-1.0
 - refine the function and variable names
 - fix errors and warnings reporte

[dpdk-dev] [PATCH v10 02/10] crypto/virtio: support virtio device init

[Jay Zhou]

This patch implements the initialization of the virtio crypto device.
The virtio crypto device conforms to virtio-1.0, so this patch only
supports modern mode operation.
The cryptodev is created at the virtio crypto pci device probing stage.
The function of virtio_crypto_pkt_tx_burst() is used to burst transfer
packets and virtio_crypto_pkt_rx_burst() is used to burst receive packets.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/Makefile   |   3 +
 drivers/crypto/virtio/meson.build|   3 +-
 drivers/crypto/virtio/virtio_cryptodev.c | 245 +++-
 drivers/crypto/virtio/virtio_cryptodev.h |  13 +
 drivers/crypto/virtio/virtio_logs.h  |  91 ++
 drivers/crypto/virtio/virtio_pci.c   | 462 +++
 drivers/crypto/virtio/virtio_pci.h   | 252 +
 drivers/crypto/virtio/virtio_ring.h  | 137 +
 drivers/crypto/virtio/virtio_rxtx.c  |  26 ++
 drivers/crypto/virtio/virtqueue.c|  43 +++
 drivers/crypto/virtio/virtqueue.h| 171 
 11 files changed, 1443 insertions(+), 3 deletions(-)
 create mode 100644 drivers/crypto/virtio/virtio_logs.h
 create mode 100644 drivers/crypto/virtio/virtio_pci.c
 create mode 100644 drivers/crypto/virtio/virtio_pci.h
 create mode 100644 drivers/crypto/virtio/virtio_ring.h
 create mode 100644 drivers/crypto/virtio/virtio_rxtx.c
 create mode 100644 drivers/crypto/virtio/virtqueue.c
 create mode 100644 drivers/crypto/virtio/virtqueue.h

diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile
index 2f04f0c..786afb8 100644
--- a/drivers/crypto/virtio/Makefile
+++ b/drivers/crypto/virtio/Makefile
@@ -18,6 +18,9 @@ LIBABIVER := 1
 #
 # all source are stored in SRCS-y
 #
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c
 
 # this lib depends upon:
diff --git a/drivers/crypto/virtio/meson.build 
b/drivers/crypto/virtio/meson.build
index 57d84c4..cee77cc 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -6,6 +6,7 @@ if not dep.found()
build = false
 endif
 deps += ['bus_pci']
-sources = files('virtio_cryptodev.c')
+sources = files('virtio_cryptodev.c', 'virtio_pci.c',
+   'virtio_rxtx.c', 'virtqueue.c')
 ext_deps += dep
 pkgconfig_extra_libs += '-lcrypto'
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 3e54942..3fe2c80 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -3,27 +3,240 @@
  */
 #include 
 #include 
+#include 
 #include 
+#include 
 #include "virtio_cryptodev.h"
+#include "virtqueue.h"
+
+int virtio_crypto_logtype_init;
+int virtio_crypto_logtype_session;
+int virtio_crypto_logtype_rx;
+int virtio_crypto_logtype_tx;
+int virtio_crypto_logtype_driver;
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static const struct rte_pci_id pci_id_virtio_crypto_map[] = {
+   { RTE_PCI_DEVICE(VIRTIO_CRYPTO_PCI_VENDORID,
+   VIRTIO_CRYPTO_PCI_DEVICEID) },
+   { .vendor_id = 0, /* sentinel */ },
+};
 
 uint8_t cryptodev_virtio_driver_id;
 
+/*
+ * dev_ops for virtio, bare necessities for basic operation
+ */
+static struct rte_cryptodev_ops virtio_crypto_dev_ops = {
+   /* Device related operations */
+   .dev_configure   = NULL,
+   .dev_start   = NULL,
+   .dev_stop= NULL,
+   .dev_close   = NULL,
+   .dev_infos_get   = NULL,
+
+   .stats_get   = NULL,
+   .stats_reset = NULL,
+
+   .queue_pair_setup= NULL,
+   .queue_pair_release  = NULL,
+   .queue_pair_start= NULL,
+   .queue_pair_stop = NULL,
+   .queue_pair_count= NULL,
+
+   /* Crypto related operations */
+   .session_get_size   = NULL,
+   .session_configure  = NULL,
+   .session_clear  = NULL,
+   .qp_attach_session = NULL,
+   .qp_detach_session = NULL
+};
+
+static int
+virtio_negotiate_features(struct virtio_crypto_hw *hw, uint64_t req_features)
+{
+   uint64_t host_features;
+
+   PMD_INIT_FUNC_TRACE();
+
+   /* Prepare guest_features: feature that driver wants to support */
+   VIRTIO_CRYPTO_INIT_LOG_DBG("guest_features before negotiate = %" PRIx64,
+   req_features);
+
+   /* Read device(host) feature bits */
+   host_features = VTPCI_OPS(hw)->get_features(hw);
+   VIRTIO_CRYPTO_INIT_LOG_DBG("host_features before negotiate = %" PRIx64,
+   host_features);
+
+   /*
+* Negotiate fe

[dpdk-dev] [PATCH v10 07/10] crypto/virtio: support AES-CBC

[Jay Zhou]

The AES-CBC cipher only algorithm has been supported now.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_crypto_capabilities.h | 30 ++
 drivers/crypto/virtio/virtio_cryptodev.c   | 11 
 2 files changed, 41 insertions(+)
 create mode 100644 drivers/crypto/virtio/virtio_crypto_capabilities.h

diff --git a/drivers/crypto/virtio/virtio_crypto_capabilities.h 
b/drivers/crypto/virtio/virtio_crypto_capabilities.h
new file mode 100644
index 000..db6932f
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#ifndef _VIRTIO_CRYPTO_CAPABILITIES_H_
+#define _VIRTIO_CRYPTO_CAPABILITIES_H_
+
+#define VIRTIO_SYM_CAPABILITIES\
+   {   /* AES CBC */   \
+   .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
+   {.sym = {   \
+   .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,  \
+   {.cipher = {\
+   .algo = RTE_CRYPTO_CIPHER_AES_CBC,  \
+   .block_size = 16,   \
+   .key_size = {   \
+   .min = 16,  \
+   .max = 32,  \
+   .increment = 8  \
+   },  \
+   .iv_size = {\
+   .min = 16,  \
+   .max = 16,  \
+   .increment = 0  \
+   }   \
+   }, }\
+   }, }\
+   }
+
+#endif /* _VIRTIO_CRYPTO_CAPABILITIES_H_ */
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index 6f92e99..f924b04 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -15,6 +15,7 @@
 #include "virtio_cryptodev.h"
 #include "virtqueue.h"
 #include "virtio_crypto_algs.h"
+#include "virtio_crypto_capabilities.h"
 
 int virtio_crypto_logtype_init;
 int virtio_crypto_logtype_session;
@@ -58,6 +59,11 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
{ .vendor_id = 0, /* sentinel */ },
 };
 
+static const struct rte_cryptodev_capabilities virtio_capabilities[] = {
+   VIRTIO_SYM_CAPABILITIES,
+   RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
+};
+
 uint8_t cryptodev_virtio_driver_id;
 
 #define NUM_ENTRY_SYM_CREATE_SESSION 4
@@ -746,6 +752,7 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
 
hw = cryptodev->data->dev_private;
hw->dev_id = cryptodev->data->dev_id;
+   hw->virtio_dev_capabilities = virtio_capabilities;
 
VIRTIO_CRYPTO_INIT_LOG_DBG("dev %d vendorID=0x%x deviceID=0x%x",
cryptodev->data->dev_id, pci_dev->id.vendor_id,
@@ -1139,6 +1146,9 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
struct rte_crypto_cipher_xform *cipher_xform)
 {
switch (cipher_xform->algo) {
+   case RTE_CRYPTO_CIPHER_AES_CBC:
+   para->algo = VIRTIO_CRYPTO_CIPHER_AES_CBC;
+   break;
default:
VIRTIO_CRYPTO_SESSION_LOG_ERR("Crypto: Unsupported "
"Cipher alg %u", cipher_xform->algo);
@@ -1402,6 +1412,7 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
info->max_nb_queue_pairs = hw->max_dataqueues;
info->sym.max_nb_sessions =
RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS;
+   info->capabilities = hw->virtio_dev_capabilities;
}
 }
 
-- 
1.8.3.1

[dpdk-dev] [PATCH v10 08/10] crypto/virtio: support HMAC-SHA1

[Jay Zhou]

The AES-CBC with HMAC-SHA1 has been supported now.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_crypto_capabilities.h | 21 +
 drivers/crypto/virtio/virtio_cryptodev.c   |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/virtio/virtio_crypto_capabilities.h 
b/drivers/crypto/virtio/virtio_crypto_capabilities.h
index db6932f..03c30de 100644
--- a/drivers/crypto/virtio/virtio_crypto_capabilities.h
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -6,6 +6,27 @@
 #define _VIRTIO_CRYPTO_CAPABILITIES_H_
 
 #define VIRTIO_SYM_CAPABILITIES\
+   {   /* SHA1 HMAC */ \
+   .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
+   {.sym = {   \
+   .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,\
+   {.auth = {  \
+   .algo = RTE_CRYPTO_AUTH_SHA1_HMAC,  \
+   .block_size = 64,   \
+   .key_size = {   \
+   .min = 1,   \
+   .max = 64,  \
+   .increment = 1  \
+   },  \
+   .digest_size = {\
+   .min = 1,   \
+   .max = 20,  \
+   .increment = 1  \
+   },  \
+   .iv_size = { 0 }\
+   }, }\
+   }, }\
+   },  \
{   /* AES CBC */   \
.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
{.sym = {   \
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
index f924b04..df88953 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1196,11 +1196,13 @@ static int virtio_crypto_sym_configure_session(struct 
rte_cryptodev *dev,
}
 
switch (auth_xform->algo) {
+   case RTE_CRYPTO_AUTH_SHA1_HMAC:
+   *algo = VIRTIO_CRYPTO_MAC_HMAC_SHA1;
+   break;
default:
VIRTIO_CRYPTO_SESSION_LOG_ERR(
"Crypto: Undefined Hash algo %u specified",
auth_xform->algo);
-   *algo = VIRTIO_CRYPTO_NO_MAC;
return -1;
}
 
-- 
1.8.3.1

[dpdk-dev] [PATCH v10 10/10] doc: add virtio crypto PMD guide

[Jay Zhou]

This patch adds the guide for virtio crypto PMD.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 MAINTAINERS   |   2 +
 doc/guides/cryptodevs/features/virtio.ini |  26 +++
 doc/guides/cryptodevs/index.rst   |   1 +
 doc/guides/cryptodevs/virtio.rst  | 117 ++
 doc/guides/rel_notes/release_18_05.rst|   5 +-
 5 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/cryptodevs/features/virtio.ini
 create mode 100644 doc/guides/cryptodevs/virtio.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index d171f10..1e9bd7d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -761,6 +761,8 @@ F: doc/guides/cryptodevs/features/snow3g.ini
 Virtio
 M: Jay Zhou 
 F: drivers/crypto/virtio/
+F: doc/guides/cryptodevs/virtio.rst
+F: doc/guides/cryptodevs/features/virtio.ini
 
 ZUC
 M: Pablo de Lara 
diff --git a/doc/guides/cryptodevs/features/virtio.ini 
b/doc/guides/cryptodevs/features/virtio.ini
new file mode 100644
index 000..168fc17
--- /dev/null
+++ b/doc/guides/cryptodevs/features/virtio.ini
@@ -0,0 +1,26 @@
+; Supported features of the 'virtio' crypto driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Symmetric crypto   = Y
+Sym operation chaining = Y
+
+;
+; Supported crypto algorithms of the 'virtio' crypto driver.
+;
+[Cipher]
+AES CBC (128)  = Y
+AES CBC (192)  = Y
+AES CBC (256)  = Y
+
+;
+; Supported authentication algorithms of the 'virtio' crypto driver.
+;
+[Auth]
+SHA1 HMAC  = Y
+
+;
+; Supported AEAD algorithms of the 'virtio' crypto driver.
+;
+[AEAD]
diff --git a/doc/guides/cryptodevs/index.rst b/doc/guides/cryptodevs/index.rst
index 8a921dd..0529583 100644
--- a/doc/guides/cryptodevs/index.rst
+++ b/doc/guides/cryptodevs/index.rst
@@ -23,4 +23,5 @@ Crypto Device Drivers
 scheduler
 snow3g
 qat
+virtio
 zuc
diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst
new file mode 100644
index 000..f3aa7c6
--- /dev/null
+++ b/doc/guides/cryptodevs/virtio.rst
@@ -0,0 +1,117 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+
+Virtio Crypto Poll Mode Driver
+==
+
+The virtio crypto PMD provides poll mode driver support for the virtio crypto
+device.
+
+Features
+
+
+The virtio crypto PMD has support for:
+
+Cipher algorithms:
+
+* ``RTE_CRYPTO_CIPHER_AES_CBC``
+
+Hash algorithms:
+
+* ``RTE_CRYPTO_AUTH_SHA1_HMAC``
+
+Limitations
+---
+
+*  Only supports the session-oriented API implementation (session-less APIs are
+   not supported).
+*  Only supports modern mode since virtio crypto conforms to virtio-1.0.
+*  Only has two types of queues: data queue and control queue. These two queues
+   only support indirect buffers to communication with the virtio backend.
+*  Only supports AES_CBC cipher only algorithm and AES_CBC with HMAC_SHA1
+   chaining algorithm since the vhost crypto backend only these algorithms
+   are supported.
+*  Does not support Link State interrupt.
+*  Does not support runtime configuration.
+
+Virtio crypto PMD Rx/Tx Callbacks
+-
+
+Rx callbacks:
+
+* ``virtio_crypto_pkt_rx_burst``
+
+Tx callbacks:
+
+* ``virtio_crypto_pkt_tx_burst``
+
+Installation
+
+
+Quick instructions are as follows:
+
+Firstly run DPDK vhost crypto sample as a server side and build QEMU with
+vhost crypto enabled.
+QEMU can then be started using the following parameters:
+
+.. code-block:: console
+
+qemu-system-x86_64 \
+[...] \
+-chardev socket,id=charcrypto0,path=/path/to/your/socket \
+-object cryptodev-vhost-user,id=cryptodev0,chardev=charcrypto0 \
+-device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0
+[...]
+
+Secondly bind the uio_generic driver for the virtio-crypto device.
+For example, :00:04.0 is the domain, bus, device and function
+number of the virtio-crypto device:
+
+.. code-block:: console
+
+modprobe uio_pci_generic
+echo -n :00:04.0 > /sys/bus/pci/drivers/virtio-pci/unbind
+echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id
+
+Finally the front-end virtio crypto PMD driver can be installed:
+
+.. code-block:: console
+
+cd to the top-level DPDK directory
+sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO\)=n,\1=y,' 
config/common_base
+make config T=x86_64-native-linuxapp-gcc
+make install T=x86_64-native-linuxapp-gcc
+
+Tests
+-
+
+The unit test cases can be tested as below:
+
+.. code-block:: console
+
+reserve enough huge pages
+cd to the top-level DPDK directory
+export RTE_TARGET=x86_64-native-linuxapp-gcc
+export RTE_SDK=`pwd`
+cd to test/test
+type the command "make" to compile
+run the tests with "./test"
+type the command "cryptodev_virtio_autotest" to test
+
+The performance can be tested as below:
+
+.. code-bloc

[dpdk-dev] [PATCH v10 05/10] crypto/virtio: support crypto enqueue/dequeue burst API

[Jay Zhou]

This patch implements the functions of virtio_crypto_pkt_tx_burst()
and virtio_crypto_pkt_rx_burst(). The encryption and decryption requests
are placed in the data queue and are ultimately handled by
the backend crypto accelerators.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 drivers/crypto/virtio/virtio_cryptodev.h |   2 +
 drivers/crypto/virtio/virtio_rxtx.c  | 441 ++-
 2 files changed, 433 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.h 
b/drivers/crypto/virtio/virtio_cryptodev.h
index 5f740ca..aa40b5f 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.h
+++ b/drivers/crypto/virtio/virtio_cryptodev.h
@@ -17,6 +17,8 @@
 
 #define NUM_ENTRY_VIRTIO_CRYPTO_OP 7
 
+extern uint8_t cryptodev_virtio_driver_id;
+
 enum virtio_crypto_cmd_id {
VIRTIO_CRYPTO_CMD_CIPHER = 0,
VIRTIO_CRYPTO_CMD_AUTH = 1,
diff --git a/drivers/crypto/virtio/virtio_rxtx.c 
b/drivers/crypto/virtio/virtio_rxtx.c
index 3b038a7..4503928 100644
--- a/drivers/crypto/virtio/virtio_rxtx.c
+++ b/drivers/crypto/virtio/virtio_rxtx.c
@@ -1,8 +1,353 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
  */
+#include 
+
 #include "virtqueue.h"
 #include "virtio_cryptodev.h"
+#include "virtio_crypto_algs.h"
+
+static void
+vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
+{
+   struct vring_desc *dp, *dp_tail;
+   struct vq_desc_extra *dxp;
+   uint16_t desc_idx_last = desc_idx;
+
+   dp = &vq->vq_ring.desc[desc_idx];
+   dxp = &vq->vq_descx[desc_idx];
+   vq->vq_free_cnt = (uint16_t)(vq->vq_free_cnt + dxp->ndescs);
+   if ((dp->flags & VRING_DESC_F_INDIRECT) == 0) {
+   while (dp->flags & VRING_DESC_F_NEXT) {
+   desc_idx_last = dp->next;
+   dp = &vq->vq_ring.desc[dp->next];
+   }
+   }
+   dxp->ndescs = 0;
+
+   /*
+* We must append the existing free chain, if any, to the end of
+* newly freed chain. If the virtqueue was completely used, then
+* head would be VQ_RING_DESC_CHAIN_END (ASSERTed above).
+*/
+   if (vq->vq_desc_tail_idx == VQ_RING_DESC_CHAIN_END) {
+   vq->vq_desc_head_idx = desc_idx;
+   } else {
+   dp_tail = &vq->vq_ring.desc[vq->vq_desc_tail_idx];
+   dp_tail->next = desc_idx;
+   }
+
+   vq->vq_desc_tail_idx = desc_idx_last;
+   dp->next = VQ_RING_DESC_CHAIN_END;
+}
+
+static uint16_t
+virtqueue_dequeue_burst_rx(struct virtqueue *vq,
+   struct rte_crypto_op **rx_pkts, uint16_t num)
+{
+   struct vring_used_elem *uep;
+   struct rte_crypto_op *cop;
+   uint16_t used_idx, desc_idx;
+   uint16_t i;
+   struct virtio_crypto_inhdr *inhdr;
+   struct virtio_crypto_op_cookie *op_cookie;
+
+   /* Caller does the check */
+   for (i = 0; i < num ; i++) {
+   used_idx = (uint16_t)(vq->vq_used_cons_idx
+   & (vq->vq_nentries - 1));
+   uep = &vq->vq_ring.used->ring[used_idx];
+   desc_idx = (uint16_t)uep->id;
+   cop = (struct rte_crypto_op *)
+   vq->vq_descx[desc_idx].crypto_op;
+   if (unlikely(cop == NULL)) {
+   VIRTIO_CRYPTO_RX_LOG_DBG("vring descriptor with no "
+   "mbuf cookie at %u",
+   vq->vq_used_cons_idx);
+   break;
+   }
+
+   op_cookie = (struct virtio_crypto_op_cookie *)
+   vq->vq_descx[desc_idx].cookie;
+   inhdr = &(op_cookie->inhdr);
+   switch (inhdr->status) {
+   case VIRTIO_CRYPTO_OK:
+   cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+   break;
+   case VIRTIO_CRYPTO_ERR:
+   cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
+   vq->packets_received_failed++;
+   break;
+   case VIRTIO_CRYPTO_BADMSG:
+   cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+   vq->packets_received_failed++;
+   break;
+   case VIRTIO_CRYPTO_NOTSUPP:
+   cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+   vq->packets_received_failed++;
+   break;
+   case VIRTIO_CRYPTO_INVSESS:
+   cop->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
+   vq->packets_received_failed++;
+   break;
+   default:
+   break;
+   }
+
+   vq->packets_received_total++;
+
+   rx_pkts[i] = cop;
+   rte_mempool_put(vq->mpool, op_cookie);
+
+

[dpdk-dev] [PATCH v10 09/10] test/crypto: add function tests for virtio crypto PMD

[Jay Zhou]

Only RTE_CRYPTO_CIPHER_AES_CBC cipher
algorithm are tested as unit test, it is supported both by the
cryptodev-backend-builtin and cryptodev-vhost-user of qemu side.

Signed-off-by: Jay Zhou 
Reviewed-by: Fan Zhang 
Acked-by: Fan Zhang 
---
 test/test/test_cryptodev.c  | 48 +
 test/test/test_cryptodev.h  |  1 +
 test/test/test_cryptodev_aes_test_vectors.h | 24 ++-
 test/test/test_cryptodev_blockcipher.c  |  9 +-
 test/test/test_cryptodev_blockcipher.h  |  1 +
 5 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index d1d7925..2f31ec9 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -1820,6 +1820,25 @@ struct crypto_unittest_params {
 }
 
 static int
+test_AES_cipheronly_virtio_all(void)
+{
+   struct crypto_testsuite_params *ts_params = &testsuite_params;
+   int status;
+
+   status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+   ts_params->op_mpool,
+   ts_params->session_mpool,
+   ts_params->valid_devs[0],
+   rte_cryptodev_driver_id_get(
+   RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)),
+   BLKCIPHER_AES_CIPHERONLY_TYPE);
+
+   TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+   return TEST_SUCCESS;
+}
+
+static int
 test_AES_chain_dpaa_sec_all(void)
 {
struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -8879,6 +8898,18 @@ struct test_crypto_vector {
}
 };
 
+static struct unit_test_suite cryptodev_virtio_testsuite = {
+   .suite_name = "Crypto VIRTIO Unit Test Suite",
+   .setup = testsuite_setup,
+   .teardown = testsuite_teardown,
+   .unit_test_cases = {
+   TEST_CASE_ST(ut_setup, ut_teardown,
+   test_AES_cipheronly_virtio_all),
+
+   TEST_CASES_END() /**< NULL terminate unit test array */
+   }
+};
+
 static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
.suite_name = "Crypto Device AESNI MB Unit Test Suite",
.setup = testsuite_setup,
@@ -9808,6 +9839,22 @@ struct test_crypto_vector {
 }
 
 static int
+test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+   gbl_driver_id = rte_cryptodev_driver_id_get(
+   RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
+
+   if (gbl_driver_id == -1) {
+   RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if "
+   "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled 
"
+   "in config file to run this testsuite.\n");
+   return TEST_FAILED;
+   }
+
+   return unit_test_suite_runner(&cryptodev_virtio_testsuite);
+}
+
+static int
 test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
 {
gbl_driver_id = rte_cryptodev_driver_id_get(
@@ -10040,3 +10087,4 @@ struct test_crypto_vector {
 REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec);
 REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
 REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
+REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
diff --git a/test/test/test_cryptodev.h b/test/test/test_cryptodev.h
index 9a01403..a630ee8 100644
--- a/test/test/test_cryptodev.h
+++ b/test/test/test_cryptodev.h
@@ -63,6 +63,7 @@
 #define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
 #define CRYPTODEV_NAME_MRVL_PMDcrypto_mrvl
 #define CRYPTODEV_NAME_CCP_PMD crypto_ccp
+#define CRYPTODEV_NAME_VIRTIO_PMD  crypto_virtio
 
 /**
  * Write (spread) data from buffer to mbuf data
diff --git a/test/test/test_cryptodev_aes_test_vectors.h 
b/test/test/test_cryptodev_aes_test_vectors.h
index 6f2422a..724c1e0 100644
--- a/test/test/test_cryptodev_aes_test_vectors.h
+++ b/test/test/test_cryptodev_aes_test_vectors.h
@@ -1544,7 +1544,8 @@
BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_MRVL |
-   BLOCKCIPHER_TEST_TARGET_PMD_CCP
+   BLOCKCIPHER_TEST_TARGET_PMD_CCP |
+   BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO
},
{
.test_descr = "AES-128-CBC Decryption",
@@ -1557,7 +1558,8 @@
BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_MRVL |
-   BLOCKCIPHER_TEST_TARGET_PMD_CCP
+   BLOCKCIPHER_TEST_TARGET_PMD_CCP |
+   BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO
},
{
.test_descr = "AES-192-CBC Encryption",
@@ -1569,7 +1571,8 @@
BLOCKCIPHER_TEST_TARGE

Re: [dpdk-dev] [PATCH v2] ethdev: check Rx/Tx offloads

[Dai, Wei]

Thanks, Thomas and Ferruh
I think I can implement v3 for this.

> -Original Message-
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Sunday, April 15, 2018 6:37 PM
> To: Yigit, Ferruh ; Dai, Wei 
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] ethdev: check Rx/Tx offloads
> 
> 13/04/2018 19:31, Ferruh Yigit:
> > On 3/28/2018 9:57 AM, Wei Dai wrote:
> > > This patch check if a requested offloading is supported in the
> > > device capability.
> > > A per port offloading feature should be enabled or disabled at same
> > > time in both rte_eth_dev_configure( ) and rte_eth_rx_queue_setup(
> > > )/rte_eth_tx_queue_setup( ).
> > > This patch check if a per port offloading flag has same
> > > configuration in rte_eth_dev_configure( ) and
> > > rte_eth_rx_queue_setup( )/rte_eth_tx_queue_setup( ).
> > > This patch can make such checking in a common way in rte_ethdev
> > > layer to avoid same checking in underlying PMD.
> >
> > I think it is good idea to move common check to the abstraction layer
> > as much as possible.
> >
> > But for this case we are targeting an API change in rc2, I believe
> > better wait that API change for this update.
> 
> I think Wei could implement some filtering of offload flags:
> If an offload is already enabled at port level, we can filter out them when
> enabling again at queue level.
> By removing such repetition in ethdev, before calling the PMD op, the PMD
> does not need to bother for offloads enabled twice.
> 

Re: [dpdk-dev] [PATCH v3 0/5] ixgbe: fix bugs or just improve.

[Zhang, Helin]

> -Original Message-
> From: Zhang, Qi Z
> Sent: Thursday, April 12, 2018 1:22 PM
> To: Tonghao Zhang; Xing, Beilei; Dai, Wei; Zhang, Helin; Lu, Wenzhuo
> Cc: dev@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH v3 0/5] ixgbe: fix bugs or just improve.
> 
> On Mon, Feb 5, 2018 at 8:51 AM,   wrote:
> > From: Tonghao Zhang 
> >
> > The patches in the patchset have no dependency. But all of them is
> > about ixgbe or ixgbevf. The patch 1 and 2 add the itr configuration
> > for ixgbe and ixgbevf, the user and developer can configure it for
> > their platform. Other patches refine the ixgbe or ixgbevf.
> >
> > v2 --> v3:
> > remove the patch: http://dpdk.org/dev/patchwork/patch/33698
> >
> > Tonghao Zhang (5):
> >   net/ixgbevf: set the inter-interrupt interval for EITR.
> >   net/ixgbe: set the ITR via configuration.
> >   net/ixgbe: write disable to ITR counter.
> >   net/ixgbevf: save IXGBE_VTEIMS to intr->mask for performance.
> >   net/ixgbe: remove the unnecessary call rte_intr_enable.
> >
> >  config/common_base   |  2 +
> >  drivers/net/ixgbe/ixgbe_ethdev.c | 79
> > +++-
> >  drivers/net/ixgbe/ixgbe_ethdev.h | 12 ++
> >  drivers/net/ixgbe/ixgbe_rxtx.c   |  3 +-
> >  4 files changed, 61 insertions(+), 35 deletions(-)
> >
> > --
> > 1.8.3.1
> >
> 
> Acked-by: Qi Zhang 
Patch series (1 to 4) applied to dpdk-next-net-intel, patch 5 rejected. Thanks!

/Helin
> 
> Note: patch 5 will be removed as agreed by author.

[dpdk-dev] Changes between two releases (16.11 with 17.11)

[Thanneeru Srinivasulu]

Hi all,

Is there way to check change log specific to dpdk core, between two releases?
Say, how can I check for changes from 16.11 to 17.11 specific to dpdk.
(excluding device specific changes).


-- 
Regards,
Srinivas

[dpdk-dev] [PATCH v3 0/4] rte_flow extension for vSwitch acceleration

[Qi Zhang]

v3:
- remove patch for port action and enhanced statistic query.
- reworked IPv6 ND related pattern base on Adrien's suggestion.
- remove generic increament/decrement/copy action
- rework packet modification action(RTE_FLOW_ACTION_TYPE_FIELD_SET).
- Add OpenFlow friendly TTL change actions.
- Add OpenFlow friendly VLAN/MPLS push/pop actions

v2: 
- fix couple typoes in code, doc and commit log

This patch extend rte_flow API.
The purpose is to provide necessary programming interface for virtual
switch software (such as OVS) to take advantage of incoming device's
vSwitch acceleration capability when using DPDK as data plane.

Note:
- The driver to demonstrate the new APIs is still in development,
  but we hope it could be accepted early to make OVS integration
  smoothly.

Qi Zhang (4):
  ethdev: add more protocol support in flow API
  ethdev: add packet field set aciton in flow API
  ethdev: add TTL change actions in flow API
  ethdev: add VLAN and MPLS pop push action in flow API

 app/test-pmd/cmdline_flow.c | 320 +
 app/test-pmd/config.c   |   8 +
 doc/guides/prog_guide/rte_flow.rst  | 251 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  53 
 lib/librte_ether/rte_flow.h | 421 +++-
 5 files changed, 1052 insertions(+), 1 deletion(-)

-- 
2.13.6

[dpdk-dev] [PATCH v3 2/4] ethdev: add packet field set aciton in flow API

[Qi Zhang]

Add new action RTE_FLOW_ACTION_TYPE_FIELD_SET, it is used to
modify fields of specific protocol layer of the packet, for
packet that does not include the specific protocal layer, the
action is skipped.

Signed-off-by: Qi Zhang 
---
 doc/guides/prog_guide/rte_flow.rst | 30 +++
 lib/librte_ether/rte_flow.h| 42 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 9c9ddcbd2..ea0e40a52 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1558,6 +1558,36 @@ fields in the pattern items.
| 1 | END  |
+---+--+
 
+Action: ``FILED_SET``
+^
+
+Modify the value of fields in a protocol layer, only applies to packets that
+contain respective protocol layer.
+
+.. _table_rte_flow_action_field_set:
+
+.. table:: FIELD_SET
+
+   
+---+---+
+   | Field | Value 
|
+   
+===+===+
+   | ``type``  | Specify the type of a protocol layer. (see 
RTE_FLOW_ITEM_TYPE_*)  |
+   
+---+---+
+   | ``dir_level`` | Specify the level of matched protocol layer.  
|
+   |   | direction (1b)
|
+   |   | 0: match start from outermost.
|
+   |   | 1: match start from innermost.
|
+   |   | level: (31b)  
|
+   |   | 0: outermost or innermost protocol layer that matched 
@type   |
+   |   | 1: next to outmost or innermost protocol layer that 
matched @type |
+   |   | 2: and so on ...  
|
+   
+---+---+
+   |  ``new_val``  | Pointer to specific data structure according to protocol 
type,|
+   |   | the content is the new value to updtae.   
|
+   
+---+---+
+   |  ``mask`` | Bit-mask applied to new_val   
|
+   
+---+---+
+
 Negative types
 ~~
 
diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
index 2efbfb3c4..80cf75ff0 100644
--- a/lib/librte_ether/rte_flow.h
+++ b/lib/librte_ether/rte_flow.h
@@ -1241,7 +1241,15 @@ enum rte_flow_action_type {
 *
 * See struct rte_flow_action_security.
 */
-   RTE_FLOW_ACTION_TYPE_SECURITY
+   RTE_FLOW_ACTION_TYPE_SECURITY,
+
+   /**
+* Modify the value of fields in a protocol layer, only applies to
+* packets that contain respective protocol layer.
+*
+* See struct rte_flow_action_field_set.
+*/
+   RTE_FLOW_ACTION_TYPE_FIELD_SET,
 };
 
 /**
@@ -1380,6 +1388,38 @@ struct rte_flow_action_security {
 };
 
 /**
+ * RTE_FLOW_ACTION_TYPE_FIELD_SET
+ *
+ * Modify the value of fields in a protocol layer, only applies to
+ * packets that contain respective protocol layer.
+ */
+struct rte_flow_action_field_set {
+   /**
+* Specify the type of a protocol layer.
+*/
+   enum rte_flow_item_type type;
+   /**
+* Specify the level of matched protocol layer.
+*
+* direction (1b)
+* 0: match start from outermost.
+* 1: match start from innermost.
+*
+* level (31b)
+* 0: outermost|innermost protocol layer that matched @type.
+* 1: next to outermost|innermost protocol layer that matched @type.
+* 2: and so on ...
+*/
+   uint32_t dir_level;
+   /**
+* Pointer to specific data structure according to protocol type,
+* the content is the new value to update.
+*/
+   const void *new_val;
+   const void *mask; /**< Bit-mask applied to new_val. */
+};
+
+/**
  * Definition of a single action.
  *
  * A list of actions is terminated by a END action.
-- 
2.13.6

[dpdk-dev] [PATCH v3 1/4] ethdev: add more protocol support in flow API

[Qi Zhang]

Add new protocol header match support as below

RTE_FLOW_ITEM_TYPE_ARP_IPV4
- matches an IPv4 ARP header
RTE_FLOW_ITEM_TYPE_IPV6_EXT
- matches an IPv6 extension header with any type.
RTE_FLOW_ITEM_TYPE_ICMP6
- matches an ICMPv6 header followed by any message body.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_NS
- matches an ICMPv6 header followed by network discovery
  neighbor solicitation.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_NA
- matches an ICMPv6 header followed by network discovery
  neighbor advertisement.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_OPT_ETH_SLA
- matches an ICMPv6 header followed by network discovery
  neighbor solicitation contains source Ethernet link-layer
  address option.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_OPT_ETH_TLA
- matches an ICMPv6 header followed by network discovery
  neighbor advertisement contains target Ethernet link-layer
  address option.

Suggested-by: Adrien Mazarguil 
Signed-off-by: Qi Zhang 
---
 app/test-pmd/cmdline_flow.c | 174 +
 app/test-pmd/config.c   |   8 +
 doc/guides/prog_guide/rte_flow.rst  |  72 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  27 
 lib/librte_ether/rte_flow.h | 231 
 5 files changed, 512 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 59f3b3b57..a5e21c1fe 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -150,6 +150,21 @@ enum index {
ITEM_GENEVE,
ITEM_GENEVE_VNI,
ITEM_GENEVE_PROTO,
+   ITEM_IPV6_EXT,
+   ITEM_IPV6_EXT_NEXT_HDR,
+   ITEM_ICMP6,
+   ITEM_ICMP6_TYPE,
+   ITEM_ICMP6_CODE,
+   ITEM_ICMP6_ND_NS,
+   ITEM_ICMP6_ND_NS_TGT_ADDR,
+   ITEM_ICMP6_ND_NA,
+   ITEM_ICMP6_ND_NA_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_SLA_ETH,
+   ITEM_ICMP6_ND_OPT_SLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_SLA_ETH_SLL_ADDR,
+   ITEM_ICMP6_ND_OPT_TLA_ETH,
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TLL_ADDR,
 
/* Validate/create actions. */
ACTIONS,
@@ -436,6 +451,12 @@ static const enum index next_item[] = {
ITEM_GTPC,
ITEM_GTPU,
ITEM_GENEVE,
+   ITEM_IPV6_EXT,
+   ITEM_ICMP6,
+   ITEM_ICMP6_ND_NS,
+   ITEM_ICMP6_ND_NA,
+   ITEM_ICMP6_ND_OPT_SLA_ETH,
+   ITEM_ICMP6_ND_OPT_TLA_ETH,
ZERO,
 };
 
@@ -586,6 +607,39 @@ static const enum index item_geneve[] = {
ZERO,
 };
 
+static const enum index item_ipv6_ext[] = {
+   ITEM_IPV6_EXT_NEXT_HDR,
+   ZERO,
+};
+
+static const enum index item_icmp6[] = {
+   ITEM_ICMP6_TYPE,
+   ITEM_ICMP6_CODE,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_ns[] = {
+   ITEM_ICMP6_ND_NS_TGT_ADDR,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_na[] = {
+   ITEM_ICMP6_ND_NA_TGT_ADDR,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_opt_sla_eth[] = {
+   ITEM_ICMP6_ND_OPT_SLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_SLA_ETH_SLL_ADDR,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_opt_tla_eth[] = {
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TLL_ADDR,
+   ZERO,
+};
+
 static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -1473,6 +1527,126 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve,
 protocol)),
},
+   [ITEM_IPV6_EXT] = {
+   .name = "ext",
+   .help = "match IPv6 extend header",
+   .priv = PRIV_ITEM(IPV6_EXT,
+ sizeof(struct rte_flow_item_ipv6_ext)),
+   .next = NEXT(item_ipv6_ext),
+   .call = parse_vc,
+   },
+   [ITEM_IPV6_EXT_NEXT_HDR] = {
+   .name = "next",
+   .help = "next header in IPv6 extend header",
+   .next = NEXT(item_ipv6_ext, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6_ext,
+next_hdr)),
+   },
+   [ITEM_ICMP6] = {
+   .name = "icmp6",
+   .help = "match ICMPv6 header",
+   .priv = PRIV_ITEM(ICMP, sizeof(struct rte_flow_item_icmp6)),
+   .next = NEXT(item_icmp6),
+   .call = parse_vc,
+   },
+   [ITEM_ICMP6_TYPE] = {
+   .name = "type",
+   .help = "ICMPv6 packet type",
+   .next = NEXT(item_icmp6, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6,
+type)),
+   },
+   [ITEM_ICMP6_CODE] = {
+   .name = "code",
+   .help = "ICMPv6 packet code",
+  

[dpdk-dev] [PATCH v3 3/4] ethdev: add TTL change actions in flow API

[Qi Zhang]

Add couple OpenFlow frienldy TTL change actions.

RTE_FLOW_ACTION_MLPS_TTL_DEC - decrement MPLS TTL.
RTE_FLOW_ACTION_IP_TTL_DEC - decrement IP TTL.
RTE_FLOW_ACTION_TTL_COPY_OUT - copy TTL outwards.
RTE_FLOW_ACTION_TTL_COPY_IN - copy TTL inwards.

Signed-off-by: Qi Zhang 
---
 app/test-pmd/cmdline_flow.c | 64 +++
 doc/guides/prog_guide/rte_flow.rst  | 80 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 12 +
 lib/librte_ether/rte_flow.h | 77 +++
 4 files changed, 233 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index a5e21c1fe..fa35ecc6d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -190,6 +190,12 @@ enum index {
ACTION_VF_ID,
ACTION_METER,
ACTION_METER_ID,
+   ACTION_MPLS_TTL_DEC,
+   ACTION_MPLS_TTL_DEC_LVL,
+   ACTION_IP_TTL_DEC,
+   ACTION_IP_TTL_DEC_LVL,
+   ACTION_TTL_COPY_OUT,
+   ACTION_TTL_COPY_IN,
 };
 
 /** Size of pattern[] field in struct rte_flow_item_raw. */
@@ -654,6 +660,10 @@ static const enum index next_action[] = {
ACTION_PF,
ACTION_VF,
ACTION_METER,
+   ACTION_MPLS_TTL_DEC,
+   ACTION_IP_TTL_DEC,
+   ACTION_TTL_COPY_OUT,
+   ACTION_TTL_COPY_IN,
ZERO,
 };
 
@@ -694,6 +704,16 @@ static const enum index action_meter[] = {
ZERO,
 };
 
+static const enum index action_mpls_ttl_dec[] = {
+   ACTION_MPLS_TTL_DEC_LVL,
+   ZERO,
+};
+
+static const enum index action_ip_ttl_dec[] = {
+   ACTION_IP_TTL_DEC_LVL,
+   ZERO,
+};
+
 static int parse_init(struct context *, const struct token *,
  const char *, unsigned int,
  void *, unsigned int);
@@ -1807,6 +1827,50 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter, mtr_id)),
.call = parse_vc_conf,
},
+   [ACTION_MPLS_TTL_DEC] = {
+   .name = "mpls_ttl_dec",
+   .help = "decrement MPLS TTL",
+   .priv = PRIV_ACTION(MPLS_TTL_DEC,
+   sizeof(struct rte_flow_action_mpls_ttl_dec)),
+   .next = NEXT(action_mpls_ttl_dec),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_TTL_DEC_LVL] = {
+   .name = "level",
+   .help = "level of MPLS header",
+   .next = NEXT(action_mpls_ttl_dec, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)),
+   .call = parse_vc,
+   },
+   [ACTION_IP_TTL_DEC] = {
+   .name = "ip_ttl_dec",
+   .help = "decrement IPv4 TTL or IPv6 Hop Limit",
+   .priv = PRIV_ACTION(MPLS_TTL_DEC,
+   sizeof(struct rte_flow_action_ip_ttl_dec)),
+   .next = NEXT(action_ip_ttl_dec),
+   .call = parse_vc,
+   },
+   [ACTION_IP_TTL_DEC_LVL] = {
+   .name = "level",
+   .help = "level of IPv4 or IPv6 header",
+   .next = NEXT(action_ip_ttl_dec, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)),
+   .call = parse_vc,
+   },
+   [ACTION_TTL_COPY_OUT] = {
+   .name = "ttl_copy_out",
+   .help = "copy TTL  outwards",
+   .priv = PRIV_ACTION(DROP, 0),
+   .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+   .call = parse_vc,
+   },
+   [ACTION_TTL_COPY_IN] = {
+   .name = "ttl_copy_in",
+   .help = "copy TTL  inwards",
+   .priv = PRIV_ACTION(DROP, 0),
+   .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+   .call = parse_vc,
+   },
 };
 
 /** Remove and return last entry from argument stack. */
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index ea0e40a52..e81f0e375 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1588,6 +1588,86 @@ contain respective protocol layer.
|  ``mask`` | Bit-mask applied to new_val   
|

+---+---+
 
+Action: ``MPLS_TTL_DEC``
+
+
+Decrement MPLS TTL, only applies to packets that contain specific MPLS
+headers.
+
+.. _table_rte_flow_action_mpls_ttl_dec:
+
+.. table:: MPLS_TTL_DEC
+
+   +---+-+
+   | Field | Value   |
+   +===+=+
+   | ``dir_level`` | Specify the level of MPLS header.   |
+   |   | direction (1b)  |
+   |   | 0: match start from outermost. 

[dpdk-dev] [PATCH v3 4/4] ethdev: add VLAN and MPLS pop push action in flow API

[Qi Zhang]

Add couple Openflow frienldy VLAN/MPLS push/pop actions.

RTE_FLOW_ACTION_VLAN_POP - pop a VLAN header.
RTE_FLOW_ACTION_VLAN_PUSH - push a VLAN header.
RTE_FLOW_ACTION_MPLS_POP - pop a MPLS header.
RTE_FLOW_ACTION_MPLS_PUSH - push a MPLS header.

Signed-off-by: Qi Zhang 
---
 app/test-pmd/cmdline_flow.c | 82 +
 doc/guides/prog_guide/rte_flow.rst  | 69 
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 +
 lib/librte_ether/rte_flow.h | 71 +
 4 files changed, 236 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index fa35ecc6d..48a3ccdfc 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -196,6 +196,13 @@ enum index {
ACTION_IP_TTL_DEC_LVL,
ACTION_TTL_COPY_OUT,
ACTION_TTL_COPY_IN,
+   ACTION_VLAN_POP,
+   ACTION_VLAN_PUSH,
+   ACTION_VLAN_PUSH_TYPE,
+   ACTION_MPLS_POP,
+   ACTION_MPLS_POP_TYPE,
+   ACTION_MPLS_PUSH,
+   ACTION_MPLS_PUSH_TYPE,
 };
 
 /** Size of pattern[] field in struct rte_flow_item_raw. */
@@ -664,6 +671,10 @@ static const enum index next_action[] = {
ACTION_IP_TTL_DEC,
ACTION_TTL_COPY_OUT,
ACTION_TTL_COPY_IN,
+   ACTION_VLAN_POP,
+   ACTION_VLAN_PUSH,
+   ACTION_MPLS_POP,
+   ACTION_MPLS_PUSH,
ZERO,
 };
 
@@ -714,6 +725,21 @@ static const enum index action_ip_ttl_dec[] = {
ZERO,
 };
 
+static const enum index action_vlan_push[] = {
+   ACTION_VLAN_PUSH_TYPE,
+   ZERO,
+};
+
+static const enum index action_mpls_pop[] = {
+   ACTION_MPLS_POP_TYPE,
+   ZERO,
+};
+
+static const enum index action_mpls_push[] = {
+   ACTION_MPLS_PUSH_TYPE,
+   ZERO,
+};
+
 static int parse_init(struct context *, const struct token *,
  const char *, unsigned int,
  void *, unsigned int);
@@ -1871,6 +1897,62 @@ static const struct token token_list[] = {
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc,
},
+
+   [ACTION_VLAN_POP] = {
+   .name = "vlan_pop",
+   .help = "pop the outermost VLAN header.",
+   .priv = PRIV_ACTION(DROP, 0),
+   .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+   .call = parse_vc,
+   },
+   [ACTION_VLAN_PUSH] = {
+   .name = "vlan_push",
+   .help = "push new VLAN header onto the packet",
+   .priv = PRIV_ACTION(VLAN_PUSH,
+   sizeof(struct rte_flow_action_vlan_push)),
+   .next = NEXT(action_vlan_push),
+   .call = parse_vc,
+   },
+   [ACTION_VLAN_PUSH_TYPE] = {
+   .name = "type",
+   .help = "Ethertype of VLAN header",
+   .next = NEXT(action_vlan_push, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_vlan_push,
+   ether_type)),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_POP] = {
+   .name = "mpls_pop",
+   .help = "pop the outermost MPLS header",
+   .priv = PRIV_ACTION(MPLS_POP,
+   sizeof(struct rte_flow_action_mpls_pop)),
+   .next = NEXT(action_mpls_pop),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_POP_TYPE] = {
+   .name = "type",
+   .help = "Ethertype of MPLS header",
+   .next = NEXT(action_mpls_pop, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mpls_pop,
+   ether_type)),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_PUSH] = {
+   .name = "mpls_push",
+   .help = "push new MPLS header onto the packet",
+   .priv = PRIV_ACTION(MPLS_PUSH,
+   sizeof(struct rte_flow_action_mpls_push)),
+   .next = NEXT(action_mpls_push),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_PUSH_TYPE] = {
+   .name = "type",
+   .help = "Ethertype of MPLS header",
+   .next = NEXT(action_mpls_push, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mpls_push,
+   ether_type)),
+   .call = parse_vc,
+   },
 };
 
 /** Remove and return last entry from argument stack. */
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index e81f0e375..bc143c1e9 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1668,6 +1668,75 @@ required MPLS or IP headers.
| no properties |
+---+
 
+Action: ``ACTION_VLAN_POP``
+^^^
+
+Pop the outer-most VLAN header from the packet.
+
+.. 

Re: [dpdk-dev] [PATCH v3 3/4] ethdev: add TTL change actions in flow API

[Shahaf Shuler]

Hi Qi,

Am wondering if we can make the below more generic and not tailored for 
specific use cases. 

Monday, April 16, 2018 8:17 AM, Qi Zhang:
> Subject: [dpdk-dev] [PATCH v3 3/4] ethdev: add TTL change actions in flow
> API
> 
> Add couple OpenFlow frienldy TTL change actions.
> 
> RTE_FLOW_ACTION_MLPS_TTL_DEC - decrement MPLS TTL.
> RTE_FLOW_ACTION_IP_TTL_DEC - decrement IP TTL.
> RTE_FLOW_ACTION_TTL_COPY_OUT - copy TTL outwards.
> RTE_FLOW_ACTION_TTL_COPY_IN - copy TTL inwards.
> 
> Signed-off-by: Qi Zhang 
> ---
>  app/test-pmd/cmdline_flow.c | 64 +++
>  doc/guides/prog_guide/rte_flow.rst  | 80
> +
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst | 12 +
>  lib/librte_ether/rte_flow.h | 77 +++
>  4 files changed, 233 insertions(+)

[...]

> 
>  /** Remove and return last entry from argument stack. */ diff --git
> a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index ea0e40a52..e81f0e375 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1588,6 +1588,86 @@ contain respective protocol layer.
> |  ``mask`` | Bit-mask applied to new_val 
>   |
> 
> +---+---+
> 
> +Action: ``MPLS_TTL_DEC``
> +
> +
> +Decrement MPLS TTL, only applies to packets that contain specific MPLS
> +headers.
> +
> +.. _table_rte_flow_action_mpls_ttl_dec:
> +
> +.. table:: MPLS_TTL_DEC
> +
> +   +---+-+
> +   | Field | Value   |
> +
> +===+=
> +
> +   | ``dir_level`` | Specify the level of MPLS header.   |
> +   |   | direction (1b)  |
> +   |   | 0: match start from outermost.  |
> +   |   | 1: match start from innermost.  |
> +   |   | level: (31b)|
> +   |   | 0: outermost or innermost MPLS header   |
> +   |   | 1: next to outmost or innermost MPLS header |
> +   |   | 2: and so on ...|
> +   +---+-+

Why not exposing it is as generic operation: increment/decrement for any type 
of header.
The action struct will receive the flow item type to modify, list of 
increment/decrement values for each of its fields (+x/-y) along with 
corresponding mask?

It is true the main use case is TTL decrement for vRouters, however It will 
save the duplication of the TTL_DEC action below and maybe we will not need to 
modify the API for future similar actions.


> +
> +Action: ``IP_TTL_DEC``
> +^^
> +
> +Decrement IPv4 TTL or IPv6 hop limit field and update the IP checksum,
> +only applies to packets that contain specific MPLS headers.
> +
> +.. _table_rte_flow_action_ip_ttl_dec:
> +
> +.. table:: IP_TTL_DEC
> +
> +   
> +---+--+
> +   | Field | Value   
>  |
> +
> +===+=
> =+
> +   | ``dir_level`` | Specify the level of IPv4 or IPv6 header.   
>  |
> +   |   | direction (1b)  
>  |
> +   |   | 0: match start from outermost.  
>  |
> +   |   | 1: match start from innermost.  
>  |
> +   |   | level: (31b)
>  |
> +   |   | 0: outermost or innermost Ipv4 or IPv6 header   
>  |
> +   |   | 1: next to outmost or innermost MPLS IPv4 or IPv6 
> header |
> +   |   | 2: and so on ...
>  |
> +
> + +---+-
> + -+
> +
> +Action: ``TTL_COPY_OUT``
> +
> +
> +Copy the TTL from next-to-outermost to outermost header with TTL, copy
> +can be IP to IP, MPLS to MPLS or IP to MPLS, only applies packets that
> +contain required MPLS or IP headers.
> +
> +.. _table_rte_flow_action_ttl_copy_out:
> +
> +.. table:: TTL_COPY_OUT
> +
> +   +---+
> +   | Field |
> +   +===+
> +   | no properties |
> +   +---+

Why only the TTL ? and why only from outermost to next-to-outer-most? 

We can have an action to copy field from flow item to another flow item. 
We will need flow item for src + mask for the field to copy, flow item for dst 
+ mask for the field to set

> +
> +Action: ``TTL_COPY_IN``
> +^^^

Re: [dpdk-dev] [PATCH] eal: fix compilation without VFIO

[Shahaf Shuler]

Friday, April 13, 2018 4:59 PM, Thomas Monjalon:
> >
> > OK. Shahaf, will you submit a v2 with this, or should i do it? I think
> > it should be just a matter of #ifndef VFIO_PRESENT //define
> > vfio_device_info struct #endif - this should take care of the problem
> > of hiding the function definitions.
> >
> > FreeBSD will also need to be adjusted to remove dummy prototypes.
> 
> I think you are more familiar with VFIO than any of us.
> It is better to let you do, think about the implications and do the tests.
> Thanks :)
> 

I don't mind whom of us will do it, as long as it will be done quickly. 
Currently there are some tests which cannot run on our regression due to it. 

[dpdk-dev] [PATCH] ethdev: remove new to old offloads API helpers

[Shahaf Shuler]

According to

commit 315ee8374e0e ("doc: reduce initial offload API rework scope
 to drivers")

All PMDs should have moved to the new offloads API. Therefore it is safe
to remove the new->old convert helps.

The old->new helpers will remain to support application which still use
the old API.

Signed-off-by: Shahaf Shuler 
---
 lib/librte_ether/rte_ethdev.c | 100 +-
 1 file changed, 2 insertions(+), 98 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 3c049ef43c..e568b8ba91 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -964,60 +964,6 @@ rte_eth_convert_rx_offload_bitfield(const struct 
rte_eth_rxmode *rxmode,
*rx_offloads = offloads;
 }
 
-/**
- * A conversion function from rxmode offloads API.
- */
-static void
-rte_eth_convert_rx_offloads(const uint64_t rx_offloads,
-   struct rte_eth_rxmode *rxmode)
-{
-
-   if (rx_offloads & DEV_RX_OFFLOAD_HEADER_SPLIT)
-   rxmode->header_split = 1;
-   else
-   rxmode->header_split = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_CHECKSUM)
-   rxmode->hw_ip_checksum = 1;
-   else
-   rxmode->hw_ip_checksum = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
-   rxmode->hw_vlan_filter = 1;
-   else
-   rxmode->hw_vlan_filter = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-   rxmode->hw_vlan_strip = 1;
-   else
-   rxmode->hw_vlan_strip = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
-   rxmode->hw_vlan_extend = 1;
-   else
-   rxmode->hw_vlan_extend = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
-   rxmode->jumbo_frame = 1;
-   else
-   rxmode->jumbo_frame = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_CRC_STRIP)
-   rxmode->hw_strip_crc = 1;
-   else
-   rxmode->hw_strip_crc = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_SCATTER)
-   rxmode->enable_scatter = 1;
-   else
-   rxmode->enable_scatter = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)
-   rxmode->enable_lro = 1;
-   else
-   rxmode->enable_lro = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP)
-   rxmode->hw_timestamp = 1;
-   else
-   rxmode->hw_timestamp = 0;
-   if (rx_offloads & DEV_RX_OFFLOAD_SECURITY)
-   rxmode->security = 1;
-   else
-   rxmode->security = 0;
-}
-
 const char * __rte_experimental
 rte_eth_dev_rx_offload_name(uint64_t offload)
 {
@@ -1108,13 +1054,9 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t 
nb_rx_q, uint16_t nb_tx_q,
 * Convert between the offloads API to enable PMDs to support
 * only one of them.
 */
-   if (dev_conf->rxmode.ignore_offload_bitfield == 0) {
+   if (dev_conf->rxmode.ignore_offload_bitfield == 0)
rte_eth_convert_rx_offload_bitfield(
&dev_conf->rxmode, &local_conf.rxmode.offloads);
-   } else {
-   rte_eth_convert_rx_offloads(dev_conf->rxmode.offloads,
-   &local_conf.rxmode);
-   }
 
/* Copy the dev_conf parameter into the dev structure */
memcpy(&dev->data->dev_conf, &local_conf, sizeof(dev->data->dev_conf));
@@ -1566,30 +1508,6 @@ rte_eth_convert_txq_flags(const uint32_t txq_flags, 
uint64_t *tx_offloads)
*tx_offloads = offloads;
 }
 
-/**
- * A conversion function from offloads API.
- */
-static void
-rte_eth_convert_txq_offloads(const uint64_t tx_offloads, uint32_t *txq_flags)
-{
-   uint32_t flags = 0;
-
-   if (!(tx_offloads & DEV_TX_OFFLOAD_MULTI_SEGS))
-   flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
-   if (!(tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT))
-   flags |= ETH_TXQ_FLAGS_NOVLANOFFL;
-   if (!(tx_offloads & DEV_TX_OFFLOAD_SCTP_CKSUM))
-   flags |= ETH_TXQ_FLAGS_NOXSUMSCTP;
-   if (!(tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM))
-   flags |= ETH_TXQ_FLAGS_NOXSUMUDP;
-   if (!(tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM))
-   flags |= ETH_TXQ_FLAGS_NOXSUMTCP;
-   if (tx_offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
-   flags |= (ETH_TXQ_FLAGS_NOREFCOUNT | ETH_TXQ_FLAGS_NOMULTMEMP);
-
-   *txq_flags = flags;
-}
-
 int
 rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
   uint16_t nb_tx_desc, unsigned int socket_id,
@@ -1654,12 +1572,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t 
tx_queue_id,
 * only one of them.
 */
local_conf = *tx_conf;
-   if (tx_conf->txq_flags & ETH_TXQ_FLAGS_IGNORE) {
-   rte_eth_convert_txq_offloads(tx_conf->offloads,
-&local_conf.txq

[dpdk-dev] [PATCH] crypto/mrvl: add MRVL PMD to meson

[Tomasz Duszynski]

Add MRVL CRYPTO PMD to meson build system.

Signed-off-by: Tomasz Duszynski 
---
 drivers/crypto/meson.build  |  2 +-
 drivers/crypto/mrvl/meson.build | 21 +
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/mrvl/meson.build

diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 736c9f5..1295743 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['dpaa_sec', 'dpaa2_sec',
-   'openssl', 'null', 'qat']
+   'openssl', 'mrvl', 'null', 'qat']
 
 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
 config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
diff --git a/drivers/crypto/mrvl/meson.build b/drivers/crypto/mrvl/meson.build
new file mode 100644
index 000..c05c793
--- /dev/null
+++ b/drivers/crypto/mrvl/meson.build
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Marvell International Ltd.
+# Copyright(c) 2018 Semihalf.
+# All rights reserved.
+
+path = run_command('printenv', 'LIBMUSDK_PATH').stdout().strip()
+lib_dir = path + '/lib'
+inc_dir = path + '/include'
+
+lib = cc.find_library('libmusdk', dirs: [lib_dir], required: false)
+if not lib.found()
+   build = false
+else
+   ext_deps += lib
+   includes += include_directories(inc_dir)
+   cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+endif
+
+sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
+
+deps += ['bus_vdev']
-- 
2.7.4

[dpdk-dev] [PATCH v3 0/4] rte_flow extension for vSwitch acceleration

[Qi Zhang]

v3:
- remove patch for port action and enhanced statistic query.
- reworked IPv6 ND related pattern base on Adrien's suggestion.
- remove generic increament/decrement/copy action
- rework packet modification action(RTE_FLOW_ACTION_TYPE_FIELD_SET).
- Add OpenFlow friendly TTL change actions.
- Add OpenFlow friendly VLAN/MPLS push/pop actions

v2:
- fix couple typoes in code, doc and commit log

This patch extend rte_flow API.
The purpose is to provide necessary programming interface for virtual
switch software (such as OVS) to take advantage of incoming device's
vSwitch acceleration capability when using DPDK as data plane.

Note:
- The driver to demonstrate the new APIs is still in development,
  but we hope it could be accepted early to make OVS integration
  smoothly. 

Qi Zhang (4):
  ethdev: add more protocol support in flow API
  ethdev: add packet field set aciton in flow API
  ethdev: add TTL change actions in flow API
  ethdev: add VLAN and MPLS pop push action in flow API

 app/test-pmd/cmdline_flow.c | 370 
 app/test-pmd/config.c   |   9 +
 doc/guides/prog_guide/rte_flow.rst  | 267 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  60 
 lib/librte_ether/rte_flow.h | 425 +++-
 5 files changed, 1130 insertions(+), 1 deletion(-)

-- 
2.13.6

[dpdk-dev] [PATCH v3 3/4] ethdev: add TTL change actions in flow API

[Qi Zhang]

Add couple OpenFlow frienldy TTL change actions.

RTE_FLOW_ACTION_MLPS_TTL_DEC - decrement MPLS TTL.
RTE_FLOW_ACTION_IP_TTL_DEC - decrement IP TTL.
RTE_FLOW_ACTION_TTL_COPY_OUT - copy TTL outwards.
RTE_FLOW_ACTION_TTL_COPY_IN - copy TTL inwards.

Signed-off-by: Qi Zhang 
---
 app/test-pmd/cmdline_flow.c | 64 +++
 doc/guides/prog_guide/rte_flow.rst  | 80 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 12 +
 lib/librte_ether/rte_flow.h | 77 +++
 4 files changed, 233 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 7950b1b8d..417cbecc9 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -195,6 +195,12 @@ enum index {
ACTION_VF_ID,
ACTION_METER,
ACTION_METER_ID,
+   ACTION_MPLS_TTL_DEC,
+   ACTION_MPLS_TTL_DEC_LVL,
+   ACTION_IP_TTL_DEC,
+   ACTION_IP_TTL_DEC_LVL,
+   ACTION_TTL_COPY_OUT,
+   ACTION_TTL_COPY_IN,
 };
 
 /** Size of pattern[] field in struct rte_flow_item_raw. */
@@ -668,6 +674,10 @@ static const enum index next_action[] = {
ACTION_PF,
ACTION_VF,
ACTION_METER,
+   ACTION_MPLS_TTL_DEC,
+   ACTION_IP_TTL_DEC,
+   ACTION_TTL_COPY_OUT,
+   ACTION_TTL_COPY_IN,
ZERO,
 };
 
@@ -708,6 +718,16 @@ static const enum index action_meter[] = {
ZERO,
 };
 
+static const enum index action_mpls_ttl_dec[] = {
+   ACTION_MPLS_TTL_DEC_LVL,
+   ZERO,
+};
+
+static const enum index action_ip_ttl_dec[] = {
+   ACTION_IP_TTL_DEC_LVL,
+   ZERO,
+};
+
 static int parse_init(struct context *, const struct token *,
  const char *, unsigned int,
  void *, unsigned int);
@@ -1857,6 +1877,50 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter, mtr_id)),
.call = parse_vc_conf,
},
+   [ACTION_MPLS_TTL_DEC] = {
+   .name = "mpls_ttl_dec",
+   .help = "decrement MPLS TTL",
+   .priv = PRIV_ACTION(MPLS_TTL_DEC,
+   sizeof(struct rte_flow_action_mpls_ttl_dec)),
+   .next = NEXT(action_mpls_ttl_dec),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_TTL_DEC_LVL] = {
+   .name = "level",
+   .help = "level of MPLS header",
+   .next = NEXT(action_mpls_ttl_dec, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)),
+   .call = parse_vc,
+   },
+   [ACTION_IP_TTL_DEC] = {
+   .name = "ip_ttl_dec",
+   .help = "decrement IPv4 TTL or IPv6 Hop Limit",
+   .priv = PRIV_ACTION(MPLS_TTL_DEC,
+   sizeof(struct rte_flow_action_ip_ttl_dec)),
+   .next = NEXT(action_ip_ttl_dec),
+   .call = parse_vc,
+   },
+   [ACTION_IP_TTL_DEC_LVL] = {
+   .name = "level",
+   .help = "level of IPv4 or IPv6 header",
+   .next = NEXT(action_ip_ttl_dec, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)),
+   .call = parse_vc,
+   },
+   [ACTION_TTL_COPY_OUT] = {
+   .name = "ttl_copy_out",
+   .help = "copy TTL outwards",
+   .priv = PRIV_ACTION(DROP, 0),
+   .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+   .call = parse_vc,
+   },
+   [ACTION_TTL_COPY_IN] = {
+   .name = "ttl_copy_in",
+   .help = "copy TTL inwards",
+   .priv = PRIV_ACTION(DROP, 0),
+   .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+   .call = parse_vc,
+   },
 };
 
 /** Remove and return last entry from argument stack. */
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 68deb9812..65f2d4a16 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1604,6 +1604,86 @@ contain respective protocol layer.
|  ``mask`` | Bit-mask applied to new_val   
|

+---+---+
 
+Action: ``MPLS_TTL_DEC``
+
+
+Decrement MPLS TTL, only applies to packets that contain specific MPLS
+headers.
+
+.. _table_rte_flow_action_mpls_ttl_dec:
+
+.. table:: MPLS_TTL_DEC
+
+   +---+-+
+   | Field | Value   |
+   +===+=+
+   | ``dir_level`` | Specify the level of MPLS header.   |
+   |   | direction (1b)  |
+   |   | 0: match start from outermost.   

[dpdk-dev] [PATCH v3 1/4] ethdev: add more protocol support in flow API

[Qi Zhang]

Add new protocol header match support as below

RTE_FLOW_ITEM_TYPE_ARP_IPV4
- matches an IPv4 ARP header
RTE_FLOW_ITEM_TYPE_IPV6_EXT
- matches an IPv6 extension header with any type.
RTE_FLOW_ITEM_TYPE_ICMP6
- matches an ICMPv6 header followed by any message body.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_NS
- matches an ICMPv6 header followed by network discovery
  neighbor solicitation.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_NA
- matches an ICMPv6 header followed by network discovery
  neighbor advertisement.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_OPT_ETH_SLA
- matches an ICMPv6 header followed by network discovery
  neighbor solicitation contains source Ethernet link-layer
  address option.
RTE_FLOW_ITEM_TYPE_ICMP6_ND_OPT_ETH_TLA
- matches an ICMPv6 header followed by network discovery
  neighbor advertisement contains target Ethernet link-layer
  address option.

Suggested-by: Adrien Mazarguil 
Signed-off-by: Qi Zhang 
---
 app/test-pmd/cmdline_flow.c | 224 ++
 app/test-pmd/config.c   |   9 ++
 doc/guides/prog_guide/rte_flow.rst  |  88 +++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  34 
 lib/librte_ether/rte_flow.h | 235 
 5 files changed, 590 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 59f3b3b57..7950b1b8d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -150,6 +150,26 @@ enum index {
ITEM_GENEVE,
ITEM_GENEVE_VNI,
ITEM_GENEVE_PROTO,
+   ITEM_ARP_IPV4,
+   ITEM_ARP_IPV4_SHA,
+   ITEM_ARP_IPV4_SIP,
+   ITEM_ARP_IPV4_THA,
+   ITEM_ARP_IPV4_TIP,
+   ITEM_IPV6_EXT,
+   ITEM_IPV6_EXT_NEXT_HDR,
+   ITEM_ICMP6,
+   ITEM_ICMP6_TYPE,
+   ITEM_ICMP6_CODE,
+   ITEM_ICMP6_ND_NS,
+   ITEM_ICMP6_ND_NS_TGT_ADDR,
+   ITEM_ICMP6_ND_NA,
+   ITEM_ICMP6_ND_NA_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_SLA_ETH,
+   ITEM_ICMP6_ND_OPT_SLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_SLA_ETH_SLL_ADDR,
+   ITEM_ICMP6_ND_OPT_TLA_ETH,
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TLL_ADDR,
 
/* Validate/create actions. */
ACTIONS,
@@ -436,6 +456,13 @@ static const enum index next_item[] = {
ITEM_GTPC,
ITEM_GTPU,
ITEM_GENEVE,
+   ITEM_ARP_IPV4,
+   ITEM_IPV6_EXT,
+   ITEM_ICMP6,
+   ITEM_ICMP6_ND_NS,
+   ITEM_ICMP6_ND_NA,
+   ITEM_ICMP6_ND_OPT_SLA_ETH,
+   ITEM_ICMP6_ND_OPT_TLA_ETH,
ZERO,
 };
 
@@ -586,6 +613,47 @@ static const enum index item_geneve[] = {
ZERO,
 };
 
+static const enum index item_arp_ipv4[] = {
+   ITEM_ARP_IPV4_SHA,
+   ITEM_ARP_IPV4_SIP,
+   ITEM_ARP_IPV4_THA,
+   ITEM_ARP_IPV4_TIP,
+   ZERO,
+};
+
+static const enum index item_ipv6_ext[] = {
+   ITEM_IPV6_EXT_NEXT_HDR,
+   ZERO,
+};
+
+static const enum index item_icmp6[] = {
+   ITEM_ICMP6_TYPE,
+   ITEM_ICMP6_CODE,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_ns[] = {
+   ITEM_ICMP6_ND_NS_TGT_ADDR,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_na[] = {
+   ITEM_ICMP6_ND_NA_TGT_ADDR,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_opt_sla_eth[] = {
+   ITEM_ICMP6_ND_OPT_SLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_SLA_ETH_SLL_ADDR,
+   ZERO,
+};
+
+static const enum index item_icmp6_nd_opt_tla_eth[] = {
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TGT_ADDR,
+   ITEM_ICMP6_ND_OPT_TLA_ETH_TLL_ADDR,
+   ZERO,
+};
+
 static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -1473,6 +1541,162 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve,
 protocol)),
},
+   [ITEM_ARP_IPV4] = {
+   .name = "arp",
+   .help = "match IPv4 ARP header",
+   .priv = PRIV_ITEM(ARP_IPV4,
+ sizeof(struct rte_flow_item_arp_ipv4)),
+   .next = NEXT(item_arp_ipv4),
+   .call = parse_vc,
+   },
+   [ITEM_ARP_IPV4_SHA] = {
+   .name = "sha",
+   .help = "sender hardware address",
+   .next = NEXT(item_arp_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_ipv4,
+arp_sha.addr_bytes)),
+   },
+   [ITEM_ARP_IPV4_SIP] = {
+   .name = "sip",
+   .help = "sender IP address",
+   .next = NEXT(item_arp_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_ipv4,
+arp_sip)),
+   },
+   [ITEM_ARP_IPV4_THA] = {
+

[dpdk-dev] [PATCH v3 2/4] ethdev: add packet field set aciton in flow API

[Qi Zhang]

Add new action RTE_FLOW_ACTION_TYPE_FIELD_SET, it is used to
modify fields of specific protocol layer of the packet, the
action only apply on packets that contain the requireds protocol
layer.

Signed-off-by: Qi Zhang 
---
 doc/guides/prog_guide/rte_flow.rst | 30 +++
 lib/librte_ether/rte_flow.h| 42 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 99468bf60..68deb9812 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1574,6 +1574,36 @@ fields in the pattern items.
| 1 | END  |
+---+--+
 
+Action: ``FILED_SET``
+^
+
+Modify the value of fields in a protocol layer, only applies to packets that
+contain respective protocol layer.
+
+.. _table_rte_flow_action_field_set:
+
+.. table:: FIELD_SET
+
+   
+---+---+
+   | Field | Value 
|
+   
+===+===+
+   | ``type``  | Specify the type of a protocol layer. (see 
RTE_FLOW_ITEM_TYPE_*)  |
+   
+---+---+
+   | ``dir_level`` | Specify the level of matched protocol layer.  
|
+   |   | direction (1b)
|
+   |   | 0: match start from outermost.
|
+   |   | 1: match start from innermost.
|
+   |   | level: (31b)  
|
+   |   | 0: outermost or innermost protocol layer that matched 
@type   |
+   |   | 1: next to outmost or innermost protocol layer that 
matched @type |
+   |   | 2: and so on ...  
|
+   
+---+---+
+   |  ``new_val``  | Pointer to specific data structure according to protocol 
type,|
+   |   | the content is the new value to updtae.   
|
+   
+---+---+
+   |  ``mask`` | Bit-mask applied to new_val   
|
+   
+---+---+
+
 Negative types
 ~~
 
diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
index f84bbfda5..2dc95b6b8 100644
--- a/lib/librte_ether/rte_flow.h
+++ b/lib/librte_ether/rte_flow.h
@@ -1245,7 +1245,15 @@ enum rte_flow_action_type {
 *
 * See struct rte_flow_action_security.
 */
-   RTE_FLOW_ACTION_TYPE_SECURITY
+   RTE_FLOW_ACTION_TYPE_SECURITY,
+
+   /**
+* Modify the value of fields in a protocol layer, only applies to
+* packets that contain respective protocol layer.
+*
+* See struct rte_flow_action_field_set.
+*/
+   RTE_FLOW_ACTION_TYPE_FIELD_SET,
 };
 
 /**
@@ -1384,6 +1392,38 @@ struct rte_flow_action_security {
 };
 
 /**
+ * RTE_FLOW_ACTION_TYPE_FIELD_SET
+ *
+ * Modify the value of fields in a protocol layer, only applies to
+ * packets that contain respective protocol layer.
+ */
+struct rte_flow_action_field_set {
+   /**
+* Specify the type of a protocol layer.
+*/
+   enum rte_flow_item_type type;
+   /**
+* Specify the level of matched protocol layer.
+*
+* direction (1b)
+* 0: match start from outermost.
+* 1: match start from innermost.
+*
+* level (31b)
+* 0: outermost|innermost protocol layer that matched @type.
+* 1: next to outermost|innermost protocol layer that matched @type.
+* 2: and so on ...
+*/
+   uint32_t dir_level;
+   /**
+* Pointer to specific data structure according to protocol type,
+* the content is the new value to update.
+*/
+   const void *new_val;
+   const void *mask; /**< Bit-mask applied to new_val. */
+};
+
+/**
  * Definition of a single action.
  *
  * A list of actions is terminated by a END action.
-- 
2.13.6

[dpdk-dev] [PATCH v3 4/4] ethdev: add VLAN and MPLS pop push action in flow API

[Qi Zhang]

Add couple Openflow frienldy VLAN/MPLS push/pop actions.

RTE_FLOW_ACTION_VLAN_POP - pop a VLAN header.
RTE_FLOW_ACTION_VLAN_PUSH - push a VLAN header.
RTE_FLOW_ACTION_MPLS_POP - pop a MPLS header.
RTE_FLOW_ACTION_MPLS_PUSH - push a MPLS header.

Signed-off-by: Qi Zhang 
---
 app/test-pmd/cmdline_flow.c | 82 +
 doc/guides/prog_guide/rte_flow.rst  | 69 
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 +
 lib/librte_ether/rte_flow.h | 71 +
 4 files changed, 236 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 417cbecc9..736d79bef 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -201,6 +201,13 @@ enum index {
ACTION_IP_TTL_DEC_LVL,
ACTION_TTL_COPY_OUT,
ACTION_TTL_COPY_IN,
+   ACTION_VLAN_POP,
+   ACTION_VLAN_PUSH,
+   ACTION_VLAN_PUSH_TYPE,
+   ACTION_MPLS_POP,
+   ACTION_MPLS_POP_TYPE,
+   ACTION_MPLS_PUSH,
+   ACTION_MPLS_PUSH_TYPE,
 };
 
 /** Size of pattern[] field in struct rte_flow_item_raw. */
@@ -678,6 +685,10 @@ static const enum index next_action[] = {
ACTION_IP_TTL_DEC,
ACTION_TTL_COPY_OUT,
ACTION_TTL_COPY_IN,
+   ACTION_VLAN_POP,
+   ACTION_VLAN_PUSH,
+   ACTION_MPLS_POP,
+   ACTION_MPLS_PUSH,
ZERO,
 };
 
@@ -728,6 +739,21 @@ static const enum index action_ip_ttl_dec[] = {
ZERO,
 };
 
+static const enum index action_vlan_push[] = {
+   ACTION_VLAN_PUSH_TYPE,
+   ZERO,
+};
+
+static const enum index action_mpls_pop[] = {
+   ACTION_MPLS_POP_TYPE,
+   ZERO,
+};
+
+static const enum index action_mpls_push[] = {
+   ACTION_MPLS_PUSH_TYPE,
+   ZERO,
+};
+
 static int parse_init(struct context *, const struct token *,
  const char *, unsigned int,
  void *, unsigned int);
@@ -1921,6 +1947,62 @@ static const struct token token_list[] = {
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc,
},
+
+   [ACTION_VLAN_POP] = {
+   .name = "vlan_pop",
+   .help = "pop the outermost VLAN header.",
+   .priv = PRIV_ACTION(DROP, 0),
+   .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+   .call = parse_vc,
+   },
+   [ACTION_VLAN_PUSH] = {
+   .name = "vlan_push",
+   .help = "push new VLAN header onto the packet",
+   .priv = PRIV_ACTION(VLAN_PUSH,
+   sizeof(struct rte_flow_action_vlan_push)),
+   .next = NEXT(action_vlan_push),
+   .call = parse_vc,
+   },
+   [ACTION_VLAN_PUSH_TYPE] = {
+   .name = "type",
+   .help = "Ethertype of VLAN header",
+   .next = NEXT(action_vlan_push, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_vlan_push,
+   ether_type)),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_POP] = {
+   .name = "mpls_pop",
+   .help = "pop the outermost MPLS header",
+   .priv = PRIV_ACTION(MPLS_POP,
+   sizeof(struct rte_flow_action_mpls_pop)),
+   .next = NEXT(action_mpls_pop),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_POP_TYPE] = {
+   .name = "type",
+   .help = "Ethertype of MPLS header",
+   .next = NEXT(action_mpls_pop, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mpls_pop,
+   ether_type)),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_PUSH] = {
+   .name = "mpls_push",
+   .help = "push new MPLS header onto the packet",
+   .priv = PRIV_ACTION(MPLS_PUSH,
+   sizeof(struct rte_flow_action_mpls_push)),
+   .next = NEXT(action_mpls_push),
+   .call = parse_vc,
+   },
+   [ACTION_MPLS_PUSH_TYPE] = {
+   .name = "type",
+   .help = "Ethertype of MPLS header",
+   .next = NEXT(action_mpls_push, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mpls_push,
+   ether_type)),
+   .call = parse_vc,
+   },
 };
 
 /** Remove and return last entry from argument stack. */
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 65f2d4a16..a009f1aac 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1684,6 +1684,75 @@ required MPLS or IP headers.
| no properties |
+---+
 
+Action: ``ACTION_VLAN_POP``
+^^^
+
+Pop the outer-most VLAN header from the packet.
+
+.. 

Re: [dpdk-dev] Problem with using VF: Initialization Failure: -15

[Weglicki, MichalX]

Hello, 

Yes, sorry, the code flow I've presented was taken from investigation of 
vfio_pci, but I'm not sure which hardware exactly (I've tested also some other 
HWs). If it still doesn't make sense, maybe those are wrong assumptions. 

Should I resent this question to u...@dpdk.org ? I don't want to cause 
confusion now when it's here already.

Br,
Michal. 

> -Original Message-
> From: Rosen, Rami
> Sent: Friday, April 13, 2018 9:03 AM
> To: Weglicki, MichalX ; dev@dpdk.org
> Subject: RE: Problem with using VF: Initialization Failure: -15
> 
> Hi, Michal,
> 
> First, I believe that such questions suit better to the dpdk-users mailing 
> list.
> 
> >I've investigated the issue, and the problem is with:
> >diag = hw->mac.ops.reset_hw(hw);
> >which calls:
> >e1000_reset_hw_vf
> >and it calls:
> >e1000_read_posted_mbx
> >Which returns: E1000_ERR_MBX (-15)
> 
> Are you sure about it ? the path that you present in your investigation
> is from drivers/net/e1000, whereas the test that you ran is on top of ixgbe,
> which has a different PMD driver (drivers/net/ixgbe). The setup that you 
> describe does not use e1000 device at all, according to my
> understanding.
> 
> Regards,
> Rami Rosen
> 
> 
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Weglicki, MichalX
> Sent: Wednesday, April 11, 2018 15:01
> To: dev@dpdk.org
> Subject: [dpdk-dev] Problem with using VF: Initialization Failure: -15
> 
> Hello,
> 
> I'm trying to test very simple scenario, creating two VFs and testing it with 
> test-pmd. Unfortunately I can't make it to work DPDK
> Version: v17.11 (I've checked also 18.02)
> NIC: Niantic 82599ES 10-Gigabit SFI/SFP+ Network Connection 10fb
> Kernel: 4.4.0-116-generic #140-Ubuntu SMP Mon Feb 12 21:23:04 UTC 2018 x86_64 
> x86_64 x86_64 GNU/Linux
> 
> Steps:
> Creating two VFs. Binding each VF to a driver (I also tried vfio_pci with 
> same results):
> ../dpdk/usertools/dpdk-devbind.py --bind=igb_uio :81:10.0 
> ../dpdk/usertools/dpdk-devbind.py --bind=igb_uio :81:10.1
> 
> ./testpmd -c 0x3 -n 4 --socket-mem 512 -- --burst=64 -i --txqflags=0xf00 
> --disable-hw-vlan
> EAL: Detected 56 lcore(s)
> EAL: Probing VFIO support...
> EAL: VFIO support initialized
> EAL: PCI device :03:00.0 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:1521 net_e1000_igb
> EAL: PCI device :03:00.3 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:1521 net_e1000_igb
> EAL: PCI device :05:00.0 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10fb net_ixgbe
> EAL: PCI device :05:00.1 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10fb net_ixgbe
> EAL: PCI device :81:00.0 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10fb net_ixgbe
> EAL: PCI device :81:00.1 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10fb net_ixgbe
> EAL: PCI device :81:10.0 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10ed net_ixgbe_vf
> PMD: eth_ixgbevf_dev_init(): VF Initialization Failure: -15
> EAL: Requested device :81:10.0 cannot be used
> EAL: PCI device :81:10.1 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10ed net_ixgbe_vf
> PMD: eth_ixgbevf_dev_init(): VF Initialization Failure: -15
> EAL: Requested device :81:10.1 cannot be used
> EAL: PCI device :83:00.0 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10fb net_ixgbe
> EAL: PCI device :83:00.1 on NUMA socket -1
> EAL:   Invalid NUMA socket, default to 0
> EAL:   probe driver: 8086:10fb net_ixgbe
> EAL: No probed ethernet devices
> Interactive-mode selected
> 
> I've investigated the issue, and the problem is with:
> diag = hw->mac.ops.reset_hw(hw);
> which calls:
> e1000_reset_hw_vf
> and it calls:
> e1000_read_posted_mbx
> Which returns: E1000_ERR_MBX (-15)
> 
> Is this common issue, or some configuration problem?
> 
> Thank you all in advance.
> 
> Br,
> Michal.

[dpdk-dev] [v2, 1/3] cryptodev: set private data for session-less mode

[Abhinandan Gujjar]

The application may want to store private data along with the
rte_crypto_op that is transparent to the rte_cryptodev layer.
For e.g., If an eventdev based application is submitting a
crypto session-less operation and wants to indicate event
information required to construct a new event that will be
enqueued to eventdev after completion of the crypto
operation. This patch provides a mechanism for the application
to associate this information with the rte_crypto_op in
session-less mode.

Signed-off-by: Abhinandan Gujjar 
Signed-off-by: Nikhil Rao 
Acked-by: Pablo de Lara 
---
 lib/librte_cryptodev/rte_crypto.h | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/librte_cryptodev/rte_crypto.h 
b/lib/librte_cryptodev/rte_crypto.h
index 95cf861..2540426 100644
--- a/lib/librte_cryptodev/rte_crypto.h
+++ b/lib/librte_cryptodev/rte_crypto.h
@@ -84,8 +84,14 @@ struct rte_crypto_op {
 */
uint8_t sess_type;
/**< operation session type */
+   uint16_t private_data_offset;
+   /**< Offset to indicate start of private data (if any). The offset
+* is counted from the start of the rte_crypto_op including IV.
+* The private data may be used by the application to store
+* information which should remain untouched in the library/driver
+*/
 
-   uint8_t reserved[5];
+   uint8_t reserved[3];
/**< Reserved bytes to fill 64 bits for future additions */
struct rte_mempool *mempool;
/**< crypto operation mempool which operation is allocated from */
-- 
1.9.1

[dpdk-dev] [v2, 2/3] cryptodev: support session private data setting

[Abhinandan Gujjar]

The application may want to store private data along with the
rte_cryptodev that is transparent to the rte_cryptodev layer.
For e.g., If an eventdev based application is submitting a
rte_cryptodev_sym_session operation and wants to indicate event
information required to construct a new event that will be
enqueued to eventdev after completion of the rte_cryptodev_sym_session
operation. This patch provides a mechanism for the application
to associate this information with the rte_cryptodev_sym_session session.
The application can set the private data using
rte_cryptodev_sym_session_set_private_data() and retrieve it using
rte_cryptodev_sym_session_get_private_data().

Signed-off-by: Abhinandan Gujjar 
Signed-off-by: Nikhil Rao 
Acked-by: Pablo de Lara 
---
 lib/librte_cryptodev/rte_cryptodev.c   | 43 +++---
 lib/librte_cryptodev/rte_cryptodev.h   | 32 +++
 lib/librte_cryptodev/rte_cryptodev_version.map |  7 +
 3 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/lib/librte_cryptodev/rte_cryptodev.c 
b/lib/librte_cryptodev/rte_cryptodev.c
index 8745b6b..2a95a35 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -1099,8 +1099,10 @@ struct rte_cryptodev_sym_session *
return NULL;
}
 
-   /* Clear device session pointer */
-   memset(sess, 0, (sizeof(void *) * nb_drivers));
+   /* Clear device session pointer.
+* Include the flag indicating presence of private data
+*/
+   memset(sess, 0, (sizeof(void *) * nb_drivers) + sizeof(uint8_t));
 
return sess;
 }
@@ -1204,9 +1206,10 @@ struct rte_cryptodev_sym_session *
 {
/*
 * Header contains pointers to the private data
-* of all registered drivers
+* of all registered drivers, and a flag which
+* indicates presence of private data
 */
-   return (sizeof(void *) * nb_drivers);
+   return ((sizeof(void *) * nb_drivers) + sizeof(uint8_t));
 }
 
 unsigned int
@@ -1238,6 +1241,38 @@ struct rte_cryptodev_sym_session *
 
 }
 
+int __rte_experimental
+rte_cryptodev_sym_session_set_private_data(
+   struct rte_cryptodev_sym_session *sess,
+   void *data,
+   uint16_t size)
+{
+   uint16_t off_set = sizeof(void *) * nb_drivers;
+   uint8_t *private_data_present = (uint8_t *)sess + off_set;
+
+   if (sess == NULL)
+   return -EINVAL;
+
+   *private_data_present = 1;
+   off_set += sizeof(uint8_t);
+   rte_memcpy((uint8_t *)sess + off_set, data, size);
+   return 0;
+}
+
+void * __rte_experimental
+rte_cryptodev_sym_session_get_private_data(
+   struct rte_cryptodev_sym_session *sess)
+{
+   uint16_t off_set = sizeof(void *) * nb_drivers;
+   uint8_t *private_data_present = (uint8_t *)sess + off_set;
+
+   if (sess == NULL || !*private_data_present)
+   return NULL;
+
+   off_set += sizeof(uint8_t);
+   return (uint8_t *)sess + off_set;
+}
+
 /** Initialise rte_crypto_op mempool element */
 static void
 rte_crypto_op_init(struct rte_mempool *mempool,
diff --git a/lib/librte_cryptodev/rte_cryptodev.h 
b/lib/librte_cryptodev/rte_cryptodev.h
index c8fa689..261a359 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -1037,6 +1037,38 @@ struct rte_cryptodev_sym_session *
  */
 const char *rte_cryptodev_driver_name_get(uint8_t driver_id);
 
+/**
+ * Set private data for a session.
+ *
+ * @param  sessSession pointer allocated by
+ * *rte_cryptodev_sym_session_create*.
+ * @param  dataPointer to the private data.
+ * @param  sizeSize of the private data.
+ *
+ * @return
+ *  - On success, zero.
+ *  - On failure, a negative value.
+ */
+int __rte_experimental
+rte_cryptodev_sym_session_set_private_data(
+   struct rte_cryptodev_sym_session *sess,
+   void *data,
+   uint16_t size);
+
+/**
+ * Get private data of a session.
+ *
+ * @param  sessSession pointer allocated by
+ * *rte_cryptodev_sym_session_create*.
+ *
+ * @return
+ *  - On success return pointer to private data.
+ *  - On failure returns NULL.
+ */
+void * __rte_experimental
+rte_cryptodev_sym_session_get_private_data(
+   struct rte_cryptodev_sym_session *sess);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map 
b/lib/librte_cryptodev/rte_cryptodev_version.map
index eb47308..560e464 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -85,3 +85,10 @@ DPDK_17.11 {
rte_

[dpdk-dev] [v3,3/3] doc: add private data info in crypto guide

[Abhinandan Gujjar]

Signed-off-by: Abhinandan Gujjar 
Acked-by: Akhil Goyal 
---
 doc/guides/prog_guide/cryptodev_lib.rst | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/doc/guides/prog_guide/cryptodev_lib.rst 
b/doc/guides/prog_guide/cryptodev_lib.rst
index 066fe2d..b279a20 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -299,6 +299,33 @@ directly from the devices processed queue, and for virtual 
device's from a
 enqueue call.
 
 
+Private data
+
+For session-based operations, the set and get API provides a mechanism for an
+application to store and retrieve the private data information stored along 
with
+the crypto session.
+
+For example, suppose an application is submitting a crypto operation with a 
session
+associated and wants to indicate private data information which is required to 
be
+used after completion of the crypto operation. In this case, the application 
can use
+the set API to set the private data and retrieve it using get API.
+
+.. code-block:: c
+
+   int rte_cryptodev_sym_session_set_private_data(
+   struct rte_cryptodev_sym_session *sess, void *data, uint16_t 
size);
+
+   void * rte_cryptodev_sym_session_get_private_data(
+   struct rte_cryptodev_sym_session *sess);
+
+
+For session-less mode, the private data information can be placed along with 
the
+``struct rte_crypto_op``. The ``rte_crypto_op::private_data_offset`` indicates 
the
+start of private data information. The offset is counted from the start of the
+rte_crypto_op including other crypto information such as the IVs (since there 
can
+be an IV also for authentication).
+
+
 Enqueue / Dequeue Burst APIs
 
 
-- 
1.9.1