[dpdk-dev] [RFC] testpmd: handle UFO packets

[Jianfeng Tan]

Mostly likely, we will make UFO as a kind of GSO engine.

For short term, we can just call APIs in librte_ip_frag to fragment.

To test:

1. start testpmd with two vhost port.
 $ set fwd csum
 $ start

2. start vm0 connected to vhost0;
 $ ifconfig xxx 1.1.1.1/24 up
 $ ethtool -K xxx ufo on

3. start vm1 connected to vhost1;
 $ ifconfig xxx 1.1.1.2/24 up
 $ ethtool -K xxx ufo on
 $ (Fill a large file named 1.txt)
 $ cat 1.txt | socat - udp-sendto:1.1.1.1:5000

Signed-off-by: Jianfeng Tan 
---
 app/test-pmd/csumonly.c | 98 +
 1 file changed, 98 insertions(+)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 5f5ab64..3e4c414 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "testpmd.h"
 
@@ -574,6 +575,75 @@ pkt_copy_split(const struct rte_mbuf *pkt)
return md[0];
 }
 
+static inline void
+frag_v4_fixup(const struct rte_mbuf *ms, struct rte_mbuf *mf)
+{
+   struct ipv4_hdr *l3h;
+
+   mf->ol_flags = ms->ol_flags;
+   mf->tx_offload = ms->tx_offload;
+
+   if ((ms->ol_flags & PKT_TX_IP_CKSUM) == 0) {
+   l3h = rte_pktmbuf_mtod(mf, struct ipv4_hdr *);
+   l3h->hdr_checksum = rte_ipv4_cksum(l3h);
+   }
+}
+
+/*
+ * Returns negative for failure to fragment or actual number of fragments.
+ */
+static inline int
+fragment(struct rte_mbuf *m, struct rte_mbuf *frag[], uint32_t num)
+{
+   void *l2;
+   int l2_len;
+   int32_t frag_num, i;
+   uint16_t ether_type;
+   struct ether_hdr *eth_hdr;
+
+   eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); 
+   ether_type = eth_hdr->ether_type;
+   m->l2_len = sizeof(*eth_hdr);
+   if (ether_type == ETHER_TYPE_VLAN) {
+   struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1); 
+   ether_type = rte_be_to_cpu_16(vlan_hdr->eth_proto);
+   m->l2_len += sizeof(struct vlan_hdr);
+   }
+   l2_len = m->l2_len;
+
+   /* store the l2 header */
+   uint8_t l2_hdr[l2_len];
+   rte_memcpy(l2_hdr, eth_hdr, l2_len);
+
+   /* Remove the l2 header from the input packet */
+   rte_pktmbuf_adj(m, l2_len);
+
+   if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+   frag_num = rte_ipv4_fragment_packet(m, frag, num,
+   m->tso_segsz, current_fwd_lcore()->mbp,
+   current_fwd_lcore()->mbp);
+   else
+   frag_num = rte_ipv6_fragment_packet(m, frag, num,
+   m->tso_segsz, current_fwd_lcore()->mbp,
+   current_fwd_lcore()->mbp);
+
+   if (frag_num > 0) {
+   for (i = 0; i != frag_num; i++) {
+
+   if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+   frag_v4_fixup(m, frag[i]);
+
+   /* Move data_off to include l2 header first */
+   l2 = rte_pktmbuf_prepend(frag[i], l2_len);
+
+   /* copy l2 header into fragmented packet */
+   rte_memcpy(l2, l2_hdr, l2_len);
+   }
+   }
+
+   return frag_num;
+}
+
 /*
  * Receive a burst of packets, and for each packet:
  *  - parse packet, and try to recognize a supported packet type (1)
@@ -603,6 +673,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 {
struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
struct rte_mbuf *gso_segments[GSO_MAX_PKT_BURST];
+   struct rte_mbuf *ufo_segments[GSO_MAX_PKT_BURST];
struct rte_gso_ctx *gso_ctx;
struct rte_mbuf **tx_pkts_burst;
struct rte_port *txp;
@@ -656,6 +727,32 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
if (gso_ports[fs->tx_port].enable)
info.gso_enable = 1;
 
+   nb_segments = 0;
+   for (i = 0; i < nb_rx; ++i) {
+   m = pkts_burst[i];
+   if (!(m->ol_flags & PKT_TX_UDP_SEG)) {
+   ufo_segments[nb_segments++] = m;
+   continue;
+   }
+
+   ret = fragment(m, &ufo_segments[nb_segments],
+   RTE_DIM(ufo_segments) - nb_segments);
+   if (ret <= 0) {
+   printf("ip frag failed %s\n", strerror(-ret));
+   rte_pktmbuf_free(m);
+   continue;
+   }
+   nb_segments += ret;
+   /* free the original packet */
+   rte_pktmbuf_free(m);
+   }
+
+   nb_rx = RTE_MIN(nb_segments, MAX_PKT_BURST);
+   for (i = 0; i < nb_rx; i++)
+   pkts_burst[i] = ufo_segments[i];
+   for (i = nb_rx; i < nb_segments; ++i)
+   rte_pktmbuf_free(ufo_segments[i]);
+
for (i = 0; i < nb_rx; i++) {
if (likely(i < nb_rx - 1))
rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1

[dpdk-dev] [PATCH v2 2/7] crpyto/virtio: add crypto related session structure

[Jay Zhou]

This structure will be used in the following patches, especially
at creating and destroying crypto sessions.

Signed-off-by: Jay Zhou 
---
 drivers/crypto/virtio/virtio_crypto_algs.h | 27 +++
 1 file changed, 27 insertions(+)
 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..5f1e9df
--- /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_ */
-- 
1.8.3.1

[dpdk-dev] [PATCH v2 1/7] crypto/virtio: add virtio related fundamental functions

[Jay Zhou]

Since there are not have the common virtio library, we have to put
these files here. They are basically the same with virtio net related files
with some minor changes.

Signed-off-by: Jay Zhou 
---
 config/common_base  |  20 ++
 drivers/crypto/virtio/virtio_logs.h |  47 
 drivers/crypto/virtio/virtio_pci.c  | 460 
 drivers/crypto/virtio/virtio_pci.h  | 252 
 drivers/crypto/virtio/virtio_ring.h | 137 +++
 drivers/crypto/virtio/virtqueue.c   |  43 
 drivers/crypto/virtio/virtqueue.h   | 176 ++
 7 files changed, 1135 insertions(+)
 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/virtqueue.c
 create mode 100644 drivers/crypto/virtio/virtqueue.h

diff --git a/config/common_base b/config/common_base
index ad03cf4..19d0cdd 100644
--- a/config/common_base
+++ b/config/common_base
@@ -482,6 +482,26 @@ 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
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_INIT=n
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_SESSION=n
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_TX=n
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_RX=n
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_DRIVER=n
+CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_DUMP=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/drivers/crypto/virtio/virtio_logs.h 
b/drivers/crypto/virtio/virtio_logs.h
new file mode 100644
index 000..20582a4
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_logs.h
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#ifndef _VIRTIO_LOGS_H_
+#define _VIRTIO_LOGS_H_
+
+#include 
+
+#ifdef RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_INIT
+#define PMD_INIT_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
+#else
+#define PMD_INIT_LOG(level, fmt, args...) do { } while (0)
+#define PMD_INIT_FUNC_TRACE() do { } while (0)
+#endif
+
+#ifdef RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_SESSION
+#define PMD_SESSION_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s() session: " fmt "\n", __func__, ## args)
+#else
+#define PMD_SESSION_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+#ifdef RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_RX
+#define PMD_RX_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s() rx: " fmt "\n", __func__, ## args)
+#else
+#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+#ifdef RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_TX
+#define PMD_TX_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s() tx: " fmt "\n", __func__, ## args)
+#else
+#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+#ifdef RTE_LIBRTE_PMD_VIRTIO_CRYPTO_DEBUG_DRIVER
+#define PMD_DRV_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s(): driver " fmt "\n", __func__, ## args)
+#else
+#define PMD_DRV_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+#endif /* _VIRTIO_LOGS_H_ */
diff --git a/drivers/crypto/virtio/virtio_pci.c 
b/drivers/crypto/virtio/virtio_pci.c
new file mode 100644
index 000..7aa5cdd
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_pci.c
@@ -0,0 +1,460 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#include 
+
+#ifdef RTE_EXEC_ENV_LINUXAPP
+ #include 
+ #include 
+#endif
+
+#include 
+#include 
+
+#include "virtio_pci.h"
+#include "virtqueue.h"
+
+/*
+ * Following macros are derived from linux/pci_regs.h, however,
+ * we can't simply include that header here, as there is no such
+ * file for non-Linux platform.
+ */
+#define PCI_CAPABILITY_LIST0x34
+#define PCI_CAP_ID_VNDR0x09
+#define PCI_CAP_ID_MSIX0x11
+
+/*
+ * The remaining space is defined by each driver as the per-driver
+ * configuration space.
+ */
+#define VIRTIO_PCI_CONFIG(hw) \
+   (((hw)->use_msix == VIRTIO_MSIX_ENABLED) ? 24 : 20)
+
+static inline int
+check_vq_phys_addr_ok(struct virtqueue *vq)
+{
+   /* Virtio PCI device VIRTIO_PCI_QUEUE_PF register is 32bit,
+* and only accepts 32 bit page frame number.
+* Check if the allocated physical memory exceeds 16TB.
+*/
+   if ((vq->vq_ring_mem + vq->vq_ring_size - 1) >>
+   (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32)) {
+   PMD_INIT_LOG(ERR, "vring a

[dpdk-dev] [PATCH v2 6/7] cryptodev: add function tests for virtio crypto PMD

[Jay Zhou]

Only RTE_CRYPTO_CIPHER_AES_CBC and RTE_CRYPTO_CIPHER_AES_CTR cipher
algorithms are tested now, it is limited by the cryptodev-backend-builtin
of qemu side.

Signed-off-by: Jay Zhou 
---
 test/test/test_cryptodev.c  | 49 +
 test/test/test_cryptodev.h  |  1 +
 test/test/test_cryptodev_aes_test_vectors.h | 45 +-
 test/test/test_cryptodev_blockcipher.c  |  9 +-
 test/test/test_cryptodev_blockcipher.h  |  1 +
 5 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 1417482..357e1df 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -1765,6 +1765,26 @@ 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;
@@ -8767,6 +8787,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,
@@ -9664,6 +9696,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(
@@ -9879,3 +9927,4 @@ struct test_crypto_vector {
 REGISTER_TEST_COMMAND(cryptodev_sw_mrvl_autotest, test_cryptodev_mrvl);
 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_virtio_autotest, test_cryptodev_virtio);
diff --git a/test/test/test_cryptodev.h b/test/test/test_cryptodev.h
index 8cdc087..c311277 100644
--- a/test/test/test_cryptodev.h
+++ b/test/test/test_cryptodev.h
@@ -61,6 +61,7 @@
 #define CRYPTODEV_NAME_DPAA2_SEC_PMD   crypto_dpaa2_sec
 #define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
 #define CRYPTODEV_NAME_MRVL_PMDcrypto_mrvl
+#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 3577ef4..5e33b51 100644
--- a/test/test/test_cryptodev_aes_test_vectors.h
+++ b/test/test/test_cryptodev_aes_test_vectors.h
@@ -1249,7 +1249,8 @@
BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-   BLOCKCIPHER_TEST_TARGET_PMD_MRVL
+   BLOCKCIPHER_TEST_TARGET_PMD_MRVL |
+   BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO
},
{
.test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
@@ -1526,7 +1527,8 @@
BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-   BLOCKCIPHER_TEST_TARGET_PMD_MRVL
+   BLOCKCIPHER_TEST_TARGET_PMD_MRVL |
+   BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO
},
{
.test_descr = "AES-128-CBC Decryption",
@@ -1538,7 +1540,8 @@
BLOCKCIPHER_TEST_TARGET_P

[dpdk-dev] [PATCH v2 0/7] crypto: add virtio poll mode driver

[Jay Zhou]

This patch series introduce virtio crypto poll mode driver.

Since it is limited by the 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)
  - RTE_CRYPTO_CIPHER_AES_CTR (128-bit, 192-bit and 256-bit keys)

Firstly build QEMU with libgcrypt cryptography support.
QEMU can then be started using the following parameters:
qemu-system-x86_64 \
[...] \
-object cryptodev-backend-builtin,id=cryptodev0 \
-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 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
  8) TestCase AES-128-CTR Encryption PASS
  9) TestCase AES-128-CTR Decryption PASS
  10) TestCase AES-192-CTR Encryption PASS
  11) TestCase AES-192-CTR Decryption PASS
  12) TestCase AES-256-CTR Encryption PASS
  13) TestCase AES-256-CTR 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

