Re: [dpdk-dev] [PATCH v4 3/5] vhost: add apis for datapath configuration
On 03/10/2018 11:01 AM, Zhihong Wang wrote:
This patch adds APIs for datapath configuration.
The did of the vhost-user socket can be set to identify the backend device,
in this case each vhost-user socket can have only 1 connection. The did is
set to -1 by default when the software datapath is used.
Signed-off-by: Zhihong Wang
---
Changes in v4:
1. Remove the "engine" concept in the lib.
lib/librte_vhost/rte_vhost.h | 35 +
lib/librte_vhost/rte_vhost_version.map | 3 +++
lib/librte_vhost/socket.c | 36 ++
lib/librte_vhost/vhost.c | 25 +++
lib/librte_vhost/vhost.h | 9 +
5 files changed, 108 insertions(+)
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index 671ea5053..d50f4c67d 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -200,6 +200,30 @@ int rte_vhost_driver_register(const char *path, uint64_t
flags);
int rte_vhost_driver_unregister(const char *path);
/**
+ * Set the device id, enforce single connection per socket
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param did
+ * Device id
+ * @return
+ * 0 on success, -1 on failure
+ */
+int __rte_experimental
+rte_vhost_driver_set_vdpa_did(const char *path, int did);
IIUC, we call this to attach a VDPA device to a Vhost-user port?
What about having this named explicitly? Something like:
rte_vhost_driver_attach_vdpa_did(const char *path, int did)
rte_vhost_driver_detach_vdpa_did(const char *path)
The later would set to did -1
This is not mandatory though
+
+/**
+ * Get the device id
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @return
+ * Device id, -1 on failure
+ */
+int __rte_experimental
+rte_vhost_driver_get_vdpa_did(const char *path);
+
+/**
* Set the feature bits the vhost-user driver supports.
*
* @param path
@@ -464,6 +488,17 @@ int rte_vhost_vring_call(int vid, uint16_t vring_idx);
*/
uint32_t rte_vhost_rx_queue_count(int vid, uint16_t qid);
+/**
+ * Get vdpa device id for vhost device.
+ *
+ * @param vid
+ * vhost device ID
+ * @return
+ * device id
+ */
+int __rte_experimental
+rte_vhost_get_vdpa_did(int vid);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_vhost/rte_vhost_version.map
b/lib/librte_vhost/rte_vhost_version.map
index 7bcffb490..6e2d5364a 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -64,4 +64,7 @@ EXPERIMENTAL {
rte_vdpa_register_device;
rte_vdpa_unregister_device;
rte_vdpa_find_device_id;
+ rte_vhost_driver_set_vdpa_did;
+ rte_vhost_driver_get_vdpa_did;
+ rte_vhost_get_vdpa_did;
} DPDK_18.02;
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index cfc31e179..3d58da94e 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -52,6 +52,13 @@ struct vhost_user_socket {
uint64_t supported_features;
uint64_t features;
+ /*
+* Device id to identify a specific backend device.
+* It's set to -1 for the default software implementation.
+* If valid, one socket can have 1 connection only.
+*/
+ int did;
I would rename it to something like vdpa_did or even better,
vdpa_dev_id. At least prefix it with vdpa not to confuse the user.
+
struct vhost_device_ops const *notify_ops;
};
@@ -545,6 +552,35 @@ find_vhost_user_socket(const char *path)
}
int
+rte_vhost_driver_set_vdpa_did(const char *path, int did)
+{
+ struct vhost_user_socket *vsocket;
+
+ pthread_mutex_lock(&vhost_user.mutex);
+ vsocket = find_vhost_user_socket(path);
+ if (vsocket)
+ vsocket->did = did;
I guess it is possible to know whether the did exists
at that time. Maybe we could check this?
+ pthread_mutex_unlock(&vhost_user.mutex);
+
+ return vsocket ? 0 : -1;
+}
+
+int
+rte_vhost_driver_get_vdpa_did(const char *path)
+{
+ struct vhost_user_socket *vsocket;
+ int did = -1;
+
+ pthread_mutex_lock(&vhost_user.mutex);
+ vsocket = find_vhost_user_socket(path);
+ if (vsocket)
+ did = vsocket->did;
+ pthread_mutex_unlock(&vhost_user.mutex);
+
+ return did;
+}
+
+int
rte_vhost_driver_disable_features(const char *path, uint64_t features)
{
struct vhost_user_socket *vsocket;
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index f6f12a03b..1740cc1ab 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -283,6 +283,7 @@ vhost_new_device(void)
dev->vid = i;
dev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET;
dev->slave_req_fd = -1;
+ dev->did = -1;
return i;
}
@@ -311,6 +312,20 @@ vhost_destroy_device(int vid)
}
void
+vhost_set_vdpa_did(int vid, int did)
+{
+ struct virtio_net *dev
Re: [dpdk-dev] [PATCH v4 4/5] vhost: adapt vhost lib for selective datapath
On 03/10/2018 11:01 AM, Zhihong Wang wrote:
This patch adapts vhost lib for selective datapath by calling device ops
at the corresponding stage.
Signed-off-by: Zhihong Wang
---
Changes in v4:
1. Remove the "engine" concept in the lib.
---
Changes in v2:
1. Ensure negotiated capabilities are supported in vhost-user lib.
2. Configure the data path at the right time.
lib/librte_vhost/rte_vhost.h | 27 ++
lib/librte_vhost/rte_vhost_version.map | 2 +
lib/librte_vhost/socket.c | 94 --
lib/librte_vhost/vhost.c | 3 ++
lib/librte_vhost/vhost.h | 2 +
lib/librte_vhost/vhost_user.c | 54 +--
6 files changed, 172 insertions(+), 10 deletions(-)
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index d50f4c67d..3c3334d3e 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -279,6 +279,33 @@ int rte_vhost_driver_disable_features(const char *path,
uint64_t features);
int rte_vhost_driver_get_features(const char *path, uint64_t *features);
/**
+ * Get the protocol feature bits before feature negotiation.
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param protocol_features
+ * A pointer to store the queried protocol feature bits
+ * @return
+ * 0 on success, -1 on failure
+ */
+int __rte_experimental
+rte_vhost_driver_get_protocol_features(const char *path,
+ uint64_t *protocol_features);
+
+/**
+ * Get the queue number bits before feature negotiation.
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param queue_num
+ * A pointer to store the queried queue number bits
+ * @return
+ * 0 on success, -1 on failure
+ */
+int __rte_experimental
+rte_vhost_driver_get_queue_num(const char *path, uint32_t *queue_num);
+
+/**
* Get the feature bits after negotiation
*
* @param vid
diff --git a/lib/librte_vhost/rte_vhost_version.map
b/lib/librte_vhost/rte_vhost_version.map
index 6e2d5364a..812ccd72b 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -67,4 +67,6 @@ EXPERIMENTAL {
rte_vhost_driver_set_vdpa_did;
rte_vhost_driver_get_vdpa_did;
rte_vhost_get_vdpa_did;
+ rte_vhost_driver_get_protocol_features;
+ rte_vhost_driver_get_queue_num;
} DPDK_18.02;
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 3d58da94e..ba7b422a0 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -216,6 +216,8 @@ vhost_user_add_connection(int fd, struct vhost_user_socket
*vsocket)
vhost_set_builtin_virtio_net(vid, vsocket->use_builtin_virtio_net);
+ vhost_set_vdpa_did(vid, vsocket->did);
+
if (vsocket->dequeue_zero_copy)
vhost_enable_dequeue_zero_copy(vid);
@@ -648,20 +650,102 @@ int
rte_vhost_driver_get_features(const char *path, uint64_t *features)
{
struct vhost_user_socket *vsocket;
+ uint64_t vdpa_features;
+ int did = -1;
+ int ret = 0;
pthread_mutex_lock(&vhost_user.mutex);
vsocket = find_vhost_user_socket(path);
- if (vsocket)
- *features = vsocket->features;
+ if (vsocket) {
+ did = vsocket->did;
+ if (did < 0 || vdpa_devices[did]->ops->feature_get == NULL)
+ *features = vsocket->features;
+ else if (vdpa_devices[did]->ops->feature_get(did,
+ &vdpa_features) < 0) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "failed to get vdpa features "
+ "for socket file %s.\n", path);
+ ret = -1;
+ } else
+ *features = vsocket->features & vdpa_features;
It seems correct but it is not very intuitive.
Also, you have to put braces everywhere if one of the if/else if/else
have some.
What about something like this:
rte_vhost_driver_get_features(const char *path, uint64_t *features)
{
struct vhost_user_socket *vsocket;
uint64_t vdpa_features;
int did = -1;
int ret = 0;
struct rte_vdpa_device *vdpa_dev;
pthread_mutex_lock(&vhost_user.mutex);
vsocket = find_vhost_user_socket(path);
if (!vsocket) {
RTE_LOG(ERR, VHOST_CONFIG,
"socket file %s is not registered yet.\n"
, path);
ret = -1;
goto out_unlock;
}
did = vsocket->did;
vdpa_dev = rte_vdpa_device_get(did);
if (!vdpa_dev || !vdpa->ops->feature_get) {
*features = vsocket->features;
goto out_unlock;
}
if (vdpa_dev->ops->feature_get(did, &vdpa_features) < 0) {
RTE_LOG(ERR, VHOST_CONFIG,
"failed
Re: [dpdk-dev] [PATCH v4 2/5] vhost: support selective datapath
On 03/10/2018 11:01 AM, Zhihong Wang wrote:
+ uint64_t *size);
+/* Device ops */
+struct rte_vdpa_dev_ops {
+ vdpa_dev_queue_num_get_t queue_num_get;
+ vdpa_dev_feature_get_tfeature_get;
+ vdpa_dev_feature_get_tprotocol_feature_get;
I would prefer them to be named as in Vhost-user spec:
get_queue_num
get_features
get_protocol_features
Thanks,
Maxime
Re: [dpdk-dev] [PATCH v4 5/5] vhost: add apis for live migration
On 03/10/2018 11:01 AM, Zhihong Wang wrote: This patch adds APIs to enable live migration for non-builtin data paths. At src side, last_avail/used_idx from the device need to be set into the virtio_net structure, and the log_base and log_size from the virtio_net structure need to be set into the device. At dst side, last_avail/used_idx need to be read from the virtio_net structure and set into the device. Signed-off-by: Zhihong Wang --- lib/librte_vhost/rte_vhost.h | 51 +++ lib/librte_vhost/rte_vhost_version.map | 3 ++ lib/librte_vhost/vhost.c | 63 ++ 3 files changed, 117 insertions(+) Reviewed-by: Maxime Coquelin Thanks, Maxime
[dpdk-dev] [PATCH v4 3/7] crypto/virtio: core code of virtio crypto PMD
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.
The virtio crypto PMD provides poll mode driver support for the
virtio crypto device.
The cryptodev is created at the virtio crypto pci device probing stage.
For now, it only supports the session-oriented API implementation, the
supported symmetrical algorithms are AES-CBC ciphering and AES-CBC with
HMAC-SHA1 algorithm-chaining. The function
virtio_crypto_sym_configure_session() is used to create a session, then
virtio_crypto_pkt_tx_burst() can be used to burst transfer packets and
virtio_crypto_pkt_rx_burst() can be used to burst receive packets.
Signed-off-by: Jay Zhou
Reviewed-by: Fan Zhang
Acked-by: Fan Zhang
---
drivers/crypto/virtio/virtio_crypto_capabilities.h | 51 +
drivers/crypto/virtio/virtio_cryptodev.c | 1508
drivers/crypto/virtio/virtio_cryptodev.h | 66 +
drivers/crypto/virtio/virtio_rxtx.c| 541 +++
4 files changed, 2166 insertions(+)
create mode 100644 drivers/crypto/virtio/virtio_crypto_capabilities.h
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_crypto_capabilities.h
b/drivers/crypto/virtio/virtio_crypto_capabilities.h
new file mode 100644
index 000..03c30de
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -0,0 +1,51 @@
+/* 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\
+ { /* 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 = { \
+ .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/dr
[dpdk-dev] [PATCH v4 5/7] doc: add virtio crypto PMD guide
Signed-off-by: Jay Zhou Reviewed-by: Fan Zhang Acked-by: Fan Zhang --- doc/guides/cryptodevs/features/virtio.ini | 26 +++ doc/guides/cryptodevs/index.rst | 1 + doc/guides/cryptodevs/virtio.rst | 117 ++ 3 files changed, 144 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..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 558c926..ef16ab3 100644 --- a/doc/guides/cryptodevs/index.rst +++ b/doc/guides/cryptodevs/index.rst @@ -22,4 +22,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-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 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 \
[dpdk-dev] [PATCH v4 0/7] crypto: add virtio poll mode driver
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 sent to DPDK community, pls see [PATCH v2 00/10] lib/librte_vhost: introduce new vhost user crypto backend support https://dpdk.org/ml/archives/dev/2018-February/091594.html 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 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 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 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 (7): crypto/virtio: add virtio related fundamental functions crypto/virtio:
[dpdk-dev] [PATCH v4 1/7] crypto/virtio: add virtio related fundamental functions
Since there does 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. Meanwhile, adding virtio crypto PMD related release note for 18.05. Signed-off-by: Jay Zhou Reviewed-by: Fan Zhang Acked-by: Fan Zhang --- config/common_base | 14 + doc/guides/rel_notes/release_18_05.rst | 4 + drivers/crypto/virtio/virtio_logs.h| 91 +++ drivers/crypto/virtio/virtio_pci.c | 460 + drivers/crypto/virtio/virtio_pci.h | 253 ++ drivers/crypto/virtio/virtio_ring.h| 137 ++ drivers/crypto/virtio/virtqueue.c | 43 +++ drivers/crypto/virtio/virtqueue.h | 172 8 files changed, 1174 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 ee10b44..91d3102 100644 --- a/config/common_base +++ b/config/common_base @@ -486,6 +486,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 3923dc2..32c39d5 100644 --- a/doc/guides/rel_notes/release_18_05.rst +++ b/doc/guides/rel_notes/release_18_05.rst @@ -41,6 +41,10 @@ New Features Also, make sure to start the actual text at the margin. = +* **Added Virtio Crypto PMD.** + + Added new Virtio Crypto PMD, which provides AES-CBC ciphering and AES-CBC + with HMAC-SHA1 algorithm-chaining. API Changes --- diff --git a/drivers/crypto/virtio/virtio_logs.h b/drivers/crypto/virtio/virtio_logs.h new file mode 100644 index 000..26a286c --- /dev/null +++ b/drivers/crypto/virtio/virtio_logs.h @@ -0,0 +1,91 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. + */ + +#ifndef _VIRTIO_LOGS_H_ +#define _VIRTIO_LOGS_H_ + +#include + +#define PMD_INIT_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \ + "PMD: %s(): " fmt "\n", __func__, ##args) + +#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") + +extern int virtio_crypto_logtype_init; + +#define VIRTIO_CRYPTO_INIT_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_init, \ + "INIT: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_INIT_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_INIT_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_INIT_LOG_DBG(fmt, args...) \ + VIRTIO_CRYPTO_INIT_LOG_IMPL(DEBUG, fmt, ## args) + +#define VIRTIO_CRYPTO_INIT_LOG_ERR(fmt, args...) \ + VIRTIO_CRYPTO_INIT_LOG_IMPL(ERR, fmt, ## args) + +extern int virtio_crypto_logtype_session; + +#define VIRTIO_CRYPTO_SESSION_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_session, \ + "SESSION: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_SESSION_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_SESSION_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_SESSION_LOG_DBG(fmt, args...) \ + VIRTIO_CRYPTO_SESSION_LOG_IMPL(DEBUG, fmt, ## args) + +#define VIRTIO_CRYPTO_SESSION_LOG_ERR(fmt, args...) \ + VIRTIO_CRYPTO_SESSION_LOG_IMPL(ERR, fmt, ## args) + +extern int virtio_crypto_logtype_rx; + +#define VIRTIO_CRYPTO_RX_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_rx, \ + "RX: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_RX_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_RX_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_RX_LOG_DBG(fmt, args...) \ + VIRTIO_CRYPTO_RX_LOG_IMPL(DEBUG, fmt, ## args) + +#define VIRTIO_CRYPTO_RX_LOG_ERR(fmt, args...) \ + VIRTIO_CRYPTO_RX_LOG_IMPL(ERR, fmt, ## args) + +extern int virtio_crypto_logtype_tx; + +#define VIRTIO_CRYPTO_TX_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_tx, \ + "TX: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_TX_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_TX_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_TX_LOG_DBG(fmt, args...) \ + VIRT
[dpdk-dev] [PATCH v4 2/7] crypto/virtio: add crypto related session structure
This structure will be used in the following patches, especially
at creating and destroying crypto sessions.
Signed-off-by: Jay Zhou
Reviewed-by: Fan Zhang
Acked-by: Fan Zhang
---
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 v4 6/7] test/crypto: add function tests for virtio crypto PMD
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 | 49 +
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, 75 insertions(+), 9 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..cac7cda 100644
--- a/test/test/test_cryptodev_aes_test_vectors.h
+++ b/test/test/test_cryptodev_aes_test_vectors.h
@@ -1526,7 +1526,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 +1539,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-192-CBC Encryption",
@@ -1549,7 +1551,8 @@
[dpdk-dev] [PATCH v4 4/7] crypto/virtio: add makefile
The virtio crypto PMD driver can be compiled now.
Signed-off-by: Jay Zhou
Reviewed-by: Fan Zhang
Acked-by: Fan Zhang
---
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 26e503e..e48bbdd 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -20,5 +20,6 @@ endif
ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec
endif
+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 94525dc..d7ddda4 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -204,6 +204,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 v4 7/7] MAINTAINERS: add myself as virtio crypto PMD maintainer
Signed-off-by: Jay Zhou Reviewed-by: Fan Zhang Acked-by: Fan Zhang --- MAINTAINERS | 6 ++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 75d3e92..24c5af8 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
Re: [dpdk-dev] [PATCH v4 0/7] crypto: add virtio poll mode driver
I find that my dpdk-next-crypto repo is not the newest, I'll send a new version. Sorry about that. Regards, Jay > -Original Message- > From: Zhoujian (jay) > Sent: Saturday, March 31, 2018 3:49 PM > To: dev@dpdk.org > Cc: pablo.de.lara.gua...@intel.com; roy.fan.zh...@intel.com; > tho...@monjalon.net; Gonglei (Arei) ; > xin.z...@intel.com; Huangweidong (C) ; wangxin (U) > ; longpeng ; Zhoujian (jay) > > Subject: [PATCH v4 0/7] crypto: add virtio poll mode driver > > 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 sent to DPDK community, pls see > > [PATCH v2 00/10] lib/librte_vhost: introduce new vhost user crypto backend > support https://dpdk.org/ml/archives/dev/2018-February/091594.html > > 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 > 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 > > 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 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 n
[dpdk-dev] [PATCH v5 0/7] crypto: add virtio poll mode driver
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 sent to DPDK community, pls see [PATCH v2 00/10] lib/librte_vhost: introduce new vhost user crypto backend support https://dpdk.org/ml/archives/dev/2018-February/091594.html 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 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 (7): crypto/virtio: add virtio related fundamental functions crypto/virtio: add crypto related session structure crypto/virtio: core code of virtio crypto PMD crypto/virtio: add makefile doc: add virtio crypto PMD guide test/crypto: add function tests for virtio cr
[dpdk-dev] [PATCH v5 1/7] crypto/virtio: add virtio related fundamental functions
Since there does 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. Meanwhile, adding virtio crypto PMD related release note for 18.05. Signed-off-by: Jay Zhou Reviewed-by: Fan Zhang Acked-by: Fan Zhang --- config/common_base | 14 + doc/guides/rel_notes/release_18_05.rst | 6 + drivers/crypto/virtio/virtio_logs.h| 91 +++ drivers/crypto/virtio/virtio_pci.c | 460 + drivers/crypto/virtio/virtio_pci.h | 253 ++ drivers/crypto/virtio/virtio_ring.h| 137 ++ drivers/crypto/virtio/virtqueue.c | 43 +++ drivers/crypto/virtio/virtqueue.h | 172 8 files changed, 1176 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 a842478..bf6bbc7 100644 --- a/config/common_base +++ b/config/common_base @@ -486,6 +486,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 0eeabf5..a90c25e 100644 --- a/doc/guides/rel_notes/release_18_05.rst +++ b/doc/guides/rel_notes/release_18_05.rst @@ -53,6 +53,12 @@ New Features :doc:`../cryptodevs/ccp` crypto driver guide for more details on this new driver. +* **Added the virtio crypto PMD.** + + Added a new virtio crypto PMD, which provides AES-CBC ciphering and + AES-CBC with HMAC-SHA1 algorithm-chaining. See the + :doc:`../cryptodevs/virtio` crypto driver guide for more details on + this new driver. API Changes --- diff --git a/drivers/crypto/virtio/virtio_logs.h b/drivers/crypto/virtio/virtio_logs.h new file mode 100644 index 000..26a286c --- /dev/null +++ b/drivers/crypto/virtio/virtio_logs.h @@ -0,0 +1,91 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. + */ + +#ifndef _VIRTIO_LOGS_H_ +#define _VIRTIO_LOGS_H_ + +#include + +#define PMD_INIT_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \ + "PMD: %s(): " fmt "\n", __func__, ##args) + +#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") + +extern int virtio_crypto_logtype_init; + +#define VIRTIO_CRYPTO_INIT_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_init, \ + "INIT: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_INIT_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_INIT_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_INIT_LOG_DBG(fmt, args...) \ + VIRTIO_CRYPTO_INIT_LOG_IMPL(DEBUG, fmt, ## args) + +#define VIRTIO_CRYPTO_INIT_LOG_ERR(fmt, args...) \ + VIRTIO_CRYPTO_INIT_LOG_IMPL(ERR, fmt, ## args) + +extern int virtio_crypto_logtype_session; + +#define VIRTIO_CRYPTO_SESSION_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_session, \ + "SESSION: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_SESSION_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_SESSION_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_SESSION_LOG_DBG(fmt, args...) \ + VIRTIO_CRYPTO_SESSION_LOG_IMPL(DEBUG, fmt, ## args) + +#define VIRTIO_CRYPTO_SESSION_LOG_ERR(fmt, args...) \ + VIRTIO_CRYPTO_SESSION_LOG_IMPL(ERR, fmt, ## args) + +extern int virtio_crypto_logtype_rx; + +#define VIRTIO_CRYPTO_RX_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_rx, \ + "RX: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_RX_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_RX_LOG_IMPL(INFO, fmt, ## args) + +#define VIRTIO_CRYPTO_RX_LOG_DBG(fmt, args...) \ + VIRTIO_CRYPTO_RX_LOG_IMPL(DEBUG, fmt, ## args) + +#define VIRTIO_CRYPTO_RX_LOG_ERR(fmt, args...) \ + VIRTIO_CRYPTO_RX_LOG_IMPL(ERR, fmt, ## args) + +extern int virtio_crypto_logtype_tx; + +#define VIRTIO_CRYPTO_TX_LOG_IMPL(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_tx, \ + "TX: %s(): " fmt "\n", __func__, ##args) + +#define VIRTIO_CRYPTO_TX_LOG_INFO(fmt, args...) \ + VIRTIO_CRYPTO_TX_LOG_IMPL(INFO, fmt, ## arg
[dpdk-dev] [PATCH v5 6/7] test/crypto: add function tests for virtio crypto PMD
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 d45fb7b..a7acad8 100644
--- a/test/test/test_cryptodev.h
+++ b/test/test/test_cryptodev.h
@@ -62,6 +62,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
[dpdk-dev] [PATCH v5 4/7] crypto/virtio: add makefile
The virtio crypto PMD driver can be compiled now.
Signed-off-by: Jay Zhou
Reviewed-by: Fan Zhang
Acked-by: Fan Zhang
---
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 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..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 8071aa6..c2767b0 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -204,6 +204,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lIPSec_MB
_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 v5 7/7] MAINTAINERS: add myself as virtio crypto PMD maintainer
Signed-off-by: Jay Zhou Reviewed-by: Fan Zhang Acked-by: Fan Zhang --- MAINTAINERS | 6 ++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b262e55..5424e74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -724,6 +724,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 v5 2/7] crypto/virtio: add crypto related session structure
This structure will be used in the following patches, especially
at creating and destroying crypto sessions.
Signed-off-by: Jay Zhou
Reviewed-by: Fan Zhang
Acked-by: Fan Zhang
---
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 v5 3/7] crypto/virtio: core code of virtio crypto PMD
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.
The virtio crypto PMD provides poll mode driver support for the
virtio crypto device.
The cryptodev is created at the virtio crypto pci device probing stage.
For now, it only supports the session-oriented API implementation, the
supported symmetrical algorithms are AES-CBC ciphering and AES-CBC with
HMAC-SHA1 algorithm-chaining. The function
virtio_crypto_sym_configure_session() is used to create a session, then
virtio_crypto_pkt_tx_burst() can be used to burst transfer packets and
virtio_crypto_pkt_rx_burst() can be used to burst receive packets.
Signed-off-by: Jay Zhou
Reviewed-by: Fan Zhang
Acked-by: Fan Zhang
---
drivers/crypto/virtio/virtio_crypto_capabilities.h | 51 +
drivers/crypto/virtio/virtio_cryptodev.c | 1508
drivers/crypto/virtio/virtio_cryptodev.h | 66 +
drivers/crypto/virtio/virtio_rxtx.c| 541 +++
4 files changed, 2166 insertions(+)
create mode 100644 drivers/crypto/virtio/virtio_crypto_capabilities.h
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_crypto_capabilities.h
b/drivers/crypto/virtio/virtio_crypto_capabilities.h
new file mode 100644
index 000..03c30de
--- /dev/null
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -0,0 +1,51 @@
+/* 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\
+ { /* 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 = { \
+ .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/dr
[dpdk-dev] [PATCH v5 5/7] doc: add virtio crypto PMD guide
Signed-off-by: Jay Zhou Reviewed-by: Fan Zhang Acked-by: Fan Zhang --- doc/guides/cryptodevs/features/virtio.ini | 26 +++ doc/guides/cryptodevs/index.rst | 1 + doc/guides/cryptodevs/virtio.rst | 117 ++ 3 files changed, 144 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..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-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 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 \
Re: [dpdk-dev] [PATCH v3 1/4] eal/vfio: add support for multiple container
On 03/31/2018 04:29 AM, Xiao Wang wrote: From: Junjie Chen Currently eal vfio framework binds vfio group fd to the default container fd, while in some cases, e.g. vDPA (vhost data path acceleration), we want to set vfio group to a new container and program DMA mapping via this new container, so this patch adds APIs to support multiple container. Signed-off-by: Junjie Chen Signed-off-by: Xiao Wang --- config/common_base | 1 + lib/librte_eal/bsdapp/eal/eal.c | 51 ++- lib/librte_eal/common/include/rte_vfio.h | 116 +++ lib/librte_eal/linuxapp/eal/eal_vfio.c | 552 +-- lib/librte_eal/linuxapp/eal/eal_vfio.h | 1 + lib/librte_eal/rte_eal_version.map | 7 + 6 files changed, 627 insertions(+), 101 deletions(-) FWIW: Reviewed-by: Maxime Coquelin Thanks, Maxime
Re: [dpdk-dev] [PATCH v3 2/4] net/virtio: skip device probe in vdpa mode
Hi Xiao, On 03/31/2018 04:29 AM, Xiao Wang wrote: 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 --- drivers/net/virtio/virtio_ethdev.c | 43 ++ 1 file changed, 43 insertions(+) As we discussed, I would prefer a generic solution at EAL level. But as a start, I agree with this solution: Reviewed-by: Maxime Coquelin Thanks! Maxime
Re: [dpdk-dev] [PATCH v3 3/4] net/ifcvf: add ifcvf vdpa driver
On 03/31/2018 04:29 AM, Xiao Wang wrote:
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
---
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
Thanks for having handled the changes, please see minor comments below.
Feel free to add my:
Reviewed-by: Maxime Coquelin
Thanks!
Maxime
+static uint64_t
+qva_to_gpa(int vid, uint64_t qva)
We might want to have this in vhost-lib to avoid duplication,
but that can be done later.
+{
+ struct rte_vhost_memory *mem = NULL;
+ struct rte_vhost_mem_region *reg;
+ uint32_t i;
+ uint64_t gpa = 0;
+
+ if (rte_vhost_get_mem_table(vid, &mem) < 0)
+ goto exit;
+
+ for (i = 0; i < mem->nregions; i++) {
+ reg = &mem->regions[i];
+
+ if (qva >= reg->host_user_addr &&
+ qva < reg->host_user_addr + reg->size) {
+ gpa = qva - reg->host_user_addr + reg->guest_phys_addr;
+ break;
+ }
+ }
+
+exit:
+ if (gpa == 0)
+ rte_panic("failed to get gpa\n");
+ if (mem)
+ free(mem);
+ return gpa;
+}
+
+static int
+vdpa_ifcvf_start(struct ifcvf_internal *internal)
+{
+ struct ifcvf_hw *hw = &internal->hw;
+ int i, nr_vring;
+ int vid;
+ struct rte_vhost_vring vq;
+
+ vid = internal->vid;
+ nr_vring = rte_vhost_get_vring_num(vid);
+ rte_vhost_get_negotiated_features(vid, &hw->req_features);
+
+ for (i = 0; i < nr_vring; i++) {
+ rte_vhost_get_vhost_vring(vid, i, &vq);
+ hw->vring[i].desc = qva_to_gpa(vid, (uint64_t)vq.desc);
+ hw->vring[i].avail = qva_to_gpa(vid, (uint64_t)vq.avail);
+ hw->vring[i].used = qva_to_gpa(vid, (uint64_t)vq.used);
+ hw->vring[i].size = vq.size;
+ rte_vhost_get_vring_base(vid, i, &hw->vring[i].last_avail_idx,
+ &hw->vring[i].last_used_idx);
+ }
+ hw->nr_vring = i;
+
+ return ifcvf_start_hw(&internal->hw);
+}
+
+static void
+vdpa_ifcvf_stop(struct ifcvf_internal *internal)
+{
+ struct ifcvf_hw *hw = &internal->hw;
+ int i, j;
+ int vid;
+ uint64_t features, pfn;
+ uint64_t log_base, log_size;
+ uint8_t *log_buf;
+
+ vid = internal->vid;
+ ifcvf_stop_hw(hw);
+
+ for (i = 0; i < hw->nr_vring; i++)
+ rte_vhost_set_vring_base(vid, i, hw->vring[i].last_avail_idx,
+ hw->vring[i].last_used_idx);
+
+ rte_vhost_get_negotiated_features(vid, &features);
+ if (RTE_VHOST_NEED_LOG(features)) {
+ ifcvf_disable_logging(hw);
+ rte_vhost_get_log_base(internal->vid, &log_base, &log_size);
+ /*
+* IFCVF marks dirty memory page
Re: [dpdk-dev] [PATCH v3 4/4] net/ifcvf: add driver document and release note
On 03/31/2018 04:29 AM, Xiao Wang wrote: Signed-off-by: Xiao Wang --- doc/guides/nics/features/ifcvf.ini | 8 doc/guides/nics/ifcvf.rst | 85 ++ doc/guides/nics/index.rst | 1 + doc/guides/rel_notes/release_18_05.rst | 9 4 files changed, 103 insertions(+) create mode 100644 doc/guides/nics/features/ifcvf.ini create mode 100644 doc/guides/nics/ifcvf.rst Reviewed-by: Maxime Coquelin Thanks! Maxime
Re: [dpdk-dev] [PATCH v3 2/4] net/virtio: skip device probe in vdpa mode
Hi, 31/03/2018 13:13, Maxime Coquelin: > On 03/31/2018 04:29 AM, Xiao Wang wrote: > > 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. > > As we discussed, I would prefer a generic solution at EAL level. Please could you explain the requirement and the context? Can we use RTE_ETH_DEV_DEFERRED state and device ownership? Without knowing what's behind, I would say that a PMD should never skip a device by itself, but let other entities decide what to do with the probed device (thanks to probe notifications).
Re: [dpdk-dev] Build is broken in dpdk-next-net
On Fri, Mar 30, 2018 at 10:47:09PM +0800, Tonghao Zhang wrote:
> I rebuild it on ubuntu 17.10 and cash it. I use the 'RTE_SET_USED' to fix it.
>
>
> diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
> index 771675718..f11803191 100644
> --- a/lib/librte_vhost/fd_man.c
> +++ b/lib/librte_vhost/fd_man.c
> @@ -279,7 +279,8 @@ fdset_pipe_read_cb(int readfd, void *dat __rte_unused,
>int *remove __rte_unused)
> {
> char charbuf[16];
> - read(readfd, charbuf, sizeof(charbuf));
> + int r = read(readfd, charbuf, sizeof(charbuf));
> + RTE_SET_USED(r);
> }
>
> void
> @@ -319,5 +320,6 @@ fdset_pipe_init(struct fdset *fdset)
> void
> fdset_pipe_notify(struct fdset *fdset)
> {
> - write(fdset->u.writefd, "1", 1);
> + int r = write(fdset->u.writefd, "1", 1);
> + RTE_SET_USED(r);
> }
>
A better option might be to use _Pragma
Something like this perhaps
#define ALLOW_UNUSED(x) \
_Pragma(push) \
_Pragma(diagnostic ignored "-Wunused-result") \
#x;\
_Pragma(pop)
This is of course untested, so it probably needs some tweaking, but this method
avoids the need to declare an additional stack variable, which i don't think can
be eliminated due to the cast. I believe that this method should also work
accross compilers (the gcc and clang compilers support this, and i think the
intel compiler should as well)
Neil
Re: [dpdk-dev] [PATCH v6] eal: provide API for querying valid socket id's
On 27-Mar-18 5:24 PM, Thomas Monjalon wrote:
22/03/2018 13:36, Anatoly Burakov:
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -57,6 +57,9 @@ enum rte_proc_type_t {
struct rte_config {
uint32_t master_lcore; /**< Id of the master lcore */
uint32_t lcore_count;/**< Number of available logical cores. */
+ uint32_t numa_node_count;/**< Number of detected NUMA nodes. */
+ uint32_t numa_nodes[RTE_MAX_NUMA_NODES];
+ /**< List of detected numa nodes. */
Please keep this comment on the same line if it's below 99 chars.
If this is allowed, can we fix checkpatch to not report error in these
cases?
--
Thanks,
Anatoly
Re: [dpdk-dev] Build is broken in dpdk-next-net
On Sat, Mar 31, 2018 at 09:33:43AM -0400, Neil Horman wrote:
> On Fri, Mar 30, 2018 at 10:47:09PM +0800, Tonghao Zhang wrote:
> > I rebuild it on ubuntu 17.10 and cash it. I use the 'RTE_SET_USED' to fix
> > it.
> >
> >
> > diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
> > index 771675718..f11803191 100644
> > --- a/lib/librte_vhost/fd_man.c
> > +++ b/lib/librte_vhost/fd_man.c
> > @@ -279,7 +279,8 @@ fdset_pipe_read_cb(int readfd, void *dat __rte_unused,
> >int *remove __rte_unused)
> > {
> > char charbuf[16];
> > - read(readfd, charbuf, sizeof(charbuf));
> > + int r = read(readfd, charbuf, sizeof(charbuf));
> > + RTE_SET_USED(r);
> > }
> >
> > void
> > @@ -319,5 +320,6 @@ fdset_pipe_init(struct fdset *fdset)
> > void
> > fdset_pipe_notify(struct fdset *fdset)
> > {
> > - write(fdset->u.writefd, "1", 1);
> > + int r = write(fdset->u.writefd, "1", 1);
> > + RTE_SET_USED(r);
> > }
> >
>
> A better option might be to use _Pragma
>
> Something like this perhaps
>
> #define ALLOW_UNUSED(x) \
> _Pragma(push) \
> _Pragma(diagnostic ignored "-Wunused-result") \
> #x;\
> _Pragma(pop)
>
> This is of course untested, so it probably needs some tweaking, but this
> method
> avoids the need to declare an additional stack variable, which i don't think
> can
> be eliminated due to the cast. I believe that this method should also work
> accross compilers (the gcc and clang compilers support this, and i think the
> intel compiler should as well)
>
> Neil
>
It would be nice to avoid the definition of a useless variable.
An alternative could be
if (read() < 0) {
/* Failure here is acceptable for such and such reason. */
}
to ensure all-around compatibility, and the definition or another macro.
Just a suggestion.
--
Gaëtan Rivet
6WIND
Re: [dpdk-dev] Build is broken in dpdk-next-net
On Sat, Mar 31, 2018 at 05:09:47PM +0200, Gaëtan Rivet wrote:
> On Sat, Mar 31, 2018 at 09:33:43AM -0400, Neil Horman wrote:
> > On Fri, Mar 30, 2018 at 10:47:09PM +0800, Tonghao Zhang wrote:
> > > I rebuild it on ubuntu 17.10 and cash it. I use the 'RTE_SET_USED' to fix
> > > it.
> > >
> > >
> > > diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
> > > index 771675718..f11803191 100644
> > > --- a/lib/librte_vhost/fd_man.c
> > > +++ b/lib/librte_vhost/fd_man.c
> > > @@ -279,7 +279,8 @@ fdset_pipe_read_cb(int readfd, void *dat __rte_unused,
> > >int *remove __rte_unused)
> > > {
> > > char charbuf[16];
> > > - read(readfd, charbuf, sizeof(charbuf));
> > > + int r = read(readfd, charbuf, sizeof(charbuf));
> > > + RTE_SET_USED(r);
> > > }
> > >
> > > void
> > > @@ -319,5 +320,6 @@ fdset_pipe_init(struct fdset *fdset)
> > > void
> > > fdset_pipe_notify(struct fdset *fdset)
> > > {
> > > - write(fdset->u.writefd, "1", 1);
> > > + int r = write(fdset->u.writefd, "1", 1);
> > > + RTE_SET_USED(r);
> > > }
> > >
> >
> > A better option might be to use _Pragma
> >
> > Something like this perhaps
> >
> > #define ALLOW_UNUSED(x) \
> > _Pragma(push) \
> > _Pragma(diagnostic ignored "-Wunused-result") \
> > #x;\
> > _Pragma(pop)
> >
> > This is of course untested, so it probably needs some tweaking, but this
> > method
> > avoids the need to declare an additional stack variable, which i don't
> > think can
> > be eliminated due to the cast. I believe that this method should also work
> > accross compilers (the gcc and clang compilers support this, and i think the
> > intel compiler should as well)
> >
> > Neil
> >
>
> It would be nice to avoid the definition of a useless variable.
> An alternative could be
>
>if (read() < 0) {
>/* Failure here is acceptable for such and such reason. */
>}
>
> to ensure all-around compatibility, and the definition or another macro.
> Just a suggestion.
>
That would be a good alternative, but I think its effectiveness is dependent on
when the compiler does with the return value check. Without any code inside the
conditional, the compiler may optimize the check out, meaning the warning will
still be asserted. If it doesn't optimize the check out, then you have a
useless compare and jump instruction left in the code path.
Best
Neil
Re: [dpdk-dev] [PATCH v4 09/20] eal/dev: implement device iteration initialization
On Fri, Mar 30, 2018 at 04:22:15PM +, Wiles, Keith wrote: > > > > On Mar 30, 2018, at 10:53 AM, Gaëtan Rivet wrote: > > > > Hello Keith, > > Hello Gaëtan, > > >>> + layers[i].kvlist = rte_kvargs_parse(copy, NULL); > >>> + free(copy); > >> > >> I am sorry this method of not adding blank lines is a bit silly and we > >> need to rethink at least adding a few blank lines to help with grouping > >> the code. This style will cause problems for new readers (old readers) to > >> understand the code. This to me is a maintenance problem for the future > >> and we need to fix this now. > >> > >> Blank lines after if statements (with possible more comments) can help > >> along with adding blank lines to group code is really the minimum amount > >> of lines required. I have never seen someone state you have to many blanks > >> lines in the code except two or more blank lines in a row. This is akin to > >> having a single paragraph in a novel or letter and it makes it very hard > >> to read. It is not hard to add some blank lines to the code for > >> readability. > >> > > > > I understand. What I dislike is having inconsistencies in the layout of > > the code. > > > > "Paragraphs", for lack of a better word, are high subjective and a > > matter of taste. > > I bet your teacher(s) would disagree with that statement with one single > paragraph in your book reports :-) The utility of using paragraph is not a matter of subjectivity. How to use them and how to structure information is what I deemed subjective. > > > > Given that subjectivity is not helpful in review and taste is hard to > > debate, I prefer to have a single terse rule, that is to avoid any > > additional bytes beside the bare minimum to respect checkpatch. > > Taste is hard to debate, but you have gone the extreme route with only the > bare minimum blank lines and that is not good as well. A silly script does > not read code or understand code we the humans have to make the code readable. > > > > When I feel the need to have a new "conceptual group", then I am forced > > to add a comment to explain what is happening. By not allowing blank > > lines, I thus feel the pressure for space and explanation more acutely. > > A blank can give somewhat convey the same information without a comment, but > not in all cases. Even a blank before a group of lines can convey this is a > new logic section. I do not buy the point for needing the same terse rule > here as most of the coding style is free form and allows for reading between > the lines a bit. > > We can make a rule here, but no blank lines in a function this size and the > patch of this size is making DPDK not as professional looking as it could be. > I think one of the main issue anyway is that this function is simply too large as it is. As it turns out, I am working on the second side of this work, which is revamping the device declaration path. This function will be split in different parts, that will be shorter and more palatable. This is a big work, still in progress (the device declaration, not the split of this function). -- Gaëtan Rivet 6WIND
[dpdk-dev] [PATCH v4 2/3] Add Intel FPGA BUS Rawdev Driver
Signed-off-by: Rosen Xu
Signed-off-by: Yanglong Wu
---
config/common_base | 1 +
drivers/raw/Makefile | 1 +
drivers/raw/ifpga_rawdev/Makefile | 34 ++
drivers/raw/ifpga_rawdev/ifpga_rawdev.c| 594 +
drivers/raw/ifpga_rawdev/ifpga_rawdev.h| 37 ++
.../raw/ifpga_rawdev/rte_ifpga_rawdev_version.map | 4 +
mk/rte.app.mk | 1 +
7 files changed, 672 insertions(+)
create mode 100644 drivers/raw/ifpga_rawdev/Makefile
create mode 100644 drivers/raw/ifpga_rawdev/ifpga_rawdev.c
create mode 100644 drivers/raw/ifpga_rawdev/ifpga_rawdev.h
create mode 100644 drivers/raw/ifpga_rawdev/rte_ifpga_rawdev_version.map
diff --git a/config/common_base b/config/common_base
index 49f6b09..08b7cce 100644
--- a/config/common_base
+++ b/config/common_base
@@ -137,6 +137,7 @@ CONFIG_RTE_LIBRTE_VDEV_BUS=y
# Compile the Intel FPGA bus
#
CONFIG_RTE_LIBRTE_IFPGA_BUS=y
+CONFIG_RTE_LIBRTE_IFPGA_RAWDEV=y
#
# Compile ARK PMD
diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile
index da7c8b4..6fc8f2f 100644
--- a/drivers/raw/Makefile
+++ b/drivers/raw/Makefile
@@ -5,5 +5,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
# DIRS-$() +=
DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_RAWDEV) += ifpga_rawdev
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/raw/ifpga_rawdev/Makefile
b/drivers/raw/ifpga_rawdev/Makefile
new file mode 100644
index 000..118c729
--- /dev/null
+++ b/drivers/raw/ifpga_rawdev/Makefile
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_ifpga_rawdev.a
+
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga
+CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev
+LDLIBS += -lrte_eal
+LDLIBS += -lrte_rawdev
+LDLIBS += -lrte_bus_vdev
+LDLIBS += -lrte_kvargs
+
+EXPORT_MAP := rte_ifpga_rawdev_version.map
+
+LIBABIVER := 1
+
+VPATH += $(SRCDIR)/base
+
+include $(RTE_SDK)/drivers/raw/ifpga_rawdev/base/Makefile
+
+#
+# all source are stored in SRCS-y
+#
+SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_RAWDEV) += ifpga_rawdev.c
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
new file mode 100644
index 000..e46c014
--- /dev/null
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -0,0 +1,594 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "base/opae_hw_api.h"
+#include "rte_rawdev.h"
+#include "rte_rawdev_pmd.h"
+#include "rte_bus_ifpga.h"
+#include "ifpga_common.h"
+#include "ifpga_logs.h"
+#include "ifpga_rawdev.h"
+
+int ifpga_rawdev_logtype;
+
+#define PCI_VENDOR_ID_INTEL 0x8086
+/* PCI Device ID */
+#define PCIE_DEVICE_ID_PF_INT_5_X0xBCBD
+#define PCIE_DEVICE_ID_PF_INT_6_X0xBCC0
+#define PCIE_DEVICE_ID_PF_DSC_1_X0x09C4
+/* VF Device */
+#define PCIE_DEVICE_ID_VF_INT_5_X0xBCBF
+#define PCIE_DEVICE_ID_VF_INT_6_X0xBCC1
+#define PCIE_DEVICE_ID_VF_DSC_1_X0x09C5
+#define RTE_MAX_RAW_DEVICE 10
+
+static const struct rte_pci_id pci_ifpga_map[] = {
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_PF_INT_5_X) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_VF_INT_5_X) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_PF_INT_6_X) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_VF_INT_6_X) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_PF_DSC_1_X) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_VF_DSC_1_X) },
+ { .vendor_id = 0, /* sentinel */ },
+};
+
+static int ifpga_fill_afu_dev(struct opae_accelerator *acc,
+ struct rte_afu_device *afu_dev)
+{
+ struct rte_mem_resource *res = afu_dev->mem_resource;
+ struct opae_acc_region_info region_info;
+ struct opae_acc_info info;
+ unsigned long i;
+ int ret;
+
+ ret = opae_acc_get_info(acc, &info);
+ if (ret)
+ return ret;
+
+ if (info.num_regions > PCI_MAX_RESOURCE)
+ return -EFAULT;
+
+ afu_dev->num_region = info.num_regions;
+
+ for (i = 0; i < info.num_regions; i++) {
+ region_info.index = i;
+ ret = opae_acc_get_region_info(acc, ®ion_info);
+ if (ret)
+ return ret;
+
+ if ((region_info.flags & ACC_REGION_MMIO) &&
+ (region_info.flags & ACC_REGION_READ
[dpdk-dev] [PATCH v4 0/3] Introduce Intel FPGA BUS
Intel FPGA BUS in DPDK - This patch set introduces Intel FPGA BUS support in DPDK. v4 updates: === - Remove all modifications from eal - Create vdev to take IFPGA parameters configuration - AFU Device Driver bind to AFU Device by uuid - Take more test in scenario of Multi-FPGA System v3 updates: === - Remove all modifications of bus scan and probe - FPGA BUS Scan is trigged by hotplug of Rawdev - Took Modifications of comments - Move AFU Device to IFPGA - FPGA BUS Scan depend on it??s IFPGA Rawdev - Add Build Macros for FPGA BUS and IFPGA Rawdev Questions = Why not PCI Bus? All of the AFUs of one FPGA may share same PCI BDF. Why not vdev Bus? Because AFUs depend on Rawdev, and it's hardware specpic. Motivation == FPGA is used more and more widely in Cloud and NFV, one primary reason is that FPGA not only provide ASIC performance but also it's more flexible than ASIC. FPGA use Partial Reconfigure(PR) Parts of Bitstream to achieve its flexibility. Another reason is that one FPGA can be shared by different Users, and each User can use some of AFUs of One FPGA. That means One FPGA Device Bitstream is divided into many Parts of Bitstream(each Part of Bitstream is defined as AFU-Accelerated Function Unit), and each AFU is a Hardware Acceleration Unit and it can dynamically Reload respectively. Proposed Solution = - Involve Rawdev to take FPGA Partial Configuration(Download/PR) - Defined FPGA-BUS for Acceleration Drivers of AFUs - FPGA PCI Scan(1st Scan) follows DPDK UIO/VFIO PCI Scan Process, probe Intel FPGA Rawdev Driver. FPGA-BUS scan is called, but AFU depend on Rawdev, so this scan doesn't trig AFU device create. - AFU Scan(2nd Scan) bind DPDK Driver to FPGA Partial-Bitstream. This scan is trigged by hotplug of IFPGA Rawdev probe, in this scan the AFUs will be created and their dirves are also probed. Scope = The Intel FPGA BUS implementation is target towards various FPGA Devices use PR to provide many Acceleration Function. Specific PMDs may also bind to its AFU. And Applications don't care they are using ASIC Acceleration or FPGA AFU Acceleration. Status = With integrating Intel PSG FPGA Software Stack OPAE(Open Programmable Acceleration Engine) Share Code, Intel FPGA BUS runs well in Intel PSG FPGA Cards. Rosen Xu (3): Add Intel FPGA BUS Lib Code Add Intel FPGA BUS Rawdev Driver Add Intel FPGA OPAE Share Code config/common_base |6 + drivers/bus/Makefile |1 + drivers/bus/ifpga/Makefile | 33 + drivers/bus/ifpga/ifpga_bus.c | 517 ++ drivers/bus/ifpga/ifpga_common.c | 141 ++ drivers/bus/ifpga/ifpga_common.h | 22 + drivers/bus/ifpga/ifpga_logs.h | 31 + drivers/bus/ifpga/rte_bus_ifpga.h | 175 ++ drivers/bus/ifpga/rte_bus_ifpga_version.map|8 + drivers/raw/Makefile |1 + drivers/raw/ifpga_rawdev/Makefile | 34 + drivers/raw/ifpga_rawdev/base/Makefile | 54 + drivers/raw/ifpga_rawdev/base/ifpga_api.c | 529 ++ drivers/raw/ifpga_rawdev/base/ifpga_api.h | 73 + drivers/raw/ifpga_rawdev/base/ifpga_compat.h | 84 + drivers/raw/ifpga_rawdev/base/ifpga_defines.h | 1688 drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c| 851 ++ drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h| 38 + drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c | 341 drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h | 191 +++ drivers/raw/ifpga_rawdev/base/ifpga_fme.c | 761 + drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c| 328 drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c| 430 + drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c| 742 + drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c | 399 + drivers/raw/ifpga_rawdev/base/ifpga_hw.h | 154 ++ drivers/raw/ifpga_rawdev/base/ifpga_port.c | 435 + drivers/raw/ifpga_rawdev/base/ifpga_port_error.c | 192 +++ drivers/raw/ifpga_rawdev/base/opae_debug.c | 126 ++ drivers/raw/ifpga_rawdev/base/opae_debug.h | 46 + drivers/raw/ifpga_rawdev/base/opae_hw_api.c| 408 + drivers/raw/ifpga_rawdev/base/opae_hw_api.h| 280 drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c | 172 ++ drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h | 306 drivers/raw/ifpga_rawdev/base/opae_osdep.h | 115 ++ .../ifpga_rawdev/base/osdep_raw/osdep_generic.h| 104 ++ .../ifpga_rawdev/base/osdep_rte/osdep_generic.h| 72 + drivers/raw/ifpga_rawdev/ifpga_rawdev.c| 594 +++ drivers/raw/ifpga_rawdev/ifpga_rawdev.h| 37 + .../raw/ifpga_raw
[dpdk-dev] [PATCH v4 1/3] Add Intel FPGA BUS Lib Code
Signed-off-by: Rosen Xu
---
config/common_base | 5 +
drivers/bus/Makefile| 1 +
drivers/bus/ifpga/Makefile | 33 ++
drivers/bus/ifpga/ifpga_bus.c | 517
drivers/bus/ifpga/ifpga_common.c| 141
drivers/bus/ifpga/ifpga_common.h| 22 ++
drivers/bus/ifpga/ifpga_logs.h | 31 ++
drivers/bus/ifpga/rte_bus_ifpga.h | 175 ++
drivers/bus/ifpga/rte_bus_ifpga_version.map | 8 +
mk/rte.app.mk | 2 +
10 files changed, 935 insertions(+)
create mode 100644 drivers/bus/ifpga/Makefile
create mode 100644 drivers/bus/ifpga/ifpga_bus.c
create mode 100644 drivers/bus/ifpga/ifpga_common.c
create mode 100644 drivers/bus/ifpga/ifpga_common.h
create mode 100644 drivers/bus/ifpga/ifpga_logs.h
create mode 100644 drivers/bus/ifpga/rte_bus_ifpga.h
create mode 100644 drivers/bus/ifpga/rte_bus_ifpga_version.map
diff --git a/config/common_base b/config/common_base
index ad03cf4..49f6b09 100644
--- a/config/common_base
+++ b/config/common_base
@@ -134,6 +134,11 @@ CONFIG_RTE_LIBRTE_PCI_BUS=y
CONFIG_RTE_LIBRTE_VDEV_BUS=y
#
+# Compile the Intel FPGA bus
+#
+CONFIG_RTE_LIBRTE_IFPGA_BUS=y
+
+#
# Compile ARK PMD
#
CONFIG_RTE_LIBRTE_ARK_PMD=y
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 7ef2593..55d2dfe 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -7,5 +7,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa
DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc
DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci
DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev
+DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile
new file mode 100644
index 000..1b569af
--- /dev/null
+++ b/drivers/bus/ifpga/Makefile
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_bus_ifpga.a
+
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+
+# versioning export map
+EXPORT_MAP := rte_bus_ifpga_version.map
+
+# library version
+LIBABIVER := 1
+
+VPATH += $(SRCDIR)/base
+
+SRCS-y += \
+ifpga_bus.c \
+ifpga_common.c
+
+LDLIBS += -lrte_eal
+
+#
+# Export include files
+#
+SYMLINK-y-include += rte_bus_ifpga.h
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
new file mode 100644
index 000..eba2615
--- /dev/null
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -0,0 +1,517 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "rte_rawdev.h"
+#include "rte_rawdev_pmd.h"
+#include "rte_bus_ifpga.h"
+#include "ifpga_logs.h"
+#include "ifpga_common.h"
+
+int ifpga_bus_logtype;
+
+/* register a ifpga bus based driver */
+void rte_ifpga_driver_register(struct rte_afu_driver *driver)
+{
+ RTE_VERIFY(driver);
+
+ TAILQ_INSERT_TAIL(&rte_ifpga_bus.driver_list, driver, next);
+}
+
+/* un-register a fpga bus based driver */
+void rte_ifpga_driver_unregister(struct rte_afu_driver *driver)
+{
+ TAILQ_REMOVE(&rte_ifpga_bus.driver_list, driver, next);
+}
+
+static struct rte_ifpga_device *
+ifpga_find_ifpga_dev(const struct rte_pci_addr *pci_addr)
+{
+ struct rte_ifpga_device *ifpga_dev = NULL;
+
+ TAILQ_FOREACH(ifpga_dev, &rte_ifpga_bus.ifpga_list, next) {
+ if (!rte_pci_addr_cmp(&ifpga_dev->pci_addr, pci_addr))
+ return ifpga_dev;
+ }
+ return NULL;
+}
+
+static struct rte_afu_device *
+ifpga_find_afu_dev(const struct rte_ifpga_device *ifpga_dev,
+ const struct rte_afu_id *afu_id)
+{
+ struct rte_afu_device *afu_dev = NULL;
+
+ TAILQ_FOREACH(afu_dev, &ifpga_dev->afu_list, next) {
+ if (!ifpga_afu_id_cmp(&afu_dev->id, afu_id))
+ return afu_dev;
+ }
+ return NULL;
+}
+
+static const char * const valid_args[] = {
+#define IFPGA_ARG_BDF "bdf"
+ IFPGA_ARG_BDF,
+#define IFPGA_ARG_PORT "port"
+ IFPGA_ARG_PORT,
+#define IFPGA_AFU_BTS "afu_bts"
+ IFPGA_AFU_BTS,
+ NULL
+};
+
+/*
+ * Scan the content of the FPGA bus, and the devices in the devices
+ * list
+ */
+static struct rte_afu_device *
+rte_ifpga_scan_one(struct rte_devargs *devargs,
+ struct rte_ifpga_device *ifpga_dev)
+{
+ struct rte_kvargs *kvlist = NULL;
+ struct rte_rawdev *rawdev = NULL;
+ struct rte_afu_device *afu_dev = NULL;
+ struct rte_afu_pr_conf afu_pr_conf;
+ int ret = 0;
+ char *path = NU
Re: [dpdk-dev] Build is broken in dpdk-next-net
On Sat, Mar 31, 2018 at 11:27:55AM -0400, Neil Horman wrote:
> On Sat, Mar 31, 2018 at 05:09:47PM +0200, Gaëtan Rivet wrote:
> > On Sat, Mar 31, 2018 at 09:33:43AM -0400, Neil Horman wrote:
> > > On Fri, Mar 30, 2018 at 10:47:09PM +0800, Tonghao Zhang wrote:
> > > > I rebuild it on ubuntu 17.10 and cash it. I use the 'RTE_SET_USED' to
> > > > fix it.
> > > >
> > > >
> > > > diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
> > > > index 771675718..f11803191 100644
> > > > --- a/lib/librte_vhost/fd_man.c
> > > > +++ b/lib/librte_vhost/fd_man.c
> > > > @@ -279,7 +279,8 @@ fdset_pipe_read_cb(int readfd, void *dat
> > > > __rte_unused,
> > > >int *remove __rte_unused)
> > > > {
> > > > char charbuf[16];
> > > > - read(readfd, charbuf, sizeof(charbuf));
> > > > + int r = read(readfd, charbuf, sizeof(charbuf));
> > > > + RTE_SET_USED(r);
> > > > }
> > > >
> > > > void
> > > > @@ -319,5 +320,6 @@ fdset_pipe_init(struct fdset *fdset)
> > > > void
> > > > fdset_pipe_notify(struct fdset *fdset)
> > > > {
> > > > - write(fdset->u.writefd, "1", 1);
> > > > + int r = write(fdset->u.writefd, "1", 1);
> > > > + RTE_SET_USED(r);
> > > > }
> > > >
> > >
> > > A better option might be to use _Pragma
> > >
> > > Something like this perhaps
> > >
> > > #define ALLOW_UNUSED(x) \
> > > _Pragma(push) \
> > > _Pragma(diagnostic ignored "-Wunused-result") \
> > > #x;\
> > > _Pragma(pop)
> > >
> > > This is of course untested, so it probably needs some tweaking, but this
> > > method
> > > avoids the need to declare an additional stack variable, which i don't
> > > think can
> > > be eliminated due to the cast. I believe that this method should also
> > > work
> > > accross compilers (the gcc and clang compilers support this, and i think
> > > the
> > > intel compiler should as well)
> > >
> > > Neil
> > >
> >
> > It would be nice to avoid the definition of a useless variable.
> > An alternative could be
> >
> >if (read() < 0) {
> >/* Failure here is acceptable for such and such reason. */
> >}
> >
> > to ensure all-around compatibility, and the definition or another macro.
> > Just a suggestion.
> >
> That would be a good alternative, but I think its effectiveness is dependent
> on
> when the compiler does with the return value check. Without any code inside
> the
> conditional, the compiler may optimize the check out, meaning the warning will
> still be asserted. If it doesn't optimize the check out, then you have a
> useless compare and jump instruction left in the code path.
>
> Best
> Neil
>
I tested quickly, I see no difference with the three methods:
#include
__attribute__((warn_unused_result))
int wur(void)
{
return read(0, NULL, 0);
}
void with_void(void)
{
int ret;
ret = wur();
(void) ret;
}
void with_pragma(void)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
wur();
#pragma GCC diagnostic pop
}
void with_if(void)
{
if (wur() < 0) {
/* I do not care for errors. */
}
}
int main(void)
{
return 0;
}
gcc -D_FORTIFY_SOURCE=2 -Wunused-result -Werror -O3 _wur.c -o wur_O3.out
gcc -D_FORTIFY_SOURCE=2 -Wunused-result -Werror -O0 _wur.c -o wur_O0.out
diff -Napy <(gdb -batch -ex 'file ./wur_O0.out' -ex 'disassemble with_void')
<(gdb -batch -ex 'file ./wur_O3.out' -ex 'disassemble with_void') || true
Dump of assembler code for function with_void: Dump of
assembler code for function with_void:
0x06ca <+0>: push %rbp |
0x06e0 <+0>: xor%edx,%edx
0x06cb <+1>: mov%rsp,%rbp |
0x06e2 <+2>: xor%esi,%esi
0x06ce <+4>: sub$0x10,%rsp |
0x06e4 <+4>: xor%edi,%edi
0x06d2 <+8>: callq 0x6b0 |
0x06e6 <+6>: jmpq 0x560
0x06d7 <+13>:mov%eax,-0x4(%rbp)<
0x06da <+16>:nop <
0x06db <+17>:leaveq<
0x06dc <+18>:retq <
End of assembler dump. End of
assembler dump.
diff -Napy <(gdb -batch -ex 'file ./wur_O0.out' -ex 'disassemble with_pragma')
<(gdb -batch -ex 'file ./wur_O3.out' -ex 'disassemble with_pragma') || true
Dump of assembler code for function with_pragma:Dump of
assembler code for function with_pragma:
0x06dd <+0>: push %rbp |
0x06f0 <+0>: xor%edx,%edx
0x06de <+1>: mov%rsp,%rbp |
0x06f2 <+2>: xor%esi,%esi
0x06e1 <+4>: callq 0x6b0 |
0x06f4 <
Re: [dpdk-dev] [PATCH v3 1/6] Add Intel FPGA BUS Command Parse Code
> -Original Message-
> From: Gaëtan Rivet [mailto:gaetan.ri...@6wind.com]
> Sent: Wednesday, March 28, 2018 21:26
> To: Xu, Rosen
> Cc: dev@dpdk.org; Doherty, Declan ;
> Richardson, Bruce ; shreyansh.j...@nxp.com;
> Zhang, Tianfei ; Wu, Hao
> Subject: Re: [PATCH v3 1/6] Add Intel FPGA BUS Command Parse Code
>
> On Wed, Mar 28, 2018 at 05:29:51PM +0800, Rosen Xu wrote:
> > Signed-off-by: Rosen Xu
> > ---
> > lib/librte_eal/common/eal_common_options.c | 8 +++-
> > lib/librte_eal/common/eal_options.h| 2 ++
> > 2 files changed, 9 insertions(+), 1 deletion(-)
> >
> > diff --git a/lib/librte_eal/common/eal_common_options.c
> > b/lib/librte_eal/common/eal_common_options.c
> > index 9f2f8d2..4fe0875 100644
> > --- a/lib/librte_eal/common/eal_common_options.c
> > +++ b/lib/librte_eal/common/eal_common_options.c
> > @@ -73,6 +73,7 @@
> > {OPT_VDEV, 1, NULL, OPT_VDEV_NUM },
> > {OPT_VFIO_INTR, 1, NULL, OPT_VFIO_INTR_NUM},
> > {OPT_VMWARE_TSC_MAP,0, NULL,
> OPT_VMWARE_TSC_MAP_NUM },
> > + {OPT_IFPGA, 1, NULL, OPT_IFPGA_NUM},
> > {0, 0, NULL, 0}
> > };
> >
> > @@ -1160,7 +1161,12 @@ static int xdigit2val(unsigned char c)
> >
> > core_parsed = LCORE_OPT_MAP;
> > break;
> > -
> > + case OPT_IFPGA_NUM:
> > + if (eal_option_device_add(RTE_DEVTYPE_VIRTUAL,
> > + optarg) < 0) {
> > + return -1;
> > + }
> > + break;
>
> why do you need to add a new option if you only insert a virtual devargs?
>
> Why wouldn't --vdev option work instead? and for that matter, I was
> expecting you to provide a PCI address. Can you give a command line
> showing how you create your device? The devtype is essentially ignored
> currently (at option stage, maybe there are still cruft left in PCI bus),
> instead
> the devargs parsing will detect the bus from the given optarg.
>
> This part of EAL will change rather soon, I'd prefer not to deal with
> additional
> options unless necessary.
For PATCH v4, I have removed all the modification from eal library.
Create vdev to take IFPGA parameters configuration.
The command line for PATCH v4 is(just take 2 AFU for example):
testpmd -c 0x3 -n 4 --socket-mem 1024,0 --huge-dir=/mnt/huge \
--vdev 'net_ifpga_cfg0,bdf=5e:00.0,port=0,afu_bts=./xxx.gbs' \
--vdev 'net_ifpga_cfg1,bdf=be:00.0,port=0,afu_bts=./xxx.gbs' -- -i --no-numa
Note: the parameter of "port" is used by OPAE for download bitstream.
> > /* don't know what to do, leave this to caller */
> > default:
> > return 1;
> > diff --git a/lib/librte_eal/common/eal_options.h
> > b/lib/librte_eal/common/eal_options.h
> > index e86c711..bdbb2c4 100644
> > --- a/lib/librte_eal/common/eal_options.h
> > +++ b/lib/librte_eal/common/eal_options.h
> > @@ -55,6 +55,8 @@ enum {
> > OPT_VFIO_INTR_NUM,
> > #define OPT_VMWARE_TSC_MAP"vmware-tsc-map"
> > OPT_VMWARE_TSC_MAP_NUM,
> > +#define OPT_IFPGA "ifpga"
> > + OPT_IFPGA_NUM,
> > OPT_LONG_MAX_NUM
> > };
> >
> > --
> > 1.8.3.1
> >
>
> --
> Gaëtan Rivet
> 6WIND
Re: [dpdk-dev] [PATCH v3 2/6] config/common_base: Add Intel FPGA Build Configuration Macro
> -Original Message- > From: Gaëtan Rivet [mailto:gaetan.ri...@6wind.com] > Sent: Wednesday, March 28, 2018 21:27 > To: Xu, Rosen > Cc: dev@dpdk.org; Doherty, Declan ; > Richardson, Bruce ; shreyansh.j...@nxp.com; > Zhang, Tianfei ; Wu, Hao > Subject: Re: [PATCH v3 2/6] config/common_base: Add Intel FPGA Build > Configuration Macro > > On Wed, Mar 28, 2018 at 05:29:52PM +0800, Rosen Xu wrote: > > Signed-off-by: Rosen Xu > > --- > > config/common_base | 6 ++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/config/common_base b/config/common_base index > > ad03cf4..08b7cce 100644 > > --- a/config/common_base > > +++ b/config/common_base > > @@ -134,6 +134,12 @@ CONFIG_RTE_LIBRTE_PCI_BUS=y > > CONFIG_RTE_LIBRTE_VDEV_BUS=y > > > > # > > +# Compile the Intel FPGA bus > > +# > > +CONFIG_RTE_LIBRTE_IFPGA_BUS=y > > +CONFIG_RTE_LIBRTE_IFPGA_RAWDEV=y > > + > > +# > > Please squash this patch with their relevant counterparts. > As it is, this won't trigger an error but the patch is meaningless. It's done by PATCH v4. > > # Compile ARK PMD > > # > > CONFIG_RTE_LIBRTE_ARK_PMD=y > > -- > > 1.8.3.1 > > > > -- > Gaëtan Rivet > 6WIND
Re: [dpdk-dev] [PATCH v3 3/6] mk/rte.app.mk: Add Intel FPGA Bus Build Configuration Macro To App Script
> -Original Message- > From: Gaëtan Rivet [mailto:gaetan.ri...@6wind.com] > Sent: Wednesday, March 28, 2018 21:29 > To: Xu, Rosen > Cc: dev@dpdk.org; Doherty, Declan ; > Richardson, Bruce ; shreyansh.j...@nxp.com; > Zhang, Tianfei ; Wu, Hao > Subject: Re: [PATCH v3 3/6] mk/rte.app.mk: Add Intel FPGA Bus Build > Configuration Macro To App Script > > On Wed, Mar 28, 2018 at 05:29:53PM +0800, Rosen Xu wrote: > > Signed-off-by: Rosen Xu > > --- > > mk/rte.app.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 3eb41d1..958b6b5 > > 100644 > > --- a/mk/rte.app.mk > > +++ b/mk/rte.app.mk > > @@ -107,6 +107,9 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE)+= - > lrte_cmdline > > _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER)+= -lrte_reorder > > _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched > > > > +_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga > > +_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_RAWDEV) += - > lrte_ifpga_rawdev > > + > > This however, should trigger a link error given that the relevant libraries > are > not yet available. Same as before, please squash with the patch introducing > the libraries. It's done by PATCH v4. > > ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) > > _LDLIBS-$(CONFIG_RTE_LIBRTE_KNI)+= -lrte_kni > > endif > > -- > > 1.8.3.1 > > > > -- > Gaëtan Rivet > 6WIND
Re: [dpdk-dev] [PATCH v3 4/6] drivers/bus: Add Intel FPGA Bus Lib Code
> -Original Message-
> From: Gaëtan Rivet [mailto:gaetan.ri...@6wind.com]
> Sent: Wednesday, March 28, 2018 21:52
> To: Xu, Rosen
> Cc: dev@dpdk.org; Doherty, Declan ;
> Richardson, Bruce ; shreyansh.j...@nxp.com;
> Zhang, Tianfei ; Wu, Hao
> Subject: Re: [PATCH v3 4/6] drivers/bus: Add Intel FPGA Bus Lib Code
>
> On Wed, Mar 28, 2018 at 05:29:54PM +0800, Rosen Xu wrote:
> > Signed-off-by: Rosen Xu
> > ---
> > drivers/bus/Makefile| 1 +
> > drivers/bus/ifpga/Makefile | 33 ++
> > drivers/bus/ifpga/ifpga_bus.c | 562
>
> > drivers/bus/ifpga/ifpga_common.c| 141 +++
> > drivers/bus/ifpga/ifpga_common.h| 22 ++
> > drivers/bus/ifpga/ifpga_logs.h | 31 ++
> > drivers/bus/ifpga/rte_bus_ifpga.h | 140 +++
> > drivers/bus/ifpga/rte_bus_ifpga_version.map | 8 +
> > 8 files changed, 938 insertions(+)
> > create mode 100644 drivers/bus/ifpga/Makefile create mode 100644
> > drivers/bus/ifpga/ifpga_bus.c create mode 100644
> > drivers/bus/ifpga/ifpga_common.c create mode 100644
> > drivers/bus/ifpga/ifpga_common.h create mode 100644
> > drivers/bus/ifpga/ifpga_logs.h create mode 100644
> > drivers/bus/ifpga/rte_bus_ifpga.h create mode 100644
> > drivers/bus/ifpga/rte_bus_ifpga_version.map
> >
> > diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index
> > 7ef2593..55d2dfe 100644
> > --- a/drivers/bus/Makefile
> > +++ b/drivers/bus/Makefile
> > @@ -7,5 +7,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa
> > DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc
> > DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci
> > DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev
> > +DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga
> >
> > include $(RTE_SDK)/mk/rte.subdir.mk
> > diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile
> > new file mode 100644 index 000..e611950
> > --- /dev/null
> > +++ b/drivers/bus/ifpga/Makefile
> > @@ -0,0 +1,33 @@
> > +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel
> > +Corporation
>
> Copyrigth 2018 (same comment for most SPDX tags, I think I saw 2017 or a
> variation of it everywhere I think).
It's done by PATCH v4.
> > +
> > +include $(RTE_SDK)/mk/rte.vars.mk
> > +
> > +#
> > +# library name
> > +#
> > +LIB = librte_bus_ifpga.a
> > +
> > +CFLAGS += -O3
> > +CFLAGS += $(WERROR_FLAGS)
> > +
> > +# versioning export map
> > +EXPORT_MAP := rte_bus_ifpga_version.map
> > +
> > +# library version
> > +LIBABIVER := 1
> > +
> > +VPATH += $(SRCDIR)/base
> > +
> > +SRCS-y += \
> > +ifpga_bus.c \
> > +ifpga_common.c
> > +
> > +LDLIBS += -lrte_eal
>
> you should probably load librte_pci.
> You use afterward functions (at least address comparison).
> I haven't tested the SHARED build, but my guess is that it would break.
The FPGA BUS is based PCI(IFPGA is probed by PCI), do you think so users
to add it?
> On that note, you haven't acted on my previous remarks to use the common
> PCI utilities provided.
It's done in PATCH v4.
> > +
> > +#
> > +# Export include files
> > +#
> > +SYMLINK-y-include += rte_bus_ifpga.h
> > +
> > +include $(RTE_SDK)/mk/rte.lib.mk
> > diff --git a/drivers/bus/ifpga/ifpga_bus.c
> > b/drivers/bus/ifpga/ifpga_bus.c new file mode 100644 index
> > 000..092be65
> > --- /dev/null
> > +++ b/drivers/bus/ifpga/ifpga_bus.c
> > @@ -0,0 +1,562 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2010-2017 Intel Corporation */
> > +
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#include "rte_rawdev.h"
> > +#include "rte_rawdev_pmd.h"
> > +#include "rte_bus_ifpga.h"
> > +#include "ifpga_logs.h"
> > +#include "ifpga_common.h"
> > +
> > +int ifpga_bus_logtype;
> > +
> > +/* register a ifpga bus based driver */ void
> > +rte_ifpga_driver_register(struct rte_afu_driver *driver) {
> > + RTE_VERIFY(driver);
> > +
> > + TAILQ_INSERT_TAIL(&rte_ifpga_bus.driver_list, driver, next); }
> > +
> > +/* un-register a fpga bus based driver */ void
> > +rte_ifpga_driver_unregister(struct rte_afu_driver *driver) {
> > + TAILQ_REMOVE(&rte_ifpga_bus.driver_list, driver, next); }
> > +
> > +static struct rte_ifpga_device *
> > +ifpga_find_ifpga_dev(const struct rte_pci_addr *pci_addr) {
> > + struct rte_ifpga_device *ifpga_dev = NULL;
> > +
> > + TAILQ_FOREACH(ifpga_dev, &rte_ifpga_bus.ifpga_list, next) {
> > + if (!rte_pci_addr_cmp(&ifpga_dev->pci_addr, pci_addr))
> > + return ifpga_dev;
> > + }
> > + return NULL;
> > +}
> > +
> > +static struct rte_afu_device *
> > +ifpga_find_afu_dev(const struct rte_ifpga_device *ifpga_dev,
> > + const stru
Re: [dpdk-dev] [PATCH] net/nfp: support new HW offloads API
On Tue, Mar 27, 2018 at 7:25 PM, Ferruh Yigit
wrote:
> On 3/15/2018 2:30 PM, Alejandro Lucero wrote:
> > In next 18.05 the old hw offload API will be removed. This patch adds
> > support for just the new hw offload API.
> >
> > Signed-off-by: Alejandro Lucero
>
> <...>
>
> > - if (rxmode->enable_scatter) {
> > + if (!(rxmode->offloads & DEV_RX_OFFLOAD_CRC_STRIP))
> > + PMD_INIT_LOG(INFO, "HW does strip CRC. No configurable!");
>
> Also this behavior is changing, not providing CRC_STRIP will be by default
> stripping [2], this check should be removed.
>
> [2]
> https://dpdk.org/ml/archives/dev/2018-March/093489.
> htmlhttps://dpdk.org/ml/archives/dev/2018-March/093489.html
>
> <...>
>
> > + dev_conf = &dev->data->dev_conf;
> > + rxmode = &dev_conf->rxmode;
> > +
> > + if (rx_conf->offloads != rxmode->offloads) {
> > + RTE_LOG(ERR, PMD, "queue %u rx offloads not as port
> offloads\n",
> > + queue_idx);
> > + RTE_LOG(ERR, PMD, "\tport: %" PRIx64 "\n",
> rxmode->offloads);
> > + RTE_LOG(ERR, PMD, "\tqueue: %" PRIx64 "\n",
> rx_conf->offloads);
> > + return -EINVAL;
> > + }
>
> The offload API is changing [1], this check is no more valid. If PMD is not
> supporting queue specific offload app will not send port offloads here.
>
> [1]
> https://dpdk.org/ml/archives/dev/2018-March/092978.html
>
> <...>
>
> > + dev_conf = &dev->data->dev_conf;
> > + txmode = &dev_conf->txmode;
> > +
> > + if (tx_conf->offloads != txmode->offloads) {
> > + RTE_LOG(ERR, PMD, "queue %u tx offloads not as port
> offloads",
> > + queue_idx);
> > + return -EINVAL;
> > + }
> > +
>
> Same as above.
>
Thank you for the review.
I will remove those checks and send a new path version.
Re: [dpdk-dev] [PATCH 1/4] net/nfp: add NFP CPP support
On Fri, Mar 30, 2018 at 11:37 AM, Ferruh Yigit
wrote:
> On 3/23/2018 5:35 PM, Alejandro Lucero wrote:
> > CPP refers to the internal NFP Command Push Pull bus. This patch allows
> > to create CPP commands from user space allowing to access any single
> > part of the chip.
> >
> > This CPP interface is the base for having other functionalities like
> > mutexes when accessing specific chip components, chip resources
> management,
> > firmware upload or using the NSP, an embedded arm processor which can
> > perform tasks on demand.
> >
> > NSP was the previous only way for doing things in the chip by the PMD,
> > where a NSPU interface was used for commands like firmware upload or
> > port link configuration. CPP interface supersedes NSPU, but it is still
> > possible to use NSP through CPP.
> >
> > CPP interface adds a great flexibility for doing things like extended
> > stats, firmware debugging or selecting properly the firmware file to
> > upload.
>
> It can be good to announce this new feature in release notes, what do you
> think?
>
>
Uhmm, not sure about this. It is specific to the NFP PMD and I do not see
it as a new feature, at least DPDK users will not be aware of it.
> Also get some build errors [1], one is about zlib.h, normally we disable
> PMDs by
> default with external dependencies, is nfp depends to libz with this patch?
>
>
I forgot to remove this reference. It is not needed now, but it was with
the initial internal work.
About the other build errors, I do not get them and I have used a couple of
different systems, Ubuntu and Redhat. This is, of course, a serious
concern. Can you give me more information about the system you are using?
I remember I got some build error with other patches, from automatic builds
made just after those patches were sent. I did not get any this time, just
those warning for checkpatch which I was aware of. Is this automatic build
not happening any more?
> [1]
> ...dpdk/drivers/net/nfp/nfpcore/nfp_mutex.c:295:28: error: format
> specifies type
> 'short' but the argument has type 'unsigned int' [-Werror,-Wformat]
> printf("\tusage:%hd\n", mutex->usage);
>
> ~~~ ^~~~
>
>
> %u
>
> ...dpdk/drivers/net/nfp/nfpcore/nfp_cppcore.c:819:1: error: unused
> function
> '__nfp_bytemask_of' [-Werror,-Wunused-function]
> __nfp_bytemask_of(int width, uint64_t addr)
>
>
> ^
>
> ...dpdk/drivers/net/nfp/nfp_net.c:2971:35: error: format specifies type
> 'unsigned char' but the argument has type 'uint32_t' (aka 'unsigned int')
> [-Werror,-Wformat]
> cpp->serial[4], cpp->serial[5], cpp->interface >> 8,
>
>
> ^~~
> ...dpdk/drivers/net/nfp/nfp_net.c:2972:3: error: format specifies type
> 'unsigned
> char' but the argument has type 'unsigned int' [-Werror,-Wformat]
> cpp->interface & 0xff);
> ^
>
> ...dpdk/drivers/net/nfp/nfpcore/nfp_cppcore.c: In function
> ‘nfp_cpp_area_readl’:
> ...dpdk/drivers/net/nfp/nfpcore/nfp_cppcore.c:459:9: error: ‘tmp’ may be
> used
> uninitialized in this function [-Werror=maybe-uninitialized]
> *value = rte_le_to_cpu_32(tmp);
>
> ...dpdk/drivers/net/nfp/nfpcore/nfp_cppcore.c: In function
> ‘nfp_cpp_area_readq’:
> ...dpdk/drivers/net/nfp/nfpcore/nfp_cppcore.c:483:9: error: ‘tmp’ may be
> used
> uninitialized in this function [-Werror=maybe-uninitialized]
> *value = rte_le_to_cpu_64(tmp);
>
> ...dpdk/drivers/net/nfp/nfpcore/nfp_resource.c:34:10: fatal error:
> zlib.h: No
> such file or directory
> #include
> ^~~~
>
> >
> > Signed-off-by: Alejandro Lucero
>
> <...>
>
> > diff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
> b/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
> > new file mode 100644
> > index 000..fbeec57
> > --- /dev/null
> > +++ b/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
> > @@ -0,0 +1,748 @@
> > +/*
> > + * Copyright (c) 2018 Netronome Systems, Inc.
> > + * All rights reserved.
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> > + * modification, are permitted provided that the following conditions
> are met:
> > + *
> > + * 1. Redistributions of source code must retain the above copyright
> notice,
> > + * this list of conditions and the following disclaimer.
> > + *
> > + * 2. Redistributions in binary form must reproduce the above copyright
> > + * notice, this list of conditions and the following disclaimer in the
> > + * documentation and/or other materials provided with the distribution
> > + *
> > + * 3. Neither the name of the copyright holder nor the names of its
> > + * contributors may be used to endorse or promote products derived
> from this
> > + * software without specific prior written permission.
> > + *
> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> "AS IS"
> > + * AND
Re: [dpdk-dev] [PATCH 3/4] doc: update NFP guide
On Fri, Mar 30, 2018 at 11:37 AM, Ferruh Yigit wrote: > On 3/23/2018 5:35 PM, Alejandro Lucero wrote: > > New CPP interface changes the way firmware upload is managed by > > the PMD. It also supports different firmware file names for > > having specific firmware aplications per card. > > > > Signed-off-by: Alejandro Lucero > > This conflicts with another nfp doc patch applied in next-net, can you > please > rebase this on latest next-net? > Yes, sure. Thanks
[dpdk-dev] [PATCH v7 1/3] eal: rename IPC sync request to pending request
Originally, there was only one type of request which was used
for multiprocess synchronization (hence the name - sync request).
However, now that we are going to have two types of requests,
synchronous and asynchronous, having it named "sync request" is
very confusing, so we will rename it to "pending request". This
is internal-only, so no externally visible API changes.
Signed-off-by: Anatoly Burakov
Suggested-by: Jianfeng Tan
Acked-by: Jianfeng Tan
---
Notes:
v7:
- Provide explanation as to why this change is being made
lib/librte_eal/common/eal_common_proc.c | 38 -
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_proc.c
b/lib/librte_eal/common/eal_common_proc.c
index 4131b67..52b6ab2 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -60,8 +60,8 @@ struct mp_msg_internal {
struct rte_mp_msg msg;
};
-struct sync_request {
- TAILQ_ENTRY(sync_request) next;
+struct pending_request {
+ TAILQ_ENTRY(pending_request) next;
int reply_received;
char dst[PATH_MAX];
struct rte_mp_msg *request;
@@ -69,13 +69,13 @@ struct sync_request {
pthread_cond_t cond;
};
-TAILQ_HEAD(sync_request_list, sync_request);
+TAILQ_HEAD(pending_request_list, pending_request);
static struct {
- struct sync_request_list requests;
+ struct pending_request_list requests;
pthread_mutex_t lock;
-} sync_requests = {
- .requests = TAILQ_HEAD_INITIALIZER(sync_requests.requests),
+} pending_requests = {
+ .requests = TAILQ_HEAD_INITIALIZER(pending_requests.requests),
.lock = PTHREAD_MUTEX_INITIALIZER
};
@@ -84,12 +84,12 @@ static int
mp_send(struct rte_mp_msg *msg, const char *peer, int type);
-static struct sync_request *
+static struct pending_request *
find_sync_request(const char *dst, const char *act_name)
{
- struct sync_request *r;
+ struct pending_request *r;
- TAILQ_FOREACH(r, &sync_requests.requests, next) {
+ TAILQ_FOREACH(r, &pending_requests.requests, next) {
if (!strcmp(r->dst, dst) &&
!strcmp(r->request->name, act_name))
break;
@@ -259,7 +259,7 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
static void
process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
{
- struct sync_request *sync_req;
+ struct pending_request *sync_req;
struct action_entry *entry;
struct rte_mp_msg *msg = &m->msg;
rte_mp_t action = NULL;
@@ -267,7 +267,7 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un
*s)
RTE_LOG(DEBUG, EAL, "msg: %s\n", msg->name);
if (m->type == MP_REP || m->type == MP_IGN) {
- pthread_mutex_lock(&sync_requests.lock);
+ pthread_mutex_lock(&pending_requests.lock);
sync_req = find_sync_request(s->sun_path, msg->name);
if (sync_req) {
memcpy(sync_req->reply, msg, sizeof(*msg));
@@ -276,7 +276,7 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un
*s)
pthread_cond_signal(&sync_req->cond);
} else
RTE_LOG(ERR, EAL, "Drop mp reply: %s\n", msg->name);
- pthread_mutex_unlock(&sync_requests.lock);
+ pthread_mutex_unlock(&pending_requests.lock);
return;
}
@@ -607,7 +607,7 @@ mp_request_one(const char *dst, struct rte_mp_msg *req,
{
int ret;
struct rte_mp_msg msg, *tmp;
- struct sync_request sync_req, *exist;
+ struct pending_request sync_req, *exist;
sync_req.reply_received = 0;
strcpy(sync_req.dst, dst);
@@ -615,14 +615,14 @@ mp_request_one(const char *dst, struct rte_mp_msg *req,
sync_req.reply = &msg;
pthread_cond_init(&sync_req.cond, NULL);
- pthread_mutex_lock(&sync_requests.lock);
+ pthread_mutex_lock(&pending_requests.lock);
exist = find_sync_request(dst, req->name);
if (!exist)
- TAILQ_INSERT_TAIL(&sync_requests.requests, &sync_req, next);
+ TAILQ_INSERT_TAIL(&pending_requests.requests, &sync_req, next);
if (exist) {
RTE_LOG(ERR, EAL, "A pending request %s:%s\n", dst, req->name);
rte_errno = EEXIST;
- pthread_mutex_unlock(&sync_requests.lock);
+ pthread_mutex_unlock(&pending_requests.lock);
return -1;
}
@@ -638,12 +638,12 @@ mp_request_one(const char *dst, struct rte_mp_msg *req,
do {
ret = pthread_cond_timedwait(&sync_req.cond,
- &sync_requests.lock, ts);
+ &pending_requests.lock, ts);
} while (ret != 0 && ret != ETIMEDOUT);
/* We got the lock now */
- TAILQ_REMOVE(&sync_requests.reque
[dpdk-dev] [PATCH v7 2/3] eal: rename mp_request to mp_request_sync
Rename rte_mp_request to rte_mp_request_sync to indicate
that this request will be done synchronously (as opposed to
asynchronous request, which comes in next patch).
Also, fix alphabetical ordering for .map file.
Signed-off-by: Anatoly Burakov
Suggested-by: Thomas Monjalon
---
Notes:
v7:
- Added this patch
lib/librte_eal/common/eal_common_proc.c | 2 +-
lib/librte_eal/common/include/rte_eal.h | 2 +-
lib/librte_eal/rte_eal_version.map | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_proc.c
b/lib/librte_eal/common/eal_common_proc.c
index 52b6ab2..b704f5a 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -674,7 +674,7 @@ mp_request_one(const char *dst, struct rte_mp_msg *req,
}
int __rte_experimental
-rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply,
+rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
const struct timespec *ts)
{
int dir_fd, ret = 0;
diff --git a/lib/librte_eal/common/include/rte_eal.h
b/lib/librte_eal/common/include/rte_eal.h
index 044474e..d1cc89e 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -314,7 +314,7 @@ rte_mp_sendmsg(struct rte_mp_msg *msg);
* - On failure, return -1, and the reason will be stored in rte_errno.
*/
int __rte_experimental
-rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply,
+rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
const struct timespec *ts);
/**
diff --git a/lib/librte_eal/rte_eal_version.map
b/lib/librte_eal/rte_eal_version.map
index d123602..7b66c73 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -223,9 +223,9 @@ EXPERIMENTAL {
rte_eal_mbuf_user_pool_ops;
rte_mp_action_register;
rte_mp_action_unregister;
- rte_mp_sendmsg;
- rte_mp_request;
rte_mp_reply;
+ rte_mp_request_sync;
+ rte_mp_sendmsg;
rte_service_attr_get;
rte_service_attr_reset_all;
rte_service_component_register;
--
2.7.4
[dpdk-dev] [PATCH v7 3/3] eal: add asynchronous request API to DPDK IPC
This API is similar to the blocking API that is already present,
but reply will be received in a separate callback by the caller
(callback specified at the time of request, rather than registering
for it in advance).
Under the hood, we create a separate thread to deal with replies to
asynchronous requests, that will just wait to be notified by the
main thread, or woken up on a timer.
Signed-off-by: Anatoly Burakov
Acked-by: Jianfeng Tan
---
Notes:
v6:
- address review comments from Jianfeng
- do not add dummy item to queue by default
v5:
- addressed review comments from Jianfeng
- split into two patches to avoid rename noise
- do not mark ignored message as processed
v4:
- rebase on top of latest IPC Improvements patchset [2]
v3:
- added support for MP_IGN messages introduced in
IPC improvements v5 patchset
v2:
- fixed deadlocks and race conditions by not calling
callbacks while iterating over sync request list
- fixed use-after-free by making a copy of request
- changed API to also give user a copy of original
request, so that they know to which message the
callback is a reply to
- fixed missing .map file entries
This patch is dependent upon previously published patchsets
for IPC fixes [1] and improvements [2].
rte_mp_action_unregister and rte_mp_async_reply_unregister
do the same thing - should we perhaps make it one function?
[1] http://dpdk.org/dev/patchwork/bundle/aburakov/IPC_Fixes/
[2] http://dpdk.org/dev/patchwork/bundle/aburakov/IPC_Improvements/
lib/librte_eal/common/eal_common_proc.c | 458 +++-
lib/librte_eal/common/include/rte_eal.h | 36 +++
lib/librte_eal/rte_eal_version.map | 1 +
3 files changed, 482 insertions(+), 13 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_proc.c
b/lib/librte_eal/common/eal_common_proc.c
index b704f5a..f98622f 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include "eal_private.h"
#include "eal_filesystem.h"
@@ -60,13 +61,32 @@ struct mp_msg_internal {
struct rte_mp_msg msg;
};
+struct async_request_param {
+ rte_mp_async_reply_t clb;
+ struct rte_mp_reply user_reply;
+ struct timespec end;
+ int n_responses_processed;
+};
+
struct pending_request {
TAILQ_ENTRY(pending_request) next;
- int reply_received;
+ enum {
+ REQUEST_TYPE_SYNC,
+ REQUEST_TYPE_ASYNC
+ } type;
char dst[PATH_MAX];
struct rte_mp_msg *request;
struct rte_mp_msg *reply;
- pthread_cond_t cond;
+ int reply_received;
+ RTE_STD_C11
+ union {
+ struct {
+ struct async_request_param *param;
+ } async;
+ struct {
+ pthread_cond_t cond;
+ } sync;
+ };
};
TAILQ_HEAD(pending_request_list, pending_request);
@@ -74,9 +94,12 @@ TAILQ_HEAD(pending_request_list, pending_request);
static struct {
struct pending_request_list requests;
pthread_mutex_t lock;
+ pthread_cond_t async_cond;
} pending_requests = {
.requests = TAILQ_HEAD_INITIALIZER(pending_requests.requests),
- .lock = PTHREAD_MUTEX_INITIALIZER
+ .lock = PTHREAD_MUTEX_INITIALIZER,
+ .async_cond = PTHREAD_COND_INITIALIZER
+ /**< used in async requests only */
};
/* forward declarations */
@@ -273,7 +296,12 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un
*s)
memcpy(sync_req->reply, msg, sizeof(*msg));
/* -1 indicates that we've been asked to ignore */
sync_req->reply_received = m->type == MP_REP ? 1 : -1;
- pthread_cond_signal(&sync_req->cond);
+
+ if (sync_req->type == REQUEST_TYPE_SYNC)
+ pthread_cond_signal(&sync_req->sync.cond);
+ else if (sync_req->type == REQUEST_TYPE_ASYNC)
+ pthread_cond_signal(
+ &pending_requests.async_cond);
} else
RTE_LOG(ERR, EAL, "Drop mp reply: %s\n", msg->name);
pthread_mutex_unlock(&pending_requests.lock);
@@ -320,6 +348,189 @@ mp_handle(void *arg __rte_unused)
}
static int
+timespec_cmp(const struct timespec *a, const struct timespec *b)
+{
+ if (a->tv_sec < b->tv_sec)
+ return -1;
+ if (a->tv_sec > b->tv_sec)
+ return 1;
+ if (a->tv_nsec < b->tv_nsec)
+ return -1;
+ if (a->tv_nsec > b->tv_nsec)
+ return 1;
+ return 0;
+}
+
+enum async_action {
+ ACTION_NONE, /**< don't do anything */
+
[dpdk-dev] [PATCH v7] eal: provide API for querying valid socket id's
During lcore scan, find all socket ID's and store them, and
provide public API to query valid socket id's. This will break
the ABI, so bump ABI version.
Also, remove deprecation notice corresponding to this change.
Signed-off-by: Anatoly Burakov
Acked-by: Gowrishankar Muthukrishnan
---
Notes:
v7:
- Renamed rte_num_socket_ids() to rte_socket_count()
- Removed deprecation notice associated with this change
- Addressed review comments
v6:
- Fixed meson ABI version header
v5:
- Move API to experimental
- Store list of valid socket id's instead of simply
recording the biggest one
v4:
- Remove backwards ABI compatibility, bump ABI instead
v3:
- Added ABI compatibility
v2:
- checkpatch changes
- check socket before deciding if the core is not to be used
doc/guides/rel_notes/deprecation.rst | 3 --
lib/librte_eal/bsdapp/eal/Makefile| 2 +-
lib/librte_eal/common/eal_common_lcore.c | 75 ++-
lib/librte_eal/common/include/rte_eal.h | 2 +
lib/librte_eal/common/include/rte_lcore.h | 30 +
lib/librte_eal/linuxapp/eal/Makefile | 2 +-
lib/librte_eal/meson.build| 2 +-
lib/librte_eal/rte_eal_version.map| 2 +
8 files changed, 100 insertions(+), 18 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 74c18ed..80472f5 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -38,9 +38,6 @@ Deprecation Notices
success and failure, respectively. This will change to 1 and 0 for true and
false, respectively, to make use of the function more intuitive.
-* eal: new ``numa_node_count`` member will be added to ``rte_config`` structure
- in v18.05.
-
* eal: due to internal data layout reorganization, there will be changes to
several structures and functions as a result of coming changes to support
memory hotplug in v18.05.
diff --git a/lib/librte_eal/bsdapp/eal/Makefile
b/lib/librte_eal/bsdapp/eal/Makefile
index dd455e6..ed1d17b 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -21,7 +21,7 @@ LDLIBS += -lgcc_s
EXPORT_MAP := ../../rte_eal_version.map
-LIBABIVER := 6
+LIBABIVER := 7
# specific to bsdapp exec-env
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c
diff --git a/lib/librte_eal/common/eal_common_lcore.c
b/lib/librte_eal/common/eal_common_lcore.c
index 7724fa4..3167e9d 100644
--- a/lib/librte_eal/common/eal_common_lcore.c
+++ b/lib/librte_eal/common/eal_common_lcore.c
@@ -7,6 +7,7 @@
#include
#include
+#include
#include
#include
#include
@@ -16,6 +17,19 @@
#include "eal_private.h"
#include "eal_thread.h"
+static int
+socket_id_cmp(const void *a, const void *b)
+{
+ const int *lcore_id_a = a;
+ const int *lcore_id_b = b;
+
+ if (*lcore_id_a < *lcore_id_b)
+ return -1;
+ if (*lcore_id_a > *lcore_id_b)
+ return 1;
+ return 0;
+}
+
/*
* Parse /sys/devices/system/cpu to get the number of physical and logical
* processors on the machine. The function will fill the cpu_info
@@ -28,6 +42,8 @@ rte_eal_cpu_init(void)
struct rte_config *config = rte_eal_get_configuration();
unsigned lcore_id;
unsigned count = 0;
+ unsigned int socket_id, prev_socket_id;
+ int lcore_to_socket_id[RTE_MAX_LCORE];
/*
* Parse the maximum set of logical cores, detect the subset of running
@@ -39,6 +55,19 @@ rte_eal_cpu_init(void)
/* init cpuset for per lcore config */
CPU_ZERO(&lcore_config[lcore_id].cpuset);
+ /* find socket first */
+ socket_id = eal_cpu_socket_id(lcore_id);
+ if (socket_id >= RTE_MAX_NUMA_NODES) {
+#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID
+ socket_id = 0;
+#else
+ RTE_LOG(ERR, EAL, "Socket ID (%u) is greater than
RTE_MAX_NUMA_NODES (%d)\n",
+ socket_id, RTE_MAX_NUMA_NODES);
+ return -1;
+#endif
+ }
+ lcore_to_socket_id[lcore_id] = socket_id;
+
/* in 1:1 mapping, record related cpu detected state */
lcore_config[lcore_id].detected = eal_cpu_detected(lcore_id);
if (lcore_config[lcore_id].detected == 0) {
@@ -54,18 +83,7 @@ rte_eal_cpu_init(void)
config->lcore_role[lcore_id] = ROLE_RTE;
lcore_config[lcore_id].core_role = ROLE_RTE;
lcore_config[lcore_id].core_id = eal_cpu_core_id(lcore_id);
- lcore_config[lcore_id].socket_id = eal_cpu_socket_id(lcore_id);
- if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES) {
-#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID
- lcore_config[lcore_id].socket_id = 0;
-#else
-
Re: [dpdk-dev] Build is broken in dpdk-next-net
On Sat, Mar 31, 2018 at 06:21:41PM +0200, Gaëtan Rivet wrote:
> On Sat, Mar 31, 2018 at 11:27:55AM -0400, Neil Horman wrote:
> > On Sat, Mar 31, 2018 at 05:09:47PM +0200, Gaëtan Rivet wrote:
> > > On Sat, Mar 31, 2018 at 09:33:43AM -0400, Neil Horman wrote:
> > > > On Fri, Mar 30, 2018 at 10:47:09PM +0800, Tonghao Zhang wrote:
> > > > > I rebuild it on ubuntu 17.10 and cash it. I use the 'RTE_SET_USED' to
> > > > > fix it.
> > > > >
> > > > >
> > > > > diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
> > > > > index 771675718..f11803191 100644
> > > > > --- a/lib/librte_vhost/fd_man.c
> > > > > +++ b/lib/librte_vhost/fd_man.c
> > > > > @@ -279,7 +279,8 @@ fdset_pipe_read_cb(int readfd, void *dat
> > > > > __rte_unused,
> > > > >int *remove __rte_unused)
> > > > > {
> > > > > char charbuf[16];
> > > > > - read(readfd, charbuf, sizeof(charbuf));
> > > > > + int r = read(readfd, charbuf, sizeof(charbuf));
> > > > > + RTE_SET_USED(r);
> > > > > }
> > > > >
> > > > > void
> > > > > @@ -319,5 +320,6 @@ fdset_pipe_init(struct fdset *fdset)
> > > > > void
> > > > > fdset_pipe_notify(struct fdset *fdset)
> > > > > {
> > > > > - write(fdset->u.writefd, "1", 1);
> > > > > + int r = write(fdset->u.writefd, "1", 1);
> > > > > + RTE_SET_USED(r);
> > > > > }
> > > > >
> > > >
> > > > A better option might be to use _Pragma
> > > >
> > > > Something like this perhaps
> > > >
> > > > #define ALLOW_UNUSED(x) \
> > > > _Pragma(push) \
> > > > _Pragma(diagnostic ignored "-Wunused-result") \
> > > > #x;\
> > > > _Pragma(pop)
> > > >
> > > > This is of course untested, so it probably needs some tweaking, but
> > > > this method
> > > > avoids the need to declare an additional stack variable, which i don't
> > > > think can
> > > > be eliminated due to the cast. I believe that this method should also
> > > > work
> > > > accross compilers (the gcc and clang compilers support this, and i
> > > > think the
> > > > intel compiler should as well)
> > > >
> > > > Neil
> > > >
> > >
> > > It would be nice to avoid the definition of a useless variable.
> > > An alternative could be
> > >
> > >if (read() < 0) {
> > >/* Failure here is acceptable for such and such reason. */
> > >}
> > >
> > > to ensure all-around compatibility, and the definition or another macro.
> > > Just a suggestion.
> > >
> > That would be a good alternative, but I think its effectiveness is
> > dependent on
> > when the compiler does with the return value check. Without any code inside
> > the
> > conditional, the compiler may optimize the check out, meaning the warning
> > will
> > still be asserted. If it doesn't optimize the check out, then you have a
> > useless compare and jump instruction left in the code path.
> >
> > Best
> > Neil
> >
>
> I tested quickly, I see no difference with the three methods:
gcc seems to be sufficiently smart to optimize out the conditional, clang not so
much:
#include
#include
#include
__attribute__((warn_unused_result))
int wur(void)
{
printf("CALLING WUR!\n");
return read(0, NULL, 0);
}
#define UNUSED_RESULT(x) if (x) {}
int main(void)
{
UNUSED_RESULT(wur());
return 0;
}
[nhorman@neilslaptop ~]$ gcc -g -Wunused-result -Werror ./test.c
[nhorman@neilslaptop ~]$ objdump -d -S a.out > ./results
[nhorman@neilslaptop ~]$ cat results
...
0040054b :
#define UNUSED_RESULT(x) if (x) {}
int main(void)
{
40054b: 55 push %rbp
40054c: 48 89 e5mov%rsp,%rbp
UNUSED_RESULT(wur());
40054f: e8 d3 ff ff ff callq 400527
return 0;
400554: b8 00 00 00 00 mov$0x0,%eax
}
400559: 5d pop%rbp
40055a: c3 retq
40055b: 0f 1f 44 00 00 nopl 0x0(%rax,%rax,1)
[nhorman@neilslaptop ~]$ clang -g -Wunused-result -Werror ./test.c
[nhorman@neilslaptop ~]$ objdump -d -S a.out > ./results
[nhorman@neilslaptop ~]$ cat results
...
00400570 :
}
#define UNUSED_RESULT(x) if (x) {}
int main(void)
{
400570: 55 push %rbp
400571: 48 89 e5mov%rsp,%rbp
400574: 48 83 ec 10 sub$0x10,%rsp
400578: c7 45 fc 00 00 00 00movl $0x0,-0x4(%rbp)
UNUSED_RESULT(wur());
40057f: e8 ac ff ff ff callq 400530
400584: 83 f8 00cmp$0x0,%eax
400587: 0f 84 05 00 00 00 je 400592
40058d: e9 00 00 00 00 jmpq 400592
400592: 31 c0 xor%eax,%eax
return 0;
400594: 48 83 c4 10 add$0x10,%rsp
400598: 5d pop%rbp
400599: c3 retq
40059a: 66 0f 1f 44 00 00 nopw 0x0(%rax,%rax,1)
There is an additional compar
Re: [dpdk-dev] [PATCH v2] net/bnxt: convert to SPDX license tag
On 3/30/2018 7:10 PM, Scott Branden wrote: > Hi Ferruh, > > > On 18-03-30 03:35 AM, Ferruh Yigit wrote: >> On 3/29/2018 5:40 PM, Ajit Khaparde wrote: >>> From: Scott Branden >>> >>> Update the license header on bnxt files to be the standard >>> BSD-3-Clause license used for the rest of DPDK, >>> bring the files in compliance with the DPDK licensing policy. >>> >>> Signed-off-by: Scott Branden >>> Signed-off-by: Ajit Khaparde >>> Cc:hemant.agra...@nxp.com >>> >>> v1->v2: modify first line of SPDX identifer as per review comment. >>> --- >>> doc/guides/nics/bnxt.rst | 30 ++ >>> drivers/net/bnxt/bnxt.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_cpr.c| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_cpr.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_ethdev.c | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_filter.c | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_filter.h | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_hwrm.c | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_hwrm.h | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_irq.c| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_irq.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_nvm_defs.h | 11 +++ >>> drivers/net/bnxt/bnxt_ring.c | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_ring.h | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_rxq.c| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_rxq.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_rxr.c| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_rxr.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_stats.c | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_stats.h | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_txq.c| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_txq.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_txr.c| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_txr.h| 32 >>> ++-- >>> drivers/net/bnxt/bnxt_vnic.c | 32 >>> ++-- >>> drivers/net/bnxt/bnxt_vnic.h | 32 >>> ++-- >>> drivers/net/bnxt/hsi_struct_def_dpdk.h | 32 >>> ++-- >>> drivers/net/bnxt/rte_pmd_bnxt.c| 32 >>> ++-- >>> drivers/net/bnxt/rte_pmd_bnxt.h| 32 >>> ++-- >>> 29 files changed, 59 insertions(+), 846 deletions(-) >> Can you please update Makefile too, but I can see it has multiple coypright, >> it >> can be better to send it as a separate patch to not block this one. > Yes, Makefile change should be in another patch. > I don't know how to change the header on that one though. > Intel and 6WIND shouldn't really have any copyright on the Makefile, though? > It looks like somebody just cut and paste the license header from > another Makefile. > Please suggest what should be done with this file. Most probably it is because of copy-paste as you stated, and I don't know what does it mean to hold the copyright in the makefile indeed J. cc'ed Hemant and Olivier. But removing an existing copyright may mean involving legal and may take time, unfortunately. It may be easier to just do the SPDX updates with existing coypright, but if you have motivation I suggest try to fix this. >> >> <...> >> >>> @@ -1,34 +1,6 @@ >>> -/*- >>> - * BSD LICENSE >>> - * >>> - * Copyright(c) Broadcom Limited. >>> +/* SPDX-License-Identifier: BSD-3-Clause >>> + * Copyright(c) 2014-2018 Broadcom >>>* All rights reserved. >> It might be nit-picking but we don't have leading spaces [1] in format, are >> they >> intentional? >> If not it is easy to fix when introduced otherwise will stay as it is >> forever J > Yes, it was intentional. Why? What is the practical reason of intentionally diverging from defined syntax? >> >> [1] >> /* SPDX-License-Identifier: BSD-3-Clause >>* Copyright(c) 2014-2018 Broadcom >>* All rights reserved. >>*/ >> >> <...> > Thanks, > Scott >
Re: [dpdk-dev] Survey for final decision about per-port offload API
Hi Thomas: > -Original Message- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Friday, March 30, 2018 9:48 PM > To: dev@dpdk.org > Cc: Ajit Khaparde ; Jerin Jacob > ; Shijith Thotton > ; Santosh Shukla > ; Rahul Lakkireddy > ; John Daley ; Lu, > Wenzhuo ; Ananyev, Konstantin > ; Xing, Beilei ; Zhang, > Qi Z ; Wu, Jingjing ; Adrien > Mazarguil ; Nelio Laranjeiro > ; Yongseok Koh ; Shahaf > Shuler ; Tomasz Duszynski ; > Jianbo Liu ; Alejandro Lucero > ; Hemant Agrawal > ; Shreyansh Jain ; > Harish Patil ; Rasesh Mody > ; Andrew Rybchenko > ; Shrikrishna Khare ; > Maxime Coquelin ; Legacy, Allain (Wind River) > ; Richardson, Bruce > ; Gaetan Rivet ; > Olivier Matz > Subject: Survey for final decision about per-port offload API > > There are some discussions about a specific part of the offload API: > "To enable per-port offload, the offload should be set on both > device configuration and queue setup." > > It means the application must repeat the port offload flags in > rte_eth_conf.[rt]xmode.offloads and rte_eth_[rt]xconf.offloads, when calling > respectively rte_eth_dev_configure() and rte_eth_[rt]x_queue_setup for each > queue. > > The PMD must check if there is mismatch, i.e. a port offload not repeated in > queue setup. > There is a proposal to do this check at ethdev level: > http://dpdk.org/ml/archives/dev/2018-March/094023.html > > It was also proposed to relax the API and allow "forgetting" port offloads in > queue offloads: > http://dpdk.org/ml/archives/dev/2018-March/092978.html > > It would mean the offloads applied to a queue result of OR operation: > rte_eth_conf.[rt]xmode.offloads | rte_eth_[rt]xconf.offloads > > 1/ Do you agree with above API change? > > > If we agree with this change, we need to update the documentation and > remove the checks in PMDs. Do you mean we will move offload check from PMD to ethdev, or just remove specific check in each PMD or it is not in the scope of this vote? Thanks Qi > Note: no matter what is decided here, 18.05-rc1 should have all PMDs > switched to the API which was defined in 17.11. > Given that API is new and not yet adopted by the applications, the sonner it > is > fixed, the better. > > 2/ Should we do this change in 18.05-rc2? > > > At the same time, we want to make clear that an offload enabled at port level, > cannot be disabled at queue level. > > 3/ Do you agree with above statement (to be added in the doc)? > > > There is the same kind of confusion in the offload capabilities: > rte_eth_dev_info.[rt]x_offload_capa > rte_eth_dev_info.[rt]x_queue_offload_capa > The queue capabilities must be a subset of port capabilities, i.e. every queue > capabilities must be reported as port capabilities. > But the port capabilities should be reported at queue level only if it can be > applied to a specific queue. > > 4/ Do you agree with above statement (to be added in the doc)? Yes > > > Please give your opinion on questions 1, 2, 3 and 4. > Answering by yes/no may be sufficient in most cases :) Thank you >
Re: [dpdk-dev] Survey for final decision about per-port offload API
Friday, March 30, 2018 4:48 PM, Thomas Monjalon: > Subject: Survey for final decision about per-port offload API > > There are some discussions about a specific part of the offload API: > "To enable per-port offload, the offload should be set on both > device configuration and queue setup." > > It means the application must repeat the port offload flags in > rte_eth_conf.[rt]xmode.offloads and rte_eth_[rt]xconf.offloads, when > calling respectively rte_eth_dev_configure() and > rte_eth_[rt]x_queue_setup for each queue. > > The PMD must check if there is mismatch, i.e. a port offload not repeated in > queue setup. > There is a proposal to do this check at ethdev level: > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F > %2Fdpdk.org%2Fml%2Farchives%2Fdev%2F2018- > March%2F094023.html&data=02%7C01%7Cshahafs%40mellanox.com%7Cb2a > e36d768424c9e616308d59644e2a7%7Ca652971c7d2e4d9ba6a4d149256f461b > %7C0%7C0%7C636580144980414466&sdata=Re2xM9u5jJr4M1PDTn5gE9mp22 > NmBI%2Bwa2GFPmUzq38%3D&reserved=0 > > It was also proposed to relax the API and allow "forgetting" port offloads in > queue offloads: > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F > %2Fdpdk.org%2Fml%2Farchives%2Fdev%2F2018- > March%2F092978.html&data=02%7C01%7Cshahafs%40mellanox.com%7Cb2a > e36d768424c9e616308d59644e2a7%7Ca652971c7d2e4d9ba6a4d149256f461b > %7C0%7C0%7C636580144980414466&sdata=xaUM8jcVl9gf3e%2By9geZDPpO > 1RJ5%2FXWJwA%2BpGp54pNs%3D&reserved=0 > > It would mean the offloads applied to a queue result of OR operation: > rte_eth_conf.[rt]xmode.offloads | rte_eth_[rt]xconf.offloads > > 1/ Do you agree with above API change? Yes. > > > If we agree with this change, we need to update the documentation and > remove the checks in PMDs. And to update applications and examples in the tree to set the offloads according to above change. > Note: no matter what is decided here, 18.05-rc1 should have all PMDs > switched to the API which was defined in 17.11. > Given that API is new and not yet adopted by the applications, the sonner it > is fixed, the better. > > 2/ Should we do this change in 18.05-rc2? > > > At the same time, we want to make clear that an offload enabled at port > level, cannot be disabled at queue level. > > 3/ Do you agree with above statement (to be added in the doc)? Yes > > > There is the same kind of confusion in the offload capabilities: > rte_eth_dev_info.[rt]x_offload_capa > rte_eth_dev_info.[rt]x_queue_offload_capa > The queue capabilities must be a subset of port capabilities, i.e. every queue > capabilities must be reported as port capabilities. > But the port capabilities should be reported at queue level only if it can be > applied to a specific queue. > > 4/ Do you agree with above statement (to be added in the doc)? No. The documentation should describe the API from the application side, and not provide guidelines for the PMDs implementation. If missing, we should clarify more about what queue and port offload means. Something like: "When port offload is enabled, the offload applies on the port along with all of its associated queues" and "When queue offload is enabled the offload, the offload applies only on the specific queue." The PMDs then will decide how they report the different offloads they offer. > > > Please give your opinion on questions 1, 2, 3 and 4. > Answering by yes/no may be sufficient in most cases :) Thank you >
[dpdk-dev] [PATCH 00/14] net/qede/base: update PMD version to 2.8.0.1
Hi, This patch set updates QEDE base driver to use FW version 8.33.12.0. It contains some base driver enhancements and fixes. The PMD version is updated to 2.8.0.1. Please apply. Thanks! -Rasesh Rasesh Mody (14): net/qede/base: use path ID for HW init net/qede/base: protect DMAE transactions net/qede/base: add DMAE sanity check net/qede/base: upgrade FW to 8.33.12.0 net/qede/base: symantic changes net/qede/base: add new chain API net/qede/base: allow changing VF MAC address net/qede/base: add MFW support for driver load timeout net/qede/base: refine error handling net/qede/base: add stats counter for link state net/qede/base: add APIs for xcvr net/qede/base: fix to support OVLAN mode net/qede/base: add packet pacing support net/qede: update PMD version to 2.8.0.1 drivers/net/qede/base/common_hsi.h|8 +- drivers/net/qede/base/ecore.h | 28 +- drivers/net/qede/base/ecore_chain.h | 49 +- drivers/net/qede/base/ecore_cxt.c | 30 +- drivers/net/qede/base/ecore_cxt.h |4 +- drivers/net/qede/base/ecore_dcbx.c|7 +- drivers/net/qede/base/ecore_dcbx_api.h|1 + drivers/net/qede/base/ecore_dev.c | 324 ++ drivers/net/qede/base/ecore_dev_api.h | 20 +- drivers/net/qede/base/ecore_hsi_common.h | 106 - drivers/net/qede/base/ecore_hsi_debug_tools.h | 108 +++-- drivers/net/qede/base/ecore_hsi_eth.h | 29 +- drivers/net/qede/base/ecore_hsi_init_func.h | 36 +- drivers/net/qede/base/ecore_hsi_init_tool.h | 107 ++--- drivers/net/qede/base/ecore_hw.c | 119 - drivers/net/qede/base/ecore_hw.h |4 + drivers/net/qede/base/ecore_init_fw_funcs.c | 210 +++-- drivers/net/qede/base/ecore_init_fw_funcs.h | 33 +- drivers/net/qede/base/ecore_init_ops.c| 32 +- drivers/net/qede/base/ecore_int.c | 11 +- drivers/net/qede/base/ecore_iov_api.h | 11 + drivers/net/qede/base/ecore_iro_values.h | 64 +-- drivers/net/qede/base/ecore_l2.c | 53 ++- drivers/net/qede/base/ecore_mcp.c | 220 - drivers/net/qede/base/ecore_mcp_api.h | 46 ++ drivers/net/qede/base/ecore_proto_if.h|3 + drivers/net/qede/base/ecore_rt_defs.h | 591 + drivers/net/qede/base/ecore_sp_commands.c | 29 +- drivers/net/qede/base/ecore_spq.c | 36 +- drivers/net/qede/base/ecore_spq.h | 13 + drivers/net/qede/base/ecore_sriov.c | 41 +- drivers/net/qede/base/eth_common.h|3 + drivers/net/qede/base/mcp_public.h|3 + drivers/net/qede/base/reg_addr.h |2 + drivers/net/qede/qede_ethdev.h|2 +- drivers/net/qede/qede_main.c |3 +- 36 files changed, 1632 insertions(+), 754 deletions(-) -- 1.7.10.3
[dpdk-dev] [PATCH 01/14] net/qede/base: use path ID for HW init
Use the path ID as the phase ID when running the engine phase of the HW init Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore_dev.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index 744d204..cd274c3 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -1658,7 +1658,8 @@ static enum _ecore_status_t ecore_hw_init_common(struct ecore_hwfn *p_hwfn, ecore_init_cache_line_size(p_hwfn, p_ptt); - rc = ecore_init_run(p_hwfn, p_ptt, PHASE_ENGINE, ANY_PHASE_ID, hw_mode); + rc = ecore_init_run(p_hwfn, p_ptt, PHASE_ENGINE, ECORE_PATH_ID(p_hwfn), + hw_mode); if (rc != ECORE_SUCCESS) return rc; -- 1.7.10.3
[dpdk-dev] [PATCH 02/14] net/qede/base: protect DMAE transactions
Protect DMAE transactions with a spinlock instead of a mutex
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore.h |6 --
drivers/net/qede/base/ecore_dev.c |6 +++---
drivers/net/qede/base/ecore_hw.c | 30 +++---
3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index ce5f3a9..7c642af 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -432,8 +432,10 @@ struct ecore_hw_info {
#define DMAE_MAX_RW_SIZE 0x2000
struct ecore_dmae_info {
- /* Mutex for synchronizing access to functions */
- osal_mutex_tmutex;
+ /* Spinlock for synchronizing access to functions */
+ osal_spinlock_t lock;
+
+ bool b_mem_ready;
u8 channel;
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index cd274c3..b15af03 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -423,9 +423,9 @@ void ecore_init_struct(struct ecore_dev *p_dev)
p_hwfn->b_active = false;
#ifdef CONFIG_ECORE_LOCK_ALLOC
- OSAL_MUTEX_ALLOC(p_hwfn, &p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_LOCK_ALLOC(p_hwfn, &p_hwfn->dmae_info.lock);
#endif
- OSAL_MUTEX_INIT(&p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_LOCK_INIT(&p_hwfn->dmae_info.lock);
}
/* hwfn 0 is always active */
@@ -4238,7 +4238,7 @@ void ecore_hw_remove(struct ecore_dev *p_dev)
ecore_mcp_free(p_hwfn);
#ifdef CONFIG_ECORE_LOCK_ALLOC
- OSAL_MUTEX_DEALLOC(&p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_LOCK_DEALLOC(&p_hwfn->dmae_info.lock);
#endif
}
diff --git a/drivers/net/qede/base/ecore_hw.c b/drivers/net/qede/base/ecore_hw.c
index 84f273b..34e2e5f 100644
--- a/drivers/net/qede/base/ecore_hw.c
+++ b/drivers/net/qede/base/ecore_hw.c
@@ -592,7 +592,8 @@ enum _ecore_status_t ecore_dmae_info_alloc(struct
ecore_hwfn *p_hwfn)
goto err;
}
- p_hwfn->dmae_info.channel = p_hwfn->rel_pf_id;
+ p_hwfn->dmae_info.channel = p_hwfn->rel_pf_id;
+ p_hwfn->dmae_info.b_mem_ready = true;
return ECORE_SUCCESS;
err:
@@ -604,8 +605,9 @@ void ecore_dmae_info_free(struct ecore_hwfn *p_hwfn)
{
dma_addr_t p_phys;
- /* Just make sure no one is in the middle */
- OSAL_MUTEX_ACQUIRE(&p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_LOCK(&p_hwfn->dmae_info.lock);
+ p_hwfn->dmae_info.b_mem_ready = false;
+ OSAL_SPIN_UNLOCK(&p_hwfn->dmae_info.lock);
if (p_hwfn->dmae_info.p_completion_word != OSAL_NULL) {
p_phys = p_hwfn->dmae_info.completion_word_phys_addr;
@@ -630,8 +632,6 @@ void ecore_dmae_info_free(struct ecore_hwfn *p_hwfn)
p_phys, sizeof(u32) * DMAE_MAX_RW_SIZE);
p_hwfn->dmae_info.p_intermediate_buffer = OSAL_NULL;
}
-
- OSAL_MUTEX_RELEASE(&p_hwfn->dmae_info.mutex);
}
static enum _ecore_status_t ecore_dmae_operation_wait(struct ecore_hwfn
*p_hwfn)
@@ -777,6 +777,14 @@ static enum _ecore_status_t
ecore_dmae_operation_wait(struct ecore_hwfn *p_hwfn)
enum _ecore_status_t ecore_status = ECORE_SUCCESS;
u32 offset = 0;
+ if (!p_hwfn->dmae_info.b_mem_ready) {
+ DP_VERBOSE(p_hwfn, ECORE_MSG_HW,
+ "No buffers allocated. Avoid DMAE transaction [{src:
addr 0x%lx, type %d}, {dst: addr 0x%lx, type %d}, size %d].\n",
+ src_addr, src_type, dst_addr, dst_type,
+ size_in_dwords);
+ return ECORE_NOMEM;
+ }
+
if (p_hwfn->p_dev->recov_in_prog) {
DP_VERBOSE(p_hwfn, ECORE_MSG_HW,
"Recovery is in progress. Avoid DMAE transaction
[{src: addr 0x%lx, type %d}, {dst: addr 0x%lx, type %d}, size %d].\n",
@@ -870,7 +878,7 @@ enum _ecore_status_t
OSAL_MEMSET(¶ms, 0, sizeof(struct ecore_dmae_params));
params.flags = flags;
- OSAL_MUTEX_ACQUIRE(&p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_LOCK(&p_hwfn->dmae_info.lock);
rc = ecore_dmae_execute_command(p_hwfn, p_ptt, source_addr,
grc_addr_in_dw,
@@ -878,7 +886,7 @@ enum _ecore_status_t
ECORE_DMAE_ADDRESS_GRC,
size_in_dwords, ¶ms);
- OSAL_MUTEX_RELEASE(&p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_UNLOCK(&p_hwfn->dmae_info.lock);
return rc;
}
@@ -896,14 +904,14 @@ enum _ecore_status_t
OSAL_MEMSET(¶ms, 0, sizeof(struct ecore_dmae_params));
params.flags = flags;
- OSAL_MUTEX_ACQUIRE(&p_hwfn->dmae_info.mutex);
+ OSAL_SPIN_LOCK(&p_hwfn->dmae_info.lock);
rc = ecore_dmae_execute_command(p_hwfn, p_ptt, grc_addr_in_dw,
[dpdk-dev] [PATCH 03/14] net/qede/base: add DMAE sanity check
Add DMA engine sanity check during the engine initialization and before
PF inititialization
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_dev.c |5 +++
drivers/net/qede/base/ecore_hw.c | 69
drivers/net/qede/base/ecore_hw.h |4 ++
drivers/net/qede/base/ecore_init_ops.c | 32 +--
drivers/net/qede/base/ecore_rt_defs.h |3 ++
5 files changed, 100 insertions(+), 13 deletions(-)
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index b15af03..38492e6 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2161,6 +2161,11 @@ static enum _ecore_status_t ecore_hw_init_port(struct
ecore_hwfn *p_hwfn,
/* perform debug configuration when chip is out of reset */
OSAL_BEFORE_PF_START((void *)p_hwfn->p_dev, p_hwfn->my_id);
+ /* Sanity check before the PF init sequence that uses DMAE */
+ rc = ecore_dmae_sanity(p_hwfn, p_ptt, "pf_phase");
+ if (rc)
+ return rc;
+
/* PF Init sequence */
rc = ecore_init_run(p_hwfn, p_ptt, PHASE_PF, rel_pf_id, hw_mode);
if (rc)
diff --git a/drivers/net/qede/base/ecore_hw.c b/drivers/net/qede/base/ecore_hw.c
index 34e2e5f..98c7fbf 100644
--- a/drivers/net/qede/base/ecore_hw.c
+++ b/drivers/net/qede/base/ecore_hw.c
@@ -952,3 +952,72 @@ void ecore_hw_err_notify(struct ecore_hwfn *p_hwfn,
OSAL_HW_ERROR_OCCURRED(p_hwfn, err_type);
}
+
+enum _ecore_status_t ecore_dmae_sanity(struct ecore_hwfn *p_hwfn,
+ struct ecore_ptt *p_ptt,
+ const char *phase)
+{
+ u32 size = OSAL_PAGE_SIZE / 2, val;
+ struct ecore_dmae_params params;
+ enum _ecore_status_t rc = ECORE_SUCCESS;
+ dma_addr_t p_phys;
+ void *p_virt;
+ u32 *p_tmp;
+
+ p_virt = OSAL_DMA_ALLOC_COHERENT(p_hwfn->p_dev, &p_phys, 2 * size);
+ if (!p_virt) {
+ DP_NOTICE(p_hwfn, false,
+ "DMAE sanity [%s]: failed to allocate memory\n",
+ phase);
+ return ECORE_NOMEM;
+ }
+
+ /* Fill the bottom half of the allocated memory with a known pattern */
+ for (p_tmp = (u32 *)p_virt;
+p_tmp < (u32 *)((u8 *)p_virt + size);
+p_tmp++) {
+ /* Save the address itself as the value */
+ val = (u32)(osal_uintptr_t)p_tmp;
+ *p_tmp = val;
+ }
+
+ /* Zero the top half of the allocated memory */
+ OSAL_MEM_ZERO((u8 *)p_virt + size, size);
+
+ DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+ "DMAE sanity [%s]: src_addr={phys 0x%lx, virt %p},
dst_addr={phys 0x%lx, virt %p}, size 0x%x\n",
+ phase, (u64)p_phys, p_virt, (u64)(p_phys + size),
+ (u8 *)p_virt + size, size);
+
+ OSAL_MEMSET(¶ms, 0, sizeof(params));
+ rc = ecore_dmae_host2host(p_hwfn, p_ptt, p_phys, p_phys + size,
+ size / 4 /* size_in_dwords */, ¶ms);
+ if (rc != ECORE_SUCCESS) {
+ DP_NOTICE(p_hwfn, false,
+ "DMAE sanity [%s]: ecore_dmae_host2host() failed. rc
= %d.\n",
+ phase, rc);
+ goto out;
+ }
+
+ /* Verify that the top half of the allocated memory has the pattern */
+ for (p_tmp = (u32 *)((u8 *)p_virt + size);
+p_tmp < (u32 *)((u8 *)p_virt + (2 * size));
+p_tmp++) {
+ /* The corresponding address in the bottom half */
+ val = (u32)(osal_uintptr_t)p_tmp - size;
+
+ if (*p_tmp != val) {
+ DP_NOTICE(p_hwfn, false,
+ "DMAE sanity [%s]: addr={phys 0x%lx, virt
%p}, read_val 0x%08x, expected_val 0x%08x\n",
+ phase,
+ (u64)p_phys + ((u8 *)p_tmp - (u8 *)p_virt),
+ p_tmp, *p_tmp, val);
+ rc = ECORE_UNKNOWN_ERROR;
+ goto out;
+ }
+ }
+
+out:
+ OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev, p_virt, p_phys, 2 * size);
+ return rc;
+}
diff --git a/drivers/net/qede/base/ecore_hw.h b/drivers/net/qede/base/ecore_hw.h
index 0b9814f..b59a26a 100644
--- a/drivers/net/qede/base/ecore_hw.h
+++ b/drivers/net/qede/base/ecore_hw.h
@@ -255,4 +255,8 @@ enum _ecore_status_t ecore_init_fw_data(struct ecore_dev
*p_dev,
void ecore_hw_err_notify(struct ecore_hwfn *p_hwfn,
enum ecore_hw_err_type err_type);
+enum _ecore_status_t ecore_dmae_sanity(struct ecore_hwfn *p_hwfn,
+ struct ecore_ptt *p_ptt,
+ const char *phase);
+
#endif /* __ECORE_HW_H__ */
diff --git a/drivers/net/qede/base/ecore_init_ops.c
b/drivers/net/qede/base/ecore_init
[dpdk-dev] [PATCH 04/14] net/qede/base: upgrade FW to 8.33.12.0
This patch adds changes to support new firmware 8.33.12.0. The changes
consist of FW bug fixes and enhancements.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/common_hsi.h|8 +-
drivers/net/qede/base/ecore_cxt.c | 10 +-
drivers/net/qede/base/ecore_cxt.h |4 +-
drivers/net/qede/base/ecore_dev.c | 10 +-
drivers/net/qede/base/ecore_hsi_common.h | 19 +-
drivers/net/qede/base/ecore_hsi_debug_tools.h |3 +-
drivers/net/qede/base/ecore_hsi_eth.h | 23 +-
drivers/net/qede/base/ecore_hsi_init_func.h |3 +
drivers/net/qede/base/ecore_init_fw_funcs.c | 210 +++--
drivers/net/qede/base/ecore_init_fw_funcs.h | 33 +-
drivers/net/qede/base/ecore_iro_values.h | 64 +--
drivers/net/qede/base/ecore_l2.c |2 +-
drivers/net/qede/base/ecore_rt_defs.h | 588 +
drivers/net/qede/base/eth_common.h|3 +
drivers/net/qede/base/reg_addr.h |2 +
drivers/net/qede/qede_main.c |2 +-
16 files changed, 585 insertions(+), 399 deletions(-)
diff --git a/drivers/net/qede/base/common_hsi.h
b/drivers/net/qede/base/common_hsi.h
index 9a6059a..d37dc7c 100644
--- a/drivers/net/qede/base/common_hsi.h
+++ b/drivers/net/qede/base/common_hsi.h
@@ -96,10 +96,10 @@
//
-#define FW_MAJOR_VERSION 8
-#define FW_MINOR_VERSION 30
-#define FW_REVISION_VERSION12
-#define FW_ENGINEERING_VERSION 0
+#define FW_MAJOR_VERSION8
+#define FW_MINOR_VERSION33
+#define FW_REVISION_VERSION 12
+#define FW_ENGINEERING_VERSION 0
/***/
/* COMMON HW CONSTANTS */
diff --git a/drivers/net/qede/base/ecore_cxt.c
b/drivers/net/qede/base/ecore_cxt.c
index 50bd66d..ca7c55f 100644
--- a/drivers/net/qede/base/ecore_cxt.c
+++ b/drivers/net/qede/base/ecore_cxt.c
@@ -1427,7 +1427,8 @@ static void ecore_cdu_init_pf(struct ecore_hwfn *p_hwfn)
}
}
-void ecore_qm_init_pf(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt)
+void ecore_qm_init_pf(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+ bool is_pf_loading)
{
struct ecore_qm_info *qm_info = &p_hwfn->qm_info;
struct ecore_mcp_link_state *p_link;
@@ -1438,8 +1439,9 @@ void ecore_qm_init_pf(struct ecore_hwfn *p_hwfn, struct
ecore_ptt *p_ptt)
p_link = &ECORE_LEADING_HWFN(p_hwfn->p_dev)->mcp_info->link_output;
- ecore_qm_pf_rt_init(p_hwfn, p_ptt, p_hwfn->port_id,
- p_hwfn->rel_pf_id, qm_info->max_phys_tcs_per_port,
+ ecore_qm_pf_rt_init(p_hwfn, p_ptt, p_hwfn->rel_pf_id,
+ qm_info->max_phys_tcs_per_port,
+ is_pf_loading,
iids.cids, iids.vf_cids, iids.tids,
qm_info->start_pq,
qm_info->num_pqs - qm_info->num_vf_pqs,
@@ -1797,7 +1799,7 @@ void ecore_cxt_hw_init_common(struct ecore_hwfn *p_hwfn)
void ecore_cxt_hw_init_pf(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt)
{
- ecore_qm_init_pf(p_hwfn, p_ptt);
+ ecore_qm_init_pf(p_hwfn, p_ptt, true);
ecore_cm_init_pf(p_hwfn);
ecore_dq_init_pf(p_hwfn);
ecore_cdu_init_pf(p_hwfn);
diff --git a/drivers/net/qede/base/ecore_cxt.h
b/drivers/net/qede/base/ecore_cxt.h
index 54761e4..1130a33 100644
--- a/drivers/net/qede/base/ecore_cxt.h
+++ b/drivers/net/qede/base/ecore_cxt.h
@@ -107,8 +107,10 @@ u32 ecore_cxt_get_proto_cid_start(struct ecore_hwfn
*p_hwfn,
*
* @param p_hwfn
* @param p_ptt
+ * @param is_pf_loading
*/
-void ecore_qm_init_pf(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt);
+void ecore_qm_init_pf(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+ bool is_pf_loading);
/**
* @brief Reconfigures QM pf on the fly
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index 38492e6..a3269f4 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -721,6 +721,7 @@ static void ecore_init_qm_pq(struct ecore_hwfn *p_hwfn,
"pq overflow! pq %d, max pq %d\n", pq_idx, max_pq);
/* init pq params */
+ qm_info->qm_pq_params[pq_idx].port_id = p_hwfn->port_id;
qm_info->qm_pq_params[pq_idx].vport_id = qm_info->start_vport +
qm_info->num_vports;
qm_info->qm_pq_params[pq_idx].tc_id = tc;
@@ -1025,10 +1026,9 @@ static void ecore_dp_init_qm_params(struct ecore_hwfn
*p_hwfn)
for (i = 0; i < qm_info->num_pqs; i++) {
pq = &qm_info->qm_pq_params[i];
DP_VERBOSE(p_hwfn, ECORE_MSG_HW,
- "pq idx %d, vport_id %d, tc %d, wrr_grp %d,"
- " rl_valid %d\n",
-
[dpdk-dev] [PATCH 05/14] net/qede/base: symantic changes
The changes included in this patch are for
- formatting
- comment rework/addtions
- relocate FW info, version related code
- convert:
__le16 to u16
__le32 to u32 etc.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_hsi_common.h | 89 +++-
drivers/net/qede/base/ecore_hsi_debug_tools.h | 105
drivers/net/qede/base/ecore_hsi_eth.h |6 +-
drivers/net/qede/base/ecore_hsi_init_func.h | 33
drivers/net/qede/base/ecore_hsi_init_tool.h | 107 +++--
5 files changed, 171 insertions(+), 169 deletions(-)
diff --git a/drivers/net/qede/base/ecore_hsi_common.h
b/drivers/net/qede/base/ecore_hsi_common.h
index 38ac507..60951a1 100644
--- a/drivers/net/qede/base/ecore_hsi_common.h
+++ b/drivers/net/qede/base/ecore_hsi_common.h
@@ -948,7 +948,9 @@ struct core_tx_bd_data {
/* Do not allow additional VLAN manipulations on this packet (DCB) */
#define CORE_TX_BD_DATA_FORCE_VLAN_MODE_MASK 0x1
#define CORE_TX_BD_DATA_FORCE_VLAN_MODE_SHIFT0
-/* Insert VLAN into packet */
+/* Insert VLAN into packet. Cannot be set for LB packets
+ * (tx_dst == CORE_TX_DEST_LB)
+ */
#define CORE_TX_BD_DATA_VLAN_INSERTION_MASK 0x1
#define CORE_TX_BD_DATA_VLAN_INSERTION_SHIFT 1
/* This is the first BD of the packet (for debug) */
@@ -1071,11 +1073,11 @@ struct core_tx_update_ramrod_data {
* Enum flag for what type of dcb data to update
*/
enum dcb_dscp_update_mode {
-/* use when no change should be done to dcb data */
+/* use when no change should be done to DCB data */
DONT_UPDATE_DCB_DSCP,
- UPDATE_DCB /* use to update only l2 (vlan) priority */,
- UPDATE_DSCP /* use to update only l3 dscp */,
- UPDATE_DCB_DSCP /* update vlan pri and dscp */,
+ UPDATE_DCB /* use to update only L2 (vlan) priority */,
+ UPDATE_DSCP /* use to update only IP DSCP */,
+ UPDATE_DCB_DSCP /* update vlan pri and DSCP */,
MAX_DCB_DSCP_UPDATE_FLAG
};
@@ -1293,10 +1295,12 @@ enum fw_flow_ctrl_mode {
* GFT profile type.
*/
enum gft_profile_type {
- GFT_PROFILE_TYPE_4_TUPLE /* 4 tuple, IP type and L4 type match. */,
-/* L4 destination port, IP type and L4 type match. */
+/* tunnel type, inner 4 tuple, IP type and L4 type match. */
+ GFT_PROFILE_TYPE_4_TUPLE,
+/* tunnel type, inner L4 destination port, IP type and L4 type match. */
GFT_PROFILE_TYPE_L4_DST_PORT,
- GFT_PROFILE_TYPE_IP_DST_ADDR /* IP destination port and IP type. */,
+/* tunnel type, inner IP destination address and IP type match. */
+ GFT_PROFILE_TYPE_IP_DST_ADDR,
/* tunnel type, inner IP source address and IP type match. */
GFT_PROFILE_TYPE_IP_SRC_ADDR,
GFT_PROFILE_TYPE_TUNNEL_TYPE /* tunnel type and outer IP type match. */,
@@ -1416,8 +1420,9 @@ struct vlan_header {
* outer tag configurations
*/
struct outer_tag_config_struct {
-/* Enables the STAG Priority Change , Should be 1 for Bette Davis and UFP with
- * Host Control mode. Else - 0
+/* Enables updating S-tag priority from inner tag or DCB. Should be 1 for Bette
+ * Davis, UFP with Host Control mode, and UFP with DCB over base interface.
+ * else - 0.
*/
u8 enable_stag_pri_change;
/* If inner_to_outer_pri_map is initialize then set pri_map_valid */
@@ -1512,14 +1517,14 @@ struct pf_start_ramrod_data {
/*
- * Data for port update ramrod
+ * Per protocol DCB data
*/
struct protocol_dcb_data {
- u8 dcb_enable_flag /* dcbEnable flag value */;
- u8 dscp_enable_flag /* If set use dscp value */;
- u8 dcb_priority /* dcbPri flag value */;
- u8 dcb_tc /* dcb TC value */;
- u8 dscp_val /* dscp value to write if dscp_enable_flag is set */;
+ u8 dcb_enable_flag /* Enable DCB */;
+ u8 dscp_enable_flag /* Enable updating DSCP value */;
+ u8 dcb_priority /* DCB priority */;
+ u8 dcb_tc /* DCB TC */;
+ u8 dscp_val /* DSCP value to write if dscp_enable_flag is set */;
/* When DCB is enabled - if this flag is set, dont add VLAN 0 tag to untagged
* frames
*/
@@ -1583,8 +1588,9 @@ struct pf_update_ramrod_data {
/* core iwarp related fields */
struct protocol_dcb_data iwarp_dcb_data;
__le16 mf_vlan /* new outer vlan id value */;
-/* enables the inner to outer TAG priority mapping. Should be 1 for Bette Davis
- * and UFP with Host Control mode, else - 0.
+/* enables updating S-tag priority from inner tag or DCB. Should be 1 for Bette
+ * Davis, UFP with Host Control mode, and UFP with DCB over base interface.
+ * else - 0
*/
u8 enable_stag_pri_change;
u8 reserved;
@@ -2139,6 +2145,53 @@ struct e4_ystorm_core_conn_ag_ctx {
};
+struct fw_asserts_ram_section {
+/* The offset of the section in the RAM in RAM lines (64-bit units) */
+ __le16 section_ram_line_offset;
+/* The size of the section in RAM lines (64-bit units) */
+ __le16 section_ram_line_size;
+/* The offset of th
[dpdk-dev] [PATCH 07/14] net/qede/base: allow changing VF MAC address
This patch allows VF to change its own MAC address regardless of MAC set
by PF
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_iov_api.h | 11 ++
drivers/net/qede/base/ecore_proto_if.h |3 +++
drivers/net/qede/base/ecore_sriov.c| 36 +---
3 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/drivers/net/qede/base/ecore_iov_api.h
b/drivers/net/qede/base/ecore_iov_api.h
index 218ef50..3ac219b 100644
--- a/drivers/net/qede/base/ecore_iov_api.h
+++ b/drivers/net/qede/base/ecore_iov_api.h
@@ -540,6 +540,17 @@ void ecore_iov_get_vf_reply_virt_mbx_params(struct
ecore_hwfn *p_hwfn,
u32 ecore_iov_pfvf_msg_length(void);
/**
+ * @brief Returns MAC address if one is configured
+ *
+ * @parm p_hwfn
+ * @parm rel_vf_id
+ *
+ * @return OSAL_NULL if mac isn't set; Otherwise, returns MAC.
+ */
+u8 *ecore_iov_bulletin_get_mac(struct ecore_hwfn *p_hwfn,
+ u16 rel_vf_id);
+
+/**
* @brief Returns forced MAC address if one is configured
*
* @parm p_hwfn
diff --git a/drivers/net/qede/base/ecore_proto_if.h
b/drivers/net/qede/base/ecore_proto_if.h
index abca740..d0518df 100644
--- a/drivers/net/qede/base/ecore_proto_if.h
+++ b/drivers/net/qede/base/ecore_proto_if.h
@@ -31,6 +31,9 @@ struct ecore_eth_pf_params {
* This will set the maximal number of configured steering-filters.
*/
u32 num_arfs_filters;
+
+ /* To allow VF to change its MAC despite of PF set forced MAC. */
+ boolallow_vf_mac_change;
};
/* Most of the parameters below are described in the FW iSCSI / TCP HSI */
diff --git a/drivers/net/qede/base/ecore_sriov.c
b/drivers/net/qede/base/ecore_sriov.c
index b1e26d6..b7a52f8 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -1968,7 +1968,8 @@ static void ecore_iov_vf_mbx_acquire(struct ecore_hwfn
*p_hwfn,
if (!p_vf->vport_instance)
return ECORE_INVAL;
- if (events & (1 << MAC_ADDR_FORCED)) {
+ if ((events & (1 << MAC_ADDR_FORCED)) ||
+ p_hwfn->pf_params.eth_pf_params.allow_vf_mac_change) {
/* Since there's no way [currently] of removing the MAC,
* we can always assume this means we need to force it.
*/
@@ -1989,7 +1990,11 @@ static void ecore_iov_vf_mbx_acquire(struct ecore_hwfn
*p_hwfn,
return rc;
}
- p_vf->configured_features |= 1 << MAC_ADDR_FORCED;
+ if (p_hwfn->pf_params.eth_pf_params.allow_vf_mac_change)
+ p_vf->configured_features |=
+ 1 << VFPF_BULLETIN_MAC_ADDR;
+ else
+ p_vf->configured_features |= 1 << MAC_ADDR_FORCED;
}
if (events & (1 << VLAN_ADDR_FORCED)) {
@@ -4370,7 +4375,11 @@ void ecore_iov_bulletin_set_forced_mac(struct ecore_hwfn
*p_hwfn,
return;
}
- feature = 1 << MAC_ADDR_FORCED;
+ if (p_hwfn->pf_params.eth_pf_params.allow_vf_mac_change)
+ feature = 1 << VFPF_BULLETIN_MAC_ADDR;
+ else
+ feature = 1 << MAC_ADDR_FORCED;
+
OSAL_MEMCPY(vf_info->bulletin.p_virt->mac, mac, ETH_ALEN);
vf_info->bulletin.p_virt->valid_bitmap |= feature;
@@ -4411,9 +4420,13 @@ enum _ecore_status_t ecore_iov_bulletin_set_mac(struct
ecore_hwfn *p_hwfn,
vf_info->bulletin.p_virt->valid_bitmap |= feature;
+ if (p_hwfn->pf_params.eth_pf_params.allow_vf_mac_change)
+ ecore_iov_configure_vport_forced(p_hwfn, vf_info, feature);
+
return ECORE_SUCCESS;
}
+#ifndef LINUX_REMOVE
enum _ecore_status_t
ecore_iov_bulletin_set_forced_untagged_default(struct ecore_hwfn *p_hwfn,
bool b_untagged_only, int vfid)
@@ -4470,6 +4483,7 @@ void ecore_iov_get_vfs_opaque_fid(struct ecore_hwfn
*p_hwfn, int vfid,
*opaque_fid = vf_info->opaque_fid;
}
+#endif
void ecore_iov_bulletin_set_forced_vlan(struct ecore_hwfn *p_hwfn,
u16 pvid, int vfid)
@@ -4657,6 +4671,22 @@ u32 ecore_iov_pfvf_msg_length(void)
return sizeof(union pfvf_tlvs);
}
+u8 *ecore_iov_bulletin_get_mac(struct ecore_hwfn *p_hwfn,
+ u16 rel_vf_id)
+{
+ struct ecore_vf_info *p_vf;
+
+ p_vf = ecore_iov_get_vf_info(p_hwfn, rel_vf_id, true);
+ if (!p_vf || !p_vf->bulletin.p_virt)
+ return OSAL_NULL;
+
+ if (!(p_vf->bulletin.p_virt->valid_bitmap &
+ (1 << VFPF_BULLETIN_MAC_ADDR)))
+ return OSAL_NULL;
+
+ return p_vf->bulletin.p_virt->mac;
+}
+
u8 *ecore_iov_bulletin_get_forced_mac(struct ecore_hwfn *p_hwfn, u16 rel_vf_id)
{
struct ecore_vf_info *p_vf;
--
1.7.10.3
[dpdk-dev] [PATCH 06/14] net/qede/base: add new chain API
Add new API ecore_chain_set_cons() and fix page index setting in
ecore_chain_set_prod(). The new API is for future use.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_chain.h | 49 ++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/net/qede/base/ecore_chain.h
b/drivers/net/qede/base/ecore_chain.h
index d8f69ad..f8c932b 100644
--- a/drivers/net/qede/base/ecore_chain.h
+++ b/drivers/net/qede/base/ecore_chain.h
@@ -526,7 +526,7 @@ static OSAL_INLINE void ecore_chain_reset(struct
ecore_chain *p_chain)
p_chain->p_prod_elem = p_chain->p_virt_addr;
if (p_chain->mode == ECORE_CHAIN_MODE_PBL) {
- /* Use (page_cnt - 1) as a reset value for the prod/cons page's
+ /* Use "page_cnt-1" as a reset value for the prod/cons page's
* indices, to avoid unnecessary page advancing on the first
* call to ecore_chain_produce/consume. Instead, the indices
* will be advanced to page_cnt and then will be wrapped to 0.
@@ -726,6 +726,21 @@ static OSAL_INLINE void *ecore_chain_get_last_elem(struct
ecore_chain *p_chain)
static OSAL_INLINE void ecore_chain_set_prod(struct ecore_chain *p_chain,
u32 prod_idx, void *p_prod_elem)
{
+ if (p_chain->mode == ECORE_CHAIN_MODE_PBL) {
+ /* Use "prod_idx-1" since ecore_chain_produce() advances the
+* page index before the producer index when getting to
+* "next_page_mask".
+*/
+ u32 elem_idx =
+ (prod_idx - 1 + p_chain->capacity) % p_chain->capacity;
+ u32 page_idx = elem_idx / p_chain->elem_per_page;
+
+ if (is_chain_u16(p_chain))
+ p_chain->pbl.c.u16.prod_page_idx = (u16)page_idx;
+ else
+ p_chain->pbl.c.u32.prod_page_idx = page_idx;
+ }
+
if (is_chain_u16(p_chain))
p_chain->u.chain16.prod_idx = (u16)prod_idx;
else
@@ -734,6 +749,38 @@ static OSAL_INLINE void ecore_chain_set_prod(struct
ecore_chain *p_chain,
}
/**
+ * @brief ecore_chain_set_cons - sets the cons to the given value
+ *
+ * @param cons_idx
+ * @param p_cons_elem
+ */
+static OSAL_INLINE void ecore_chain_set_cons(struct ecore_chain *p_chain,
+u32 cons_idx, void *p_cons_elem)
+{
+ if (p_chain->mode == ECORE_CHAIN_MODE_PBL) {
+ /* Use "cons_idx-1" since ecore_chain_consume() advances the
+* page index before the consumer index when getting to
+* "next_page_mask".
+*/
+ u32 elem_idx =
+ (cons_idx - 1 + p_chain->capacity) % p_chain->capacity;
+ u32 page_idx = elem_idx / p_chain->elem_per_page;
+
+ if (is_chain_u16(p_chain))
+ p_chain->pbl.c.u16.cons_page_idx = (u16)page_idx;
+ else
+ p_chain->pbl.c.u32.cons_page_idx = page_idx;
+ }
+
+ if (is_chain_u16(p_chain))
+ p_chain->u.chain16.cons_idx = (u16)cons_idx;
+ else
+ p_chain->u.chain32.cons_idx = cons_idx;
+
+ p_chain->p_cons_elem = p_cons_elem;
+}
+
+/**
* @brief ecore_chain_pbl_zero_mem - set chain memory to 0
*
* @param p_chain
--
1.7.10.3
[dpdk-dev] [PATCH 09/14] net/qede/base: refine error handling
Adjust the verbosity of the log messages and add preventive checks for
errors.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_cxt.c | 20 ++--
drivers/net/qede/base/ecore_dcbx.c|2 +-
drivers/net/qede/base/ecore_dev.c | 179 -
drivers/net/qede/base/ecore_dev_api.h |2 +-
drivers/net/qede/base/ecore_hw.c | 20 ++--
drivers/net/qede/base/ecore_int.c | 11 +-
drivers/net/qede/base/ecore_l2.c |5 +-
drivers/net/qede/base/ecore_mcp.c | 21 ++--
drivers/net/qede/base/ecore_spq.c | 20 ++--
drivers/net/qede/base/ecore_sriov.c |5 +-
10 files changed, 173 insertions(+), 112 deletions(-)
diff --git a/drivers/net/qede/base/ecore_cxt.c
b/drivers/net/qede/base/ecore_cxt.c
index ca7c55f..389008c 100644
--- a/drivers/net/qede/base/ecore_cxt.c
+++ b/drivers/net/qede/base/ecore_cxt.c
@@ -834,7 +834,7 @@ static enum _ecore_status_t ecore_cxt_src_t2_alloc(struct
ecore_hwfn *p_hwfn)
p_mngr->t2_num_pages *
sizeof(struct ecore_dma_mem));
if (!p_mngr->t2) {
- DP_NOTICE(p_hwfn, true, "Failed to allocate t2 table\n");
+ DP_NOTICE(p_hwfn, false, "Failed to allocate t2 table\n");
rc = ECORE_NOMEM;
goto t2_fail;
}
@@ -919,6 +919,9 @@ static void ecore_ilt_shadow_free(struct ecore_hwfn *p_hwfn)
struct ecore_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr;
u32 ilt_size, i;
+ if (p_mngr->ilt_shadow == OSAL_NULL)
+ return;
+
ilt_size = ecore_cxt_ilt_shadow_size(p_cli);
for (i = 0; p_mngr->ilt_shadow && i < ilt_size; i++) {
@@ -931,6 +934,7 @@ static void ecore_ilt_shadow_free(struct ecore_hwfn *p_hwfn)
p_dma->p_virt = OSAL_NULL;
}
OSAL_FREE(p_hwfn->p_dev, p_mngr->ilt_shadow);
+ p_mngr->ilt_shadow = OSAL_NULL;
}
static enum _ecore_status_t
@@ -1000,8 +1004,7 @@ static enum _ecore_status_t ecore_ilt_shadow_alloc(struct
ecore_hwfn *p_hwfn)
size * sizeof(struct ecore_dma_mem));
if (!p_mngr->ilt_shadow) {
- DP_NOTICE(p_hwfn, true,
- "Failed to allocate ilt shadow table\n");
+ DP_NOTICE(p_hwfn, false, "Failed to allocate ilt shadow
table\n");
rc = ECORE_NOMEM;
goto ilt_shadow_fail;
}
@@ -1044,12 +1047,14 @@ static void ecore_cid_map_free(struct ecore_hwfn
*p_hwfn)
for (type = 0; type < MAX_CONN_TYPES; type++) {
OSAL_FREE(p_hwfn->p_dev, p_mngr->acquired[type].cid_map);
+ p_mngr->acquired[type].cid_map = OSAL_NULL;
p_mngr->acquired[type].max_count = 0;
p_mngr->acquired[type].start_cid = 0;
for (vf = 0; vf < COMMON_MAX_NUM_VFS; vf++) {
OSAL_FREE(p_hwfn->p_dev,
p_mngr->acquired_vf[type][vf].cid_map);
+ p_mngr->acquired_vf[type][vf].cid_map = OSAL_NULL;
p_mngr->acquired_vf[type][vf].max_count = 0;
p_mngr->acquired_vf[type][vf].start_cid = 0;
}
@@ -1126,8 +1131,7 @@ enum _ecore_status_t ecore_cxt_mngr_alloc(struct
ecore_hwfn *p_hwfn)
p_mngr = OSAL_ZALLOC(p_hwfn->p_dev, GFP_KERNEL, sizeof(*p_mngr));
if (!p_mngr) {
- DP_NOTICE(p_hwfn, true,
- "Failed to allocate `struct ecore_cxt_mngr'\n");
+ DP_NOTICE(p_hwfn, false, "Failed to allocate `struct
ecore_cxt_mngr'\n");
return ECORE_NOMEM;
}
@@ -1189,21 +1193,21 @@ enum _ecore_status_t ecore_cxt_tables_alloc(struct
ecore_hwfn *p_hwfn)
/* Allocate the ILT shadow table */
rc = ecore_ilt_shadow_alloc(p_hwfn);
if (rc) {
- DP_NOTICE(p_hwfn, true, "Failed to allocate ilt memory\n");
+ DP_NOTICE(p_hwfn, false, "Failed to allocate ilt memory\n");
goto tables_alloc_fail;
}
/* Allocate the T2 table */
rc = ecore_cxt_src_t2_alloc(p_hwfn);
if (rc) {
- DP_NOTICE(p_hwfn, true, "Failed to allocate T2 memory\n");
+ DP_NOTICE(p_hwfn, false, "Failed to allocate T2 memory\n");
goto tables_alloc_fail;
}
/* Allocate and initialize the acquired cids bitmaps */
rc = ecore_cid_map_alloc(p_hwfn);
if (rc) {
- DP_NOTICE(p_hwfn, true, "Failed to allocate cid maps\n");
+ DP_NOTICE(p_hwfn, false, "Failed to allocate cid maps\n");
goto tables_alloc_fail;
}
diff --git a/drivers/net/qede/base/ecore_dcbx.c
b/drivers/net/qede/base/ecore_dcbx.c
index 21ddda9..fe9d5c0 100644
--- a/drivers/net/qede/base/ecore_dcbx.c
+++ b/drivers/net/qede/base/ecore_dcbx.c
@@ -910,7 +910,7 @@ enum _ecore_status_t ecore_dc
[dpdk-dev] [PATCH 10/14] net/qede/base: add stats counter for link state
Add link_change_count counter to track number of link state transitions
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_dev_api.h |1 +
drivers/net/qede/base/ecore_l2.c | 10 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/qede/base/ecore_dev_api.h
b/drivers/net/qede/base/ecore_dev_api.h
index aee11c0..f619683 100644
--- a/drivers/net/qede/base/ecore_dev_api.h
+++ b/drivers/net/qede/base/ecore_dev_api.h
@@ -377,6 +377,7 @@ struct ecore_eth_stats_common {
u64 tx_mac_mc_packets;
u64 tx_mac_bc_packets;
u64 tx_mac_ctrl_frames;
+ u64 link_change_count;
};
struct ecore_eth_stats_bb {
diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index bbcbbd0..0883fd3 100644
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -1948,6 +1948,11 @@ static void __ecore_get_vport_port_stats(struct
ecore_hwfn *p_hwfn,
p_ah->tx_1519_to_max_byte_packets =
port_stats.eth.u1.ah1.t1519_to_max;
}
+
+ p_common->link_change_count = ecore_rd(p_hwfn, p_ptt,
+ p_hwfn->mcp_info->port_addr +
+ OFFSETOF(struct public_port,
+ link_change_count));
}
void __ecore_get_vport_stats(struct ecore_hwfn *p_hwfn,
@@ -2064,11 +2069,14 @@ void ecore_reset_vport_stats(struct ecore_dev *p_dev)
/* PORT statistics are not necessarily reset, so we need to
* read and create a baseline for future statistics.
+* Link change stat is maintained by MFW, return its value as is.
*/
if (!p_dev->reset_stats)
DP_INFO(p_dev, "Reset stats not allocated\n");
- else
+ else {
_ecore_get_vport_stats(p_dev, p_dev->reset_stats);
+ p_dev->reset_stats->common.link_change_count = 0;
+ }
}
void ecore_arfs_mode_configure(struct ecore_hwfn *p_hwfn,
--
1.7.10.3
[dpdk-dev] [PATCH 08/14] net/qede/base: add MFW support for driver load timeout
Add SPQ timeout base driver parameter support management FW timeout values
other than default and none. Have fallback mechanism for old MFWs.
Reduce the defult timeout to 1 sec.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_dev.c | 66 +++--
drivers/net/qede/base/ecore_dev_api.h | 14 +++
drivers/net/qede/base/ecore_spq.c | 16 +++-
drivers/net/qede/base/ecore_spq.h | 13 +++
drivers/net/qede/base/mcp_public.h|2 +
5 files changed, 97 insertions(+), 14 deletions(-)
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index a3269f4..1b01bba 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2289,14 +2289,15 @@ static void ecore_reset_mb_shadow(struct ecore_hwfn
*p_hwfn,
}
static void ecore_pglueb_clear_err(struct ecore_hwfn *p_hwfn,
-struct ecore_ptt *p_ptt)
+ struct ecore_ptt *p_ptt)
{
ecore_wr(p_hwfn, p_ptt, PGLUE_B_REG_WAS_ERROR_PF_31_0_CLR,
1 << p_hwfn->abs_pf_id);
}
-static void
-ecore_fill_load_req_params(struct ecore_load_req_params *p_load_req,
+static enum _ecore_status_t
+ecore_fill_load_req_params(struct ecore_hwfn *p_hwfn,
+ struct ecore_load_req_params *p_load_req,
struct ecore_drv_load_params *p_drv_load)
{
/* Make sure that if ecore-client didn't provide inputs, all the
@@ -2308,15 +2309,51 @@ static void ecore_pglueb_clear_err(struct ecore_hwfn
*p_hwfn,
OSAL_MEM_ZERO(p_load_req, sizeof(*p_load_req));
- if (p_drv_load != OSAL_NULL) {
- p_load_req->drv_role = p_drv_load->is_crash_kernel ?
- ECORE_DRV_ROLE_KDUMP :
- ECORE_DRV_ROLE_OS;
+ if (p_drv_load == OSAL_NULL)
+ goto out;
+
+ p_load_req->drv_role = p_drv_load->is_crash_kernel ?
+ ECORE_DRV_ROLE_KDUMP :
+ ECORE_DRV_ROLE_OS;
+ p_load_req->avoid_eng_reset = p_drv_load->avoid_eng_reset;
+ p_load_req->override_force_load = p_drv_load->override_force_load;
+
+ /* Old MFW versions don't support timeout values other than default and
+* none, so these values are replaced according to the fall-back action.
+*/
+
+ if (p_drv_load->mfw_timeout_val == ECORE_LOAD_REQ_LOCK_TO_DEFAULT ||
+ p_drv_load->mfw_timeout_val == ECORE_LOAD_REQ_LOCK_TO_NONE ||
+ (p_hwfn->mcp_info->capabilities &
+FW_MB_PARAM_FEATURE_SUPPORT_DRV_LOAD_TO)) {
p_load_req->timeout_val = p_drv_load->mfw_timeout_val;
- p_load_req->avoid_eng_reset = p_drv_load->avoid_eng_reset;
- p_load_req->override_force_load =
- p_drv_load->override_force_load;
+ goto out;
}
+
+ switch (p_drv_load->mfw_timeout_fallback) {
+ case ECORE_TO_FALLBACK_TO_NONE:
+ p_load_req->timeout_val = ECORE_LOAD_REQ_LOCK_TO_NONE;
+ break;
+ case ECORE_TO_FALLBACK_TO_DEFAULT:
+ p_load_req->timeout_val = ECORE_LOAD_REQ_LOCK_TO_DEFAULT;
+ break;
+ case ECORE_TO_FALLBACK_FAIL_LOAD:
+ DP_NOTICE(p_hwfn, false,
+ "Received %d as a value for MFW timeout while the MFW
supports only default [%d] or none [%d]. Abort.\n",
+ p_drv_load->mfw_timeout_val,
+ ECORE_LOAD_REQ_LOCK_TO_DEFAULT,
+ ECORE_LOAD_REQ_LOCK_TO_NONE);
+ return ECORE_ABORTED;
+ }
+
+ DP_INFO(p_hwfn,
+ "Modified the MFW timeout value from %d to %s [%d] due to lack
of MFW support\n",
+ p_drv_load->mfw_timeout_val,
+ (p_load_req->timeout_val == ECORE_LOAD_REQ_LOCK_TO_DEFAULT) ?
+ "default" : "none",
+ p_load_req->timeout_val);
+out:
+ return ECORE_SUCCESS;
}
enum _ecore_status_t ecore_vf_start(struct ecore_hwfn *p_hwfn,
@@ -2372,8 +2409,13 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev
*p_dev,
if (rc != ECORE_SUCCESS)
return rc;
- ecore_fill_load_req_params(&load_req_params,
- p_params->p_drv_load_params);
+ ecore_set_spq_block_timeout(p_hwfn, p_params->spq_timeout_ms);
+
+ rc = ecore_fill_load_req_params(p_hwfn, &load_req_params,
+ p_params->p_drv_load_params);
+ if (rc != ECORE_SUCCESS)
+ return rc;
+
rc = ecore_mcp_load_req(p_hwfn, p_hwfn->p_main_ptt,
&load_req_params);
if (rc != ECORE_SUCCESS) {
diff --git a/drivers/net/qede/base/ecore
[dpdk-dev] [PATCH 11/14] net/qede/base: add APIs for xcvr
Add API to query transceiver info and to retrieve link speed.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore_mcp.c | 199 -
drivers/net/qede/base/ecore_mcp_api.h | 46
drivers/net/qede/base/mcp_public.h|1 +
3 files changed, 243 insertions(+), 3 deletions(-)
diff --git a/drivers/net/qede/base/ecore_mcp.c
b/drivers/net/qede/base/ecore_mcp.c
index 0e425aa..c1bfdd1 100644
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -9,6 +9,7 @@
#include "bcm_osal.h"
#include "ecore.h"
#include "ecore_status.h"
+#include "nvm_cfg.h"
#include "ecore_mcp.h"
#include "mcp_public.h"
#include "reg_addr.h"
@@ -602,7 +603,7 @@ void ecore_mcp_print_cpu_info(struct ecore_hwfn *p_hwfn,
/* MCP not initialized */
if (!ecore_mcp_is_init(p_hwfn)) {
- DP_NOTICE(p_hwfn, true, "MFW is not initialized !\n");
+ DP_NOTICE(p_hwfn, true, "MFW is not initialized!\n");
return ECORE_BUSY;
}
@@ -2130,19 +2131,20 @@ enum _ecore_status_t ecore_mcp_get_media_type(struct
ecore_hwfn *p_hwfn,
struct ecore_ptt *p_ptt,
u32 *p_media_type)
{
+ enum _ecore_status_t rc = ECORE_SUCCESS;
/* TODO - Add support for VFs */
if (IS_VF(p_hwfn->p_dev))
return ECORE_INVAL;
if (!ecore_mcp_is_init(p_hwfn)) {
- DP_NOTICE(p_hwfn, true, "MFW is not initialized !\n");
+ DP_NOTICE(p_hwfn, false, "MFW is not initialized!\n");
return ECORE_BUSY;
}
if (!p_ptt) {
*p_media_type = MEDIA_UNSPECIFIED;
- return ECORE_INVAL;
+ rc = ECORE_INVAL;
} else {
*p_media_type = ecore_rd(p_hwfn, p_ptt,
p_hwfn->mcp_info->port_addr +
@@ -2153,6 +2155,197 @@ enum _ecore_status_t ecore_mcp_get_media_type(struct
ecore_hwfn *p_hwfn,
return ECORE_SUCCESS;
}
+enum _ecore_status_t ecore_mcp_get_transceiver_data(struct ecore_hwfn *p_hwfn,
+ struct ecore_ptt *p_ptt,
+ u32 *p_tranceiver_type)
+{
+ enum _ecore_status_t rc = ECORE_SUCCESS;
+
+ /* TODO - Add support for VFs */
+ if (IS_VF(p_hwfn->p_dev))
+ return ECORE_INVAL;
+
+ if (!ecore_mcp_is_init(p_hwfn)) {
+ DP_NOTICE(p_hwfn, false, "MFW is not initialized!\n");
+ return ECORE_BUSY;
+ }
+ if (!p_ptt) {
+ *p_tranceiver_type = ETH_TRANSCEIVER_TYPE_NONE;
+ rc = ECORE_INVAL;
+ } else {
+ *p_tranceiver_type = ecore_rd(p_hwfn, p_ptt,
+ p_hwfn->mcp_info->port_addr +
+ offsetof(struct public_port,
+ transceiver_data));
+ }
+
+ return rc;
+}
+
+static int is_transceiver_ready(u32 transceiver_state, u32 transceiver_type)
+{
+ if ((transceiver_state & ETH_TRANSCEIVER_STATE_PRESENT) &&
+ ((transceiver_state & ETH_TRANSCEIVER_STATE_UPDATING) == 0x0) &&
+ (transceiver_type != ETH_TRANSCEIVER_TYPE_NONE))
+ return 1;
+
+ return 0;
+}
+
+enum _ecore_status_t ecore_mcp_trans_speed_mask(struct ecore_hwfn *p_hwfn,
+ struct ecore_ptt *p_ptt,
+ u32 *p_speed_mask)
+{
+ u32 transceiver_data, transceiver_type, transceiver_state;
+
+ ecore_mcp_get_transceiver_data(p_hwfn, p_ptt, &transceiver_data);
+
+ transceiver_state = GET_MFW_FIELD(transceiver_data,
+ ETH_TRANSCEIVER_STATE);
+
+ transceiver_type = GET_MFW_FIELD(transceiver_data,
+ ETH_TRANSCEIVER_TYPE);
+
+ if (is_transceiver_ready(transceiver_state, transceiver_type) == 0)
+ return ECORE_INVAL;
+
+ switch (transceiver_type) {
+ case ETH_TRANSCEIVER_TYPE_1G_LX:
+ case ETH_TRANSCEIVER_TYPE_1G_SX:
+ case ETH_TRANSCEIVER_TYPE_1G_PCC:
+ case ETH_TRANSCEIVER_TYPE_1G_ACC:
+ case ETH_TRANSCEIVER_TYPE_1000BASET:
+ *p_speed_mask = NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G;
+ break;
+
+ case ETH_TRANSCEIVER_TYPE_10G_SR:
+ case ETH_TRANSCEIVER_TYPE_10G_LR:
+ case ETH_TRANSCEIVER_TYPE_10G_LRM:
+ case ETH_TRANSCEIVER_TYPE_10G_ER:
+ case ETH_TRANSCEIVER_TYPE_10G_PCC:
+ case ETH_TRANSCEIVER_TYPE_10G_ACC:
+ case ETH_TRANSCEIVER_TYPE_4x10G:
+ *p_speed_mask = NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G;
+ break;
+
+ case ETH_TRANSCEIVER_TYPE_40G_LR4:
+ case ETH_TRANSCEIVER_TYPE_40G_SR4:
+ case ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G
[dpdk-dev] [PATCH 14/14] net/qede: update PMD version to 2.8.0.1
Signed-off-by: Rasesh Mody --- drivers/net/qede/qede_ethdev.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h index baae22d..4737c8f 100644 --- a/drivers/net/qede/qede_ethdev.h +++ b/drivers/net/qede/qede_ethdev.h @@ -45,7 +45,7 @@ /* Driver versions */ #define QEDE_PMD_VER_PREFIX"QEDE PMD" #define QEDE_PMD_VERSION_MAJOR 2 -#define QEDE_PMD_VERSION_MINOR 7 +#define QEDE_PMD_VERSION_MINOR 8 #define QEDE_PMD_VERSION_REVISION 0 #define QEDE_PMD_VERSION_PATCH 1 -- 1.7.10.3
[dpdk-dev] [PATCH 12/14] net/qede/base: fix to support OVLAN mode
This fix allows driver to program NIC configuration to support OVLAN
mode in multi-function scenario
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore.h |6 ++
drivers/net/qede/base/ecore_dcbx.c|5 +
drivers/net/qede/base/ecore_dcbx_api.h|1 +
drivers/net/qede/base/ecore_dev.c | 10 --
drivers/net/qede/base/ecore_sp_commands.c | 29 -
5 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 7c642af..c8e6311 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -536,6 +536,12 @@ enum ecore_mf_mode_bit {
ECORE_MF_UFP_SPECIFIC,
ECORE_MF_DISABLE_ARFS,
+
+ /* Use vlan for steering */
+ ECORE_MF_8021Q_TAGGING,
+
+ /* Use stag for steering */
+ ECORE_MF_8021AD_TAGGING,
};
enum ecore_ufp_mode {
diff --git a/drivers/net/qede/base/ecore_dcbx.c
b/drivers/net/qede/base/ecore_dcbx.c
index fe9d5c0..93262ee 100644
--- a/drivers/net/qede/base/ecore_dcbx.c
+++ b/drivers/net/qede/base/ecore_dcbx.c
@@ -149,6 +149,10 @@ u8 ecore_dcbx_get_dscp_value(struct ecore_hwfn *p_hwfn, u8
pri)
}
p_data->arr[type].update = UPDATE_DCB_DSCP;
+ /* Do not add valn tag 0 when DCB is enabled and port is in UFP mode */
+ if (OSAL_TEST_BIT(ECORE_MF_UFP_SPECIFIC, &p_hwfn->p_dev->mf_bits))
+ p_data->arr[type].dont_add_vlan0 = true;
+
/* QM reconf data */
if (p_hwfn->hw_info.personality == personality)
p_hwfn->hw_info.offload_tc = tc;
@@ -935,6 +939,7 @@ static void ecore_dcbx_update_protocol_data(struct
protocol_dcb_data *p_data,
p_data->dcb_tc = p_src->arr[type].tc;
p_data->dscp_enable_flag = p_src->arr[type].dscp_enable;
p_data->dscp_val = p_src->arr[type].dscp_val;
+ p_data->dcb_dont_add_vlan0 = p_src->arr[type].dont_add_vlan0;
}
/* Set pf update ramrod command params */
diff --git a/drivers/net/qede/base/ecore_dcbx_api.h
b/drivers/net/qede/base/ecore_dcbx_api.h
index 9ff4df4..4df99ae 100644
--- a/drivers/net/qede/base/ecore_dcbx_api.h
+++ b/drivers/net/qede/base/ecore_dcbx_api.h
@@ -29,6 +29,7 @@ struct ecore_dcbx_app_data {
u8 tc; /* Traffic Class */
bool dscp_enable; /* DSCP enabled */
u8 dscp_val;/* DSCP value */
+ bool dont_add_vlan0;/* Do not insert a vlan tag with id 0 */
};
#ifndef __EXTRACT__LINUX__
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index a85d26d..112f854 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -3588,9 +3588,14 @@ static enum _ecore_status_t ecore_hw_get_resc(struct
ecore_hwfn *p_hwfn,
break;
case NVM_CFG1_GLOB_MF_MODE_UFP:
p_hwfn->p_dev->mf_bits = 1 << ECORE_MF_OVLAN_CLSS |
-1 << ECORE_MF_UFP_SPECIFIC;
+1 << ECORE_MF_UFP_SPECIFIC |
+1 << ECORE_MF_8021Q_TAGGING;
+ break;
+ case NVM_CFG1_GLOB_MF_MODE_BD:
+ p_hwfn->p_dev->mf_bits = 1 << ECORE_MF_OVLAN_CLSS |
+1 << ECORE_MF_LLH_PROTO_CLSS |
+1 << ECORE_MF_8021AD_TAGGING;
break;
-
case NVM_CFG1_GLOB_MF_MODE_NPAR1_0:
p_hwfn->p_dev->mf_bits = 1 << ECORE_MF_LLH_MAC_CLSS |
1 << ECORE_MF_LLH_PROTO_CLSS |
@@ -3619,6 +3624,7 @@ static enum _ecore_status_t ecore_hw_get_resc(struct
ecore_hwfn *p_hwfn,
*/
switch (mf_mode) {
case NVM_CFG1_GLOB_MF_MODE_MF_ALLOWED:
+ case NVM_CFG1_GLOB_MF_MODE_BD:
p_hwfn->p_dev->mf_mode = ECORE_MF_OVLAN;
break;
case NVM_CFG1_GLOB_MF_MODE_NPAR1_0:
diff --git a/drivers/net/qede/base/ecore_sp_commands.c
b/drivers/net/qede/base/ecore_sp_commands.c
index 7598e7a..83705b8 100644
--- a/drivers/net/qede/base/ecore_sp_commands.c
+++ b/drivers/net/qede/base/ecore_sp_commands.c
@@ -295,6 +295,7 @@ static void ecore_set_hw_tunn_mode_port(struct ecore_hwfn
*p_hwfn,
}
#define ETH_P_8021Q 0x8100
+#define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */
enum _ecore_status_t ecore_sp_pf_start(struct ecore_hwfn *p_hwfn,
struct ecore_ptt *p_ptt,
@@ -308,7 +309,7 @@ enum _ecore_status_t ecore_sp_pf_start(struct ecore_hwfn
*p_hwfn,
struct ecore_sp_init_data init_data;
enum _ecore_status_t rc = ECORE_NOTIMPL;
u8 page_cnt;
- int i;
+ u8 i;
/* update initial eq producer */
ecore_eq_prod_update(p_hwfn,
@@ -343,18 +344,27 @@ enum _ecore_status_t ecore_sp_pf_start(struct ecore_hwfn
*p_hwfn,
p_ramrod->outer_tag_config.outer_tag.
[dpdk-dev] [PATCH 13/14] net/qede/base: add packet pacing support
Add packet pacing support for PFs.
ecore client can request for enabling packet pacing at init time,
if requested then ecore is going to skip MCoS and SRIOV configurations.
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/ecore.h | 16 ++-
drivers/net/qede/base/ecore_dev.c | 47 -
drivers/net/qede/base/ecore_dev_api.h |3 +++
drivers/net/qede/base/ecore_l2.c | 36 ++---
drivers/net/qede/qede_main.c |1 +
5 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index c8e6311..b6541dc 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -41,6 +41,9 @@
((FW_MAJOR_VERSION << 24) | (FW_MINOR_VERSION << 16) | \
(FW_REVISION_VERSION << 8) | FW_ENGINEERING_VERSION)
+#define IS_ECORE_PACING(p_hwfn)\
+ (!!(p_hwfn->b_en_pacing))
+
#define MAX_HWFNS_PER_DEVICE 2
#define NAME_SIZE 128 /* @DPDK */
#define ECORE_WFQ_UNIT 100
@@ -680,6 +683,13 @@ struct ecore_hwfn {
/* Mechanism for recovering from doorbell drop */
struct ecore_db_recovery_info db_recovery_info;
+ /* Enable/disable pacing, if request to enable then
+* IOV and mcos configuration will be skipped.
+* this actually reflects the value requested in
+* struct ecore_hw_prepare_params by ecore client.
+*/
+ bool b_en_pacing;
+
/* @DPDK */
struct ecore_ptt*p_arfs_ptt;
};
@@ -932,12 +942,16 @@ void ecore_set_fw_mac_addr(__le16 *fw_msb, __le16
*fw_mid, __le16 *fw_lsb,
#define PQ_FLAGS_ACK (1 << 4)
#define PQ_FLAGS_OFLD (1 << 5)
#define PQ_FLAGS_VFS (1 << 6)
+#define PQ_FLAGS_LLT (1 << 7)
/* physical queue index for cm context intialization */
u16 ecore_get_cm_pq_idx(struct ecore_hwfn *p_hwfn, u32 pq_flags);
u16 ecore_get_cm_pq_idx_mcos(struct ecore_hwfn *p_hwfn, u8 tc);
u16 ecore_get_cm_pq_idx_vf(struct ecore_hwfn *p_hwfn, u16 vf);
-u16 ecore_get_cm_pq_idx_rl(struct ecore_hwfn *p_hwfn, u8 qpid);
+u16 ecore_get_cm_pq_idx_rl(struct ecore_hwfn *p_hwfn, u16 rl);
+
+/* qm vport for rate limit configuration */
+u16 ecore_get_qm_vport_idx_rl(struct ecore_hwfn *p_hwfn, u16 rl);
const char *ecore_hw_get_resc_name(enum ecore_resources res_id);
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index 112f854..b1e67e2 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -513,11 +513,14 @@ static u32 ecore_get_pq_flags(struct ecore_hwfn *p_hwfn)
/* feature flags */
if (IS_ECORE_SRIOV(p_hwfn->p_dev))
flags |= PQ_FLAGS_VFS;
+ if (IS_ECORE_PACING(p_hwfn))
+ flags |= PQ_FLAGS_RLS;
/* protocol flags */
switch (p_hwfn->hw_info.personality) {
case ECORE_PCI_ETH:
- flags |= PQ_FLAGS_MCOS;
+ if (!IS_ECORE_PACING(p_hwfn))
+ flags |= PQ_FLAGS_MCOS;
break;
case ECORE_PCI_FCOE:
flags |= PQ_FLAGS_OFLD;
@@ -526,11 +529,14 @@ static u32 ecore_get_pq_flags(struct ecore_hwfn *p_hwfn)
flags |= PQ_FLAGS_ACK | PQ_FLAGS_OOO | PQ_FLAGS_OFLD;
break;
case ECORE_PCI_ETH_ROCE:
- flags |= PQ_FLAGS_MCOS | PQ_FLAGS_OFLD;
+ flags |= PQ_FLAGS_OFLD | PQ_FLAGS_LLT;
+ if (!IS_ECORE_PACING(p_hwfn))
+ flags |= PQ_FLAGS_MCOS;
break;
case ECORE_PCI_ETH_IWARP:
- flags |= PQ_FLAGS_MCOS | PQ_FLAGS_ACK | PQ_FLAGS_OOO |
-PQ_FLAGS_OFLD;
+ flags |= PQ_FLAGS_ACK | PQ_FLAGS_OOO | PQ_FLAGS_OFLD;
+ if (!IS_ECORE_PACING(p_hwfn))
+ flags |= PQ_FLAGS_MCOS;
break;
default:
DP_ERR(p_hwfn, "unknown personality %d\n",
@@ -837,7 +843,7 @@ u16 ecore_get_cm_pq_idx_vf(struct ecore_hwfn *p_hwfn, u16
vf)
return ecore_get_cm_pq_idx(p_hwfn, PQ_FLAGS_VFS) + vf;
}
-u16 ecore_get_cm_pq_idx_rl(struct ecore_hwfn *p_hwfn, u8 rl)
+u16 ecore_get_cm_pq_idx_rl(struct ecore_hwfn *p_hwfn, u16 rl)
{
u16 max_rl = ecore_init_qm_get_num_pf_rls(p_hwfn);
@@ -847,6 +853,23 @@ u16 ecore_get_cm_pq_idx_rl(struct ecore_hwfn *p_hwfn, u8
rl)
return ecore_get_cm_pq_idx(p_hwfn, PQ_FLAGS_RLS) + rl;
}
+u16 ecore_get_qm_vport_idx_rl(struct ecore_hwfn *p_hwfn, u16 rl)
+{
+ u16 start_pq, pq, qm_pq_idx;
+
+ pq = ecore_get_cm_pq_idx_rl(p_hwfn, rl);
+ start_pq = p_hwfn->qm_info.start_pq;
+ qm_pq_idx = pq - start_pq - CM_TX_PQ_BASE;
+
+ if (qm_pq_idx > p_hwfn->qm_info.num_pqs) {
+ DP_ERR(p_hwfn,
+ "qm_pq_idx %d must be smaller than %d\n",
+ qm_pq_idx, p_hwfn->qm_info.num_pqs);
+ }
+
+ retur
[dpdk-dev] [PATCH] net/bnx2x: convert to new Rx offloads API
From: Harish Patil
Ethdev RX offloads API has changed since:
commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API")
This patch makes use of DEV_RX_OFFLOAD_JUMBO_FRAME offload flag
to advertise jumbo frame support.
Signed-off-by: Harish Patil
---
drivers/net/bnx2x/bnx2x_ethdev.c |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 483d5a1..fada4bd 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -140,11 +140,13 @@ struct rte_bnx2x_xstats_name_off {
bnx2x_dev_configure(struct rte_eth_dev *dev)
{
struct bnx2x_softc *sc = dev->data->dev_private;
+ struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+
int mp_ncpus = sysconf(_SC_NPROCESSORS_CONF);
PMD_INIT_FUNC_TRACE();
- if (dev->data->dev_conf.rxmode.jumbo_frame)
+ if (rxmode & DEV_RX_OFFLOAD_JUMBO_FRAME)
sc->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len;
if (dev->data->nb_tx_queues > dev->data->nb_rx_queues) {
@@ -454,6 +456,7 @@ struct rte_bnx2x_xstats_name_off {
dev_info->max_rx_pktlen = BNX2X_MAX_RX_PKT_LEN;
dev_info->max_mac_addrs = BNX2X_MAX_MAC_ADDRS;
dev_info->speed_capa = ETH_LINK_SPEED_10G | ETH_LINK_SPEED_20G;
+ dev_info->rx_offload_capa = DEV_RX_OFFLOAD_JUMBO_FRAME;
}
static int
--
1.7.10.3
Re: [dpdk-dev] [PATCH v6 2/8] ethdev: add switch identifier parameter to port
--Shahaf
> -Original Message-
> From: Doherty, Declan [mailto:declan.dohe...@intel.com]
> Sent: Thursday, March 29, 2018 6:13 PM
> To: Shahaf Shuler ; dev@dpdk.org
> Cc: Alex Rosenbaum ; Ferruh Yigit
> ; Thomas Monjalon ; Qi
> Zhang ; Alejandro Lucero
> ; Andrew Rybchenko
> ; Mohammad Abdul Awal
> ; Remy Horton
> ; John McNamara ;
> Rony Efraim ; Jingjing Wu ;
> Wenzhuo Lu ; Vincent Jardin
> ; Yuanhan Liu ; Bruce
> Richardson ; Konstantin Ananyev
> ; Zhihong Wang
>
> Subject: Re: [dpdk-dev][PATCH v6 2/8] ethdev: add switch identifier
> parameter to port
>
> On 29/03/2018 11:12 AM, Shahaf Shuler wrote:
> > Thursday, March 29, 2018 12:14 PM, Doherty, Declan:
> >> On 29/03/2018 7:13 AM, Shahaf Shuler wrote:
> >>> Hi Declan,
> >>>
> >>> Thanks for the series! See some comments below
> >>>
> >>> Wednesday, March 28, 2018 4:54 PM, Declan Doherty:
> Subject: [dpdk-dev][PATCH v6 2/8] ethdev: add switch identifier
> parameter to port
>
> Introduces a new port attribute to ethdev port's which denotes the
> switch domain a port belongs to. By default all port's switch
> identifiers are the their port_id. Ports which share a common
> switch domain are configured with the same switch id.
>
> Signed-off-by: Declan Doherty
> ---
> app/test-pmd/config.c | 1 +
> lib/librte_ether/rte_ethdev.c | 3 +++
> lib/librte_ether/rte_ethdev.h | 1 +
> lib/librte_ether/rte_ethdev_core.h | 1 +
> 4 files changed, 6 insertions(+)
>
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> 4bb255c62..e12f8c515 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -517,6 +517,7 @@ port_infos_display(portid_t port_id)
> printf("Min possible number of TXDs per queue: %hu\n",
> dev_info.tx_desc_lim.nb_min);
> printf("TXDs number alignment: %hu\n",
> dev_info.tx_desc_lim.nb_align);
> +printf("Switch Id: %u\n", dev_info.switch_id);
> }
>
> void
> diff --git a/lib/librte_ether/rte_ethdev.c
> b/lib/librte_ether/rte_ethdev.c index 23857c91f..f32d18cad 100644
> --- a/lib/librte_ether/rte_ethdev.c
> +++ b/lib/librte_ether/rte_ethdev.c
> @@ -290,6 +290,8 @@ rte_eth_dev_allocate(const char *name)
> eth_dev = eth_dev_get(port_id);
> snprintf(eth_dev->data->name, sizeof(eth_dev->data->name),
> >> "%s",
> name);
> eth_dev->data->port_id = port_id;
> +eth_dev->data->switch_id = port_id;
> +/**< Default switch_id is the port_id of the device */
> >>>
> >>> Why such default is needed? Why not let the PMD to set it always?
> >>
> >> I saw this a simple way to have a consistent default value (the
> >> port_id) for all PMDs, without the need to modify existing PMD which
> >> don't currently have any concept of a switch domain.
> >
> > The default value don't makes much sense though. By default it would
> > mean the application each port is on different switch domain. This is
> > obviously not true in case of multiple VFs
>
> But it is the case today for all ports, that they are assumed to be in
> separate
> switch domains or at least in unknowable switch domains by applications,
> with the exception of LAG groups, were it is implicit that they are in the
> same
> domain. Even if two ports were attached to the same switch, or if you where
> using multiple VFs from the same switch there is currently no way of telling
> the application that this is the case.
Right, but I thought your new parameter is the way :
Uint16_t switch_domain -
"Introduces a new port attribute to ethdev port's which denotes the
switch domain a port belongs to"
What would be the use case for having
> multiple VFs from the same port/switch domain in a single data path
> application. It doesn't seem likely to me that you would use hardware
> switching to move traffic between 2 VFs in the same data path application.
It is not likely. However the parameter you defined is not true only for the
representor case, but for the generic case (unless you state otherwise in the
documentation of it).
Maybe it can also use application like VFd to understand the connectivity
between the different VFs.
My point is - unless this parameter is valid only for the reprsentor case, the
default value should be the correct one.
I think it is better to not limit this field to representor only. Extra info
for application is never a bad thing.
>
> If you are using port representors, I assumed that you would set a valid
> switch domain id, possibly picking up the port id of the first port created on
> that switch domain, but it would be completely up to the PMD how this was
> done, I have just shown the simplest model in which the port_id of the PF is
> used for all subsequent representor ports in that switch domain, but if you
> want
Re: [dpdk-dev] [PATCH v6 4/8] ethdev: Add port representor device flag
Thursday, March 29, 2018 5:53 PM, Doherty, Declan:
> On 29/03/2018 7:13 AM, Shahaf Shuler wrote:
> > Wednesday, March 28, 2018 4:54 PM, Declan Doherty:
> >> Subject: [dpdk-dev][PATCH v6 4/8] ethdev: Add port representor device
> >> flag
> >>
> >> Add new device flag to specify that ethdev port is a port representor.
> >> Extend rte_eth_dev_info structure to expose device flags to user
> >> which enable applications to discover if a port is a representor port.
> >>
> >> Signed-off-by: Declan Doherty
> >> ---
> >> lib/librte_ether/rte_ethdev.c | 1 +
> >> lib/librte_ether/rte_ethdev.h | 9 ++---
> >> lib/librte_ether/rte_ethdev_representor.h | 3 +++
> >> 3 files changed, 10 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/lib/librte_ether/rte_ethdev.c
> >> b/lib/librte_ether/rte_ethdev.c index c719f84a3..163246433 100644
> >> --- a/lib/librte_ether/rte_ethdev.c
> >> +++ b/lib/librte_ether/rte_ethdev.c
> >> @@ -2399,6 +2399,7 @@ rte_eth_dev_info_get(uint16_t port_id, struct
> >> rte_eth_dev_info *dev_info)
> >>dev_info->nb_rx_queues = dev->data->nb_rx_queues;
> >>dev_info->nb_tx_queues = dev->data->nb_tx_queues;
> >>dev_info->switch_id = dev->data->switch_id;
> >> + dev_info->dev_flags = dev->data->dev_flags;
> >> }
> >>
> >> int
> >> diff --git a/lib/librte_ether/rte_ethdev.h
> >> b/lib/librte_ether/rte_ethdev.h index dced4fc41..226acc8b1 100644
> >> --- a/lib/librte_ether/rte_ethdev.h
> >> +++ b/lib/librte_ether/rte_ethdev.h
> >> @@ -996,6 +996,7 @@ struct rte_eth_dev_info {
> >>const char *driver_name; /**< Device Driver name. */
> >>unsigned int if_index; /**< Index to bound host interface, or 0 if
> >> none.
> >>Use if_indextoname() to translate into an interface name. */
> >> + uint32_t dev_flags; /**< Device flags */
> >>uint32_t min_rx_bufsize; /**< Minimum size of RX buffer. */
> >>uint32_t max_rx_pktlen; /**< Maximum configurable length of RX
> >> pkt. */
> >>uint16_t max_rx_queues; /**< Maximum number of RX queues. */
> @@
> >> -1229,11 +1230,13 @@ struct rte_eth_dev_owner { };
> >>
> >> /** Device supports link state interrupt */
> >> -#define RTE_ETH_DEV_INTR_LSC 0x0002
> >> +#define RTE_ETH_DEV_INTR_LSC 0x0002
> >> /** Device is a bonded slave */
> >> -#define RTE_ETH_DEV_BONDED_SLAVE 0x0004
> >> +#define RTE_ETH_DEV_BONDED_SLAVE 0x0004
> >> /** Device supports device removal interrupt */
> >> -#define RTE_ETH_DEV_INTR_RMV 0x0008
> >> +#define RTE_ETH_DEV_INTR_RMV 0x0008
> >> +/** Device is port representor */
> >> +#define RTE_ETH_DEV_REPRESENTOR 0x0010
> >
> > Maybe it is a good time to make some order here.
> > I understand the decision to use flags instead of bit-field. It is better.
> >
> > However there is a mix here of device capabilities like :
> RTE_ETH_DEV_INTR_LSC and RTE_ETH_DEV_INTR_RMV
> > And device attributes like : RTE_ETH_DEV_BONDED_SLAVE and
> RTE_ETH_DEV_REPRESENTOR.
> > I don't think they belong together under the genetic name of dev_flags.
> >
> > Moreover, I am not sure the fact device is bonded slave should be exposed
> to the application. It should be internal to ethdev and its port iterators.
>
> That's a good point on the bonded slave flag, I'll look at fixing that for the
> next release. I don't think changing it should effect ABI but I'll need to
> have a
> closer look.
>
> Do you think that we should have a separate device attributes field, which
> the representor flag is contained in.
>
> >
> > Finally I think representor port may need more info now (and in the
> future), for example the associated vf id.
> > For that, I think it is better it to be exposed as a dedicated struct on
> > device
> info.
>
> I think a switch port id should suffice for that, for SR-IOV devices it would
> map to the vf_id.
I think we need both switch_domain and vf_id.
Because for representors, the application should know which VFs can be reached
from this representor and which VF it represent.
>
> >
> >>
> >> /**
> >>* @warning
> >> diff --git a/lib/librte_ether/rte_ethdev_representor.h
> >> b/lib/librte_ether/rte_ethdev_representor.h
> >> index cbc1f2855..f3726d0ba 100644
> >> --- a/lib/librte_ether/rte_ethdev_representor.h
> >> +++ b/lib/librte_ether/rte_ethdev_representor.h
> >> @@ -22,6 +22,9 @@ eth_dev_representor_port_init(struct rte_eth_dev
> >> *ethdev, void *init_params)
> >>/** representor inherits the switch id of it's base device */
> >>ethdev->data->switch_id = base_ethdev->data->switch_id;
> >>
> >> + /** Set device flags to specify that device is a representor port */
> >> + ethdev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
> >
> > Should be set in the PMD, not in ethdev layer
>
> As in the previous patch this is just a generic port bus init function which
> meets the simplest use case of representor port with a single switch domain,
> a PMD doesn't need to use it but having it here saves duplicating th