Please help to review, thanks!

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 (7):
  crypto/virtio: add virtio related fundamental functions
  crpyto/virtio: add crypto related session structure
  cryptodev/virtio: core code of crypto devices
  crypto/virtio: add makefile
  cryptodev: add document for virtio crypto PMD
  cryptodev: add function tests for virtio crypto PMD
  MAINTAINERS: add myself as virtio crypto PMD maintainer

 MAINTAINERS|6 +
 config/common_base |   20 +
 doc/guides/cryptodevs/features/virtio.ini  |   20 +
 doc/guides/cryptodevs/virtio.rst   |   93 ++
 drivers/crypto/Makefile|1 +
 drivers/crypto/virtio/Makefile |   31 +
 .../virtio/rte_pmd_virtio_crypto_version.map   |3 +
 drivers/crypto/virtio/virtio_crypto_algs.h |   27 +
 drivers/crypto/virtio/virtio_cryptodev.c   | 1544 
 drivers/crypto/virtio/virtio_cryptodev.h   |   66 +
 drivers/crypto/virtio/virtio_logs.h|   47 +
 drivers/crypto/virtio/virtio_pci.c |  460 ++
 drivers/crypto/virtio/virtio_pci.h |  252 
 drivers/crypto/virtio/virtio_ring.h|  137 ++
 drivers/crypto/virtio/virtio_rxtx.c|  533 +++
 drivers/crypto/virtio/virtqueue.c  |   43 +
 drivers/crypto/virtio/virtqueue.h  |  176 +++
 mk/rte.app.mk  |1 +
 test/test/test_cryptodev.c |   49 +
 test/test/test_cryptodev.h |1 +
 test/test/test_cryptodev_aes_test_vectors.h|   45 +-
 test/test/test_cryptodev_blockcipher.c |   

[dpdk-dev] [PATCH v2 3/7] cryptodev/virtio: core code of crypto devices

[Jay Zhou]

The idea comes from QAT and virtio-net devices.

Signed-off-by: Jay Zhou 
---
 drivers/crypto/virtio/virtio_cryptodev.c | 1544 ++
 drivers/crypto/virtio/virtio_cryptodev.h |   66 ++
 drivers/crypto/virtio/virtio_rxtx.c  |  533 +++
 3 files changed, 2143 insertions(+)
 create mode 100644 drivers/crypto/virtio/virtio_cryptodev.c
 create mode 100644 drivers/crypto/virtio/virtio_cryptodev.h
 create mode 100644 drivers/crypto/virtio/virtio_rxtx.c

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c 
b/drivers/crypto/virtio/virtio_cryptodev.c
new file mode 100644
index 000..8d84526
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -0,0 +1,1544 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#ifdef RTE_EXEC_ENV_LINUXAPP
+#include 
+#include 
+#endif
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include "virtio_cryptodev.h"
+#include "virtqueue.h"
+#include "virtio_crypto_algs.h"
+
+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 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,
+   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);
+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
+ */
+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;
+
+#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) {
+   PMD_SESSION_LOG(ERR, "session is NULL.");
+   return -EINVAL;
+   }
+   /* cipher only is supported, it is available if auth_key is NULL */
+   if (!cipher_key) {
+   PMD_SESSION_LOG(ERR, "cipher key is NULL.");
+   return -EINVAL;
+   }
+
+   head = vq->vq_desc_head_idx;
+   PMD_INIT_LOG(DEBUG, "vq->vq_desc_head_idx = %d, vq = %p", head, vq);
+
+   if (vq->vq_free_cnt < needed) {
+   PMD_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:
+   

[dpdk-dev] [PATCH v2 5/7] cryptodev: add document for virtio crypto PMD

[Jay Zhou]

Signed-off-by: Jay Zhou 
---
 doc/guides/cryptodevs/features/virtio.ini | 20 +++
 doc/guides/cryptodevs/virtio.rst  | 93 +++
 2 files changed, 113 insertions(+)
 create mode 100644 doc/guides/cryptodevs/features/virtio.ini
 create mode 100644 doc/guides/cryptodevs/virtio.rst

diff --git a/doc/guides/cryptodevs/features/virtio.ini 
b/doc/guides/cryptodevs/features/virtio.ini
new file mode 100644
index 000..43396ff
--- /dev/null
+++ b/doc/guides/cryptodevs/features/virtio.ini
@@ -0,0 +1,20 @@
+; 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 = N
+HW Accelerated = N
+Mbuf scatter gather= N
+
+;
+; Supported crypto algorithms of the 'virtio' crypto driver.
+;
+[Cipher]
+AES CBC (128)  = Y
+AES CBC (192)  = Y
+AES CBC (256)  = Y
+AES CTR (128)  = Y
+AES CTR (192)  = Y
+AES CTR (256)  = Y
diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst
new file mode 100644
index 000..8c06eb5
--- /dev/null
+++ b/doc/guides/cryptodevs/virtio.rst
@@ -0,0 +1,93 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2015-2016 Intel Corporation.
+
+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``
+* ``RTE_CRYPTO_CIPHER_AES_CTR``
+
+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 cipher only algorithms since the virtio backend of qemu side
+   only supports cipher only now.
+*  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 build QEMU with libgcrypt cryptography support.
+QEMU can then be started using the following parameters:
+
+.. code-block:: console
+
+qemu-system-x86_64 \
+[...] \
+-object cryptodev-backend-builtin,id=cryptodev0 \
+-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 test cases can be tested as below:
+
+.. code-block:: console
+
+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
+reserve enough huge pages
+run the tests with "./test"
+type the command "cryptodev_virtio_autotest" to test
-- 
1.8.3.1

[dpdk-dev] [PATCH v2 4/7] crypto/virtio: add makefile

[Jay Zhou]

The virtio crypto PMD driver can be compiled now.

Signed-off-by: Jay Zhou 
---
 drivers/crypto/Makefile|  1 +
 drivers/crypto/virtio/Makefile | 31 ++
 .../virtio/rte_pmd_virtio_crypto_version.map   |  3 +++
 mk/rte.app.mk  |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 drivers/crypto/virtio/Makefile
 create mode 100644 drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map

diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 628bd14..81f91f5 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -16,5 +16,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_MRVL_CRYPTO) += mrvl
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec
+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..c4727ea
--- /dev/null
+++ b/drivers/crypto/virtio/Makefile
@@ -0,0 +1,31 @@
+# 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) += 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:
+DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += lib/librte_eal
+DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += lib/librte_mempool 
lib/librte_mbuf
+DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += lib/librte_cryptodev
+
+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/mk/rte.app.mk b/mk/rte.app.mk
index 3eb41d1..4aaf93a 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -194,6 +194,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM)   += 
-L$(AESNI_MULTI_BUFFER_LIB_PATH)
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto
+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += -lrte_pmd_virtio_crypto 
-lcrypto
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G)  += -lrte_pmd_snow3g
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G)  += -L$(LIBSSO_SNOW3G_PATH)/build 
-lsso_snow3g
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI)  += -lrte_pmd_kasumi
-- 
1.8.3.1

[dpdk-dev] [PATCH v2 7/7] MAINTAINERS: add myself as virtio crypto PMD maintainer

[Jay Zhou]

Signed-off-by: Jay Zhou 
---
 MAINTAINERS | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4f1f33b..3efc8df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -718,6 +718,12 @@ 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/
+F: doc/guides/cryptodevs/virtio.rst
+F: doc/guides/cryptodevs/features/virtio.ini
+
 ZUC
 M: Pablo de Lara 
 F: drivers/crypto/zuc/
-- 
1.8.3.1

[dpdk-dev] [PATCH] net/enic: use memcpy to avoid strict aliasing warnings

[John Daley]

From: Hyong Youb Kim 

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 drivers/net/enic/enic_clsf.c | 21 -
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c
index 3ef1d0832..9d95201ec 100644
--- a/drivers/net/enic/enic_clsf.c
+++ b/drivers/net/enic/enic_clsf.c
@@ -111,7 +111,6 @@ copy_fltr_v2(struct filter_v2 *fltr, struct 
rte_eth_fdir_input *input,
 struct rte_eth_fdir_masks *masks)
 {
struct filter_generic_1 *gp = &fltr->u.generic_1;
-   int i;
 
fltr->type = FILTER_DPDK_1;
memset(gp, 0, sizeof(*gp));
@@ -273,18 +272,14 @@ copy_fltr_v2(struct filter_v2 *fltr, struct 
rte_eth_fdir_input *input,
ipv6_mask.proto = masks->ipv6_mask.proto;
ipv6_val.proto = input->flow.ipv6_flow.proto;
}
-   for (i = 0; i < 4; i++) {
-   *(uint32_t *)&ipv6_mask.src_addr[i * 4] =
-   masks->ipv6_mask.src_ip[i];
-   *(uint32_t *)&ipv6_val.src_addr[i * 4] =
-   input->flow.ipv6_flow.src_ip[i];
-   }
-   for (i = 0; i < 4; i++) {
-   *(uint32_t *)&ipv6_mask.dst_addr[i * 4] =
-   masks->ipv6_mask.src_ip[i];
-   *(uint32_t *)&ipv6_val.dst_addr[i * 4] =
-   input->flow.ipv6_flow.dst_ip[i];
-   }
+   memcpy(ipv6_mask.src_addr, masks->ipv6_mask.src_ip,
+  sizeof(ipv6_mask.src_addr));
+   memcpy(ipv6_val.src_addr, input->flow.ipv6_flow.src_ip,
+  sizeof(ipv6_val.src_addr));
+   memcpy(ipv6_mask.dst_addr, masks->ipv6_mask.dst_ip,
+  sizeof(ipv6_mask.dst_addr));
+   memcpy(ipv6_val.dst_addr, input->flow.ipv6_flow.dst_ip,
+  sizeof(ipv6_val.dst_addr));
if (input->flow.ipv6_flow.tc) {
ipv6_mask.vtc_flow = masks->ipv6_mask.tc << 12;
ipv6_val.vtc_flow = input->flow.ipv6_flow.tc << 12;
-- 
2.12.0

[dpdk-dev] [PATCH] net/enic: remove the VLAN filter handler

[John Daley]

From: Hyong Youb Kim 

VIC does not support VLAN filtering at the moment. The firmware does
accept the filter add/del commands and returns success. But, they are
no-ops. To avoid confusion, remove the filter set handler so the app
sees an error instead of silent failure.

Also during the device configure time, enicpmd_vlan_offload_set would
not print a warning message about unsupported VLAN filtering, because
the caller specifies only ETH_VLAN_STRIP_MASK. This is wrong, as we
should attempt to apply all requested offloads at the configure
time. So, pass all VLAN offload masks, which triggers a warning
message about VLAN filtering, if requested.

Finally, enicpmd_vlan_offload_set should check both mask and
rxmode.offloads, not just mask.

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 drivers/net/enic/enic_ethdev.c | 34 ++
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index bdbaf4cdf..e5523e311 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -318,40 +318,29 @@ static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev 
*eth_dev,
return enicpmd_dev_setup_intr(enic);
 }
 
-static int enicpmd_vlan_filter_set(struct rte_eth_dev *eth_dev,
-   uint16_t vlan_id, int on)
-{
-   struct enic *enic = pmd_priv(eth_dev);
-   int err;
-
-   ENICPMD_FUNC_TRACE();
-   if (on)
-   err = enic_add_vlan(enic, vlan_id);
-   else
-   err = enic_del_vlan(enic, vlan_id);
-   return err;
-}
-
 static int enicpmd_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)
 {
struct enic *enic = pmd_priv(eth_dev);
+   uint64_t offloads;
 
ENICPMD_FUNC_TRACE();
 
+   offloads = eth_dev->data->dev_conf.rxmode.offloads;
if (mask & ETH_VLAN_STRIP_MASK) {
-   if (eth_dev->data->dev_conf.rxmode.offloads &
-   DEV_RX_OFFLOAD_VLAN_STRIP)
+   if (offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
enic->ig_vlan_strip_en = 1;
else
enic->ig_vlan_strip_en = 0;
}
 
-   if (mask & ETH_VLAN_FILTER_MASK) {
+   if ((mask & ETH_VLAN_FILTER_MASK) &&
+   (offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
dev_warning(enic,
"Configuration of VLAN filter is not supported\n");
}
 
-   if (mask & ETH_VLAN_EXTEND_MASK) {
+   if ((mask & ETH_VLAN_EXTEND_MASK) &&
+   (offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)) {
dev_warning(enic,
"Configuration of extended VLAN is not supported\n");
}
@@ -362,6 +351,7 @@ static int enicpmd_vlan_offload_set(struct rte_eth_dev 
*eth_dev, int mask)
 static int enicpmd_dev_configure(struct rte_eth_dev *eth_dev)
 {
int ret;
+   int mask;
struct enic *enic = pmd_priv(eth_dev);
 
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -376,7 +366,11 @@ static int enicpmd_dev_configure(struct rte_eth_dev 
*eth_dev)
 
enic->hw_ip_checksum = !!(eth_dev->data->dev_conf.rxmode.offloads &
  DEV_RX_OFFLOAD_CHECKSUM);
-   ret = enicpmd_vlan_offload_set(eth_dev, ETH_VLAN_STRIP_MASK);
+   /* All vlan offload masks to apply the current settings */
+   mask = ETH_VLAN_STRIP_MASK |
+   ETH_VLAN_FILTER_MASK |
+   ETH_VLAN_EXTEND_MASK;
+   ret = enicpmd_vlan_offload_set(eth_dev, mask);
if (ret) {
dev_err(enic, "Failed to configure VLAN offloads\n");
return ret;
@@ -710,7 +704,7 @@ static const struct eth_dev_ops enicpmd_eth_dev_ops = {
.dev_infos_get= enicpmd_dev_info_get,
.dev_supported_ptypes_get = enicpmd_dev_supported_ptypes_get,
.mtu_set  = enicpmd_mtu_set,
-   .vlan_filter_set  = enicpmd_vlan_filter_set,
+   .vlan_filter_set  = NULL,
.vlan_tpid_set= NULL,
.vlan_offload_set = enicpmd_vlan_offload_set,
.vlan_strip_queue_set = NULL,
-- 
2.12.0

[dpdk-dev] [PATCH] net/enic: add Rx/Tx queue configuration getters

[John Daley]

From: Hyong Youb Kim 

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 drivers/net/enic/enic_ethdev.c | 76 --
 1 file changed, 65 insertions(+), 11 deletions(-)

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index e5523e311..6dd72729e 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -39,6 +39,19 @@ static const struct rte_pci_id pci_id_enic_map[] = {
{.vendor_id = 0, /* sentinel */},
 };
 
+#define ENIC_TX_OFFLOAD_CAPA ( \
+   DEV_TX_OFFLOAD_VLAN_INSERT |\
+   DEV_TX_OFFLOAD_IPV4_CKSUM  |\
+   DEV_TX_OFFLOAD_UDP_CKSUM   |\
+   DEV_TX_OFFLOAD_TCP_CKSUM   |\
+   DEV_TX_OFFLOAD_TCP_TSO)
+
+#define ENIC_RX_OFFLOAD_CAPA ( \
+   DEV_RX_OFFLOAD_VLAN_STRIP | \
+   DEV_RX_OFFLOAD_IPV4_CKSUM | \
+   DEV_RX_OFFLOAD_UDP_CKSUM  | \
+   DEV_RX_OFFLOAD_TCP_CKSUM)
+
 RTE_INIT(enicpmd_init_log);
 static void
 enicpmd_init_log(void)
@@ -473,17 +486,8 @@ static void enicpmd_dev_info_get(struct rte_eth_dev 
*eth_dev,
 */
device_info->max_rx_pktlen = enic_mtu_to_max_rx_pktlen(enic->max_mtu);
device_info->max_mac_addrs = ENIC_MAX_MAC_ADDR;
-   device_info->rx_offload_capa =
-   DEV_RX_OFFLOAD_VLAN_STRIP |
-   DEV_RX_OFFLOAD_IPV4_CKSUM |
-   DEV_RX_OFFLOAD_UDP_CKSUM  |
-   DEV_RX_OFFLOAD_TCP_CKSUM;
-   device_info->tx_offload_capa =
-   DEV_TX_OFFLOAD_VLAN_INSERT |
-   DEV_TX_OFFLOAD_IPV4_CKSUM  |
-   DEV_TX_OFFLOAD_UDP_CKSUM   |
-   DEV_TX_OFFLOAD_TCP_CKSUM   |
-   DEV_TX_OFFLOAD_TCP_TSO;
+   device_info->rx_offload_capa = ENIC_RX_OFFLOAD_CAPA;
+   device_info->tx_offload_capa = ENIC_TX_OFFLOAD_CAPA;
device_info->default_rxconf = (struct rte_eth_rxconf) {
.rx_free_thresh = ENIC_DEFAULT_RX_FREE_THRESH
};
@@ -686,6 +690,54 @@ static int enicpmd_dev_rss_hash_conf_get(struct 
rte_eth_dev *dev,
return 0;
 }
 
+static void enicpmd_dev_rxq_info_get(struct rte_eth_dev *dev,
+uint16_t rx_queue_id,
+struct rte_eth_rxq_info *qinfo)
+{
+   struct enic *enic = pmd_priv(dev);
+   struct vnic_rq *rq_sop;
+   struct vnic_rq *rq_data;
+   struct rte_eth_rxconf *conf;
+   uint16_t sop_queue_idx;
+   uint16_t data_queue_idx;
+
+   ENICPMD_FUNC_TRACE();
+   sop_queue_idx = enic_rte_rq_idx_to_sop_idx(rx_queue_id);
+   data_queue_idx = enic_rte_rq_idx_to_data_idx(rx_queue_id);
+   rq_sop = &enic->rq[sop_queue_idx];
+   rq_data = &enic->rq[data_queue_idx]; /* valid if data_queue_enable */
+   qinfo->mp = rq_sop->mp;
+   qinfo->scattered_rx = rq_sop->data_queue_enable;
+   qinfo->nb_desc = rq_sop->ring.desc_count;
+   if (qinfo->scattered_rx)
+   qinfo->nb_desc += rq_data->ring.desc_count;
+   conf = &qinfo->conf;
+   memset(conf, 0, sizeof(*conf));
+   conf->rx_free_thresh = rq_sop->rx_free_thresh;
+   conf->rx_drop_en = 1;
+   /*
+* Except VLAN stripping (port setting), all the checksum offloads
+* are always enabled.
+*/
+   conf->offloads = ENIC_RX_OFFLOAD_CAPA;
+   if (!enic->ig_vlan_strip_en)
+   conf->offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+   /* rx_thresh and other fields are not applicable for enic */
+}
+
+static void enicpmd_dev_txq_info_get(struct rte_eth_dev *dev,
+__rte_unused uint16_t tx_queue_id,
+struct rte_eth_txq_info *qinfo)
+{
+   struct enic *enic = pmd_priv(dev);
+
+   ENICPMD_FUNC_TRACE();
+   qinfo->nb_desc = enic->config.wq_desc_count;
+   memset(&qinfo->conf, 0, sizeof(qinfo->conf));
+   qinfo->conf.offloads = ENIC_TX_OFFLOAD_CAPA; /* not configurable */
+   /* tx_thresh, and all the other fields are not applicable for enic */
+}
+
 static const struct eth_dev_ops enicpmd_eth_dev_ops = {
.dev_configure= enicpmd_dev_configure,
.dev_start= enicpmd_dev_start,
@@ -718,6 +770,8 @@ static const struct eth_dev_ops enicpmd_eth_dev_ops = {
.rx_descriptor_done   = NULL,
.tx_queue_setup   = enicpmd_dev_tx_queue_setup,
.tx_queue_release = enicpmd_dev_tx_queue_release,
+   .rxq_info_get = enicpmd_dev_rxq_info_get,
+   .txq_info_get = enicpmd_dev_txq_info_get,
.dev_led_on   = NULL,
.dev_led_off  = NULL,
.flow_ctrl_get= NULL,
-- 
2.12.0

[dpdk-dev] [PATCH] net/enic: remove 'extern' in .h file function declarations

[John Daley]

Signed-off-by: John Daley 
---
 drivers/net/enic/enic.h | 80 -
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index c083985ee..e88af6bc9 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -220,54 +220,54 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx)
return idx;
 }
 
-extern void enic_fdir_stats_get(struct enic *enic,
-   struct rte_eth_fdir_stats *stats);
-extern int enic_fdir_add_fltr(struct enic *enic,
-   struct rte_eth_fdir_filter *params);
-extern int enic_fdir_del_fltr(struct enic *enic,
-   struct rte_eth_fdir_filter *params);
-extern void enic_free_wq(void *txq);
-extern int enic_alloc_intr_resources(struct enic *enic);
-extern int enic_setup_finish(struct enic *enic);
-extern int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
-   unsigned int socket_id, uint16_t nb_desc);
-extern void enic_start_wq(struct enic *enic, uint16_t queue_idx);
-extern int enic_stop_wq(struct enic *enic, uint16_t queue_idx);
-extern void enic_start_rq(struct enic *enic, uint16_t queue_idx);
-extern int enic_stop_rq(struct enic *enic, uint16_t queue_idx);
-extern void enic_free_rq(void *rxq);
-extern int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
-   unsigned int socket_id, struct rte_mempool *mp,
-   uint16_t nb_desc, uint16_t free_thresh);
-extern int enic_set_rss_nic_cfg(struct enic *enic);
-extern int enic_set_vnic_res(struct enic *enic);
-extern int enic_enable(struct enic *enic);
-extern int enic_disable(struct enic *enic);
-extern void enic_remove(struct enic *enic);
-extern int enic_get_link_status(struct enic *enic);
-extern int enic_dev_stats_get(struct enic *enic,
-   struct rte_eth_stats *r_stats);
-extern void enic_dev_stats_clear(struct enic *enic);
-extern void enic_add_packet_filter(struct enic *enic);
+void enic_fdir_stats_get(struct enic *enic,
+struct rte_eth_fdir_stats *stats);
+int enic_fdir_add_fltr(struct enic *enic,
+  struct rte_eth_fdir_filter *params);
+int enic_fdir_del_fltr(struct enic *enic,
+  struct rte_eth_fdir_filter *params);
+void enic_free_wq(void *txq);
+int enic_alloc_intr_resources(struct enic *enic);
+int enic_setup_finish(struct enic *enic);
+int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
+ unsigned int socket_id, uint16_t nb_desc);
+void enic_start_wq(struct enic *enic, uint16_t queue_idx);
+int enic_stop_wq(struct enic *enic, uint16_t queue_idx);
+void enic_start_rq(struct enic *enic, uint16_t queue_idx);
+int enic_stop_rq(struct enic *enic, uint16_t queue_idx);
+void enic_free_rq(void *rxq);
+int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
+ unsigned int socket_id, struct rte_mempool *mp,
+ uint16_t nb_desc, uint16_t free_thresh);
+int enic_set_rss_nic_cfg(struct enic *enic);
+int enic_set_vnic_res(struct enic *enic);
+int enic_enable(struct enic *enic);
+int enic_disable(struct enic *enic);
+void enic_remove(struct enic *enic);
+int enic_get_link_status(struct enic *enic);
+int enic_dev_stats_get(struct enic *enic,
+  struct rte_eth_stats *r_stats);
+void enic_dev_stats_clear(struct enic *enic);
+void enic_add_packet_filter(struct enic *enic);
 int enic_set_mac_address(struct enic *enic, uint8_t *mac_addr);
 void enic_del_mac_address(struct enic *enic, int mac_index);
-extern unsigned int enic_cleanup_wq(struct enic *enic, struct vnic_wq *wq);
-extern void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
- struct rte_mbuf *tx_pkt, unsigned short len,
- uint8_t sop, uint8_t eop, uint8_t cq_entry,
- uint16_t ol_flags, uint16_t vlan_tag);
-
-extern void enic_post_wq_index(struct vnic_wq *wq);
-extern int enic_probe(struct enic *enic);
-extern int enic_clsf_init(struct enic *enic);
-extern void enic_clsf_destroy(struct enic *enic);
+unsigned int enic_cleanup_wq(struct enic *enic, struct vnic_wq *wq);
+void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
+  struct rte_mbuf *tx_pkt, unsigned short len,
+  uint8_t sop, uint8_t eop, uint8_t cq_entry,
+  uint16_t ol_flags, uint16_t vlan_tag);
+
+void enic_post_wq_index(struct vnic_wq *wq);
+int enic_probe(struct enic *enic);
+int enic_clsf_init(struct enic *enic);
+void enic_clsf_destroy(struct enic *enic);
 uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
 uint16_t enic_dummy_recv_pkts(void *rx_queue,
  struct rte_mbuf **rx_pkts,
  uint16_t nb_pkts);
 uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
-  uint16_t nb_pkts);
+   uint16_t nb_pkts);
 uint16_t enic_prep_pkts(void *tx_queue, str

[dpdk-dev] [PATCH] doc: describe Rx bytes counter behavior for enic

[John Daley]

From: Hyong Youb Kim 

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 doc/guides/nics/enic.rst | 8 
 1 file changed, 8 insertions(+)

diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index 7e19cf88a..0bc55936a 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -310,6 +310,14 @@ Limitations
 were added. Since there currently is no grouping or priority support,
 'catch-all' filters should be added last.
 
+- **Statistics**
+
+  - ``rx_good_bytes`` (ibytes) always includes VLAN header (4B) and CRC bytes 
(4B).
+  - When the NIC drops a packet because the Rx queue has no free buffers,
+``rx_good_bytes`` still increments by 4B if the packet is not VLAN tagged 
or
+VLAN stripping is disabled, or by 8B if the packet is VLAN tagged and 
stripping
+is enabled.
+
 How to build the suite
 --
 
-- 
2.12.0

[dpdk-dev] [PATCH] net/enic: allocate stats DMA buffer upfront during probe

[John Daley]

From: Hyong Youb Kim 

The driver provides a DMA buffer to the firmware when it requests port
stats. The NIC then fills that buffer with latest stats. Currently,
the driver allocates the DMA buffer the first time it requests stats
and saves it for later use. This can lead to crashes when
primary/secondary processes are involved. For example, the following
sequence crashes the secondary process.

1. Start a primary app that does not call rte_eth_stats_get()
2. dpdk-procinfo -- --stats

dpdk-procinfo crashes while trying to allocate the stats DMA buffer
because the alloc function pointer (vdev.alloc_consistent) is valid
only in the primary process, not in the secondary process.

Overwriting the alloc function pointer in the secondary process is not
an option, as it will simply make the pointer invalid in the primary
process. Instead, allocate the DMA buffer during probe so that only
the primary process does both allocate and free. This allows the
secondary process to dump stats as well.

Cc: sta...@dpdk.org
Fixes: 9913fbb91df0 ("enic/base: common code")

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 drivers/net/enic/base/vnic_dev.c | 24 ++--
 drivers/net/enic/base/vnic_dev.h |  1 +
 drivers/net/enic/enic_main.c |  9 +
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c
index 05b595eb8..1f8d222fc 100644
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -587,17 +587,9 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct 
vnic_stats **stats)
 {
u64 a0, a1;
int wait = 1000;
-   static u32 instance;
-   char name[NAME_MAX];
 
-   if (!vdev->stats) {
-   snprintf((char *)name, sizeof(name),
-   "vnic_stats-%u", instance++);
-   vdev->stats = vdev->alloc_consistent(vdev->priv,
-   sizeof(struct vnic_stats), &vdev->stats_pa, (u8 *)name);
-   if (!vdev->stats)
-   return -ENOMEM;
-   }
+   if (!vdev->stats)
+   return -ENOMEM;
 
*stats = vdev->stats;
a0 = vdev->stats_pa;
@@ -922,6 +914,18 @@ u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev)
return vdev->intr_coal_timer_info.max_usec;
 }
 
+int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev)
+{
+   char name[NAME_MAX];
+   static u32 instance;
+
+   snprintf((char *)name, sizeof(name), "vnic_stats-%u", instance++);
+   vdev->stats = vdev->alloc_consistent(vdev->priv,
+sizeof(struct vnic_stats),
+&vdev->stats_pa, (u8 *)name);
+   return vdev->stats == NULL ? -ENOMEM : 0;
+}
+
 void vnic_dev_unregister(struct vnic_dev *vdev)
 {
if (vdev) {
diff --git a/drivers/net/enic/base/vnic_dev.h b/drivers/net/enic/base/vnic_dev.h
index 8c0992063..7e5736b4d 100644
--- a/drivers/net/enic/base/vnic_dev.h
+++ b/drivers/net/enic/base/vnic_dev.h
@@ -165,6 +165,7 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
void *priv, struct rte_pci_device *pdev, struct vnic_dev_bar *bar,
unsigned int num_bars);
 struct rte_pci_device *vnic_dev_get_pdev(struct vnic_dev *vdev);
+int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev);
 int vnic_dev_cmd_init(struct vnic_dev *vdev, int fallback);
 int vnic_dev_get_size(void);
 int vnic_dev_int13(struct vnic_dev *vdev, u64 arg, u32 op);
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index d4f478b5e..bd4447f01 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1478,6 +1478,15 @@ int enic_probe(struct enic *enic)
enic_alloc_consistent,
enic_free_consistent);
 
+   /*
+* Allocate the consistent memory for stats upfront so both primary and
+* secondary processes can dump stats.
+*/
+   err = vnic_dev_alloc_stats_mem(enic->vdev);
+   if (err) {
+   dev_err(enic, "Failed to allocate cmd memory, aborting\n");
+   goto err_out_unregister;
+   }
/* Issue device open to get device in known state */
err = enic_dev_open(enic);
if (err) {
-- 
2.12.0

[dpdk-dev] [PATCH] net/enic: support for meson

[John Daley]

From: Hyong Youb Kim 

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---

Note: check-git-log.sh seems to fail when files in drivers/net are included
even if they are commited independently with the "drivers/net:" prefix.
Commiting both files at once. Please ignore check-git-log.sh failure
or suggest a petter prefix.

 drivers/net/enic/meson.build | 19 +++
 drivers/net/meson.build  |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/enic/meson.build

diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
new file mode 100644
index 0..bfd4e2373
--- /dev/null
+++ b/drivers/net/enic/meson.build
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Cisco Systems, Inc.
+
+sources = files(
+   'base/vnic_cq.c',
+   'base/vnic_dev.c',
+   'base/vnic_intr.c',
+   'base/vnic_rq.c',
+   'base/vnic_rss.c',
+   'base/vnic_wq.c',
+   'enic_clsf.c',
+   'enic_ethdev.c',
+   'enic_flow.c',
+   'enic_main.c',
+   'enic_res.c',
+   'enic_rxtx.c',
+   )
+deps += ['hash']
+includes += include_directories('base')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 704cbe3c8..f535baa13 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['af_packet', 'bonding',
-   'e1000', 'fm10k', 'i40e', 'ixgbe',
+   'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
'null', 'octeontx', 'pcap', 'ring',
'sfc', 'thunderx']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.12.0

[dpdk-dev] [PATCH] net/enic: support Rx queue interrupts

[John Daley]

From: Hyong Youb Kim 

Enable rx queue interrupts if the app requests them, and vNIC has
enough interrupt resources. Use interrupt vector 0 for link status and
errors. Use vector 1 for rx queue 0, vector 2 for rx queue 1, and so
on. So, with n rx queues, vNIC needs to have at n + 1 interrupts.

For VIC, enabling and disabling rx queue interrupts are simply
mask/unmask operations. VIC's credit based interrupt moderation is not
used, as the app wants to explicitly control when to enable/disable
interrupts.

This version requires MSI-X (vfio-pci). Sharing one interrupt for link
status and rx queues is possible, but is rather complex and has no
user demands.

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 doc/guides/nics/enic.rst  |   7 ++-
 doc/guides/nics/features/enic.ini |   1 +
 drivers/net/enic/enic.h   |  15 -
 drivers/net/enic/enic_ethdev.c|  22 +++
 drivers/net/enic/enic_main.c  | 123 --
 drivers/net/enic/enic_res.c   |   3 +-
 6 files changed, 149 insertions(+), 22 deletions(-)

diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index 0e655e9e3..7e19cf88a 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -114,11 +114,16 @@ Configuration information
 
   - **Interrupts**
 
-Only one interrupt per vNIC interface should be configured in the UCS
+At least one interrupt per vNIC interface should be configured in the UCS
 manager regardless of the number receive/transmit queues. The ENIC PMD
 uses this interrupt to get information about link status and errors
 in the fast path.
 
+In addition to the interrupt for link status and errors, when using Rx 
queue
+interrupts, increase the number of configured interrupts so that there is 
at
+least one interrupt for each Rx queue. For example, if the app uses 3 Rx
+queues and wants to use per-queue interrupts, configure 4 (3 + 1) 
interrupts.
+
 .. _enic-flow-director:
 
 Flow director support
diff --git a/doc/guides/nics/features/enic.ini 
b/doc/guides/nics/features/enic.ini
index e79d7277d..ea171a45b 100644
--- a/doc/guides/nics/features/enic.ini
+++ b/doc/guides/nics/features/enic.ini
@@ -6,6 +6,7 @@
 [Features]
 Link status  = Y
 Link status event= Y
+Rx interrupt = Y
 Queue start/stop = Y
 MTU update   = Y
 Jumbo frame  = Y
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 1b3813a58..adccc8ac5 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -49,6 +49,15 @@
 
 #define ENICPMD_FDIR_MAX   64
 
+/*
+ * Interrupt 0: LSC and errors
+ * Interrupt 1: rx queue 0
+ * Interrupt 2: rx queue 1
+ * ...
+ */
+#define ENICPMD_LSC_INTR_OFFSET 0
+#define ENICPMD_RXQ_INTR_OFFSET 1
+
 struct enic_fdir_node {
struct rte_eth_fdir_filter filter;
u16 fltr_id;
@@ -126,9 +135,9 @@ struct enic {
struct vnic_cq *cq;
unsigned int cq_count; /* equals rq_count + wq_count */
 
-   /* interrupt resource */
-   struct vnic_intr intr;
-   unsigned int intr_count;
+   /* interrupt vectors (len = conf_intr_count) */
+   struct vnic_intr *intr;
+   unsigned int intr_count; /* equals enabled interrupts (lsc + rxqs) */
 
/* software counters */
struct enic_soft_stats soft_stats;
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 6dd72729e..2a289b6a4 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -738,6 +738,26 @@ static void enicpmd_dev_txq_info_get(struct rte_eth_dev 
*dev,
/* tx_thresh, and all the other fields are not applicable for enic */
 }
 
+static int enicpmd_dev_rx_queue_intr_enable(struct rte_eth_dev *eth_dev,
+   uint16_t rx_queue_id)
+{
+   struct enic *enic = pmd_priv(eth_dev);
+
+   ENICPMD_FUNC_TRACE();
+   vnic_intr_unmask(&enic->intr[rx_queue_id + ENICPMD_RXQ_INTR_OFFSET]);
+   return 0;
+}
+
+static int enicpmd_dev_rx_queue_intr_disable(struct rte_eth_dev *eth_dev,
+uint16_t rx_queue_id)
+{
+   struct enic *enic = pmd_priv(eth_dev);
+
+   ENICPMD_FUNC_TRACE();
+   vnic_intr_mask(&enic->intr[rx_queue_id + ENICPMD_RXQ_INTR_OFFSET]);
+   return 0;
+}
+
 static const struct eth_dev_ops enicpmd_eth_dev_ops = {
.dev_configure= enicpmd_dev_configure,
.dev_start= enicpmd_dev_start,
@@ -770,6 +790,8 @@ static const struct eth_dev_ops enicpmd_eth_dev_ops = {
.rx_descriptor_done   = NULL,
.tx_queue_setup   = enicpmd_dev_tx_queue_setup,
.tx_queue_release = enicpmd_dev_tx_queue_release,
+   .rx_queue_intr_enable = enicpmd_dev_rx_queue_intr_enable,
+   .rx_queue_intr_disable = enicpmd_dev_rx_queue_intr_disable,
.rxq_info_get = enicpmd_dev_rxq_info_get,
.txq_info_get = enicpmd_dev_txq_

[dpdk-dev] [PATCH] net/enic: heed the requested max Rx packet size

[John Daley]

From: Hyong Youb Kim 

Currently, enic completely ignores the requested max Rx packet size
(rxmode.max_rx_pkt_len). The desired behavior is that the NIC hardware
drops packets larger than the requested size, even though they are
still smaller than MTU.

Cisco VIC does not have such a feature. But, we can accomplish a
similar (not same) effect by reducing the size of posted receive
buffers. Packets larger than the posted size get truncated, and the
receive handler drops them. This is also how the kernel enic driver
enforces the Rx side MTU.

This workaround works only when scatter mode is *not* used. When
scatter is used, there is currently no way to support
rxmode.max_rx_pkt_len, as the NIC always receives packets up to MTU.

For posterity, add a copious amount of comments regarding the
hardware's drop/receive behavior with respect to max/current MTU.

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 doc/guides/nics/enic.rst   |  1 +
 drivers/net/enic/enic.h|  7 ++
 drivers/net/enic/enic_ethdev.c |  9 +++-
 drivers/net/enic/enic_main.c   | 49 --
 4 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index 4dffce1a6..0e655e9e3 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -371,6 +371,7 @@ Known bugs and unsupported features in this release
 - Setting of extended VLAN
 - UDP RSS hashing
 - MTU update only works if Scattered Rx mode is disabled
+- Maximum receive packet length is ignored if Scattered Rx mode is used
 
 Prerequisites
 -
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index d29939c94..1b3813a58 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -162,6 +162,13 @@ struct enic {
union vnic_rss_cpu rss_cpu;
 };
 
+/* Compute ethdev's max packet size from MTU */
+static inline uint32_t enic_mtu_to_max_rx_pktlen(uint32_t mtu)
+{
+   /* ethdev max size includes eth and crc whereas NIC MTU does not */
+   return mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+}
+
 /* Get the CQ index from a Start of Packet(SOP) RQ index */
 static inline unsigned int enic_sop_rq_idx_to_cq_idx(unsigned int sop_idx)
 {
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index cbab7029b..bdbaf4cdf 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -470,7 +470,14 @@ static void enicpmd_dev_info_get(struct rte_eth_dev 
*eth_dev,
device_info->max_rx_queues = enic->conf_rq_count / 2;
device_info->max_tx_queues = enic->conf_wq_count;
device_info->min_rx_bufsize = ENIC_MIN_MTU;
-   device_info->max_rx_pktlen = enic->max_mtu + ETHER_HDR_LEN + 4;
+   /* "Max" mtu is not a typo. HW receives packet sizes up to the
+* max mtu regardless of the current mtu (vNIC's mtu). vNIC mtu is
+* a hint to the driver to size receive buffers accordingly so that
+* larger-than-vnic-mtu packets get truncated.. For DPDK, we let
+* the user decide the buffer size via rxmode.max_rx_pkt_len, basically
+* ignoring vNIC mtu.
+*/
+   device_info->max_rx_pktlen = enic_mtu_to_max_rx_pktlen(enic->max_mtu);
device_info->max_mac_addrs = ENIC_MAX_MAC_ADDR;
device_info->rx_offload_capa =
DEV_RX_OFFLOAD_VLAN_STRIP |
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index f00e816a1..d4f478b5e 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -266,6 +266,8 @@ enic_alloc_rx_queue_mbufs(struct enic *enic, struct vnic_rq 
*rq)
struct rq_enet_desc *rqd = rq->ring.descs;
unsigned i;
dma_addr_t dma_addr;
+   uint32_t max_rx_pkt_len;
+   uint16_t rq_buf_len;
 
if (!rq->in_use)
return 0;
@@ -273,6 +275,18 @@ enic_alloc_rx_queue_mbufs(struct enic *enic, struct 
vnic_rq *rq)
dev_debug(enic, "queue %u, allocating %u rx queue mbufs\n", rq->index,
  rq->ring.desc_count);
 
+   /*
+* If *not* using scatter and the mbuf size is smaller than the
+* requested max packet size (max_rx_pkt_len), then reduce the
+* posted buffer size to max_rx_pkt_len. HW still receives packets
+* larger than max_rx_pkt_len, but they will be truncated, which we
+* drop in the rx handler. Not ideal, but better than returning
+* large packets when the user is not expecting them.
+*/
+   max_rx_pkt_len = enic->rte_dev->data->dev_conf.rxmode.max_rx_pkt_len;
+   rq_buf_len = rte_pktmbuf_data_room_size(rq->mp) - RTE_PKTMBUF_HEADROOM;
+   if (max_rx_pkt_len < rq_buf_len && !rq->data_queue_enable)
+   rq_buf_len = max_rx_pkt_len;
for (i = 0; i < rq->ring.desc_count; i++, rqd++) {
mb = rte_mbuf_raw_alloc(rq->mp);
if (mb == NULL) {
@@ -287,7 +301,7 @@ enic_alloc_rx_queue_mbufs(stru

[dpdk-dev] [PATCH] net/enic: allow the user to change RSS settings

[John Daley]

From: Hyong Youb Kim 

Currently, when more than 1 receive queues are configured, the driver
always enables RSS with the driver's own default hash type, key, and
RETA. The user is unable to change any of the RSS settings. Address
this by implementing the ethdev RSS API as follows.

Correctly report the RETA size, key size, and supported hash types
through rte_eth_dev_info.

During dev_configure(), initialize RSS according to the device's
mq_mode and rss_conf. Start with the default RETA, and use the default
key unless a custom key is provided.

Add the RETA and rss_conf query/set handlers to let the user change
RSS settings after the initial configuration. The hardware is able to
change hash type, key, and RETA individually. So, the handlers change
only the affected settings.

Refactor/rename several functions in order to make their intentions
clear. For example, remove all traces of RSS from
enicpmd_vlan_offload_set() as it is confusing.

Signed-off-by: Hyong Youb Kim 
Reviewed-by: John Daley 
---
 doc/guides/nics/features/enic.ini |   2 +
 drivers/net/enic/enic.h   |  20 +++-
 drivers/net/enic/enic_ethdev.c| 117 ++-
 drivers/net/enic/enic_main.c  | 192 --
 drivers/net/enic/enic_res.c   |  20 
 drivers/net/enic/enic_res.h   |   6 ++
 6 files changed, 301 insertions(+), 56 deletions(-)

diff --git a/doc/guides/nics/features/enic.ini 
b/doc/guides/nics/features/enic.ini
index 498341f07..e79d7277d 100644
--- a/doc/guides/nics/features/enic.ini
+++ b/doc/guides/nics/features/enic.ini
@@ -15,6 +15,8 @@ Promiscuous mode = Y
 Unicast MAC filter   = Y
 Multicast MAC filter = Y
 RSS hash = Y
+RSS key update   = Y
+RSS reta update  = Y
 SR-IOV   = Y
 VLAN filter  = Y
 CRC offload  = Y
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index e88af6bc9..d29939c94 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -146,6 +146,20 @@ struct enic {
 
LIST_HEAD(enic_flows, rte_flow) flows;
rte_spinlock_t flows_lock;
+
+   /* RSS */
+   uint16_t reta_size;
+   uint8_t hash_key_size;
+   uint64_t flow_type_rss_offloads; /* 0 indicates RSS not supported */
+   /*
+* Keep a copy of current RSS config for queries, as we cannot retrieve
+* it from the NIC.
+*/
+   uint8_t rss_hash_type; /* NIC_CFG_RSS_HASH_TYPE flags */
+   uint8_t rss_enable;
+   uint64_t rss_hf; /* ETH_RSS flags */
+   union vnic_rss_key rss_key;
+   union vnic_rss_cpu rss_cpu;
 };
 
 /* Get the CQ index from a Start of Packet(SOP) RQ index */
@@ -239,8 +253,12 @@ void enic_free_rq(void *rxq);
 int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
  unsigned int socket_id, struct rte_mempool *mp,
  uint16_t nb_desc, uint16_t free_thresh);
-int enic_set_rss_nic_cfg(struct enic *enic);
 int enic_set_vnic_res(struct enic *enic);
+int enic_init_rss_nic_cfg(struct enic *enic);
+int enic_set_rss_conf(struct enic *enic,
+ struct rte_eth_rss_conf *rss_conf);
+int enic_set_rss_reta(struct enic *enic, union vnic_rss_cpu *rss_cpu);
+int enic_set_vlan_strip(struct enic *enic);
 int enic_enable(struct enic *enic);
 int enic_disable(struct enic *enic);
 void enic_remove(struct enic *enic);
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index d84714efb..cbab7029b 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -345,8 +345,6 @@ static int enicpmd_vlan_offload_set(struct rte_eth_dev 
*eth_dev, int mask)
else
enic->ig_vlan_strip_en = 0;
}
-   enic_set_rss_nic_cfg(enic);
-
 
if (mask & ETH_VLAN_FILTER_MASK) {
dev_warning(enic,
@@ -358,7 +356,7 @@ static int enicpmd_vlan_offload_set(struct rte_eth_dev 
*eth_dev, int mask)
"Configuration of extended VLAN is not supported\n");
}
 
-   return 0;
+   return enic_set_vlan_strip(enic);
 }
 
 static int enicpmd_dev_configure(struct rte_eth_dev *eth_dev)
@@ -379,8 +377,16 @@ static int enicpmd_dev_configure(struct rte_eth_dev 
*eth_dev)
enic->hw_ip_checksum = !!(eth_dev->data->dev_conf.rxmode.offloads &
  DEV_RX_OFFLOAD_CHECKSUM);
ret = enicpmd_vlan_offload_set(eth_dev, ETH_VLAN_STRIP_MASK);
-
-   return ret;
+   if (ret) {
+   dev_err(enic, "Failed to configure VLAN offloads\n");
+   return ret;
+   }
+   /*
+* Initialize RSS with the default reta and key. If the user key is
+* given (rx_adv_conf.rss_conf.rss_key), will use that instead of the
+* default key.
+*/
+   return enic_init_rss_nic_cfg(enic);
 }
 
 /* Start the device.
@@ -480,6 +486,9 @@ static void enicpmd_dev_info_get(struct rte_eth_dev 
*eth_dev,
device_info->default_

[dpdk-dev] [dpdk-announce] FYI: CFP: FD.io mini-summit at ONS, March 26th

[St Leger, Jim]

Sorry if this is a duplicate.
Jim

From: m...@lists.fd.io [mailto:m...@lists.fd.io] On Behalf Of Trishan de 
Lanerolle
Sent: Thursday, February 22, 2018 12:48 PM
To: m...@lists.fd.io
Subject: [FD.io] CFP: FD.io mini-summit at ONS, March 26th


Call for Proposals Open

Join us at the FD.io mini summit at ONS, to hear and learn from 
FD.io community experts who will be sharing information about 
the projects, use cases, capabilities, integration between FD.io 
and Kubernetes/ODL/OPNFV/Other communities, tools and many more exciting topics.

This is a great opportunity for the ONS attendees to share their thought 
leadership and innovations at one of the industry’s premier events.

Call for Proposals: https://goo.gl/HK2fo1

Submissions must be received by 11:59pm PST on Thursday, March 1st, 2018.

Dates to Remember
CFP Open: Monday, Feb 14, 2018
CFP Close: Thursday, March 1, 2018, 11:59 PST
CFP Notifications: Week of March 3
Mini-Summit Day: Monday, March 26


--
Trishan R. de Lanerolle
Program Manager,  Networking
Linux Foundation
voice: +1.203.699.6401
skype: tdelanerolle
email: tdelanero...@linuxfoundation.org
_._,_._,_

Links:

You receive all messages sent to this group.

View/Reply Online (#2) | Reply To 
Group
 | Reply To 
Sender
 | Mute This Topic | New 
Topic

Change Your Subscription
Group Home
Contact Group Owner
Terms Of Service
Unsubscribe From This 
Group
_._,_._,_

[dpdk-dev] [PATCH v2] doc: update mlx4 flow limitations

[Ophir Munk]

This patch updates mlx4 documentation with flow
configuration limitations imposed by NIC hardware and
PMD implementation

Signed-off-by: Moti Haimovsky 
Signed-off-by: Ophir Munk 
---
v1: initial version (use testpmd examples)
v2: enhance and add rte_flow examples

 doc/guides/nics/mlx4.rst | 383 +++
 1 file changed, 383 insertions(+)

diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst
index 98b9716..02cea79 100644
--- a/doc/guides/nics/mlx4.rst
+++ b/doc/guides/nics/mlx4.rst
@@ -515,3 +515,386 @@ devices managed by librte_pmd_mlx4.
   Port 3 Link Up - speed 4 Mbps - full-duplex
   Done
   testpmd>
+
+Flow Limitations
+
+
+- Flows are specified by rte_flow API (defined in **rte_flow.h**) which 
provides
+  a generic means to match specific traffic. Please refer to
+  http://dpdk.org/doc/guides/prog_guide/rte_flow.html
+- testpmd application **(app/test-pmd/)** has a command line interface where
+  flows can be specified. These flows are translated by testpmd
+  to rte_flow calls.
+- **drivers/net/mlx4/mlx4_flow.c** can be used as a reference to flow
+  limitations written in source code.
+
+General
+~~~
+
+.. code-block:: console
+
+struct rte_flow_attr {
+uint32_t group; /**< Priority group. */
+uint32_t priority; /**< Priority level within group. */
+uint32_t ingress:1; /**< Rule applies to ingress traffic. */
+uint32_t egress:1; /**< Rule applies to egress traffic. */
+uint32_t reserved:30; /**< Reserved, must be zero. */
+}
+
+struct rte_flow_attr *attr;
+
+- No support for mlx4 group rte_flow
+
+.. code-block:: console
+
+if (attr->group)
+ print_err("groups are not supported");
+
+- No support for mlx4 rte_flow priority above 0xfff
+
+.. code-block:: console
+
+if (attr->priority > 0xfff)
+ print_err("maximum priority level is 0xfff");
+
+- No support for mlx4 rte_flow egress filters
+
+.. code-block:: console
+
+if (attr->egress)
+ print_err("egress is not supported");
+
+- Must specify mlx4 rte_flow ingress filters
+
+.. code-block:: console
+
+if (!attr->ingress)
+ print_err("only ingress is supported");
+
+Flow rules filters
+~~
+
+Flow rules filters can be validated using testpmd **flow validate** syntax.
+
+L2 (ETH)
+
+
+This section documents flow rules limitations related to 
RTE_FLOW_ITEM_TYPE_ETH.
+It does not apply to an inner ETH used after VXLAN since mlx4 can't match those
+yet.
+
+.. code-block:: console
+
+/**
+ * RTE_FLOW_ITEM_TYPE_ETH
+ *
+ * Matches an Ethernet header.
+ */
+struct rte_flow_item_eth {
+   struct ether_addr dst; /**< Destination MAC. */
+   struct ether_addr src; /**< Source MAC. */
+   rte_be16_t type; /**< EtherType. */
+};
+
+struct rte_flow_item_eth *mask;
+
+- Can only use real destination MAC.
+- EtherType is not taken into consideration.
+- Source MAC is not taken into consideration and should be set to 0
+
+.. code-block:: console
+
+/**
+ * Summarize all src adrresses
+ **/
+for (i = 0; i != sizeof(mask->src.addr_bytes); ++i)
+   sum_src += mask->src.addr_bytes[i];
+
+if (sum_src)
+print_err("mlx4 does not support source MAC matching");
+
+
+Using testpmd application - src mask must be 00:00:00:00:00:00
+otherwise the following command will fail.
+
+.. code-block:: console
+
+ testpmd> flow validate 1 ingress pattern eth
+  src spec 00:16:3e:2b:e6:47 src mask FF:FF:FF:FF:FF:FF
+  / end actions drop / end
+
+- Supports only full mask.
+- No support for partial masks, except in the specific case of matching
+  all multicast traffic (spec->dst and mask->dst equal to
+  01:00:00:00:00:00).
+
+.. code-block:: console
+
+/**
+ * Summarize all dst adrresses
+ */
+for (i = 0; i != sizeof(mask->dst.addr_bytes); ++i) {
+   sum_dst += mask->dst.addr_bytes[i];
+
+if (sum_dst != (0xffui8 * ETHER_ADDR_LEN))
+print_err("mlx4 does not support matching partial"
+ " Ethernet fields");
+}
+
+Using the following testpmd command with partial mask will fail.
+
+.. code-block:: console
+
+ testpmd> flow validate 1 ingress pattern eth
+  src spec 00:16:3e:2b:e6:47
+  dst spec 4A:11:6C:FA:60:D0 dst mask FF:00:FF:FF:FF:00
+  / end actions drop / end
+
+- When configured to run in promiscuous or all-multicast modes does
+  not support additional rules
+
+.. code-block:: console
+
+if (flow->promisc || flow->allmulti)
+print_err("mlx4 does not support additional matching"
+" criteria combined with indiscriminate"
+" matching on Ethernet headers");
+
+- Does not support the explicit exclusion of all multicast traffic
+
+.. code-block:: console
+
+if (sum_dst

Re: [dpdk-dev] [PATCH v1] net/mlx4: fix RSS actions with no parameters

[Ophir Munk]

Hi,
Please see below

> -Original Message-
> From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> Sent: Friday, February 23, 2018 6:53 PM
> To: Ophir Munk 
> Cc: dev@dpdk.org; Thomas Monjalon ; Olga Shern
> ; sta...@dpdk.org
> Subject: Re: [PATCH v1] net/mlx4: fix RSS actions with no parameters
> 
> On Wed, Feb 21, 2018 at 01:38:38PM +, Ophir Munk wrote:
> > When creating an RSS flow with missing actions parameters, for example:
> > flow create 0 ingress pattern   / end actions rss /
> > end
> >
> > testpmd aborts with segmentation fault.
> > In the corrupted code mlx4_flow_prepare() accesses RSS action->conf
> > pointer without verifying its validity.
> > In case of missing RSS actions parameters this pointer is NULL and
> > must not  be accessed.
> 
> Problem is that testpmd is far from perfect and shouldn't feed PMDs with
> invalid pointers in the first place. The configuration structure is not
> documented as optional with actions that take one.
> 
> > The fix is to return an error in such cases "missing rss actions".
> >
> > Fixes: 078b8b452e6b ("net/mlx4: add RSS flow rule action support")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Ophir Munk 
> 
> I suggest to fix this at once for all present and future PMDs in testpmd
> directly. It may be added as a workaround in mlx4 but not as a fix since the
> cause is not in that PMD.
> 

I am not sure if missing rss queues in testpmd is not by design. For example a 
PMD can theoretically
interpreted it as an rss default action to split traffic over all existing 
device queues, or giving it any other meaning.
The lack of rss queues should be left to the interpretation of the PMD. 

For example:
* ixgbe PMD seems to handle an NULL rss configuration pointer in its own way
* mlx5 PMD checks for this and return an error in such a case

Changes to testpmd will have to be coordinated and accepted by all dpdk PMDs.

> > ---
> >  drivers/net/mlx4/mlx4_flow.c | 4 
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/net/mlx4/mlx4_flow.c
> > b/drivers/net/mlx4/mlx4_flow.c index 2d55bfe..7a127a8 100644
> > --- a/drivers/net/mlx4/mlx4_flow.c
> > +++ b/drivers/net/mlx4/mlx4_flow.c
> > @@ -735,6 +735,10 @@ mlx4_flow_prepare(struct priv *priv,
> > if (flow->rss)
> > break;
> > rss = action->conf;
> > +   if (!rss) {
> > +   msg = "missing rss actions";
> > +   goto exit_action_not_supported;
> > +   }
> 
> This message may be understood as a lack of RSS action, while it is in fact
> present. This error can be more accurately described as:
> 
>  "RSS action configuration wasn't provided"
> 

mlx5 PMD printout for missing rss queues is: "no valid queues"

I suggest that both mlx4 and mlx5 print the same error for the same rss flow 
w/o queues.
Do you confirm using mlx5 message printed above?

> Note the same issue exists with the QUEUE action handled just prior to this
> one and probably affects other PMDs as well. You really should consider
> fixing testpmd instead.
> 
> --
> Adrien Mazarguil
> 6WIND

Re: [dpdk-dev] [PATCH] net/qede: fix alloc from socket 0

[Patil, Harish]

-Original Message-
From: Pascal Mazon 
Date: Friday, February 23, 2018 at 4:53 AM
To: "dev@dpdk.org" , "Mody, Rasesh"
, Harish Patil , "Shaikh,
Shahed" 
Cc: "pascal.ma...@6wind.com" , "sta...@dpdk.org"

Subject: [PATCH] net/qede: fix alloc from socket 0

>In case osal_dma_alloc_coherent() is called from a management thread,
>core_id turn out to be LCORE_ID_ANY, and the resulting socket for alloc
>will be socket 0.
>
>This is not desirable when using a NIC from socket 1 which might very
>likely be configured to use memory from that socket only.
>In that case, allocation will fail.
>
>To address this, use master lcore instead when called from mgmt thread.
>The associated socket should have memory available.
>
>Fixes: ec94dbc57362 ("qede: add base driver")
>Cc: sta...@dpdk.org
>
>Signed-off-by: Pascal Mazon 
>---
> drivers/net/qede/base/bcm_osal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/net/qede/base/bcm_osal.c
>b/drivers/net/qede/base/bcm_osal.c
>index fe42f3256400..0760cdcb9523 100644
>--- a/drivers/net/qede/base/bcm_osal.c
>+++ b/drivers/net/qede/base/bcm_osal.c
>@@ -133,7 +133,7 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
>   snprintf(mz_name, sizeof(mz_name) - 1, "%lx",
>   (unsigned long)rte_get_timer_cycles());
>   if (core_id == (unsigned int)LCORE_ID_ANY)
>-  core_id = 0;
>+  core_id = rte_get_master_lcore();
>   socket_id = rte_lcore_to_socket_id(core_id);
>   mz = rte_memzone_reserve_aligned(mz_name, size,
>socket_id, 0, RTE_CACHE_LINE_SIZE);
>-- 
>2.16.1.72.g5be1f00a9
>
Hi Pascal,
Looks good.
Can you please similar change in osal_dma_alloc_coherent_aligned() also?
Thanks.

Acked-by: Harish Patil 


>

[dpdk-dev] [PATCH] net/mlx5: add bluefield device ID

[Shahaf Shuler]

Signed-off-by: Shahaf Shuler 
---
 drivers/net/mlx5/mlx5.c | 4 
 drivers/net/mlx5/mlx5.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 61cb93101..5345bc46f 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1027,6 +1027,10 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
   PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF)
},
{
+   RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
+  PCI_DEVICE_ID_MELLANOX_BLUEFIELD)
+   },
+   {
.vendor_id = 0
}
 };
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 3e2d96abc..1c9845503 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -49,6 +49,7 @@ enum {
PCI_DEVICE_ID_MELLANOX_CONNECTX5VF = 0x1018,
PCI_DEVICE_ID_MELLANOX_CONNECTX5EX = 0x1019,
PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF = 0x101a,
+   PCI_DEVICE_ID_MELLANOX_BLUEFIELD = 0xa2d2,
 };
 
 struct mlx5_xstats_ctrl {
-- 
2.12.0

[dpdk-dev] [PATCH] net/mlx5: fix tunnel offloads cap query

[Shahaf Shuler]

The query for the tunnel stateless offloads is wrongly implemented
because of:

1. It was using the device id to query for the offloads.
2. It was using a compilation flag for Verbs which no longer exits.

The main reason was lack of proper API from Verbs.

Fixing the query to use rdma-core API. The capability returned from
rdma-core refer to both Tx and Rx sides.
Eventhough there is a separate cap for GRE and VXLAN, implementation merge
them into a single flag in order to simplify the checks on the data
path.

Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")
Fixes: f5fde5205101 ("net/mlx5: add hardware checksum offload for tunnel 
packets")
Cc: sta...@dpdk.org

Signed-off-by: Shahaf Shuler 
Acked-by: Yongseok Koh 
Acked-by: Xueming Li 
---
 drivers/net/mlx5/Makefile   |  6 +++---
 drivers/net/mlx5/mlx5.c | 39 +++
 drivers/net/mlx5/mlx5.h |  4 ++--
 drivers/net/mlx5/mlx5_rxq.c |  2 +-
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 3bc9736c9..afda4118f 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -125,9 +125,9 @@ mlx5_autoconf.h.new: FORCE
 mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
$Q $(RM) -f -- '$@'
$Q sh -- '$<' '$@' \
-   HAVE_IBV_DEVICE_VXLAN_SUPPORT \
-   infiniband/verbs.h \
-   enum IBV_DEVICE_VXLAN_SUPPORT \
+   HAVE_IBV_DEVICE_TUNNEL_SUPPORT \
+   infiniband/mlx5dv.h \
+   enum MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS \
$(AUTOCONF_OUTPUT)
$Q sh -- '$<' '$@' \
HAVE_IBV_WQ_FLAG_RX_END_PADDING \
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6c0985bd6..61cb93101 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -584,7 +584,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct 
rte_pci_device *pci_dev)
unsigned int tunnel_en = 0;
int idx;
int i;
-   struct mlx5dv_context attrs_out;
+   struct mlx5dv_context attrs_out = {0};
 #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
struct ibv_counter_set_description cs_desc;
 #endif
@@ -633,20 +633,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct 
rte_pci_device *pci_dev)
   PCI_DEVICE_ID_MELLANOX_CONNECTX5VF) ||
  (pci_dev->id.device_id ==
   PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF));
-   switch (pci_dev->id.device_id) {
-   case PCI_DEVICE_ID_MELLANOX_CONNECTX4:
-   tunnel_en = 1;
-   break;
-   case PCI_DEVICE_ID_MELLANOX_CONNECTX4LX:
-   case PCI_DEVICE_ID_MELLANOX_CONNECTX5:
-   case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF:
-   case PCI_DEVICE_ID_MELLANOX_CONNECTX5EX:
-   case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
-   tunnel_en = 1;
-   break;
-   default:
-   break;
-   }
INFO("PCI information matches, using device \"%s\""
 " (SR-IOV: %s)",
 list[i]->name,
@@ -675,6 +661,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct 
rte_pci_device *pci_dev)
 * Multi-packet send is supported by ConnectX-4 Lx PF as well
 * as all ConnectX-5 devices.
 */
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+   attrs_out.comp_mask |= MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS;
+#endif
mlx5_glue->dv_query_device(attr_ctx, &attrs_out);
if (attrs_out.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
if (attrs_out.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
@@ -693,6 +682,17 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct 
rte_pci_device *pci_dev)
cqe_comp = 0;
else
cqe_comp = 1;
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+   if (attrs_out.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
+   tunnel_en = ((attrs_out.tunnel_offloads_caps &
+ MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN) &&
+(attrs_out.tunnel_offloads_caps &
+ MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE));
+   }
+   DEBUG("Tunnel offloading is %ssupported", tunnel_en ? "" : "not ");
+#else
+   WARN("Tunnel offloading disabled due to old OFED/rdma-core version");
+#endif
if (mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr))
goto error;
INFO("%u port(s) detected", device_attr.orig_attr.phys_port_cnt);
@@ -838,15 +838,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct 
rte_pci_device *pci_dev)
IBV_DEVICE_RAW_IP_CSUM);
DEBUG("checksum offloading is %ssupported",
  (config.hw_csum ? "" : "not "));
-
-