Re: [dpdk-dev] [PATCH v5 0/5] compiling ethdev lib under windows

[Thomas Monjalon]

You got some acks in previous versions which should be reported in this 
patchset,
otherwise they are lost.


11/08/2020 08:24, Fady Bader:
> Added needed changes in order to get ethdev compiling under windows.
> 
> Depends-on: series-10382 ("compile librte_net for windows")
> 
> v5: fixed style issues.
> 
> v4: added comments to #else and fixed code issue.
> 
> v3: rebased on current master, added more exports to export list
> 
> v2: fixed logging issue in telemetry lib.
> 
> Fady Bader (5):
>   eal: added interrupts empty stubs
>   eal: updated export list for Windows
>   ethdev: remove structs from export list
>   telemetry: implement empty stubs for Windows
>   ethdev: compiling ethdev under Windows
> 
>  lib/librte_eal/rte_eal_exports.def   | 11 +++
>  lib/librte_eal/windows/eal_interrupts.c  | 18 
>  lib/librte_eal/windows/meson.build   |  1 +
>  lib/librte_ethdev/rte_ethdev_version.map |  2 --
>  lib/librte_telemetry/rte_telemetry.h |  4 +++
>  lib/librte_telemetry/telemetry.c | 50 
> 
>  lib/librte_telemetry/telemetry_legacy.c  | 25 
>  lib/meson.build  |  3 +-
>  8 files changed, 111 insertions(+), 3 deletions(-)
>  create mode 100644 lib/librte_eal/windows/eal_interrupts.c
> 
> 

[dpdk-dev] [PATCH] net/octeontx2: add support for VLAN based RSS hash

[kirankumark]

From: Kiran Kumar K 

Adding support for VLAN based RSS hash. 2 bytes of SPI will
be considered for hashing.

Signed-off-by: Kiran Kumar K 
---
 drivers/common/octeontx2/otx2_mbox.h | 2 ++
 drivers/net/octeontx2/otx2_ethdev.h  | 2 +-
 drivers/net/octeontx2/otx2_rss.c | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/common/octeontx2/otx2_mbox.h 
b/drivers/common/octeontx2/otx2_mbox.h
index 34b1d0663..831445703 100644
--- a/drivers/common/octeontx2/otx2_mbox.h
+++ b/drivers/common/octeontx2/otx2_mbox.h
@@ -966,6 +966,8 @@ struct nix_rss_flowkey_cfg {
 #define FLOW_KEY_TYPE_INNR_SCTP BIT(16)
 #define FLOW_KEY_TYPE_INNR_ETH_DMAC BIT(17)
 #define FLOW_KEY_TYPE_CH_LEN_90B   BIT(18)
+#define FLOW_KEY_TYPE_CUSTOM0  BIT(19)
+#define FLOW_KEY_TYPE_VLAN BIT(20)
 #define FLOW_KEY_TYPE_L4_DST BIT(28)
 #define FLOW_KEY_TYPE_L4_SRC BIT(29)
 #define FLOW_KEY_TYPE_L3_DST BIT(30)
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index e9efe52bb..c4cb09621 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -119,7 +119,7 @@
 #define NIX_RSS_OFFLOAD(ETH_RSS_PORT | ETH_RSS_IP | 
ETH_RSS_UDP |\
 ETH_RSS_TCP | ETH_RSS_SCTP | \
 ETH_RSS_TUNNEL | ETH_RSS_L2_PAYLOAD | \
-NIX_RSS_L3_L4_SRC_DST)
+NIX_RSS_L3_L4_SRC_DST | ETH_RSS_C_VLAN)
 
 #define NIX_TX_OFFLOAD_CAPA ( \
DEV_TX_OFFLOAD_MBUF_FAST_FREE   | \
diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c
index d859937e6..364dc623c 100644
--- a/drivers/net/octeontx2/otx2_rss.c
+++ b/drivers/net/octeontx2/otx2_rss.c
@@ -238,6 +238,9 @@ otx2_rss_ethdev_to_nix(struct otx2_eth_dev *dev, uint64_t 
ethdev_rss,
flowkey_cfg |= FLOW_KEY_TYPE_CH_LEN_90B;
}
 
+   if (ethdev_rss & ETH_RSS_C_VLAN)
+   flowkey_cfg |= FLOW_KEY_TYPE_VLAN;
+
if (ethdev_rss & ETH_RSS_L3_SRC_ONLY)
flowkey_cfg |= FLOW_KEY_TYPE_L3_SRC;
 
-- 
2.25.1

Re: [dpdk-dev] FW: [PATCH v2] Fixes: 57f90f894588("net/virtio: reuse packed ring functions")

[chupenghong]

OK !









At 2020-08-13 15:23:01, "Vipul Ashri"  wrote:
>Hi Javin
>
>FYI
>http://patches.dpdk.org/patch/75476/
>The mentioned fix you are trying to submit is already addressed and in review 
>with Xia chenbo since 10th august.
>Hope you can discard your patch as I have already sent the patch to dpdk 
>community.
>
>Regards
>Vipul
>
>-Original Message-
>From: Xia, Chenbo [mailto:chenbo@intel.com] 
>Sent: Wednesday, 12 August, 2020 17:31
>To: Vipul Ashri ; dev@dpdk.org
>Cc: Edwin Leung 
>Subject: RE: [PATCH v2] Fixes: 57f90f894588("net/virtio: reuse packed ring 
>functions")
>
>Hi Vipul,
>
>> -Original Message-
>> From: Vipul Ashri 
>> Sent: Wednesday, August 12, 2020 5:23 PM
>> To: dev@dpdk.org
>> Cc: Xia, Chenbo ; vipul.as...@oracle.com; 
>> edwin.le...@oracle.com
>> Subject: [PATCH v2] Fixes: 57f90f894588("net/virtio: reuse packed ring
>> functions")
>> 
>> Problem - Standard Tx packets are not going out and found broken  due 
>> to cleanup malfunctioning whereever below mentioned macro is  used.
>> 
>> RootCause - Here inside Macro 'ASSIGN_UNLESS_EQUAL(var, val)'
>>  assignment to 'var' argument passed is always failing as assignment  
>> done using 'var_' having local scope only.
>> 
>> Signed-off-by: Vipul Ashri 
>
>I understand now. Your patch makes sense. But your commit title/msg is still 
>wrong. An example commit message should be (you could use this):
>
>net/virtio: fix wrong variable assignment in helper macro
>
>Inside Macro ASSIGN_UNLESS_EQUAL(var, val), assignment to var is always 
>failing as assignment done using var_ having local scope only. This leads to 
>TX packets not going out and found broken due to cleanup malfunctioning. This 
>patch fixes the wrong variable assignment.
>
>Fixes: 57f90f894588("net/virtio: reuse packed ring functions")
>Cc: sta...@dpdk.org
>
>Signed-off-by: Vipul Ashri 
>
>> ---
>>  drivers/net/virtio/virtqueue.h | 6 ++
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/net/virtio/virtqueue.h 
>> b/drivers/net/virtio/virtqueue.h index 105a9c00c..20c95471e 100644
>> --- a/drivers/net/virtio/virtqueue.h
>> +++ b/drivers/net/virtio/virtqueue.h
>> @@ -607,10 +607,8 @@ virtqueue_notify(struct virtqueue *vq)
>> 
>>  /* avoid write operation when necessary, to lessen cache issues */
>>  #define ASSIGN_UNLESS_EQUAL(var, val) do {  \
>> -typeof(var) var_ = (var);   \
>> -typeof(val) val_ = (val);   \
>> -if ((var_) != (val_))   \
>> -(var_) = (val_);\
>> +if ((var) != (val)) \
>> +(var) = (val);  \
>>  } while (0)
>> 
>>  #define virtqueue_clear_net_hdr(hdr) do {   \
>> --
>> 2.28.0.windows.1

Re: [dpdk-dev] [PATCH v3] net/virtio: fix wrong variable assignment in helper macro

[Xia, Chenbo]

> -Original Message-
> From: Vipul Ashri 
> Sent: Thursday, August 13, 2020 3:29 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo ; vipul.as...@oracle.com;
> edwin.le...@oracle.com; sta...@dpdk.org
> Subject: [PATCH v3] net/virtio: fix wrong variable assignment in helper
> macro
> 
> Inside Macro ASSIGN_UNLESS_EQUAL(var, val), assignment to var is always
> failing as assignment done using var_ having local scope only.
> This leads to TX packets not going out and found broken due to cleanup
> malfunctioning. This patch fixes the wrong variable assignment.
> 
> Fixes: 57f90f894588 ("net/virtio: reuse packed ring functions")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Vipul Ashri 
> ---
>  drivers/net/virtio/virtqueue.h | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtqueue.h
> b/drivers/net/virtio/virtqueue.h
> index 105a9c00c..20c95471e 100644
> --- a/drivers/net/virtio/virtqueue.h
> +++ b/drivers/net/virtio/virtqueue.h
> @@ -607,10 +607,8 @@ virtqueue_notify(struct virtqueue *vq)
> 
>  /* avoid write operation when necessary, to lessen cache issues */
>  #define ASSIGN_UNLESS_EQUAL(var, val) do {   \
> - typeof(var) var_ = (var);   \
> - typeof(val) val_ = (val);   \
> - if ((var_) != (val_))   \
> - (var_) = (val_);\
> + if ((var) != (val)) \
> + (var) = (val);  \
>  } while (0)
> 
>  #define virtqueue_clear_net_hdr(hdr) do {\
> --
> 2.28.0.windows.1

Thanks for the fix!

But please remember to cc all maintainers next time you send a patch.
I add them this time.

For this patch:

Reviewed-by: Chenbo Xia 

[dpdk-dev] dpdk-next-crypto not up to date

[Dybkowski, AdamX]

Hi.

Please merge main dpdk branch into dpdk-next-crypto.
20.08 was released few days ago but I don't see any new commits here: 
https://git.dpdk.org/next/dpdk-next-crypto/
I can't prepare and send to ML any patches because of the lack of new release 
notes for 20.11 and few other recently updated files.

Thank you.

Regards,

Adam Dybkowski

Re: [dpdk-dev] dpdk-next-crypto not up to date

[Akhil Goyal]

Hi Adam,

It is updated now. But I don't see that you are blocked in any way due to this. 
You can send the patches over master if the crypto tree is behind master. It 
will be updated to the latest master whenever it is synced. So there will be no 
conflict.

Regards,
Akhil


Hi.

Please merge main dpdk branch into dpdk-next-crypto.
20.08 was released few days ago but I don't see any new commits here: 
https://git.dpdk.org/next/dpdk-next-crypto/
I can't prepare and send to ML any patches because of the lack of new release 
notes for 20.11 and few other recently updated files.

Re: [dpdk-dev] dpdk-next-crypto not up to date

[Dybkowski, AdamX]

Thank you.
BTW: It's not master any more. Now the default branch is called "main".

Adam

From: Akhil Goyal 
Sent: Thursday, 13 August, 2020 10:36
To: Dybkowski, AdamX ; Thomas Monjalon 
; dev@dpdk.org
Cc: Trahe, Fiona 
Subject: RE: dpdk-next-crypto not up to date

Hi Adam,

It is updated now. But I don't see that you are blocked in any way due to this. 
You can send the patches over master if the crypto tree is behind master. It 
will be updated to the latest master whenever it is synced. So there will be no 
conflict.

Regards,
Akhil


Hi.

Please merge main dpdk branch into dpdk-next-crypto.
20.08 was released few days ago but I don't see any new commits here: 
https://git.dpdk.org/next/dpdk-next-crypto/
I can't prepare and send to ML any patches because of the lack of new release 
notes for 20.11 and few other recently updated files.

[dpdk-dev] [PATCH v6 3/5] build: add aarch32 to meson cross-compilation

[Juraj Linkeš]

Create meson cross file arm32_armv8a_linux_gcc. Use arm-linux-gnueabihf-
toolset which comes with standard packages on most used systems, such as
Ubuntu and CentOS.

Signed-off-by: Juraj Linkeš 
---
 config/arm/arm32_armv8a_linux_gcc | 17 +
 1 file changed, 17 insertions(+)
 create mode 100644 config/arm/arm32_armv8a_linux_gcc

diff --git a/config/arm/arm32_armv8a_linux_gcc 
b/config/arm/arm32_armv8a_linux_gcc
new file mode 100644
index 0..d3c4bce6c
--- /dev/null
+++ b/config/arm/arm32_armv8a_linux_gcc
@@ -0,0 +1,17 @@
+[binaries]
+c = 'arm-linux-gnueabihf-gcc'
+cpp = 'arm-linux-gnueabihf-cpp'
+ar = 'arm-linux-gnueabihf-gcc-ar'
+strip = 'arm-linux-gnueabihf-strip'
+pkgconfig = 'arm-linux-gnueabihf-pkg-config'
+pcap-config = ''
+
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'armv8-a'
+endian = 'little'
+
+[properties]
+implementor_id = '0x41'
+implementor_pn = 'aarch32'
-- 
2.20.1

[dpdk-dev] [PATCH v6 0/5] aarch64 -> aarch32 cross compilation support

[Juraj Linkeš]

Add support for aarch32 cross build in meson
and add aarch64 -> aarch32 cross build to Travis.

Aarch32 is an execution state that allows execution of 32-bit code on
armv8 machines. This execution state contains a superset of previous
armv7 32-bit instructions and features. Thus the aarch32 build is
distinct from arvm7 build.

Tested here:
[v6] https://travis-ci.com/github/jlinkes/dpdk/builds/179252628

v4:
Removed disabled drivers which actually build on arm32.
Also tested the patchset with series 9609 which fixes underlying
failures.

v5:
Changed the condition for running test-null.sh in ci.
Re-uploaded after underlying fixes have been committed.

v6:
Changed the condition for running test-null.sh again.
Reworked the patch to do aarch32 build instead of arvm7-a build.
Simplified meson build flags. Changed commit msgs.
Added 32b qualifier to .travis.yml.
Added a patch with fixes for bnxt.
Added a patch with cross compilation docs.

Juraj Linkeš (3):
  build: add aarch32 meson build flags
  build: add aarch32 to meson cross-compilation
  ci: add aarch64 -> aarch32 cross compiling jobs

Phil Yang (1):
  doc: add aarch32 build guidance

Ruifeng Wang (1):
  net/bnxt: add support for aarch32

 .ci/linux-build.sh|  7 -
 .travis.yml   | 19 
 config/arm/arm32_armv8a_linux_gcc | 17 +++
 config/arm/meson.build| 20 +++--
 .../linux_gsg/cross_build_dpdk_for_arm64.rst  | 30 ++-
 drivers/net/bnxt/Makefile |  2 +-
 drivers/net/bnxt/bnxt_rxq.h   |  2 +-
 drivers/net/bnxt/bnxt_rxr.h   |  2 +-
 drivers/net/bnxt/bnxt_txr.h   |  2 +-
 9 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 config/arm/arm32_armv8a_linux_gcc

-- 
2.20.1

[dpdk-dev] [PATCH v6 1/5] net/bnxt: add support for aarch32

[Juraj Linkeš]

From: Ruifeng Wang 

Expand vector PMD support to aarch32.

Signed-off-by: Ruifeng Wang 
---
 drivers/net/bnxt/Makefile   | 2 +-
 drivers/net/bnxt/bnxt_rxq.h | 2 +-
 drivers/net/bnxt/bnxt_rxr.h | 2 +-
 drivers/net/bnxt/bnxt_txr.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile
index 2c4cdd1c4..db8fdf293 100644
--- a/drivers/net/bnxt/Makefile
+++ b/drivers/net/bnxt/Makefile
@@ -43,7 +43,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c
 ifeq ($(CONFIG_RTE_ARCH_X86), y)
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c
 endif
-ifeq ($(CONFIG_RTE_ARCH_ARM64), y)
+ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c
 endif
 
diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h
index d5ce3b6d5..1c4027711 100644
--- a/drivers/net/bnxt/bnxt_rxq.h
+++ b/drivers/net/bnxt/bnxt_rxq.h
@@ -22,7 +22,7 @@ struct bnxt_rx_queue {
uint16_tnb_rx_hold; /* num held free RX desc */
uint16_trx_free_thresh; /* max free RX desc to hold */
uint16_tqueue_id; /* RX queue index */
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) || defined(RTE_ARCH_ARM)
uint16_trxrearm_nb; /* number of descs to reinit. */
uint16_trxrearm_start; /* next desc index to reinit. */
 #endif
diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h
index 2bf46cd91..e2fba1647 100644
--- a/drivers/net/bnxt/bnxt_rxr.h
+++ b/drivers/net/bnxt/bnxt_rxr.h
@@ -221,7 +221,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq);
 int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
 int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
 
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) || defined(RTE_ARCH_ARM)
 uint16_t bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
 int bnxt_rxq_vec_setup(struct bnxt_rx_queue *rxq);
diff --git a/drivers/net/bnxt/bnxt_txr.h b/drivers/net/bnxt/bnxt_txr.h
index 7715c11b8..38e5ac9df 100644
--- a/drivers/net/bnxt/bnxt_txr.h
+++ b/drivers/net/bnxt/bnxt_txr.h
@@ -59,7 +59,7 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf 
**tx_pkts,
   uint16_t nb_pkts);
 uint16_t bnxt_dummy_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
  uint16_t nb_pkts);
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) || defined(RTE_ARCH_ARM)
 uint16_t bnxt_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
 #endif
-- 
2.20.1

[dpdk-dev] [PATCH v6 5/5] doc: add aarch32 build guidance

[Juraj Linkeš]

From: Phil Yang 

Add cross-compiling guidance for 32-bit aarch32 DPDK on aarch64 host.

Signed-off-by: Phil Yang 
---
 .../linux_gsg/cross_build_dpdk_for_arm64.rst  | 30 ++-
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst 
b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
index c5875a6d5..07085e3ea 100644
--- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
@@ -1,15 +1,16 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
 Copyright(c) 2018 ARM Corporation.
 
-Cross compile DPDK for ARM64
-
-This chapter describes how to cross compile DPDK for ARM64 from x86 build 
hosts.
+Cross compile DPDK for aarch64 and aarch32
+==
+This chapter describes how to cross compile DPDK for aarch64 from x86 build 
hosts and compile
+32-bit aarch32 DPDK from aarch64 build hosts.
 
 .. note::
 
-   Whilst it is recommended to natively build DPDK on ARM64 (just
-   like with x86), it is also possible to cross-build DPDK for ARM64. An
-   ARM64 cross compile GNU toolchain is used for this.
+   Whilst it is recommended to natively build DPDK on aarch64 (just
+   like with x86), it is also possible to cross-build DPDK for aarch64.
+   An aarch64 cross compile GNU toolchain is used for this.
 
 Obtain the cross tool chain
 ---
@@ -88,18 +89,33 @@ To install it in Ubuntu::
 
sudo apt-get install pkg-config-aarch64-linux-gnu
 
+.. note::
+
+Some aarch64 platforms support EL0 aarch32 mode, which means the 32-bit 
aarch32 applications
+can run on aarch64. The armhf architecture toolchain 
``gcc-arm-linux-gnueabihf`` is required
+for aarch32 on aarch64. To install it in Ubuntu::
+
+   sudo dpkg --add-architecture armhf
+   sudo apt-get update
+   sudo apt-get install -y gcc gcc-arm-linux-gnueabihf libc6:armhf make 
binutils
+
 To cross-compile DPDK on a desired target machine we can use the following
 command::
 
meson cross-build --cross-file 
ninja -C cross-build
 
-For example if the target machine is arm64 we can use the following
+For example if the target machine is aarch64 we can use the following
 command::
 
meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc
ninja -C arm64-build
 
+If the target machine is aarch32 we can use the following command::
+
+   meson arm32-build --cross-file config/arm/arm32_armv8a_linux_gcc
+   ninja -C arm32-build
+
 Configure and Cross Compile DPDK using Make
 ---
 To configure a build, choose one of the target configurations, like 
arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc.
-- 
2.20.1

[dpdk-dev] [PATCH v6 2/5] build: add aarch32 meson build flags

[Juraj Linkeš]

Add aarch32 extra build flags and aarch32 machine flags to generic
machine args.
Also modify how arm flags are updated in meson build - for 32-bit build,
update only if cross-compiling.

Signed-off-by: Juraj Linkeš 
---
 config/arm/meson.build | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 8728051d5..b29f27097 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -63,6 +63,11 @@ flags_armada = [
['RTE_MAX_LCORE', 16]]
 
 flags_default_extra = []
+flags_aarch32_extra = [
+['RTE_ARCH_ARM_NEON_MEMCPY', false],
+['RTE_ARCH_STRICT_ALIGN', true],
+['RTE_EAL_NUMA_AWARE_HUGEPAGES', false],
+['RTE_MAX_LCORE', 256]]
 flags_n1sdp_extra = [
['RTE_MACHINE', '"n1sdp"'],
['RTE_MAX_NUMA_NODES', 1],
@@ -90,6 +95,7 @@ flags_octeontx2_extra = [
 machine_args_generic = [
['default', ['-march=armv8-a+crc']],
['native', ['-march=native']],
+   ['aarch32', ['-march=armv8-a', '-mfpu=neon'], flags_aarch32_extra],
['0xd03', ['-mcpu=cortex-a53']],
['0xd04', ['-mcpu=cortex-a35']],
['0xd07', ['-mcpu=cortex-a57']],
@@ -129,15 +135,23 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
 impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
 
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
-
+update_flags = false
 if not dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
dpdk_conf.set('RTE_ARCH_ARM', 1)
dpdk_conf.set('RTE_ARCH_ARMv7', 1)
# the minimum architecture supported, armv7-a, needs the following,
# mk/machine/armv7a/rte.vars.mk sets it too
-   machine_args += '-mfpu=neon'
+   if meson.is_cross_build()
+   update_flags = true
+   impl_id = meson.get_cross_property('implementor_id', 'aarch32')
+   impl_pn = meson.get_cross_property('implementor_pn', 'default')
+   machine = get_variable('impl_' + impl_id)
+   else
+   machine_args += '-mfpu=neon'
+   endif
 else
+   update_flags = true
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
dpdk_conf.set('RTE_ARCH_ARM64', 1)
 
@@ -172,7 +186,9 @@ else
impl_pn = meson.get_cross_property('implementor_pn', 'default')
machine = get_variable('impl_' + impl_id)
endif
+endif
 
+if update_flags == true
# Apply Common Defaults. These settings may be overwritten by machine
# settings later.
foreach flag: flags_common_default
-- 
2.20.1

[dpdk-dev] [PATCH v6 4/5] ci: add aarch64 -> aarch32 cross compiling jobs

[Juraj Linkeš]

Add two jobs (static and shared libs), both building on aarch64 and
producing 32-bit arm binaries executable on armv8-a, but not armv7.
Do not run tests in these jobs.

Signed-off-by: Juraj Linkeš 
---
 .ci/linux-build.sh |  7 ++-
 .travis.yml| 19 +++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index d079801d7..c042b065c 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -33,6 +33,11 @@ if [ "$AARCH64" = "1" ]; then
 OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_gcc"
 fi
 
+if [ "$AARCH32" = "1" ]; then
+# convert the arch specifier
+OPTS="$OPTS --cross-file config/arm/arm32_armv8a_linux_gcc"
+fi
+
 if [ "$BUILD_DOCS" = "1" ]; then
 OPTS="$OPTS -Denable_docs=true"
 fi
@@ -53,7 +58,7 @@ OPTS="$OPTS --buildtype=debugoptimized"
 meson build --werror $OPTS
 ninja -C build
 
-if [ "$AARCH64" != "1" ]; then
+if file build/app/dpdk-testpmd | sed 's/-/_/g' | grep -q "$(uname -m)"; then
 devtools/test-null.sh
 fi
 
diff --git a/.travis.yml b/.travis.yml
index 14f812423..966b657a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,10 @@ _aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, 
pkg-config-aarch64-linux-gnu]
 
+_arm_32b_packages: &arm_32b_packages
+  - *required_packages
+  - [gcc-arm-linux-gnueabihf, libc6-dev-armhf-cross, 
pkg-config-arm-linux-gnueabihf]
+
 _libabigail_build_packages: &libabigail_build_packages
   - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
 
@@ -124,6 +128,21 @@ jobs:
 packages:
   - *required_packages
   - *libabigail_build_packages
+  # aarch64 cross-compiling aarch32 jobs
+  - env: DEF_LIB="shared" AARCH32=1
+arch: arm64
+compiler: gcc
+addons:
+  apt:
+packages:
+  - *arm_32b_packages
+  - env: DEF_LIB="static" AARCH32=1
+arch: arm64
+compiler: gcc
+addons:
+  apt:
+packages:
+  - *arm_32b_packages
   # aarch64 clang jobs
   - env: DEF_LIB="static"
 arch: arm64
-- 
2.20.1

[dpdk-dev] [Bug 524] mlx5 pmd crash, mlx5_rxte_vec_sse.h# rxq_cq_decompress_v

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=524

Bug ID: 524
   Summary: mlx5 pmd  crash, mlx5_rxte_vec_sse.h#
rxq_cq_decompress_v
   Product: DPDK
   Version: 19.11
  Hardware: x86
OS: Linux
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: akoz...@tencent.com
  Target Milestone: ---

Created attachment 116
  --> https://bugs.dpdk.org/attachment.cgi?id=116&action=edit
core dump stack

https://github.com/DPDK/dpdk/blob/v20.08/drivers/net/mlx5/mlx5_rxtx_vec_sse.h#L143
Crash in this line elts[post+1] is NULL. Where is no check elts buffer length
in code.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[dpdk-dev] [PATCH v2 1/7] rawdev: add private data length parameter to info fn

[Bruce Richardson]

Currently with the rawdev API there is no way to check that the structure
passed in via the dev_private pointer in the dev_info structure is of the
correct type - it's just checked that it is non-NULL. Adding in the length
of the expected structure provides a measure of typechecking, and can also
be used for ABI compatibility in future, since ABI changes involving
structs almost always involve a change in size.

Signed-off-by: Bruce Richardson 
Reviewed-by: Rosen Xu 
---
 app/test/test_rawdev.c  |  2 +-
 doc/guides/rawdevs/ioat.rst |  2 +-
 doc/guides/sample_app_ug/ioat.rst   |  2 +-
 drivers/bus/ifpga/ifpga_bus.c   |  2 +-
 drivers/raw/ifpga/ifpga_rawdev.c|  5 +++--
 drivers/raw/ioat/ioat_rawdev.c  |  5 +++--
 drivers/raw/ioat/ioat_rawdev_test.c |  4 ++--
 drivers/raw/ntb/ntb.c   |  8 +++-
 drivers/raw/skeleton/skeleton_rawdev.c  |  5 +++--
 drivers/raw/skeleton/skeleton_rawdev_test.c | 19 ---
 examples/ioat/ioatfwd.c |  2 +-
 examples/ntb/ntb_fwd.c  |  2 +-
 lib/librte_rawdev/rte_rawdev.c  |  6 --
 lib/librte_rawdev/rte_rawdev.h  |  9 -
 lib/librte_rawdev/rte_rawdev_pmd.h  |  5 -
 15 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/app/test/test_rawdev.c b/app/test/test_rawdev.c
index 524a9d5f3b..d8d9595be1 100644
--- a/app/test/test_rawdev.c
+++ b/app/test/test_rawdev.c
@@ -34,7 +34,7 @@ test_rawdev_selftest_ioat(void)
 
for (i = 0; i < count; i++) {
struct rte_rawdev_info info = { .dev_private = NULL };
-   if (rte_rawdev_info_get(i, &info) == 0 &&
+   if (rte_rawdev_info_get(i, &info, 0) == 0 &&
strstr(info.driver_name, "ioat") != NULL)
return rte_rawdev_selftest(i) == 0 ?
TEST_SUCCESS : TEST_FAILED;
diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index d0eee5e237..dac52fabf1 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -107,7 +107,7 @@ rawdev device for use by an application:
 
 for (i = 0; i < count && !found; i++) {
 struct rte_rawdev_info info = { .dev_private = NULL };
-found = (rte_rawdev_info_get(i, &info) == 0 &&
+found = (rte_rawdev_info_get(i, &info, 0) == 0 &&
 strcmp(info.driver_name,
 IOAT_PMD_RAWDEV_NAME_STR) == 
0);
 }
diff --git a/doc/guides/sample_app_ug/ioat.rst 
b/doc/guides/sample_app_ug/ioat.rst
index bab7654b8d..b5188220ba 100644
--- a/doc/guides/sample_app_ug/ioat.rst
+++ b/doc/guides/sample_app_ug/ioat.rst
@@ -265,7 +265,7 @@ functions:
 do {
 if (rdev_id == rte_rawdev_count())
 goto end;
-rte_rawdev_info_get(rdev_id++, &rdev_info);
+rte_rawdev_info_get(rdev_id++, &rdev_info, 0);
 } while (strcmp(rdev_info.driver_name,
 IOAT_PMD_RAWDEV_NAME_STR) != 0);
 
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 6b16a20bb6..bb8b3dcfb9 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -162,7 +162,7 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
afu_dev->id.port  = afu_pr_conf.afu_id.port;
 
if (rawdev->dev_ops && rawdev->dev_ops->dev_info_get)
-   rawdev->dev_ops->dev_info_get(rawdev, afu_dev);
+   rawdev->dev_ops->dev_info_get(rawdev, afu_dev, 
sizeof(*afu_dev));
 
if (rawdev->dev_ops &&
rawdev->dev_ops->dev_start &&
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index cc25c662bc..47cfa38778 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -605,7 +605,8 @@ ifpga_fill_afu_dev(struct opae_accelerator *acc,
 
 static void
 ifpga_rawdev_info_get(struct rte_rawdev *dev,
-rte_rawdev_obj_t dev_info)
+ rte_rawdev_obj_t dev_info,
+ size_t dev_info_size)
 {
struct opae_adapter *adapter;
struct opae_accelerator *acc;
@@ -617,7 +618,7 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,
 
IFPGA_RAWDEV_PMD_FUNC_TRACE();
 
-   if (!dev_info) {
+   if (!dev_info || dev_info_size != sizeof(*afu_dev)) {
IFPGA_RAWDEV_PMD_ERR("Invalid request");
return;
}
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 87fd088aac..a5c0452d7e 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -111,12 +111,13 @@ ioat_dev_stop(struct rte_rawdev *dev)
 }
 
 static void
-ioat_dev_info_get(struct rte_rawdev *dev, rte_rawd

[dpdk-dev] [PATCH v2 0/7] Enhance rawdev APIs

[Bruce Richardson]

This patchset proposes some internal and externally-visible changes to the
rawdev API, the ABI change of which were previously announced.

The changes are in two main areas:
* For any APIs which take a void * parameter for driver-specific structs,
  add an additional parameter to provide the struct length. This allows
  some runtime type-checking, as well as possible ABI-compatibility support
  in the future as structure change generally involve a change in the size
  of the structure.
* Ensure all APIs which can return error values have int type, rather than
  void. Since functions like info_get and queue_default_get can now do some
  typechecking, they need to be modified to allow them to return error
  codes on failure.

V2:
  - add additional patch to make start/stop functions optional
  - remove deprecation notice once changes applied

Bruce Richardson (7):
  rawdev: add private data length parameter to info fn
  rawdev: allow drivers to return error from info function
  rawdev: add private data length parameter to config fn
  rawdev: add private data length parameter to queue fns
  rawdev: allow queue default config query to return error
  rawdev: mark start and stop functions optional
  doc: remove rawdev deprecation notice

 app/test/test_rawdev.c  |  2 +-
 doc/guides/rawdevs/ioat.rst |  4 +-
 doc/guides/rawdevs/octeontx2_dma.rst|  2 +-
 doc/guides/rawdevs/octeontx2_ep.rst |  3 +-
 doc/guides/rel_notes/deprecation.rst|  7 ---
 doc/guides/sample_app_ug/ioat.rst   |  4 +-
 drivers/bus/ifpga/ifpga_bus.c   |  2 +-
 drivers/raw/ifpga/ifpga_rawdev.c| 23 +-
 drivers/raw/ioat/ioat_rawdev.c  | 17 ---
 drivers/raw/ioat/ioat_rawdev_test.c |  6 +--
 drivers/raw/ntb/ntb.c   | 49 -
 drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c |  7 +--
 drivers/raw/octeontx2_dma/otx2_dpi_test.c   |  3 +-
 drivers/raw/octeontx2_ep/otx2_ep_rawdev.c   |  7 +--
 drivers/raw/octeontx2_ep/otx2_ep_test.c |  2 +-
 drivers/raw/skeleton/skeleton_rawdev.c  | 36 +--
 drivers/raw/skeleton/skeleton_rawdev_test.c | 32 --
 examples/ioat/ioatfwd.c |  4 +-
 examples/ntb/ntb_fwd.c  |  7 +--
 lib/librte_rawdev/rte_rawdev.c  | 47 +---
 lib/librte_rawdev/rte_rawdev.h  | 27 ++--
 lib/librte_rawdev/rte_rawdev_pmd.h  | 22 ++---
 22 files changed, 201 insertions(+), 112 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v2 4/7] rawdev: add private data length parameter to queue fns

[Bruce Richardson]

The queue setup and queue defaults query functions take a void * parameter
as configuration data, preventing any compile-time checking of the
parameters and limiting runtime checks. Adding in the length of the
expected structure provides a measure of typechecking, and can also be used
for ABI compatibility in future, since ABI changes involving structs almost
always involve a change in size.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ntb/ntb.c   | 25 -
 drivers/raw/skeleton/skeleton_rawdev.c  | 12 ++
 drivers/raw/skeleton/skeleton_rawdev_test.c |  8 +++
 examples/ntb/ntb_fwd.c  |  3 ++-
 lib/librte_rawdev/rte_rawdev.c  | 12 ++
 lib/librte_rawdev/rte_rawdev.h  | 10 +++--
 lib/librte_rawdev/rte_rawdev_pmd.h  |  6 +++--
 7 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index 7f6b835a4b..ad10857991 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -249,11 +249,15 @@ ntb_dev_intr_handler(void *param)
 static void
 ntb_queue_conf_get(struct rte_rawdev *dev,
   uint16_t queue_id,
-  rte_rawdev_obj_t queue_conf)
+  rte_rawdev_obj_t queue_conf,
+  size_t conf_size)
 {
struct ntb_queue_conf *q_conf = queue_conf;
struct ntb_hw *hw = dev->dev_private;
 
+   if (conf_size != sizeof(*q_conf))
+   return;
+
q_conf->tx_free_thresh = hw->tx_queues[queue_id]->tx_free_thresh;
q_conf->nb_desc = hw->rx_queues[queue_id]->nb_rx_desc;
q_conf->rx_mp = hw->rx_queues[queue_id]->mpool;
@@ -294,12 +298,16 @@ ntb_rxq_release(struct ntb_rx_queue *rxq)
 static int
 ntb_rxq_setup(struct rte_rawdev *dev,
  uint16_t qp_id,
- rte_rawdev_obj_t queue_conf)
+ rte_rawdev_obj_t queue_conf,
+ size_t conf_size)
 {
struct ntb_queue_conf *rxq_conf = queue_conf;
struct ntb_hw *hw = dev->dev_private;
struct ntb_rx_queue *rxq;
 
+   if (conf_size != sizeof(*rxq_conf))
+   return -EINVAL;
+
/* Allocate the rx queue data structure */
rxq = rte_zmalloc_socket("ntb rx queue",
 sizeof(struct ntb_rx_queue),
@@ -375,13 +383,17 @@ ntb_txq_release(struct ntb_tx_queue *txq)
 static int
 ntb_txq_setup(struct rte_rawdev *dev,
  uint16_t qp_id,
- rte_rawdev_obj_t queue_conf)
+ rte_rawdev_obj_t queue_conf,
+ size_t conf_size)
 {
struct ntb_queue_conf *txq_conf = queue_conf;
struct ntb_hw *hw = dev->dev_private;
struct ntb_tx_queue *txq;
uint16_t i, prev;
 
+   if (conf_size != sizeof(*txq_conf))
+   return -EINVAL;
+
/* Allocate the TX queue data structure. */
txq = rte_zmalloc_socket("ntb tx queue",
  sizeof(struct ntb_tx_queue),
@@ -439,7 +451,8 @@ ntb_txq_setup(struct rte_rawdev *dev,
 static int
 ntb_queue_setup(struct rte_rawdev *dev,
uint16_t queue_id,
-   rte_rawdev_obj_t queue_conf)
+   rte_rawdev_obj_t queue_conf,
+   size_t conf_size)
 {
struct ntb_hw *hw = dev->dev_private;
int ret;
@@ -447,11 +460,11 @@ ntb_queue_setup(struct rte_rawdev *dev,
if (queue_id >= hw->queue_pairs)
return -EINVAL;
 
-   ret = ntb_txq_setup(dev, queue_id, queue_conf);
+   ret = ntb_txq_setup(dev, queue_id, queue_conf, conf_size);
if (ret < 0)
return ret;
 
-   ret = ntb_rxq_setup(dev, queue_id, queue_conf);
+   ret = ntb_rxq_setup(dev, queue_id, queue_conf, conf_size);
 
return ret;
 }
diff --git a/drivers/raw/skeleton/skeleton_rawdev.c 
b/drivers/raw/skeleton/skeleton_rawdev.c
index 531d0450c8..801c707fb9 100644
--- a/drivers/raw/skeleton/skeleton_rawdev.c
+++ b/drivers/raw/skeleton/skeleton_rawdev.c
@@ -222,14 +222,16 @@ static int skeleton_rawdev_reset(struct rte_rawdev *dev)
 
 static void skeleton_rawdev_queue_def_conf(struct rte_rawdev *dev,
   uint16_t queue_id,
-  rte_rawdev_obj_t queue_conf)
+  rte_rawdev_obj_t queue_conf,
+  size_t conf_size)
 {
struct skeleton_rawdev *skeldev;
struct skeleton_rawdev_queue *skelq;
 
SKELETON_PMD_FUNC_TRACE();
 
-   if (!dev || !queue_conf)
+   if (!dev || !queue_conf ||
+   conf_size != sizeof(struct skeleton_rawdev_queue))
return;
 
skeldev = skeleton_rawdev_get_priv(dev);
@@ -252,7 +254,8 @@ clear_queue_bufs(int queue_id)
 
 static int skeleton_rawdev_queue_setup(struct rte_rawdev *dev,
   uint16_t queue_id,
-   

[dpdk-dev] [PATCH v2 2/7] rawdev: allow drivers to return error from info function

[Bruce Richardson]

Since we now allow some parameter checking inside the driver info_get()
functions, it makes sense to allow error return from those functions to the
caller. Therefore we change the driver callback return type from void to
int.

Signed-off-by: Bruce Richardson 
Reviewed-by: Rosen Xu 
---
 drivers/raw/ifpga/ifpga_rawdev.c   | 15 ---
 drivers/raw/ioat/ioat_rawdev.c |  9 ++---
 drivers/raw/ntb/ntb.c  |  8 +---
 drivers/raw/skeleton/skeleton_rawdev.c |  6 --
 lib/librte_rawdev/rte_rawdev.c |  6 --
 lib/librte_rawdev/rte_rawdev_pmd.h |  4 ++--
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 47cfa38778..32a2b96c90 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -603,7 +603,7 @@ ifpga_fill_afu_dev(struct opae_accelerator *acc,
return 0;
 }
 
-static void
+static int
 ifpga_rawdev_info_get(struct rte_rawdev *dev,
  rte_rawdev_obj_t dev_info,
  size_t dev_info_size)
@@ -620,12 +620,12 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,
 
if (!dev_info || dev_info_size != sizeof(*afu_dev)) {
IFPGA_RAWDEV_PMD_ERR("Invalid request");
-   return;
+   return -EINVAL;
}
 
adapter = ifpga_rawdev_get_priv(dev);
if (!adapter)
-   return;
+   return -ENOENT;
 
afu_dev = dev_info;
afu_dev->rawdev = dev;
@@ -637,7 +637,7 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,
 
if (ifpga_fill_afu_dev(acc, afu_dev)) {
IFPGA_RAWDEV_PMD_ERR("cannot get info\n");
-   return;
+   return -ENOENT;
}
}
 
@@ -647,21 +647,21 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,
/* get LineSide BAR Index */
if (opae_manager_get_eth_group_region_info(mgr, 0,
&opae_lside_eth_info)) {
-   return;
+   return -ENOENT;
}
lside_bar_idx = opae_lside_eth_info.mem_idx;
 
/* get NICSide BAR Index */
if (opae_manager_get_eth_group_region_info(mgr, 1,
&opae_nside_eth_info)) {
-   return;
+   return -ENOENT;
}
nside_bar_idx = opae_nside_eth_info.mem_idx;
 
if (lside_bar_idx >= PCI_MAX_RESOURCE ||
nside_bar_idx >= PCI_MAX_RESOURCE ||
lside_bar_idx == nside_bar_idx)
-   return;
+   return -ENOENT;
 
/* fill LineSide BAR Index */
afu_dev->mem_resource[lside_bar_idx].phys_addr =
@@ -679,6 +679,7 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,
afu_dev->mem_resource[nside_bar_idx].addr =
opae_nside_eth_info.addr;
}
+   return 0;
 }
 
 static int
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index a5c0452d7e..e2fc787263 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -110,15 +110,18 @@ ioat_dev_stop(struct rte_rawdev *dev)
RTE_SET_USED(dev);
 }
 
-static void
+static int
 ioat_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
size_t dev_info_size)
 {
struct rte_ioat_rawdev_config *cfg = dev_info;
struct rte_ioat_rawdev *ioat = dev->dev_private;
 
-   if (cfg != NULL && dev_info_size == sizeof(*cfg))
-   cfg->ring_size = ioat->ring_size;
+   if (dev_info == NULL || dev_info_size != sizeof(*cfg))
+   return -EINVAL;
+
+   cfg->ring_size = ioat->ring_size;
+   return 0;
 }
 
 static const char * const xstat_names[] = {
diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index c890c43a32..ced5b6d624 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -800,7 +800,7 @@ ntb_dequeue_bufs(struct rte_rawdev *dev,
return nb_rx;
 }
 
-static void
+static int
 ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
size_t dev_info_size)
 {
@@ -809,7 +809,7 @@ ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t 
dev_info,
 
if (dev_info_size != sizeof(*info)) {
NTB_LOG(ERR, "Invalid size parameter to %s", __func__);
-   return;
+   return -EINVAL;
}
 
info->mw_cnt = hw->mw_cnt;
@@ -824,7 +824,7 @@ ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t 
dev_info,
 
if (!hw->queue_size || !hw->queue_pairs) {
NTB_LOG(ERR, "No queue size and queue num assigned.");
-   return;
+   return -EAGAIN;
}
 
hw->hdr_size_per_queue = RTE_ALIGN(sizeof(struct ntb_h

[dpdk-dev] [PATCH v2 3/7] rawdev: add private data length parameter to config fn

[Bruce Richardson]

Currently with the rawdev API there is no way to check that the structure
passed in via the dev_private pointer in the structure passed to configure
API is of the correct type - it's just checked that it is non-NULL. Adding
in the length of the expected structure provides a measure of typechecking,
and can also be used for ABI compatibility in future, since ABI changes
involving structs almost always involve a change in size.

Signed-off-by: Bruce Richardson 
Reviewed-by: Rosen Xu 
---
 doc/guides/rawdevs/ioat.rst | 2 +-
 doc/guides/rawdevs/octeontx2_dma.rst| 2 +-
 doc/guides/rawdevs/octeontx2_ep.rst | 3 ++-
 doc/guides/sample_app_ug/ioat.rst   | 2 +-
 drivers/raw/ifpga/ifpga_rawdev.c| 3 ++-
 drivers/raw/ioat/ioat_rawdev.c  | 5 +++--
 drivers/raw/ioat/ioat_rawdev_test.c | 2 +-
 drivers/raw/ntb/ntb.c   | 6 +-
 drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c | 7 ---
 drivers/raw/octeontx2_dma/otx2_dpi_test.c   | 3 ++-
 drivers/raw/octeontx2_ep/otx2_ep_rawdev.c   | 7 ---
 drivers/raw/octeontx2_ep/otx2_ep_test.c | 2 +-
 drivers/raw/skeleton/skeleton_rawdev.c  | 5 +++--
 drivers/raw/skeleton/skeleton_rawdev_test.c | 5 +++--
 examples/ioat/ioatfwd.c | 2 +-
 examples/ntb/ntb_fwd.c  | 2 +-
 lib/librte_rawdev/rte_rawdev.c  | 6 --
 lib/librte_rawdev/rte_rawdev.h  | 8 +++-
 lib/librte_rawdev/rte_rawdev_pmd.h  | 3 ++-
 19 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index dac52fabf1..c46460ff45 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -142,7 +142,7 @@ The following code shows how the device is configured in
 /* ... */
 
 p.ring_size = IOAT_TEST_RINGSIZE;
-if (rte_rawdev_configure(dev_id, &info) != 0) {
+if (rte_rawdev_configure(dev_id, &info, sizeof(p)) != 0) {
 printf("Error with rte_rawdev_configure()\n");
 return -1;
 }
diff --git a/doc/guides/rawdevs/octeontx2_dma.rst 
b/doc/guides/rawdevs/octeontx2_dma.rst
index 1e1dfbe931..4a9794489e 100644
--- a/doc/guides/rawdevs/octeontx2_dma.rst
+++ b/doc/guides/rawdevs/octeontx2_dma.rst
@@ -92,7 +92,7 @@ The following code shows how the device is configured
rte_mempool_set_ops_byname(conf.chunk_pool, 
rte_mbuf_platform_mempool_ops(), NULL);
rte_mempool_populate_default(conf.chunk_pool);
 
-   rte_rawdev_configure(dev_id, (rte_rawdev_obj_t)&rdev_info);
+   rte_rawdev_configure(dev_id, (rte_rawdev_obj_t)&rdev_info, sizeof(conf));
 
 Performing Data Transfer
 
diff --git a/doc/guides/rawdevs/octeontx2_ep.rst 
b/doc/guides/rawdevs/octeontx2_ep.rst
index bbcf530a45..b03fcf789a 100644
--- a/doc/guides/rawdevs/octeontx2_ep.rst
+++ b/doc/guides/rawdevs/octeontx2_ep.rst
@@ -66,7 +66,8 @@ The following code shows how the device is configured
struct rte_rawdev_info rdev_info = {.dev_private = &config};
config.enqdeq_mpool = (void *)rte_mempool_create(...);
 
-   rte_rawdev_configure(dev_id, (rte_rawdev_obj_t)&rdev_info);
+   rte_rawdev_configure(dev_id, (rte_rawdev_obj_t)&rdev_info,
+sizeof(config));
 
 Performing Data Transfer
 
diff --git a/doc/guides/sample_app_ug/ioat.rst 
b/doc/guides/sample_app_ug/ioat.rst
index b5188220ba..3f7d5c34a6 100644
--- a/doc/guides/sample_app_ug/ioat.rst
+++ b/doc/guides/sample_app_ug/ioat.rst
@@ -296,7 +296,7 @@ is done in ``configure_rawdev_queue()``.
 struct rte_ioat_rawdev_config dev_config = { .ring_size = ring_size };
 struct rte_rawdev_info info = { .dev_private = &dev_config };
 
-if (rte_rawdev_configure(dev_id, &info) != 0) {
+if (rte_rawdev_configure(dev_id, &info, sizeof(dev_config)) != 0) {
 rte_exit(EXIT_FAILURE,
 "Error with rte_rawdev_configure()\n");
 }
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 32a2b96c90..a50173264c 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -684,7 +684,8 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,
 
 static int
 ifpga_rawdev_configure(const struct rte_rawdev *dev,
-   rte_rawdev_obj_t config)
+   rte_rawdev_obj_t config,
+   size_t config_size __rte_unused)
 {
IFPGA_RAWDEV_PMD_FUNC_TRACE();
 
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index e2fc787263..7f1a154360 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -39,7 +39,8 @@ RTE_LOG_REGISTER(ioat_pmd_logtype, rawdev.ioat, INFO);
 #define COMPLETION_SZ sizeof(__m128i)
 
 static int
-ioat_dev_configure(const struct rte_rawdev *dev, rte_rawdev_obj_t config)
+ioat_dev_configure(const struct rte_rawdev *dev, rte_rawdev_obj_t config,
+  

[dpdk-dev] [PATCH v2 6/7] rawdev: mark start and stop functions optional

[Bruce Richardson]

Not all rawdevs will require a device start/stop function, so rather than
requiring such drivers to provide dummy functions, just set the
started/stopped rawdev flag from the rawdev layer and return success.

Signed-off-by: Kevin Laatz 
Signed-off-by: Bruce Richardson 
---
 lib/librte_rawdev/rte_rawdev.c | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
index fd123bb848..36f3acf2b7 100644
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -398,20 +398,21 @@ rte_rawdev_start(uint16_t dev_id)
 
RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_rawdevs[dev_id];
-   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP);
-
if (dev->started != 0) {
RTE_RDEV_ERR("Device with dev_id=%" PRIu8 "already started",
 dev_id);
return 0;
}
 
+   if (dev->dev_ops->dev_start == NULL)
+   goto mark_started;
+
diag = (*dev->dev_ops->dev_start)(dev);
-   if (diag == 0)
-   dev->started = 1;
-   else
+   if (diag != 0)
return diag;
 
+mark_started:
+   dev->started = 1;
return 0;
 }
 
@@ -425,15 +426,18 @@ rte_rawdev_stop(uint16_t dev_id)
RTE_RAWDEV_VALID_DEVID_OR_RET(dev_id);
dev = &rte_rawdevs[dev_id];
 
-   RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
-
if (dev->started == 0) {
RTE_RDEV_ERR("Device with dev_id=%" PRIu8 "already stopped",
dev_id);
return;
}
 
+   if (dev->dev_ops->dev_stop == NULL)
+   goto mark_stopped;
+
(*dev->dev_ops->dev_stop)(dev);
+
+mark_stopped:
dev->started = 0;
 }
 
-- 
2.25.1

[dpdk-dev] [PATCH v2 7/7] doc: remove rawdev deprecation notice

[Bruce Richardson]

Since all changes covered by the deprecation notice have been applied, the
notice can be removed.

Signed-off-by: Bruce Richardson 
---
 doc/guides/rel_notes/deprecation.rst | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 345c38d5b6..c0b3b7a605 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -301,13 +301,6 @@ Deprecation Notices
   - https://patches.dpdk.org/patch/71457/
   - https://patches.dpdk.org/patch/71456/
 
-* rawdev: The rawdev APIs which take a device-specific structure as
-  parameter directly, or indirectly via a "private" pointer inside another
-  structure, will be modified to take an additional parameter of the
-  structure size. The affected APIs will include ``rte_rawdev_info_get``,
-  ``rte_rawdev_configure``, ``rte_rawdev_queue_conf_get`` and
-  ``rte_rawdev_queue_setup``.
-
 * acl: ``RTE_ACL_CLASSIFY_NUM`` enum value will be removed.
   This enum value is not used inside DPDK, while it prevents to add new
   classify algorithms without causing an ABI breakage.
-- 
2.25.1

[dpdk-dev] [PATCH v2 5/7] rawdev: allow queue default config query to return error

[Bruce Richardson]

The driver APIs for returning the queue default config can fail if the
parameters are invalid, or other reasons, so allow them to return error
codes to the rawdev layer and from hence to the app.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ntb/ntb.c  |  6 --
 drivers/raw/skeleton/skeleton_rawdev.c | 12 +++-
 lib/librte_rawdev/rte_rawdev.c |  3 +--
 lib/librte_rawdev/rte_rawdev_pmd.h |  4 +++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index ad10857991..bddb1f5916 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -246,7 +246,7 @@ ntb_dev_intr_handler(void *param)
}
 }
 
-static void
+static int
 ntb_queue_conf_get(struct rte_rawdev *dev,
   uint16_t queue_id,
   rte_rawdev_obj_t queue_conf,
@@ -256,11 +256,13 @@ ntb_queue_conf_get(struct rte_rawdev *dev,
struct ntb_hw *hw = dev->dev_private;
 
if (conf_size != sizeof(*q_conf))
-   return;
+   return -EINVAL;
 
q_conf->tx_free_thresh = hw->tx_queues[queue_id]->tx_free_thresh;
q_conf->nb_desc = hw->rx_queues[queue_id]->nb_rx_desc;
q_conf->rx_mp = hw->rx_queues[queue_id]->mpool;
+
+   return 0;
 }
 
 static void
diff --git a/drivers/raw/skeleton/skeleton_rawdev.c 
b/drivers/raw/skeleton/skeleton_rawdev.c
index 801c707fb9..f8b47a391a 100644
--- a/drivers/raw/skeleton/skeleton_rawdev.c
+++ b/drivers/raw/skeleton/skeleton_rawdev.c
@@ -220,10 +220,10 @@ static int skeleton_rawdev_reset(struct rte_rawdev *dev)
return 0;
 }
 
-static void skeleton_rawdev_queue_def_conf(struct rte_rawdev *dev,
-  uint16_t queue_id,
-  rte_rawdev_obj_t queue_conf,
-  size_t conf_size)
+static int skeleton_rawdev_queue_def_conf(struct rte_rawdev *dev,
+ uint16_t queue_id,
+ rte_rawdev_obj_t queue_conf,
+ size_t conf_size)
 {
struct skeleton_rawdev *skeldev;
struct skeleton_rawdev_queue *skelq;
@@ -232,7 +232,7 @@ static void skeleton_rawdev_queue_def_conf(struct 
rte_rawdev *dev,
 
if (!dev || !queue_conf ||
conf_size != sizeof(struct skeleton_rawdev_queue))
-   return;
+   return -EINVAL;
 
skeldev = skeleton_rawdev_get_priv(dev);
skelq = &skeldev->queues[queue_id];
@@ -240,6 +240,8 @@ static void skeleton_rawdev_queue_def_conf(struct 
rte_rawdev *dev,
if (queue_id < SKELETON_MAX_QUEUES)
rte_memcpy(queue_conf, skelq,
sizeof(struct skeleton_rawdev_queue));
+
+   return 0;
 }
 
 static void
diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
index f48d8cf10b..fd123bb848 100644
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -146,9 +146,8 @@ rte_rawdev_queue_conf_get(uint16_t dev_id,
dev = &rte_rawdevs[dev_id];
 
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_def_conf, -ENOTSUP);
-   (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf,
+   return (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf,
queue_conf_size);
-   return 0;
 }
 
 int
diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h 
b/lib/librte_rawdev/rte_rawdev_pmd.h
index 34eb667f62..34dd7181b4 100644
--- a/lib/librte_rawdev/rte_rawdev_pmd.h
+++ b/lib/librte_rawdev/rte_rawdev_pmd.h
@@ -215,8 +215,10 @@ typedef int (*rawdev_reset_t)(struct rte_rawdev *dev);
  * @param[out] queue_conf
  *   Raw device queue configuration structure
  *
+ * @return
+ *   Returns 0 on success, negative errno on failure
  */
-typedef void (*rawdev_queue_conf_get_t)(struct rte_rawdev *dev,
+typedef int (*rawdev_queue_conf_get_t)(struct rte_rawdev *dev,
uint16_t queue_id,
rte_rawdev_obj_t queue_conf,
size_t queue_conf_size);
-- 
2.25.1

Re: [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles

[Power, Ciara]

>-Original Message-
>From: Bruce Richardson 
>Sent: Wednesday 12 August 2020 17:39
>To: Power, Ciara 
>Cc: dev@dpdk.org; tho...@monjalon.net
>Subject: Re: [PATCH 20.11 01/19] examples: remove legacy sections of
>makefiles
>
>On Fri, Aug 07, 2020 at 01:29:51PM +0100, Ciara Power wrote:
>> The example app makefiles contained sections using the legacy method
>> of compiling with make. These are no longer needed, and are removed,
>> leaving only the section that uses pkg-config for the make build.
>>
>> Signed-off-by: Ciara Power 
>> ---



>>
>
>There are still references to the old build system in the examples makefiles.
>Running "find examples/ -name Makefile | xargs grep RTE_SDK"
>shows quite a few references to the old builds.
>
>/Bruce

Hi Bruce,

The Makefiles that still have references to the old build system after this 
patch are removed completely in the next patch. 
There is an open to convert these Makefiles to use pkg-config instead, any and 
all help is appreciated here.

Thanks,
Ciara

Re: [dpdk-dev] [PATCH v3 2/7] app/proc-info: eliminate useless borders

[Stephen Hemminger]

On Thu, 13 Aug 2020 04:10:39 +
"Varghese, Vipin"  wrote:

> Hi Stephen,
> 
> snipped
> > 
> > 15/07/2020 23:22, Stephen Hemminger:  
> > > Printing extra borders does not improve readability, and is just
> > > unnecessary. Putting TSC hz in header also makes no sense here.  
> > 
> > The CPU frequency on headers!
> > OK to remove :)
> >   
> 
> The rational of having Time Stamp Counter as the header for port info and 
> stats, is to account for each iteration for an average `packets per second`. 
> That is using `watch -d -n 1 ./dpdk-procinfo -- --xstats | grep -v ": 0"`.
> 
> But if there better way to do this or add as new feature, +1 to remove.

Proc info should just use standard clock for its updates, not TSC?

Re: [dpdk-dev] [RFC v2 1/5] eal: add power management intrinsics

[Liang, Ma]

On 11 Aug 11:27, Liang Ma wrote:
> Add two new power management intrinsics, and provide an implementation
> in eal/x86 based on UMONITOR/UMWAIT instructions. The instructions
> are implemented as raw byte opcodes because there is not yet widespread
> compiler support for these instructions.
> 
> The power management instructions provide an architecture-specific
> function to either wait until a specified TSC timestamp is reached, or
> optionally wait until either a TSC timestamp is reached or a memory
> location is written to. The monitor function also provides an optional
> comparison, to avoid sleeping when the expected write has already
> happened, and no more writes are expected.
> 
> Signed-off-by: Liang Ma 
> Signed-off-by: Anatoly Burakov 
> --- 
 
> diff --git a/lib/librte_eal/x86/include/rte_cpuflags.h 
> b/lib/librte_eal/x86/include/rte_cpuflags.h
> index c1d20364d..94d6a4376 100644
> --- a/lib/librte_eal/x86/include/rte_cpuflags.h
> +++ b/lib/librte_eal/x86/include/rte_cpuflags.h
> @@ -110,6 +110,7 @@ enum rte_cpu_flag_t {
>   RTE_CPUFLAG_RDTSCP, /**< RDTSCP */
>   RTE_CPUFLAG_EM64T,  /**< EM64T */
>  
> + RTE_CPUFLAG_WAITPKG, /**< UMINITOR/UMWAIT/TPAUSE */
need re-work the order to avoid breaking ABI
>   /* (EAX 8007h) EDX features */
>   RTE_CPUFLAG_INVTSC, /**< INVTSC */
>  
  
> -- 
> 2.17.1
> 

[dpdk-dev] [PATCH v5 3/8] net/dpaa: add support for fmcless mode

[Hemant Agrawal]

From: Sachin Saxena 

This patch uses fmlib to configure the FMAN HW for flow
and distribution configuration, thus avoiding the need
for static FMC tool execution optionally.

Signed-off-by: Sachin Saxena 
Signed-off-by: Hemant Agrawal 
---
 drivers/bus/dpaa/include/fsl_qman.h   |   1 +
 drivers/bus/dpaa/rte_bus_dpaa_version.map |   1 +
 drivers/net/dpaa/Makefile |   1 +
 drivers/net/dpaa/dpaa_ethdev.c| 111 ++-
 drivers/net/dpaa/dpaa_ethdev.h|   4 +
 drivers/net/dpaa/dpaa_flow.c  | 901 ++
 drivers/net/dpaa/dpaa_flow.h  |  14 +
 drivers/net/dpaa/meson.build  |   1 +
 8 files changed, 1012 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/dpaa/dpaa_flow.c
 create mode 100644 drivers/net/dpaa/dpaa_flow.h

diff --git a/drivers/bus/dpaa/include/fsl_qman.h 
b/drivers/bus/dpaa/include/fsl_qman.h
index 8ba37411af..dd7ca783a2 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1896,6 +1896,7 @@ int qman_enqueue_orp(struct qman_fq *fq, const struct 
qm_fd *fd, u32 flags,
  * FQs than requested (though alignment will be as requested). If @partial is
  * zero, the return value will either be 'count' or negative.
  */
+__rte_internal
 int qman_alloc_fqid_range(u32 *result, u32 count, u32 align, int partial);
 static inline int qman_alloc_fqid(u32 *result)
 {
diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map 
b/drivers/bus/dpaa/rte_bus_dpaa_version.map
index 77840a5645..f47922c6a0 100644
--- a/drivers/bus/dpaa/rte_bus_dpaa_version.map
+++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map
@@ -49,6 +49,7 @@ INTERNAL {
netcfg_release;
per_lcore_dpaa_io;
qman_alloc_cgrid_range;
+   qman_alloc_fqid_range;
qman_alloc_pool_range;
qman_clear_irq;
qman_create_cgr;
diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index 5eaa4abcb5..28493ce9fa 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -30,6 +30,7 @@ EXPORT_MAP := rte_pmd_dpaa_version.map
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_lib.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_flow.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
 
 LDLIBS += -lrte_bus_dpaa
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index c15e2b5462..c5b9ac1a5b 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -39,6 +39,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -76,6 +77,7 @@ static uint64_t dev_tx_offloads_nodis =
 
 /* Keep track of whether QMAN and BMAN have been globally initialized */
 static int is_global_init;
+static int fmc_q = 1;  /* Indicates the use of static fmc for distribution */
 static int default_q;  /* use default queue - FMC is not executed*/
 /* At present we only allow up to 4 push mode queues as default - as each of
  * this queue need dedicated portal and we are short of portals.
@@ -1418,16 +1420,15 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, 
struct qman_cgr *cgr_rx,
}
};
 
-   if (fqid) {
+   if (fmc_q || default_q) {
ret = qman_reserve_fqid(fqid);
if (ret) {
-   DPAA_PMD_ERR("reserve rx fqid 0x%x failed with ret: %d",
+   DPAA_PMD_ERR("reserve rx fqid 0x%x failed, ret: %d",
 fqid, ret);
return -EINVAL;
}
-   } else {
-   flags |= QMAN_FQ_FLAG_DYNAMIC_FQID;
}
+
DPAA_PMD_DEBUG("creating rx fq %p, fqid 0x%x", fq, fqid);
ret = qman_create_fq(fqid, flags, fq);
if (ret) {
@@ -1602,7 +1603,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
struct fman_if_bpool *bp, *tmp_bp;
uint32_t cgrid[DPAA_MAX_NUM_PCD_QUEUES];
uint32_t cgrid_tx[MAX_DPAA_CORES];
-   char eth_buf[RTE_ETHER_ADDR_FMT_SIZE];
+   uint32_t dev_rx_fqids[DPAA_MAX_NUM_PCD_QUEUES];
 
PMD_INIT_FUNC_TRACE();
 
@@ -1619,30 +1620,36 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
dpaa_intf->ifid = dev_id;
dpaa_intf->cfg = cfg;
 
+   memset((char *)dev_rx_fqids, 0,
+   sizeof(uint32_t) * DPAA_MAX_NUM_PCD_QUEUES);
+
/* Initialize Rx FQ's */
if (default_q) {
num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
+   } else if (fmc_q) {
+   num_rx_fqs = 1;
} else {
-   if (getenv("DPAA_NUM_RX_QUEUES"))
-   num_rx_fqs = atoi(getenv("DPAA_NUM_RX_QUEUES"));
-   else
-   num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
+   /* FMCLESS mode, load balance to multiple cores.*/
+   num_rx_fqs = rte_lcore_count();
}
 
-
/* Each device can not have more than 

[dpdk-dev] [PATCH v5 2/8] net/dpaa: add VSP support in FMLIB

[Hemant Agrawal]

From: Jun Yang 

This patch adds support for VSP (Virtual Storage Profile)
in fmlib routines.
VSP allow a network interface to be divided into physical
and virtual instance(s).
The concept is very similar to SRIOV.

Signed-off-by: Jun Yang 
Acked-by: Hemant Agrawal 
---
 drivers/net/dpaa/Makefile   |   1 +
 drivers/net/dpaa/fmlib/fm_vsp.c | 143 +
 drivers/net/dpaa/fmlib/fm_vsp_ext.h | 155 
 drivers/net/dpaa/meson.build|   1 +
 4 files changed, 300 insertions(+)
 create mode 100644 drivers/net/dpaa/fmlib/fm_vsp.c
 create mode 100644 drivers/net/dpaa/fmlib/fm_vsp_ext.h

diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index deb9d5ed61..5eaa4abcb5 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -28,6 +28,7 @@ EXPORT_MAP := rte_pmd_dpaa_version.map
 
 # Interfaces with DPDK
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_lib.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
 
diff --git a/drivers/net/dpaa/fmlib/fm_vsp.c b/drivers/net/dpaa/fmlib/fm_vsp.c
new file mode 100644
index 00..fde8eb77e3
--- /dev/null
+++ b/drivers/net/dpaa/fmlib/fm_vsp.c
@@ -0,0 +1,143 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2019-2020 NXP
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include "fm_ext.h"
+#include "fm_pcd_ext.h"
+#include "fm_port_ext.h"
+#include "fm_vsp_ext.h"
+#include 
+
+uint32_t fm_port_vsp_alloc(t_handle h_fm_port,
+   t_fm_port_vspalloc_params *p_params)
+{
+   t_device *p_dev = (t_device *)h_fm_port;
+   ioc_fm_port_vsp_alloc_params_t params;
+
+   _fml_dbg("Calling...\n");
+   memset(¶ms, 0, sizeof(ioc_fm_port_vsp_alloc_params_t));
+   memcpy(¶ms.params, p_params, sizeof(t_fm_port_vspalloc_params));
+
+   if (ioctl(p_dev->fd, FM_PORT_IOC_VSP_ALLOC, ¶ms))
+   RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
+
+   _fml_dbg("Called.\n");
+
+   return E_OK;
+}
+
+t_handle fm_vsp_config(t_fm_vsp_params *p_fm_vsp_params)
+{
+   t_device *p_dev = NULL;
+   t_device *p_vsp_dev = NULL;
+   ioc_fm_vsp_params_t param;
+
+   p_dev = p_fm_vsp_params->h_fm;
+
+   _fml_dbg("Performing VSP Configuration...\n");
+
+   memset(¶m, 0, sizeof(ioc_fm_vsp_params_t));
+   memcpy(¶m, p_fm_vsp_params, sizeof(t_fm_vsp_params));
+   param.vsp_params.h_fm = UINT_TO_PTR(p_dev->id);
+   param.id = NULL;
+
+   if (ioctl(p_dev->fd, FM_IOC_VSP_CONFIG, ¶m)) {
+   DPAA_PMD_ERR("%s ioctl error\n", __func__);
+   return NULL;
+   }
+
+   p_vsp_dev = (t_device *)malloc(sizeof(t_device));
+   if (!p_vsp_dev) {
+   DPAA_PMD_ERR("FM VSP Params!\n");
+   return NULL;
+   }
+   memset(p_vsp_dev, 0, sizeof(t_device));
+   p_vsp_dev->h_user_priv = (t_handle)p_dev;
+   p_dev->owners++;
+   p_vsp_dev->id = PTR_TO_UINT(param.id);
+
+   _fml_dbg("VSP Configuration completed\n");
+
+   return (t_handle)p_vsp_dev;
+}
+
+uint32_t fm_vsp_init(t_handle h_fm_vsp)
+{
+   t_device *p_dev = NULL;
+   t_device *p_vsp_dev = (t_device *)h_fm_vsp;
+   ioc_fm_obj_t id;
+
+   _fml_dbg("Calling...\n");
+
+   p_dev = (t_device *)p_vsp_dev->h_user_priv;
+   id.obj = UINT_TO_PTR(p_vsp_dev->id);
+
+   if (ioctl(p_dev->fd, FM_IOC_VSP_INIT, &id)) {
+   DPAA_PMD_ERR("%s ioctl error\n", __func__);
+   RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
+   }
+
+   _fml_dbg("Called.\n");
+
+   return E_OK;
+}
+
+uint32_t fm_vsp_free(t_handle h_fm_vsp)
+{
+   t_device *p_dev = NULL;
+   t_device *p_vsp_dev = (t_device *)h_fm_vsp;
+   ioc_fm_obj_t id;
+
+   _fml_dbg("Calling...\n");
+
+   p_dev = (t_device *)p_vsp_dev->h_user_priv;
+   id.obj = UINT_TO_PTR(p_vsp_dev->id);
+
+   if (ioctl(p_dev->fd, FM_IOC_VSP_FREE, &id)) {
+   DPAA_PMD_ERR("%s ioctl error\n", __func__);
+   RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
+   }
+
+   p_dev->owners--;
+   free(p_vsp_dev);
+
+   _fml_dbg("Called.\n");
+
+   return E_OK;
+}
+
+uint32_t fm_vsp_config_buffer_prefix_content(t_handle h_fm_vsp,
+   t_fm_buffer_prefix_content *p_fm_buffer_prefix_content)
+{
+   t_device *p_dev = NULL;
+   t_device *p_vsp_dev = (t_device *)h_fm_vsp;
+   ioc_fm_buffer_prefix_content_params_t params;
+
+   _fml_dbg("Calling...\n");
+
+   p_dev = (t_device *)p_vsp_dev->h_user_priv;
+   params.p_fm_vsp = UINT_TO_PTR(p_vsp_dev->id);
+   memcpy(¶ms.fm_buffer_prefix_content,
+  p_fm_buffer_prefix_content, sizeof(*p_fm_buffer_prefix_content));
+
+   if (ioctl(p_dev->fd, FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT,
+ ¶m

[dpdk-dev] [PATCH v5 5/8] bus/dpaa: add Virtual Storage Profile port init

[Hemant Agrawal]

This patch add support to initialize the VSP ports
in the FMAN library.

Signed-off-by: Rohit Raj 
Signed-off-by: Hemant Agrawal 
---
 drivers/bus/dpaa/base/fman/fman.c | 57 +++
 drivers/bus/dpaa/include/fman.h   |  3 ++
 2 files changed, 60 insertions(+)

diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index 3ae29bf065..39102bc1f3 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -145,6 +145,61 @@ fman_get_mac_index(uint64_t regs_addr_host, uint8_t 
*mac_idx)
return ret;
 }
 
+static void fman_if_vsp_init(struct __fman_if *__if)
+{
+   const phandle *prop;
+   int cell_index;
+   const struct device_node *dev;
+   size_t lenp;
+   const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1};
+
+   if (__if->__if.mac_type == fman_mac_1g) {
+   for_each_compatible_node(dev, NULL,
+   "fsl,fman-port-1g-rx-extended-args") {
+   prop = of_get_property(dev, "cell-index", &lenp);
+   if (prop) {
+   cell_index = of_read_number(
+   &prop[0],
+   lenp / sizeof(phandle));
+   if (cell_index == mac_idx[__if->__if.mac_idx]) {
+   prop = of_get_property(
+   dev,
+   "vsp-window", &lenp);
+   if (prop) {
+   __if->__if.num_profiles =
+   of_read_number(
+   &prop[0], 1);
+   __if->__if.base_profile_id =
+   of_read_number(
+   &prop[1], 1);
+   }
+   }
+   }
+   }
+   } else if (__if->__if.mac_type == fman_mac_10g) {
+   for_each_compatible_node(dev, NULL,
+   "fsl,fman-port-10g-rx-extended-args") {
+   prop = of_get_property(dev, "cell-index", &lenp);
+   if (prop) {
+   cell_index = of_read_number(
+   &prop[0], lenp / sizeof(phandle));
+   if (cell_index == mac_idx[__if->__if.mac_idx]) {
+   prop = of_get_property(
+   dev, "vsp-window", &lenp);
+   if (prop) {
+   __if->__if.num_profiles =
+   of_read_number(
+   &prop[0], 1);
+   __if->__if.base_profile_id =
+   of_read_number(
+   &prop[1], 1);
+   }
+   }
+   }
+   }
+   }
+}
+
 static int
 fman_if_init(const struct device_node *dpa_node)
 {
@@ -519,6 +574,8 @@ fman_if_init(const struct device_node *dpa_node)
if (is_shared)
__if->__if.is_shared_mac = 1;
 
+   fman_if_vsp_init(__if);
+
/* Parsing of the network interface is complete, add it to the list */
DPAA_BUS_LOG(DEBUG, "Found %s, Tx Channel = %x, FMAN = %x,"
"Port ID = %x",
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index cb7f18ca26..dcf408372a 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -321,6 +321,9 @@ struct fman_if {
/* The Qman channel to schedule Tx FQs to */
u16 tx_channel_id;
 
+   uint8_t base_profile_id;
+   uint8_t num_profiles;
+
uint8_t is_shared_mac;
/* The hard-coded FQIDs for this interface. Note: this doesn't cover
 * the PCD nor the "Rx default" FQIDs, which are configured via FMC
-- 
2.17.1

[dpdk-dev] [PATCH v5 6/8] net/dpaa: add support for Virtual Storage Profile

[Hemant Agrawal]

From: Jun Yang 

This patch adds support for Virtual Storage profile (VSP) feature.
With VSP support when memory pool is created, the hw buffer pool id
i.e. bpid is not allocated; thhe bpid is identified by dpaa flow
create API.
The memory pool of RX queue is attached to specific BMan pool
according to the VSP ID when RX queue is setup.
for fmlib based hash queue, vsp base ID is assigned to each queue.

Signed-off-by: Jun Yang 
Acked-by: Hemant Agrawal 
---
 drivers/bus/dpaa/include/fsl_qman.h |   1 +
 drivers/net/dpaa/dpaa_ethdev.c  | 133 +-
 drivers/net/dpaa/dpaa_ethdev.h  |   7 ++
 drivers/net/dpaa/dpaa_flow.c| 164 +++-
 drivers/net/dpaa/dpaa_flow.h|   5 +
 5 files changed, 282 insertions(+), 28 deletions(-)

diff --git a/drivers/bus/dpaa/include/fsl_qman.h 
b/drivers/bus/dpaa/include/fsl_qman.h
index dd7ca783a2..10212f0fd5 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1229,6 +1229,7 @@ struct qman_fq {
 
int q_fd;
u16 ch_id;
+   int8_t vsp_id;
u8 cgr_groupid;
u8 is_static:4;
u8 qp_initialized:4;
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index c2d4803978..8e7eb98247 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -722,6 +722,55 @@ static int dpaa_eth_multicast_disable(struct rte_eth_dev 
*dev)
return 0;
 }
 
+static void dpaa_fman_if_pool_setup(struct rte_eth_dev *dev)
+{
+   struct dpaa_if *dpaa_intf = dev->data->dev_private;
+   struct fman_if_ic_params icp;
+   uint32_t fd_offset;
+   uint32_t bp_size;
+
+   memset(&icp, 0, sizeof(icp));
+   /* set ICEOF for to the default value , which is 0*/
+   icp.iciof = DEFAULT_ICIOF;
+   icp.iceof = DEFAULT_RX_ICEOF;
+   icp.icsz = DEFAULT_ICSZ;
+   fman_if_set_ic_params(dev->process_private, &icp);
+
+   fd_offset = RTE_PKTMBUF_HEADROOM + DPAA_HW_BUF_RESERVE;
+   fman_if_set_fdoff(dev->process_private, fd_offset);
+
+   /* Buffer pool size should be equal to Dataroom Size*/
+   bp_size = rte_pktmbuf_data_room_size(dpaa_intf->bp_info->mp);
+
+   fman_if_set_bp(dev->process_private,
+  dpaa_intf->bp_info->mp->size,
+  dpaa_intf->bp_info->bpid, bp_size);
+}
+
+static inline int dpaa_eth_rx_queue_bp_check(struct rte_eth_dev *dev,
+int8_t vsp_id, uint32_t bpid)
+{
+   struct dpaa_if *dpaa_intf = dev->data->dev_private;
+   struct fman_if *fif = dev->process_private;
+
+   if (fif->num_profiles) {
+   if (vsp_id < 0)
+   vsp_id = fif->base_profile_id;
+   } else {
+   if (vsp_id < 0)
+   vsp_id = 0;
+   }
+
+   if (dpaa_intf->vsp_bpid[vsp_id] &&
+   bpid != dpaa_intf->vsp_bpid[vsp_id]) {
+   DPAA_PMD_ERR("Various MPs are assigned to RXQs with same VSP");
+
+   return -1;
+   }
+
+   return 0;
+}
+
 static
 int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t nb_desc,
@@ -757,6 +806,20 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, 
uint16_t queue_idx,
DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)",
queue_idx, rxq->fqid);
 
+   if (!fif->num_profiles) {
+   if (dpaa_intf->bp_info && dpaa_intf->bp_info->bp &&
+   dpaa_intf->bp_info->mp != mp) {
+   DPAA_PMD_WARN("Multiple pools on same interface not"
+ " supported");
+   return -EINVAL;
+   }
+   } else {
+   if (dpaa_eth_rx_queue_bp_check(dev, rxq->vsp_id,
+   DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid)) {
+   return -EINVAL;
+   }
+   }
+
/* Max packet can fit in single buffer */
if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= buffsz) {
;
@@ -779,36 +842,40 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, 
uint16_t queue_idx,
 buffsz - RTE_PKTMBUF_HEADROOM);
}
 
-   if (!dpaa_intf->bp_info || dpaa_intf->bp_info->mp != mp) {
-   struct fman_if_ic_params icp;
-   uint32_t fd_offset;
-   uint32_t bp_size;
+   dpaa_intf->bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp);
 
-   if (!mp->pool_data) {
-   DPAA_PMD_ERR("Not an offloaded buffer pool!");
-   return -1;
+   /* For shared interface, it's done in kernel, skip.*/
+   if (!fif->is_shared_mac)
+   dpaa_fman_if_pool_setup(dev);
+
+   if (fif->num_profiles) {
+   int8_t vsp_id = rxq->vsp_id;
+
+   if (vsp_id >= 0) {
+   ret = dpaa_port_vsp_upda

[dpdk-dev] [PATCH v5 4/8] bus/dpaa: add shared MAC support

[Hemant Agrawal]

From: Radu Bulie 

A shared MAC interface is an interface which can be used
by both kernel and userspace based on classification configuration
It is defined in dts with the compatible string "fsl,dpa-ethernet-shared"
which bpool will be seeded by the dpdk partition and configured
as a netdev by the dpaa Linux eth driver.
User space buffers from the bpool will be kmapped by the kernel.

Signed-off-by: Radu Bulie 
Signed-off-by: Jun Yang 
Signed-off-by: Nipun Gupta 
Acked-by: Hemant Agrawal 
---
 drivers/bus/dpaa/base/fman/fman.c | 27 ++-
 drivers/bus/dpaa/include/fman.h   |  2 ++
 drivers/net/dpaa/dpaa_ethdev.c| 31 +--
 drivers/net/dpaa/dpaa_flow.c  | 18 ++
 4 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index 33be9e5d7b..3ae29bf065 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -167,13 +167,21 @@ fman_if_init(const struct device_node *dpa_node)
const char *mname, *fname;
const char *dname = dpa_node->full_name;
size_t lenp;
-   int _errno;
+   int _errno, is_shared = 0;
const char *char_prop;
uint32_t na;
 
if (of_device_is_available(dpa_node) == false)
return 0;
 
+   if (!of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-init") &&
+   !of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-shared")) {
+   return 0;
+   }
+
+   if (of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-shared"))
+   is_shared = 1;
+
rprop = "fsl,qman-frame-queues-rx";
mprop = "fsl,fman-mac";
 
@@ -387,7 +395,7 @@ fman_if_init(const struct device_node *dpa_node)
goto err;
}
 
-   assert(lenp == (4 * sizeof(phandle)));
+   assert(lenp >= (4 * sizeof(phandle)));
 
na = of_n_addr_cells(mac_node);
/* Get rid of endianness (issues). Convert to host byte order */
@@ -408,7 +416,7 @@ fman_if_init(const struct device_node *dpa_node)
goto err;
}
 
-   assert(lenp == (4 * sizeof(phandle)));
+   assert(lenp >= (4 * sizeof(phandle)));
/*TODO: Fix for other cases also */
na = of_n_addr_cells(mac_node);
/* Get rid of endianness (issues). Convert to host byte order */
@@ -508,6 +516,9 @@ fman_if_init(const struct device_node *dpa_node)
pools_phandle++;
}
 
+   if (is_shared)
+   __if->__if.is_shared_mac = 1;
+
/* Parsing of the network interface is complete, add it to the list */
DPAA_BUS_LOG(DEBUG, "Found %s, Tx Channel = %x, FMAN = %x,"
"Port ID = %x",
@@ -524,7 +535,7 @@ fman_if_init(const struct device_node *dpa_node)
 int
 fman_init(void)
 {
-   const struct device_node *dpa_node;
+   const struct device_node *dpa_node, *parent_node;
int _errno;
 
/* If multiple dependencies try to initialise the Fman driver, don't
@@ -539,7 +550,13 @@ fman_init(void)
return fman_ccsr_map_fd;
}
 
-   for_each_compatible_node(dpa_node, NULL, "fsl,dpa-ethernet-init") {
+   parent_node = of_find_compatible_node(NULL, NULL, "fsl,dpaa");
+   if (!parent_node) {
+   DPAA_BUS_LOG(ERR, "Unable to find fsl,dpaa node");
+   return -ENODEV;
+   }
+
+   for_each_child_node(parent_node, dpa_node) {
_errno = fman_if_init(dpa_node);
if (_errno) {
FMAN_ERR(_errno, "if_init(%s)\n", dpa_node->full_name);
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 7a0a7d405f..cb7f18ca26 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -320,6 +320,8 @@ struct fman_if {
struct rte_ether_addr mac_addr;
/* The Qman channel to schedule Tx FQs to */
u16 tx_channel_id;
+
+   uint8_t is_shared_mac;
/* The hard-coded FQIDs for this interface. Note: this doesn't cover
 * the PCD nor the "Rx default" FQIDs, which are configured via FMC
 * and its XML-based configuration.
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index c5b9ac1a5b..c2d4803978 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -351,7 +351,8 @@ static void dpaa_eth_dev_stop(struct rte_eth_dev *dev)
 
PMD_INIT_FUNC_TRACE();
 
-   fman_if_disable_rx(fif);
+   if (!fif->is_shared_mac)
+   fman_if_disable_rx(fif);
dev->tx_pkt_burst = dpaa_eth_tx_drop_all;
 }
 
@@ -1807,19 +1808,21 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
fman_intf->mac_addr.addr_bytes[4],
fman_intf->mac_addr.addr_bytes[5]);
 
-
-   /* Disable RX mode */
-   fman_if_discard_rx_errors(fman_intf);
-   fman_if_disable_rx(fman_intf);
-  

[dpdk-dev] [PATCH v5 8/8] net/dpaa: add RSS update func with FMCless

[Hemant Agrawal]

From: Sachin Saxena 

With fmlib (FMCLESS) mode now RSS can be modified on runtime.
This patch add support for RSS update functions

Signed-off-by: Hemant Agrawal 
Signed-off-by: Sachin Saxena 
---
 drivers/net/dpaa/dpaa_ethdev.c | 37 ++
 1 file changed, 37 insertions(+)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 0ce2f5ae3e..b0f2023e60 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1303,6 +1303,41 @@ dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
return ret;
 }
 
+static int
+dpaa_dev_rss_hash_update(struct rte_eth_dev *dev,
+struct rte_eth_rss_conf *rss_conf)
+{
+   struct rte_eth_dev_data *data = dev->data;
+   struct rte_eth_conf *eth_conf = &data->dev_conf;
+
+   PMD_INIT_FUNC_TRACE();
+
+   if (!(default_q || fmc_q)) {
+   if (dpaa_fm_config(dev, rss_conf->rss_hf)) {
+   DPAA_PMD_ERR("FM port configuration: Failed\n");
+   return -1;
+   }
+   eth_conf->rx_adv_conf.rss_conf.rss_hf = rss_conf->rss_hf;
+   } else {
+   DPAA_PMD_ERR("Function not supported\n");
+   return -ENOTSUP;
+   }
+   return 0;
+}
+
+static int
+dpaa_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+  struct rte_eth_rss_conf *rss_conf)
+{
+   struct rte_eth_dev_data *data = dev->data;
+   struct rte_eth_conf *eth_conf = &data->dev_conf;
+
+   /* dpaa does not support rss_key, so length should be 0*/
+   rss_conf->rss_key_len = 0;
+   rss_conf->rss_hf = eth_conf->rx_adv_conf.rss_conf.rss_hf;
+   return 0;
+}
+
 static int dpaa_dev_queue_intr_enable(struct rte_eth_dev *dev,
  uint16_t queue_id)
 {
@@ -1418,6 +1453,8 @@ static struct eth_dev_ops dpaa_devops = {
 
.rx_queue_intr_enable = dpaa_dev_queue_intr_enable,
.rx_queue_intr_disable= dpaa_dev_queue_intr_disable,
+   .rss_hash_update  = dpaa_dev_rss_hash_update,
+   .rss_hash_conf_get= dpaa_dev_rss_hash_conf_get,
 };
 
 static bool
-- 
2.17.1

[dpdk-dev] [PATCH v5 7/8] net/dpaa: add fmc parser support for VSP

[Hemant Agrawal]

From: Jun Yang 

Parse the fmc.bin generated by fmc to setup
RXQs for each port on fmc mode.
The parser gets the fqids and vspids from fmc.bin.

Signed-off-by: Jun Yang 
Acked-by: Hemant Agrawal 
---
 drivers/net/dpaa/Makefile  |   1 +
 drivers/net/dpaa/dpaa_ethdev.c |  26 +-
 drivers/net/dpaa/dpaa_ethdev.h |  10 +-
 drivers/net/dpaa/dpaa_fmc.c| 475 +
 drivers/net/dpaa/meson.build   |   3 +-
 5 files changed, 508 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/dpaa/dpaa_fmc.c

diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index 28493ce9fa..99f146f5c5 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -32,6 +32,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_flow.c
 SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_fmc.c
 
 LDLIBS += -lrte_bus_dpaa
 LDLIBS += -lrte_mempool_dpaa
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 8e7eb98247..0ce2f5ae3e 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -259,6 +259,16 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
dev->data->scattered_rx = 1;
}
 
+   if (!(default_q || fmc_q)) {
+   if (dpaa_fm_config(dev,
+   eth_conf->rx_adv_conf.rss_conf.rss_hf)) {
+   dpaa_write_fm_config_to_file();
+   DPAA_PMD_ERR("FM port configuration: Failed\n");
+   return -1;
+   }
+   dpaa_write_fm_config_to_file();
+   }
+
/* if the interrupts were configured on this devices*/
if (intr_handle && intr_handle->fd) {
if (dev->data->dev_conf.intr_conf.lsc != 0)
@@ -334,6 +344,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
 
PMD_INIT_FUNC_TRACE();
 
+   if (!(default_q || fmc_q))
+   dpaa_write_fm_config_to_file();
+
/* Change tx callback to the real one */
if (dpaa_intf->cgr_tx)
dev->tx_pkt_burst = dpaa_eth_queue_tx_slow;
@@ -1699,7 +1712,18 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
if (default_q) {
num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
} else if (fmc_q) {
-   num_rx_fqs = 1;
+   num_rx_fqs = dpaa_port_fmc_init(fman_intf, dev_rx_fqids,
+   dev_vspids,
+   DPAA_MAX_NUM_PCD_QUEUES);
+   if (num_rx_fqs < 0) {
+   DPAA_PMD_ERR("%s FMC initializes failed!",
+   dpaa_intf->name);
+   goto free_rx;
+   }
+   if (!num_rx_fqs) {
+   DPAA_PMD_WARN("%s is not configured by FMC.",
+   dpaa_intf->name);
+   }
} else {
/* FMCLESS mode, load balance to multiple cores.*/
num_rx_fqs = rte_lcore_count();
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index dd182c4d55..1b8e120e8f 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -59,10 +59,10 @@
 #endif
 
 /* PCD frame queues */
-#define DPAA_PCD_FQID_START0x400
-#define DPAA_PCD_FQID_MULTIPLIER   0x100
 #define DPAA_DEFAULT_NUM_PCD_QUEUES1
-#define DPAA_MAX_NUM_PCD_QUEUES4
+#define DPAA_VSP_PROFILE_MAX_NUM   8
+#define DPAA_MAX_NUM_PCD_QUEUESDPAA_VSP_PROFILE_MAX_NUM
+/*Same as VSP profile number*/
 
 #define DPAA_IF_TX_PRIORITY3
 #define DPAA_IF_RX_PRIORITY0
@@ -103,10 +103,10 @@
 #define DPAA_FD_CMD_CFQ0x00ff
 /**< Confirmation Frame Queue */
 
-#define DPAA_VSP_PROFILE_MAX_NUM   8
-
 #define DPAA_DEFAULT_RXQ_VSP_ID1
 
+#define FMC_FILE "/tmp/fmc.bin"
+
 /* Each network interface is represented by one of these */
 struct dpaa_if {
int valid;
diff --git a/drivers/net/dpaa/dpaa_fmc.c b/drivers/net/dpaa/dpaa_fmc.c
new file mode 100644
index 00..0ef3622744
--- /dev/null
+++ b/drivers/net/dpaa/dpaa_fmc.c
@@ -0,0 +1,475 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017-2020 NXP
+ */
+
+/* System headers */
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define FMC_OUTPUT_FORMAT_VER 0x106
+
+#define FMC_NAME_LEN 64
+#define FMC_FMAN_NUM  2
+#define FMC_PORTS_PER_FMAN   16
+#define FMC_SCHEMES_NUM  32
+#define FMC_SCHEME_PROTOCOLS_NUM 16
+#define FMC_CC_NODES_NUM512
+#define FMC_REPLICATORS_NUM  16
+#define FMC_PLC_NUM  64
+#define MAX_SP_CODE_SIZE  0x7C0
+#define FMC_MANIP_MAX64
+#define FMC_HMANIP_MAX  5

Re: [dpdk-dev] [PATCH] net/ena/base: fix doorbell evaluation for the LLQ case

[Marcin Wojtas]

Hi,

śr., 12 sie 2020 o 18:37 Artur Rojek  napisał(a):
>
> From: Michal Krawczyk 
>
> This patch adds a missing LLQ-related check in the
> ena_com_is_doorbell_needed() routine, which is relevant for the feature
> supported by the next generation HW of the ENA.
>
> Fixes: b2b02edeb0d6 ("net/ena/base: upgrade HAL for new HW features")
> CC: sta...@dpdk.org
>
> Signed-off-by: Michal Krawczyk 
> [Extracted from a bigger patch]
> Signed-off-by: Artur Rojek 

Reviewed-by: Marcin Wojtas 

> ---
>  drivers/net/ena/base/ena_eth_com.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ena/base/ena_eth_com.h 
> b/drivers/net/ena/base/ena_eth_com.h
> index e37b642d4..3d66237b8 100644
> --- a/drivers/net/ena/base/ena_eth_com.h
> +++ b/drivers/net/ena/base/ena_eth_com.h
> @@ -133,7 +133,8 @@ static inline bool ena_com_is_doorbell_needed(struct 
> ena_com_io_sq *io_sq,
> llq_info = &io_sq->llq_info;
> num_descs = ena_tx_ctx->num_bufs;
>
> -   if (unlikely(ena_com_meta_desc_changed(io_sq, ena_tx_ctx)))
> +   if (llq_info->disable_meta_caching ||
> +   unlikely(ena_com_meta_desc_changed(io_sq, ena_tx_ctx)))
> ++num_descs;
>
> if (num_descs > llq_info->descs_num_before_header) {
> --
> 2.28.0
>

Re: [dpdk-dev] [RFC v2 2/5] ethdev: add simple power management API and callback

[Liang, Ma]

On 11 Aug 11:27, Liang Ma wrote:

> +static uint16_t
> +rte_ethdev_pmgmt_umait(uint16_t port_id, uint16_t qidx,
> + struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx,
> + uint16_t max_pkts __rte_unused, void *_  __rte_unused)
> +{
> +
> + struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> +
> + if (dev->pwr_mgmt_state == RTE_ETH_DEV_POWER_MGMT_ENABLED) {
> + if (unlikely(nb_rx == 0)) {
> + dev->empty_poll_stats[qidx].num++;
> + if (unlikely(dev->empty_poll_stats[qidx].num >
> + ETH_EMPTYPOLL_MAX)) {
> + volatile void *target_addr;
> + uint64_t expected, mask;
> + uint16_t ret;
> +
> + /*
> +  * get address of next descriptor in the RX
> +  * ring for this queue, as well as expected
> +  * value and a mask.
> +  */
> + ret = (*dev->dev_ops->next_rx_desc)
> + (dev->data->rx_queues[qidx],
> +  &target_addr, &expected, &mask);
> + if (ret == 0)
> + /* -1ULL is maximum value for TSC */
> + rte_power_monitor(target_addr,
> +   expected, mask,
> +   0, -1ULL);
> + }
> + } else
> + dev->empty_poll_stats[qidx].num = 0;
> + }
> +
> + return 0;
should return nb_rx here. that's fixed in v3.
> +}
> +
> +static uint16_t
> +rte_ethdev_pmgmt_pause(uint16_t port_id, uint16_t qidx,
> + struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx,
> + uint16_t max_pkts __rte_unused, void *_  __rte_unused)
> +{
> + struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> +
> + int i;
> +
> + if (dev->pwr_mgmt_state == RTE_ETH_DEV_POWER_MGMT_ENABLED) {
> + if (unlikely(nb_rx == 0)) {
> +
> + dev->empty_poll_stats[qidx].num++;
> +
> + if (unlikely(dev->empty_poll_stats[qidx].num >
> + ETH_EMPTYPOLL_MAX)) {
> +
> + for (i = 0; i < RTE_ETH_PAUSE_NUM; i++)
> + rte_pause();
> +
> + }
> + } else
> + dev->empty_poll_stats[qidx].num = 0;
> + }
> +
> + return 0;
should return  nb_rx here. that's fixed in v3.
> +}
> +
> +static uint16_t
> +rte_ethdev_pmgmt_scalefreq(uint16_t port_id, uint16_t qidx,
> + struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx,
> + uint16_t max_pkts __rte_unused, void *_  __rte_unused)
> +{
> + struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> +
> + if (dev->pwr_mgmt_state == RTE_ETH_DEV_POWER_MGMT_ENABLED) {
> + if (unlikely(nb_rx == 0)) {
> + dev->empty_poll_stats[qidx].num++;
> + if (unlikely(dev->empty_poll_stats[qidx].num >
> + ETH_EMPTYPOLL_MAX)) {
> +
> + /*scale down freq */
> + rte_power_freq_min(rte_lcore_id());
> +
> + }
> + } else {
> + dev->empty_poll_stats[qidx].num = 0;
> + /* scal up freq */
> + rte_power_freq_max(rte_lcore_id());
> + }
> + }
> +
> + return 0;
should return  nb_rx here. that's fixed in v3.
> +}
> +


 -- 
> 2.17.1
> 

[dpdk-dev] DPDK Release Status Meeting 13/08/2020

[Mcnamara, John]

Minutes 13 August 2020
--

Agenda:
* Release Dates
* -rc3/-rc4 status
* Subtrees
* LTS
* OvS

Participants:
* Arm
* Broadcom
* Debian/Microsoft
* Intel
* Marvell
* Nvidia
* NXP


Release Dates
-

* v20.11 proposal dates, please comment:
  * Proposal/V1:Friday, 11 September 2020
  * -rc1:   Friday, 9 October 2020
  * -rc2:   Friday, 23 October 2020
  * Release:Friday, 13 November 2020

  * The dates are still not finalized, we need to discuss this offline and
define dates as soon as possible, please comment.

  * Please remember to send roadmap for 20.11, none received yet.



Subtrees


DPDK 20.08 released.

There were a lot of maintainers on holiday this week and not much activity on 
the subtrees,


LTS
---

* 19.11.4 work is going on
  * Some patches are backported, email sent, please review.
  * RC planned for Monday 18th

* 18.11.10 work is going on
  * Some patches are backported


OvS
---

* 2.14 release trending for 17 August



DPDK Release Status Meetings


The DPDK Release Status Meeting is intended for DPDK Committers to discuss the 
status of the master tree and sub-trees, and for project managers to track 
progress or milestone dates.

The meeting occurs on every Thursdays at 8:30 UTC. on https://meet.jit.si/DPDK

If you wish to attend just send an email to "John McNamara 
" for the invite.

[dpdk-dev] [PATCH v2 2/8] crypto/bcmfs: add vfio support

[Vikas Gupta]

Add vfio support for device.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 drivers/crypto/bcmfs/bcmfs_device.c |   5 ++
 drivers/crypto/bcmfs/bcmfs_device.h |   6 ++
 drivers/crypto/bcmfs/bcmfs_vfio.c   | 107 
 drivers/crypto/bcmfs/bcmfs_vfio.h   |  17 +
 drivers/crypto/bcmfs/meson.build|   3 +-
 5 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/bcmfs/bcmfs_vfio.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_vfio.h

diff --git a/drivers/crypto/bcmfs/bcmfs_device.c 
b/drivers/crypto/bcmfs/bcmfs_device.c
index 47c776de6..3b5cc9e98 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.c
+++ b/drivers/crypto/bcmfs/bcmfs_device.c
@@ -11,6 +11,7 @@
 
 #include "bcmfs_device.h"
 #include "bcmfs_logs.h"
+#include "bcmfs_vfio.h"
 
 struct bcmfs_device_attr {
const char name[BCMFS_MAX_PATH_LEN];
@@ -71,6 +72,10 @@ fsdev_allocate_one_dev(struct rte_vdev_device *vdev,
 
fsdev->vdev = vdev;
 
+   /* attach to VFIO */
+   if (bcmfs_attach_vfio(fsdev))
+   goto cleanup;
+
TAILQ_INSERT_TAIL(&fsdev_list, fsdev, next);
 
return fsdev;
diff --git a/drivers/crypto/bcmfs/bcmfs_device.h 
b/drivers/crypto/bcmfs/bcmfs_device.h
index cc64a8df2..c41cc0031 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.h
+++ b/drivers/crypto/bcmfs/bcmfs_device.h
@@ -35,6 +35,12 @@ struct bcmfs_device {
char name[BCMFS_DEV_NAME_LEN];
/* Parent vdev */
struct rte_vdev_device *vdev;
+   /* vfio handle */
+   int vfio_dev_fd;
+   /* mapped address */
+   uint8_t *mmap_addr;
+   /* mapped size */
+   uint32_t mmap_size;
 };
 
 #endif /* _BCMFS_DEV_H_ */
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c 
b/drivers/crypto/bcmfs/bcmfs_vfio.c
new file mode 100644
index 0..dc2def580
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -0,0 +1,107 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Broadcom.
+ * All rights reserved.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include "bcmfs_device.h"
+#include "bcmfs_logs.h"
+#include "bcmfs_vfio.h"
+
+#ifdef VFIO_PRESENT
+static int
+vfio_map_dev_obj(const char *path, const char *dev_obj,
+uint32_t *size, void **addr, int *dev_fd)
+{
+   int32_t ret;
+   struct vfio_group_status status = { .argsz = sizeof(status) };
+
+   struct vfio_device_info d_info = { .argsz = sizeof(d_info) };
+   struct vfio_region_info reg_info = { .argsz = sizeof(reg_info) };
+
+   ret = rte_vfio_setup_device(path, dev_obj, dev_fd, &d_info);
+   if (ret) {
+   BCMFS_LOG(ERR, "VFIO Setting for device failed");
+   return ret;
+   }
+
+   /* getting device region info*/
+   ret = ioctl(*dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info);
+   if (ret < 0) {
+   BCMFS_LOG(ERR, "Error in VFIO getting REGION_INFO");
+   goto map_failed;
+   }
+
+   *addr = mmap(NULL, reg_info.size,
+PROT_WRITE | PROT_READ, MAP_SHARED,
+*dev_fd, reg_info.offset);
+   if (*addr == MAP_FAILED) {
+   BCMFS_LOG(ERR, "Error mapping region (errno = %d)", errno);
+   ret = errno;
+   goto map_failed;
+   }
+   *size = reg_info.size;
+
+   return 0;
+
+map_failed:
+   rte_vfio_release_device(path, dev_obj, *dev_fd);
+
+   return ret;
+}
+
+int
+bcmfs_attach_vfio(struct bcmfs_device *dev)
+{
+   int ret;
+   int vfio_dev_fd;
+   void  *v_addr = NULL;
+   uint32_t size = 0;
+
+   ret = vfio_map_dev_obj(dev->dirname, dev->name,
+  &size, &v_addr, &vfio_dev_fd);
+   if (ret)
+   return -1;
+
+   dev->mmap_size = size;
+   dev->mmap_addr = v_addr;
+   dev->vfio_dev_fd = vfio_dev_fd;
+
+   return 0;
+}
+
+void
+bcmfs_release_vfio(struct bcmfs_device *dev)
+{
+   int ret;
+
+   if (dev == NULL)
+   return;
+
+   /* unmap the addr */
+   munmap(dev->mmap_addr, dev->mmap_size);
+   /* release the device */
+   ret = rte_vfio_release_device(dev->dirname, dev->name,
+ dev->vfio_dev_fd);
+   if (ret < 0) {
+   BCMFS_LOG(ERR, "cannot release device");
+   return;
+   }
+}
+#else
+int
+bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
+{
+   return -1;
+}
+
+void
+bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
+{
+}
+#endif
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.h 
b/drivers/crypto/bcmfs/bcmfs_vfio.h
new file mode 100644
index 0..d0fdf6483
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Broadcom
+ * All rights reserved.
+ */
+
+#ifndef _BCMFS_VFIO_H_
+#define _BCMFS_VFIO_H_
+
+/* Attach the bcmfs device to vfio */
+int
+bcmf

[dpdk-dev] [PATCH v2 0/8] Add Crypto PMD for Broadcom`s FlexSparc devices

[Vikas Gupta]

Hi,
This patchset contains support for Crypto offload on Broadcom’s
Stingray/Stingray2 SoCs having FlexSparc unit. 
BCMFS is an acronym for Broadcom FlexSparc device used in the patchest.

The patchset progressively adds major modules as below.
a) Detection of platform-device based on the known registered platforms and 
attaching with VFIO.
b) Creation of Cryptodevice.
c) Addition of session handling.
d) Add Cryptodevice into test Cryptodev framework. 

The patchset has been tested on the above mentioned SoCs.

Regards,
Vikas

Changes from v0->v1: 
  Updated the ABI version in file .../crypto/bcmfs/rte_pmd_bcmfs_version.map

Changes from v1->v2:
- Fix compilation errors and coding style warnings.
- Use global test crypto suite suggested by Adam Dybkowski

Vikas Gupta (8):
  crypto/bcmfs: add BCMFS driver
  crypto/bcmfs: add vfio support
  crypto/bcmfs: add apis for queue pair management
  crypto/bcmfs: add hw queue pair operations
  crypto/bcmfs: create a symmetric cryptodev
  crypto/bcmfs: add session handling and capabilities
  crypto/bcmfs: add crypto h/w module
  crypto/bcmfs: add crypto pmd into cryptodev test

 MAINTAINERS   |   7 +
 app/test/test_cryptodev.c |  17 +
 app/test/test_cryptodev.h |   1 +
 config/common_base|   5 +
 doc/guides/cryptodevs/bcmfs.rst   |  72 ++
 doc/guides/cryptodevs/features/bcmfs.ini  |  56 +
 doc/guides/cryptodevs/index.rst   |   1 +
 drivers/crypto/bcmfs/bcmfs_dev_msg.h  |  29 +
 drivers/crypto/bcmfs/bcmfs_device.c   | 331 ++
 drivers/crypto/bcmfs/bcmfs_device.h   |  76 ++
 drivers/crypto/bcmfs/bcmfs_hw_defs.h  |  38 +
 drivers/crypto/bcmfs/bcmfs_logs.c |  38 +
 drivers/crypto/bcmfs/bcmfs_logs.h |  34 +
 drivers/crypto/bcmfs/bcmfs_qp.c   | 383 +++
 drivers/crypto/bcmfs/bcmfs_qp.h   | 142 +++
 drivers/crypto/bcmfs/bcmfs_sym.c  | 316 ++
 drivers/crypto/bcmfs/bcmfs_sym_capabilities.c | 764 ++
 drivers/crypto/bcmfs/bcmfs_sym_capabilities.h |  16 +
 drivers/crypto/bcmfs/bcmfs_sym_defs.h | 186 
 drivers/crypto/bcmfs/bcmfs_sym_engine.c   | 994 ++
 drivers/crypto/bcmfs/bcmfs_sym_engine.h   | 103 ++
 drivers/crypto/bcmfs/bcmfs_sym_pmd.c  | 426 
 drivers/crypto/bcmfs/bcmfs_sym_pmd.h  |  38 +
 drivers/crypto/bcmfs/bcmfs_sym_req.h  |  62 ++
 drivers/crypto/bcmfs/bcmfs_sym_session.c  | 424 
 drivers/crypto/bcmfs/bcmfs_sym_session.h  |  99 ++
 drivers/crypto/bcmfs/bcmfs_vfio.c | 107 ++
 drivers/crypto/bcmfs/bcmfs_vfio.h |  17 +
 drivers/crypto/bcmfs/hw/bcmfs4_rm.c   | 742 +
 drivers/crypto/bcmfs/hw/bcmfs5_rm.c   | 677 
 drivers/crypto/bcmfs/hw/bcmfs_rm_common.c |  82 ++
 drivers/crypto/bcmfs/hw/bcmfs_rm_common.h |  46 +
 drivers/crypto/bcmfs/meson.build  |  20 +
 .../crypto/bcmfs/rte_pmd_bcmfs_version.map|   3 +
 drivers/crypto/meson.build|   3 +-
 mk/rte.app.mk |   1 +
 36 files changed, 6355 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/cryptodevs/bcmfs.rst
 create mode 100644 doc/guides/cryptodevs/features/bcmfs.ini
 create mode 100644 drivers/crypto/bcmfs/bcmfs_dev_msg.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_device.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_device.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_hw_defs.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_logs.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_logs.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_qp.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_qp.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_capabilities.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_defs.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_engine.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_engine.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_pmd.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_pmd.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_req.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_session.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_session.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_vfio.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_vfio.h
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs4_rm.c
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs5_rm.c
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs_rm_common.c
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs_rm_common.h
 create mode 100644 drivers/crypto/bcmfs/meson.build
 create mode 100644 drivers/crypto/bcmfs/rte_pmd_bcmfs_version.map

-- 
2.17.1

[dpdk-dev] [PATCH v2 1/8] crypto/bcmfs: add BCMFS driver

[Vikas Gupta]

Add Broadcom FlexSparc(FS) device creation driver which registers to a
vdev and create a device. Add APIs for logs, supportive documention and
maintainers file.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 MAINTAINERS   |   7 +
 config/common_base|   5 +
 doc/guides/cryptodevs/bcmfs.rst   |  26 ++
 doc/guides/cryptodevs/index.rst   |   1 +
 drivers/crypto/bcmfs/bcmfs_device.c   | 256 ++
 drivers/crypto/bcmfs/bcmfs_device.h   |  40 +++
 drivers/crypto/bcmfs/bcmfs_logs.c |  38 +++
 drivers/crypto/bcmfs/bcmfs_logs.h |  34 +++
 drivers/crypto/bcmfs/meson.build  |  10 +
 .../crypto/bcmfs/rte_pmd_bcmfs_version.map|   3 +
 drivers/crypto/meson.build|   3 +-
 mk/rte.app.mk |   1 +
 12 files changed, 423 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/cryptodevs/bcmfs.rst
 create mode 100644 drivers/crypto/bcmfs/bcmfs_device.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_device.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_logs.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_logs.h
 create mode 100644 drivers/crypto/bcmfs/meson.build
 create mode 100644 drivers/crypto/bcmfs/rte_pmd_bcmfs_version.map

diff --git a/MAINTAINERS b/MAINTAINERS
index 3cd402b34..7c2d7ff1b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1099,6 +1099,13 @@ F: drivers/crypto/zuc/
 F: doc/guides/cryptodevs/zuc.rst
 F: doc/guides/cryptodevs/features/zuc.ini
 
+Broadcom FlexSparc
+M: Vikas Gupta  
+M: Raveendra Padasalagi 
+M: Ajit Khaparde 
+F: drivers/crypto/bcmfs/
+F: doc/guides/cryptodevs/bcmfs.rst
+F: doc/guides/cryptodevs/features/bcmfs.ini
 
 Compression Drivers
 ---
diff --git a/config/common_base b/config/common_base
index f7a8824f5..21daadcdd 100644
--- a/config/common_base
+++ b/config/common_base
@@ -705,6 +705,11 @@ CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=n
 #
 CONFIG_RTE_LIBRTE_PMD_NITROX=y
 
+#
+# Compile PMD for Broadcom crypto device
+#
+CONFIG_RTE_LIBRTE_PMD_BCMFS=y
+
 #
 # Compile generic security library
 #
diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
new file mode 100644
index 0..752ce028a
--- /dev/null
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -0,0 +1,26 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(C) 2020 Broadcom
+
+Broadcom FlexSparc Crypto Poll Mode Driver
+==
+
+The FlexSparc crypto poll mode driver provides support for offloading
+cryptographic operations to the Broadcom SoCs having FlexSparc4/FlexSparc5 
unit.
+Detailed information about SoCs can be found in
+
+* https://www.broadcom.com/
+
+Installation
+
+
+For compiling the Broadcom FlexSparc crypto PMD, please check if the
+CONFIG_RTE_LIBRTE_PMD_BCMFS setting is set to `y` in config/common_base file.
+
+* ``CONFIG_RTE_LIBRTE_PMD_BCMFS=y``
+
+Initialization
+--
+BCMFS crypto PMD depend upon the devices present in the path
+/sys/bus/platform/devices/fs/ on the platform.
+Each cryptodev PMD instance can be attached to the nodes present
+in the mentioned path.
diff --git a/doc/guides/cryptodevs/index.rst b/doc/guides/cryptodevs/index.rst
index a67ed5a28..5d7e028bd 100644
--- a/doc/guides/cryptodevs/index.rst
+++ b/doc/guides/cryptodevs/index.rst
@@ -29,3 +29,4 @@ Crypto Device Drivers
 qat
 virtio
 zuc
+bcmfs
diff --git a/drivers/crypto/bcmfs/bcmfs_device.c 
b/drivers/crypto/bcmfs/bcmfs_device.c
new file mode 100644
index 0..47c776de6
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_device.c
@@ -0,0 +1,256 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Broadcom.
+ * All rights reserved.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include "bcmfs_device.h"
+#include "bcmfs_logs.h"
+
+struct bcmfs_device_attr {
+   const char name[BCMFS_MAX_PATH_LEN];
+   const char suffix[BCMFS_DEV_NAME_LEN];
+   const enum bcmfs_device_type type;
+   const uint32_t offset;
+   const uint32_t version;
+};
+
+/* BCMFS supported devices */
+static struct bcmfs_device_attr dev_table[] = {
+   {
+   .name = "fs4",
+   .suffix = "crypto_mbox",
+   .type = BCMFS_SYM_FS4,
+   .offset = 0,
+   .version = 0x76303031
+   },
+   {
+   .name = "fs5",
+   .suffix = "mbox",
+   .type = BCMFS_SYM_FS5,
+   .offset = 0,
+   .version = 0x76303032
+   },
+   {
+   /* sentinel */
+   }
+};
+
+TAILQ_HEAD(fsdev_list, bcmfs_device);
+static struct fsdev_list fsdev_list = TAILQ_HEAD_INITIALIZER(fsdev_list);
+
+static struct bcmfs_device *
+fsdev_allocate_one_dev(struct rte_vdev_device *vdev,
+  char *dirpath,
+  char *devname,
+   

[dpdk-dev] [PATCH v2 5/8] crypto/bcmfs: create a symmetric cryptodev

[Vikas Gupta]

Create a symmetric crypto device and supported cryptodev ops.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 drivers/crypto/bcmfs/bcmfs_device.c  |  15 ++
 drivers/crypto/bcmfs/bcmfs_device.h  |   9 +
 drivers/crypto/bcmfs/bcmfs_qp.c  |  37 +++
 drivers/crypto/bcmfs/bcmfs_qp.h  |  16 ++
 drivers/crypto/bcmfs/bcmfs_sym_pmd.c | 387 +++
 drivers/crypto/bcmfs/bcmfs_sym_pmd.h |  38 +++
 drivers/crypto/bcmfs/bcmfs_sym_req.h |  22 ++
 drivers/crypto/bcmfs/meson.build |   3 +-
 8 files changed, 526 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_pmd.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_pmd.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_req.h

diff --git a/drivers/crypto/bcmfs/bcmfs_device.c 
b/drivers/crypto/bcmfs/bcmfs_device.c
index bd2d64acf..c9263ec28 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.c
+++ b/drivers/crypto/bcmfs/bcmfs_device.c
@@ -13,6 +13,7 @@
 #include "bcmfs_logs.h"
 #include "bcmfs_qp.h"
 #include "bcmfs_vfio.h"
+#include "bcmfs_sym_pmd.h"
 
 struct bcmfs_device_attr {
const char name[BCMFS_MAX_PATH_LEN];
@@ -239,6 +240,7 @@ bcmfs_vdev_probe(struct rte_vdev_device *vdev)
char out_dirname[BCMFS_MAX_PATH_LEN];
uint32_t fsdev_dev[BCMFS_MAX_NODES];
enum bcmfs_device_type dtype;
+   int err;
int i = 0;
int dev_idx;
int count = 0;
@@ -290,7 +292,20 @@ bcmfs_vdev_probe(struct rte_vdev_device *vdev)
return -ENODEV;
}
 
+   err = bcmfs_sym_dev_create(fsdev);
+   if (err) {
+   BCMFS_LOG(WARNING,
+ "Failed to create BCMFS SYM PMD for device %s",
+ fsdev->name);
+   goto pmd_create_fail;
+   }
+
return 0;
+
+pmd_create_fail:
+   fsdev_release(fsdev);
+
+   return err;
 }
 
 static int
diff --git a/drivers/crypto/bcmfs/bcmfs_device.h 
b/drivers/crypto/bcmfs/bcmfs_device.h
index 9e40c5d74..e8a9c4091 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.h
+++ b/drivers/crypto/bcmfs/bcmfs_device.h
@@ -62,6 +62,15 @@ struct bcmfs_device {
struct bcmfs_qp *qps_in_use[BCMFS_MAX_HW_QUEUES];
/* queue pair ops exported by symmetric crypto hw */
struct bcmfs_hw_queue_pair_ops *sym_hw_qp_ops;
+   /* a cryptodevice attached to bcmfs device */
+   struct rte_cryptodev *cdev;
+   /* a rte_device to register with cryptodev */
+   struct rte_device sym_rte_dev;
+   /* private info to keep with cryptodev */
+   struct bcmfs_sym_dev_private *sym_dev;
 };
 
+/* stats exported by device */
+
+
 #endif /* _BCMFS_DEV_H_ */
diff --git a/drivers/crypto/bcmfs/bcmfs_qp.c b/drivers/crypto/bcmfs/bcmfs_qp.c
index ec1327b78..cb5ff6c61 100644
--- a/drivers/crypto/bcmfs/bcmfs_qp.c
+++ b/drivers/crypto/bcmfs/bcmfs_qp.c
@@ -344,3 +344,40 @@ bcmfs_dequeue_op_burst(void *qp, void **ops, uint16_t 
nb_ops)
 
return deq;
 }
+
+void bcmfs_qp_stats_get(struct bcmfs_qp **qp, int num_qp,
+   struct bcmfs_qp_stats *stats)
+{
+   int i;
+
+   if (stats == NULL) {
+   BCMFS_LOG(ERR, "invalid param: stats %p",
+ stats);
+   return;
+   }
+
+   for (i = 0; i < num_qp; i++) {
+   if (qp[i] == NULL) {
+   BCMFS_LOG(DEBUG, "Uninitialised qp %d", i);
+   continue;
+   }
+
+   stats->enqueued_count += qp[i]->stats.enqueued_count;
+   stats->dequeued_count += qp[i]->stats.dequeued_count;
+   stats->enqueue_err_count += qp[i]->stats.enqueue_err_count;
+   stats->dequeue_err_count += qp[i]->stats.dequeue_err_count;
+   }
+}
+
+void bcmfs_qp_stats_reset(struct bcmfs_qp **qp, int num_qp)
+{
+   int i;
+
+   for (i = 0; i < num_qp; i++) {
+   if (qp[i] == NULL) {
+   BCMFS_LOG(DEBUG, "Uninitialised qp %d", i);
+   continue;
+   }
+   memset(&qp[i]->stats, 0, sizeof(qp[i]->stats));
+   }
+}
diff --git a/drivers/crypto/bcmfs/bcmfs_qp.h b/drivers/crypto/bcmfs/bcmfs_qp.h
index e4b0c3f2f..fec58ca71 100644
--- a/drivers/crypto/bcmfs/bcmfs_qp.h
+++ b/drivers/crypto/bcmfs/bcmfs_qp.h
@@ -24,6 +24,13 @@ enum bcmfs_queue_type {
BCMFS_RM_CPLQ
 };
 
+#define BCMFS_QP_IOBASE_XLATE(base, idx)   \
+   ((base) + ((idx) * BCMFS_HW_QUEUE_IO_ADDR_LEN))
+
+/* Max pkts for preprocessing before submitting to h/w qp */
+#define BCMFS_MAX_REQS_BUFF64
+
+/* qp stats */
 struct bcmfs_qp_stats {
/* Count of all operations enqueued */
uint64_t enqueued_count;
@@ -92,6 +99,10 @@ struct bcmfs_qp {
struct bcmfs_qp_stats stats;
/* h/w ops associated with qp */
struct bcmfs_hw_queue_pair_ops *ops;
+   /* bcmfs requests pool*/
+   struct rte_mempool *sr_mp;
+   /* a t

[dpdk-dev] [PATCH v2 3/8] crypto/bcmfs: add apis for queue pair management

[Vikas Gupta]

Add queue pair management APIs which will be used by Crypto device to
manage h/w queues. A bcmfs device structure owns multiple queue-pairs
based on the mapped address allocated to it.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 drivers/crypto/bcmfs/bcmfs_device.c  |   4 +
 drivers/crypto/bcmfs/bcmfs_device.h  |   5 +
 drivers/crypto/bcmfs/bcmfs_hw_defs.h |  38 +++
 drivers/crypto/bcmfs/bcmfs_qp.c  | 345 +++
 drivers/crypto/bcmfs/bcmfs_qp.h  | 122 ++
 drivers/crypto/bcmfs/meson.build |   3 +-
 6 files changed, 516 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/bcmfs/bcmfs_hw_defs.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_qp.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_qp.h

diff --git a/drivers/crypto/bcmfs/bcmfs_device.c 
b/drivers/crypto/bcmfs/bcmfs_device.c
index 3b5cc9e98..b475c2933 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.c
+++ b/drivers/crypto/bcmfs/bcmfs_device.c
@@ -11,6 +11,7 @@
 
 #include "bcmfs_device.h"
 #include "bcmfs_logs.h"
+#include "bcmfs_qp.h"
 #include "bcmfs_vfio.h"
 
 struct bcmfs_device_attr {
@@ -76,6 +77,9 @@ fsdev_allocate_one_dev(struct rte_vdev_device *vdev,
if (bcmfs_attach_vfio(fsdev))
goto cleanup;
 
+   /* Maximum number of QPs supported */
+   fsdev->max_hw_qps = fsdev->mmap_size / BCMFS_HW_QUEUE_IO_ADDR_LEN;
+
TAILQ_INSERT_TAIL(&fsdev_list, fsdev, next);
 
return fsdev;
diff --git a/drivers/crypto/bcmfs/bcmfs_device.h 
b/drivers/crypto/bcmfs/bcmfs_device.h
index c41cc0031..a47537332 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.h
+++ b/drivers/crypto/bcmfs/bcmfs_device.h
@@ -11,6 +11,7 @@
 #include 
 
 #include "bcmfs_logs.h"
+#include "bcmfs_qp.h"
 
 /* max number of dev nodes */
 #define BCMFS_MAX_NODES4
@@ -41,6 +42,10 @@ struct bcmfs_device {
uint8_t *mmap_addr;
/* mapped size */
uint32_t mmap_size;
+   /* max number of h/w queue pairs detected */
+   uint16_t max_hw_qps;
+   /* current qpairs in use */
+   struct bcmfs_qp *qps_in_use[BCMFS_MAX_HW_QUEUES];
 };
 
 #endif /* _BCMFS_DEV_H_ */
diff --git a/drivers/crypto/bcmfs/bcmfs_hw_defs.h 
b/drivers/crypto/bcmfs/bcmfs_hw_defs.h
new file mode 100644
index 0..ecb0c09ba
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_hw_defs.h
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Broadcom
+ * All rights reserved.
+ */
+
+#ifndef _BCMFS_RM_DEFS_H_
+#define _BCMFS_RM_DEFS_H_
+
+#include 
+#include 
+#include 
+#include 
+
+/* 32-bit MMIO register write */
+#define FS_MMIO_WRITE32(value, addr) rte_write32_relaxed((value), (addr))
+
+/* 32-bit MMIO register read */
+#define FS_MMIO_READ32(addr) rte_read32_relaxed((addr))
+
+#ifndef BIT
+#define BIT(nr) (1UL << (nr))
+#endif
+
+#define FS_RING_REGS_SIZE  0x1
+#define FS_RING_DESC_SIZE  8
+#define FS_RING_BD_ALIGN_ORDER 12
+#define FS_RING_BD_DESC_PER_REQ32
+#define FS_RING_CMPL_ALIGN_ORDER   13
+#define FS_RING_CMPL_SIZE  (1024 * FS_RING_DESC_SIZE)
+#define FS_RING_MAX_REQ_COUNT  1024
+#define FS_RING_PAGE_SHFT  12
+#define FS_RING_PAGE_SIZE  BIT(FS_RING_PAGE_SHFT)
+
+/* Minimum and maximum number of requests supported */
+#define FS_RM_MAX_REQS 1024
+#define FS_RM_MIN_REQS 32
+
+#endif /* BCMFS_RM_DEFS_H_ */
diff --git a/drivers/crypto/bcmfs/bcmfs_qp.c b/drivers/crypto/bcmfs/bcmfs_qp.c
new file mode 100644
index 0..864e7bb74
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_qp.c
@@ -0,0 +1,345 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Broadcom.
+ * All rights reserved.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "bcmfs_logs.h"
+#include "bcmfs_qp.h"
+#include "bcmfs_hw_defs.h"
+
+/* TX or submission queue name */
+static const char *txq_name = "tx";
+/* Completion or receive queue name */
+static const char *cmplq_name = "cmpl";
+
+/* Helper function */
+static int
+bcmfs_qp_check_queue_alignment(uint64_t phys_addr,
+  uint32_t align)
+{
+   if (((align - 1) & phys_addr) != 0)
+   return -EINVAL;
+   return 0;
+}
+
+static void
+bcmfs_queue_delete(struct bcmfs_queue *queue,
+  uint16_t queue_pair_id)
+{
+   const struct rte_memzone *mz;
+   int status = 0;
+
+   if (queue == NULL) {
+   BCMFS_LOG(DEBUG, "Invalid queue");
+   return;
+   }
+   BCMFS_LOG(DEBUG, "Free ring %d type %d, memzone: %s",
+ queue_pair_id, queue->q_type, queue->memz_name);
+
+   mz = rte_memzone_lookup(queue->memz_name);
+   if (mz != NULL) {
+   /* Write an unused pattern to the queue memory. */
+   memset(queue->base_addr, 0x9B, queue->que

[dpdk-dev] [PATCH v2 7/8] crypto/bcmfs: add crypto h/w module

[Vikas Gupta]

Add crypto h/w module to process crypto op. Crypto op is processed via
sym_engine module before submitting the crypto request to h/w queues.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 drivers/crypto/bcmfs/bcmfs_sym.c| 316 
 drivers/crypto/bcmfs/bcmfs_sym_defs.h   |  16 +
 drivers/crypto/bcmfs/bcmfs_sym_engine.c | 994 
 drivers/crypto/bcmfs/bcmfs_sym_engine.h | 103 +++
 drivers/crypto/bcmfs/bcmfs_sym_pmd.c|  26 +
 drivers/crypto/bcmfs/bcmfs_sym_req.h|  40 +
 drivers/crypto/bcmfs/meson.build|   4 +-
 7 files changed, 1498 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_engine.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_engine.h

diff --git a/drivers/crypto/bcmfs/bcmfs_sym.c b/drivers/crypto/bcmfs/bcmfs_sym.c
new file mode 100644
index 0..8f9415b5e
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_sym.c
@@ -0,0 +1,316 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Broadcom
+ * All rights reserved.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "bcmfs_sym_defs.h"
+#include "bcmfs_sym_engine.h"
+#include "bcmfs_sym_req.h"
+#include "bcmfs_sym_session.h"
+
+/** Process cipher operation */
+static int
+process_crypto_cipher_op(struct rte_crypto_op *op,
+struct rte_mbuf *mbuf_src,
+struct rte_mbuf *mbuf_dst,
+struct bcmfs_sym_session *sess,
+struct bcmfs_sym_request *req)
+{
+   int rc = 0;
+   struct fsattr src, dst, iv, key;
+   struct rte_crypto_sym_op *sym_op = op->sym;
+
+   fsattr_sz(&src) = sym_op->cipher.data.length;
+   fsattr_sz(&dst) = sym_op->cipher.data.length;
+
+   fsattr_va(&src) = rte_pktmbuf_mtod_offset
+   (mbuf_src,
+uint8_t *,
+op->sym->cipher.data.offset);
+
+   fsattr_va(&dst) = rte_pktmbuf_mtod_offset
+   (mbuf_dst,
+uint8_t *,
+op->sym->cipher.data.offset);
+
+   fsattr_pa(&src) = rte_pktmbuf_iova(mbuf_src);
+   fsattr_pa(&dst) = rte_pktmbuf_iova(mbuf_dst);
+
+   fsattr_va(&iv) = rte_crypto_op_ctod_offset(op,
+uint8_t *,
+sess->cipher.iv.offset);
+
+   fsattr_sz(&iv) = sess->cipher.iv.length;
+
+   fsattr_va(&key) = sess->cipher.key.data;
+   fsattr_pa(&key) = 0;
+   fsattr_sz(&key) = sess->cipher.key.length;
+
+   rc = bcmfs_crypto_build_cipher_req(req, sess->cipher.algo,
+  sess->cipher.direction, &src,
+  &dst, &key, &iv);
+   if (rc)
+   op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+
+   return rc;
+}
+
+/** Process auth operation */
+static int
+process_crypto_auth_op(struct rte_crypto_op *op,
+  struct rte_mbuf *mbuf_src,
+  struct bcmfs_sym_session *sess,
+  struct bcmfs_sym_request *req)
+{
+   int rc = 0;
+   struct fsattr src, dst, mac, key;
+
+   fsattr_sz(&src) = op->sym->auth.data.length;
+   fsattr_va(&src) = rte_pktmbuf_mtod_offset(mbuf_src,
+  uint8_t *,
+  op->sym->auth.data.offset);
+   fsattr_pa(&src) = rte_pktmbuf_iova(mbuf_src);
+
+   if (!sess->auth.operation) {
+   fsattr_va(&mac) = op->sym->auth.digest.data;
+   fsattr_pa(&mac) = op->sym->auth.digest.phys_addr;
+   fsattr_sz(&mac) = sess->auth.digest_length;
+   } else {
+   fsattr_va(&dst) = op->sym->auth.digest.data;
+   fsattr_pa(&dst) = op->sym->auth.digest.phys_addr;
+   fsattr_sz(&dst) = sess->auth.digest_length;
+   }
+
+   fsattr_va(&key) = sess->auth.key.data;
+   fsattr_pa(&key) = 0;
+   fsattr_sz(&key) = sess->auth.key.length;
+
+   /* AES-GMAC uses AES-GCM-128 authenticator */
+   if (sess->auth.algo == BCMFS_CRYPTO_AUTH_AES_GMAC) {
+   struct fsattr  iv;
+   fsattr_va(&iv) = rte_crypto_op_ctod_offset(op,
+   uint8_t *,
+   
sess->auth.iv.offset);
+   fsattr_pa(&iv) = 0;
+   fsattr_sz(&iv) = sess->auth.iv.length;
+
+   rc = bcmfs_crypto_build_aead_request(req,
+BCMFS_CRYPTO_CIPHER_NONE,
+0,
+ 

[dpdk-dev] [PATCH v2 6/8] crypto/bcmfs: add session handling and capabilities

[Vikas Gupta]

Add session handling and capabilities supported by crypto h/w
accelerator.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 doc/guides/cryptodevs/bcmfs.rst   |  46 ++
 doc/guides/cryptodevs/features/bcmfs.ini  |  56 ++
 drivers/crypto/bcmfs/bcmfs_sym_capabilities.c | 764 ++
 drivers/crypto/bcmfs/bcmfs_sym_capabilities.h |  16 +
 drivers/crypto/bcmfs/bcmfs_sym_defs.h | 170 
 drivers/crypto/bcmfs/bcmfs_sym_pmd.c  |  13 +
 drivers/crypto/bcmfs/bcmfs_sym_session.c  | 424 ++
 drivers/crypto/bcmfs/bcmfs_sym_session.h  |  99 +++
 drivers/crypto/bcmfs/meson.build  |   4 +-
 9 files changed, 1591 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/cryptodevs/features/bcmfs.ini
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_capabilities.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_defs.h
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_session.c
 create mode 100644 drivers/crypto/bcmfs/bcmfs_sym_session.h

diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
index 752ce028a..2488b19f7 100644
--- a/doc/guides/cryptodevs/bcmfs.rst
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -18,9 +18,55 @@ CONFIG_RTE_LIBRTE_PMD_BCMFS setting is set to `y` in 
config/common_base file.
 
 * ``CONFIG_RTE_LIBRTE_PMD_BCMFS=y``
 
+Features
+
+
+The BCMFS SYM PMD has support for:
+
+Cipher algorithms:
+
+* ``RTE_CRYPTO_CIPHER_3DES_CBC``
+* ``RTE_CRYPTO_CIPHER_3DES_CTR``
+* ``RTE_CRYPTO_CIPHER_AES128_CBC``
+* ``RTE_CRYPTO_CIPHER_AES192_CBC``
+* ``RTE_CRYPTO_CIPHER_AES256_CBC``
+* ``RTE_CRYPTO_CIPHER_AES128_CTR``
+* ``RTE_CRYPTO_CIPHER_AES192_CTR``
+* ``RTE_CRYPTO_CIPHER_AES256_CTR``
+* ``RTE_CRYPTO_CIPHER_AES_XTS``
+* ``RTE_CRYPTO_CIPHER_DES_CBC``
+
+Hash algorithms:
+
+* ``RTE_CRYPTO_AUTH_SHA1``
+* ``RTE_CRYPTO_AUTH_SHA1_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA224``
+* ``RTE_CRYPTO_AUTH_SHA224_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA256``
+* ``RTE_CRYPTO_AUTH_SHA256_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA384``
+* ``RTE_CRYPTO_AUTH_SHA384_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA512``
+* ``RTE_CRYPTO_AUTH_SHA512_HMAC``
+* ``RTE_CRYPTO_AUTH_AES_XCBC_MAC``
+* ``RTE_CRYPTO_AUTH_MD5_HMAC``
+* ``RTE_CRYPTO_AUTH_AES_GMAC``
+* ``RTE_CRYPTO_AUTH_AES_CMAC``
+
+Supported AEAD algorithms:
+
+* ``RTE_CRYPTO_AEAD_AES_GCM``
+* ``RTE_CRYPTO_AEAD_AES_CCM``
+
 Initialization
 --
 BCMFS crypto PMD depend upon the devices present in the path
 /sys/bus/platform/devices/fs/ on the platform.
 Each cryptodev PMD instance can be attached to the nodes present
 in the mentioned path.
+
+Limitations
+~~~
+
+* Only supports the session-oriented API implementation (session-less APIs are 
not supported).
+* CCM is not supported on Broadcom`s SoCs having FlexSparc4 unit.
diff --git a/doc/guides/cryptodevs/features/bcmfs.ini 
b/doc/guides/cryptodevs/features/bcmfs.ini
new file mode 100644
index 0..82d2c639d
--- /dev/null
+++ b/doc/guides/cryptodevs/features/bcmfs.ini
@@ -0,0 +1,56 @@
+;
+; Supported features of the 'bcmfs' crypto driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Symmetric crypto   = Y
+Sym operation chaining = Y
+HW Accelerated = Y
+Protocol offload   = Y
+In Place SGL   = Y
+
+;
+; Supported crypto algorithms of the 'bcmfs' crypto driver.
+;
+[Cipher]
+AES CBC (128)  = Y
+AES CBC (192)  = Y
+AES CBC (256)  = Y
+AES CTR (128)  = Y
+AES CTR (192)  = Y
+AES CTR (256)  = Y
+AES XTS (128)  = Y
+AES XTS (256)  = Y
+3DES CBC   = Y
+DES CBC= Y
+;
+; Supported authentication algorithms of the 'bcmfs' crypto driver.
+;
+[Auth]
+MD5 HMAC = Y
+SHA1 = Y
+SHA1 HMAC= Y
+SHA224   = Y
+SHA224 HMAC  = Y
+SHA256   = Y
+SHA256 HMAC  = Y
+SHA384   = Y
+SHA384 HMAC  = Y
+SHA512   = Y
+SHA512 HMAC  = Y
+AES GMAC = Y
+AES CMAC (128) = Y
+AES CBC = Y
+AES XCBC = Y
+
+;
+; Supported AEAD algorithms of the 'bcmfs' crypto driver.
+;
+[AEAD]
+AES GCM (128) = Y
+AES GCM (192) = Y
+AES GCM (256) = Y
+AES CCM (128) = Y
+AES CCM (192) = Y
+AES CCM (256) = Y
diff --git a/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c 
b/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
new file mode 100644
index 0..dee88ed4a
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
@@ -0,0 +1,764 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Broadcom
+ * All rights reserved.
+ */
+
+#include 
+
+#include "bcmfs_sym_capabilities.h"
+
+static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
+   {
+   /* SHA1 */
+   .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+   {.sym = {
+   .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+   {.auth = {
+   .algo = RTE_CRYPTO_AUTH_SHA1,
+  

[dpdk-dev] [PATCH v2 4/8] crypto/bcmfs: add hw queue pair operations

[Vikas Gupta]

Add queue pair operations exported by supported devices.

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 drivers/crypto/bcmfs/bcmfs_dev_msg.h  |  29 +
 drivers/crypto/bcmfs/bcmfs_device.c   |  51 ++
 drivers/crypto/bcmfs/bcmfs_device.h   |  16 +
 drivers/crypto/bcmfs/bcmfs_qp.c   |   1 +
 drivers/crypto/bcmfs/bcmfs_qp.h   |   4 +
 drivers/crypto/bcmfs/hw/bcmfs4_rm.c   | 742 ++
 drivers/crypto/bcmfs/hw/bcmfs5_rm.c   | 677 
 drivers/crypto/bcmfs/hw/bcmfs_rm_common.c |  82 +++
 drivers/crypto/bcmfs/hw/bcmfs_rm_common.h |  46 ++
 drivers/crypto/bcmfs/meson.build  |   5 +-
 10 files changed, 1652 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/bcmfs/bcmfs_dev_msg.h
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs4_rm.c
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs5_rm.c
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs_rm_common.c
 create mode 100644 drivers/crypto/bcmfs/hw/bcmfs_rm_common.h

diff --git a/drivers/crypto/bcmfs/bcmfs_dev_msg.h 
b/drivers/crypto/bcmfs/bcmfs_dev_msg.h
new file mode 100644
index 0..5b50bde35
--- /dev/null
+++ b/drivers/crypto/bcmfs/bcmfs_dev_msg.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Broadcom
+ * All rights reserved.
+ */
+
+#ifndef _BCMFS_DEV_MSG_H_
+#define _BCMFS_DEV_MSG_H_
+
+#define MAX_SRC_ADDR_BUFFERS8
+#define MAX_DST_ADDR_BUFFERS3
+
+struct bcmfs_qp_message {
+   /** Physical address of each source */
+   uint64_t srcs_addr[MAX_SRC_ADDR_BUFFERS];
+   /** Length of each sources */
+   uint32_t srcs_len[MAX_SRC_ADDR_BUFFERS];
+   /** Total number of sources */
+   unsigned int srcs_count;
+   /** Physical address of each destination */
+   uint64_t dsts_addr[MAX_DST_ADDR_BUFFERS];
+   /** Length of each destination */
+   uint32_t dsts_len[MAX_DST_ADDR_BUFFERS];
+   /** Total number of destinations */
+   unsigned int dsts_count;
+
+   void *ctx;
+};
+
+#endif /* _BCMFS_DEV_MSG_H_ */
diff --git a/drivers/crypto/bcmfs/bcmfs_device.c 
b/drivers/crypto/bcmfs/bcmfs_device.c
index b475c2933..bd2d64acf 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.c
+++ b/drivers/crypto/bcmfs/bcmfs_device.c
@@ -43,6 +43,47 @@ static struct bcmfs_device_attr dev_table[] = {
}
 };
 
+struct bcmfs_hw_queue_pair_ops_table bcmfs_hw_queue_pair_ops_table = {
+   .tl =  RTE_SPINLOCK_INITIALIZER,
+   .num_ops = 0
+};
+
+int bcmfs_hw_queue_pair_register_ops(const struct bcmfs_hw_queue_pair_ops *h)
+{
+   struct bcmfs_hw_queue_pair_ops *ops;
+   int16_t ops_index;
+
+   rte_spinlock_lock(&bcmfs_hw_queue_pair_ops_table.tl);
+
+   if (h->enq_one_req == NULL || h->dequeue == NULL ||
+   h->ring_db == NULL || h->startq == NULL || h->stopq == NULL) {
+   rte_spinlock_unlock(&bcmfs_hw_queue_pair_ops_table.tl);
+   BCMFS_LOG(ERR,
+ "Missing callback while registering device ops");
+   return -EINVAL;
+   }
+
+   if (strlen(h->name) >= sizeof(ops->name) - 1) {
+   rte_spinlock_unlock(&bcmfs_hw_queue_pair_ops_table.tl);
+   BCMFS_LOG(ERR, "%s(): fs device_ops <%s>: name too long",
+   __func__, h->name);
+   return -EEXIST;
+   }
+
+   ops_index = bcmfs_hw_queue_pair_ops_table.num_ops++;
+   ops = &bcmfs_hw_queue_pair_ops_table.qp_ops[ops_index];
+   strlcpy(ops->name, h->name, sizeof(ops->name));
+   ops->enq_one_req = h->enq_one_req;
+   ops->dequeue = h->dequeue;
+   ops->ring_db = h->ring_db;
+   ops->startq = h->startq;
+   ops->stopq = h->stopq;
+
+   rte_spinlock_unlock(&bcmfs_hw_queue_pair_ops_table.tl);
+
+   return ops_index;
+}
+
 TAILQ_HEAD(fsdev_list, bcmfs_device);
 static struct fsdev_list fsdev_list = TAILQ_HEAD_INITIALIZER(fsdev_list);
 
@@ -53,6 +94,7 @@ fsdev_allocate_one_dev(struct rte_vdev_device *vdev,
   enum bcmfs_device_type dev_type __rte_unused)
 {
struct bcmfs_device *fsdev;
+   uint32_t i;
 
fsdev = calloc(1, sizeof(*fsdev));
if (!fsdev)
@@ -68,6 +110,15 @@ fsdev_allocate_one_dev(struct rte_vdev_device *vdev,
goto cleanup;
}
 
+   /* check if registered ops name is present in directory path */
+   for (i = 0; i < bcmfs_hw_queue_pair_ops_table.num_ops; i++)
+   if (strstr(dirpath,
+  bcmfs_hw_queue_pair_ops_table.qp_ops[i].name))
+   fsdev->sym_hw_qp_ops =
+   &bcmfs_hw_queue_pair_ops_table.qp_ops[i];
+   if (!fsdev->sym_hw_qp_ops)
+   goto cleanup;
+
strcpy(fsdev->dirname, dirpath);
strcpy(fsdev->name, devname);
 
diff --git a/drivers/crypto/bcmfs/bcmfs_device.h 
b/drivers/crypto/bcmfs/bcmfs_device.h
index a47537332..9e40

[dpdk-dev] [PATCH v2 8/8] crypto/bcmfs: add crypto pmd into cryptodev test

[Vikas Gupta]

Add global test suite for bcmfs crypto pmd

Signed-off-by: Vikas Gupta 
Signed-off-by: Raveendra Padasalagi 
Reviewed-by: Ajit Khaparde 
---
 app/test/test_cryptodev.c | 17 +
 app/test/test_cryptodev.h |  1 +
 2 files changed, 18 insertions(+)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 70bf6fe2c..9157115ab 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -13041,6 +13041,22 @@ test_cryptodev_nitrox(void)
return unit_test_suite_runner(&cryptodev_nitrox_testsuite);
 }
 
+static int
+test_cryptodev_bcmfs(void)
+{
+   gbl_driver_id = rte_cryptodev_driver_id_get(
+   RTE_STR(CRYPTODEV_NAME_BCMFS_PMD));
+
+   if (gbl_driver_id == -1) {
+   RTE_LOG(ERR, USER1, "BCMFS PMD must be loaded. Check if "
+   "CONFIG_RTE_LIBRTE_PMD_BCMFS is enabled "
+   "in config file to run this testsuite.\n");
+   return TEST_FAILED;
+   }
+
+   return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_mb_autotest,
@@ -13063,3 +13079,4 @@ REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, 
test_cryptodev_octeontx);
 REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);
 REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
 REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);
+REGISTER_TEST_COMMAND(cryptodev_bcmfs_autotest, test_cryptodev_bcmfs);
diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index 41542e055..c58126368 100644
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -70,6 +70,7 @@
 #define CRYPTODEV_NAME_OCTEONTX2_PMD   crypto_octeontx2
 #define CRYPTODEV_NAME_CAAM_JR_PMD crypto_caam_jr
 #define CRYPTODEV_NAME_NITROX_PMD  crypto_nitrox_sym
+#define CRYPTODEV_NAME_BCMFS_PMD   crypto_bcmfs
 
 /**
  * Write (spread) data from buffer to mbuf data
-- 
2.17.1

Re: [dpdk-dev] [PATCH v2 1/4] test/stack: avoid trivial memory allocations

[Eads, Gage]

> -Original Message-
> From: Steven Lariau 
> Sent: Wednesday, August 12, 2020 2:19 PM
> To: Eads, Gage ; Olivier Matz
> 
> Cc: dev@dpdk.org; n...@arm.com; Steven Lariau 
> Subject: [PATCH v2 1/4] test/stack: avoid trivial memory allocations
> 
> Replace the arguments array by one argument.
> All objects in the args array have the same values, so there is no need
> to use an array, only one struct is enough.
> The args object is a lot smaller, and the allocation can be replaced
> with a global variable.
> 
> The allocation of obj_table isn't needed either, because MAX_BULK is
> small. The allocation can instead be replaced with a static array.
> 
> Signed-off-by: Steven Lariau 
> Reviewed-by: Dharmik Thakkar 
> Reviewed-by: Phil Yang 
> Reviewed-by: Ruifeng Wang 

Acked-by: Gage Eads 

Thanks,
Gage

[dpdk-dev] [PATCH 00/22] windows/netuio: add netuio driver for Windows

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

The NetUIO driver for Windows allows the usermode application
to directly access the hardware and allocates the memory that gets mapped in
usermode.

Anand Rawat (1):
  Updated Source and Project files to use Clang toolset

Harini Ramakrishnan (10):
  Windows DPDK libraries and applications have now been updated to the
latest public release v18.08, of the main DPDK source.
  doc: remove embedded buffer from Windows UIO ioctl
  Windows DPDK libraries and applications have now been updated to the
latest public release v18.08, of the main DPDK source.
  doc: change the Windows UIO driver's default security descriptor to
admin only
  doc: remove lower bound on mapped address from Windows UIO driver
  doc: remove embedded buffer from Windows UIO ioctl
  uio: move SDDL string to INF on Windows
  uio: Fix 64 bit BARs mapping
  license: update headers with BSD 3-clause license:
  doc: updating REAME for NetUIO driver

Jason Messer (2):
  Initial commit of UIO driver for Windows
  Added new core libraries for Windows

Narcisa Vasile (8):
  Update .gitignore and create .gitattributes
  uio: Use local time when verifying INF DriverVer
  uio: Remove co-installers section from inf
  uio: Wrap call into try/except block
  uio: Use request handler that guarantees execution in correct context
  uio: Change the device setup class to a custom one
  Enable DMA remapping through INF directive
  Move all files under windows folder

Thomas Monjalon (1):
  init DPDK repository

-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 01/22] init DPDK repository

[Narcisa Ana Maria Vasile]

From: Thomas Monjalon 

---
 .gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0..e69de29bb
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 05/22] doc: remove embedded buffer from Windows UIO ioctl

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 mk/exec-env/windows/netuio/netuio.vcxproj | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj 
b/mk/exec-env/windows/netuio/netuio.vcxproj
index b6564e4e7..b6b11e49a 100644
--- a/mk/exec-env/windows/netuio/netuio.vcxproj
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj
@@ -68,6 +68,9 @@
 
   0.6.0.5
 
+
+  
%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfLdr.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfDriverEntry.lib;$(DDK_LIB_PATH)\wdmsec.lib
+
   
   
 
@@ -80,6 +83,9 @@
 
   0.6.0.5
 
+
+  
%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfLdr.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfDriverEntry.lib;$(DDK_LIB_PATH)\wdmsec.lib
+
   
   
 
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 03/22] Added new core libraries for Windows

[Narcisa Ana Maria Vasile]

From: Jason Messer 

---
 mk/exec-env/windows/netuio/netuio.vcxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj 
b/mk/exec-env/windows/netuio/netuio.vcxproj
index 251b8eb95..9e769b5d0 100644
--- a/mk/exec-env/windows/netuio/netuio.vcxproj
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj
@@ -66,7 +66,7 @@
   false
 
 
-  0.6.0.2
+  0.6.0.5
 
   
   
@@ -78,7 +78,7 @@
   false
 
 
-  0.6.0.2
+  0.6.0.5
 
   
   
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 08/22] doc: remove lower bound on mapped address from Windows UIO driver

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 kernel/windows/netuio/netuio_dev.c | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel/windows/netuio/netuio_dev.c 
b/kernel/windows/netuio/netuio_dev.c
index 4d8b9430d..f5d41cb65 100644
--- a/kernel/windows/netuio/netuio_dev.c
+++ b/kernel/windows/netuio/netuio_dev.c
@@ -28,23 +28,23 @@ NTSTATUS
 netuio_create_device(_Inout_ PWDFDEVICE_INIT DeviceInit)
 {
 WDF_OBJECT_ATTRIBUTES deviceAttributes;
-WDFDEVICE device;
+WDFDEVICE device = NULL;
 NTSTATUS status;
 
 PAGED_CODE();
 
-   // Ensure that only administrators can access our device object.
-   status = WdfDeviceInitAssignSDDLString(DeviceInit, 
&SDDL_DEVOBJ_SYS_ALL_ADM_ALL);
+// Ensure that only administrators can access our device object.
+status = WdfDeviceInitAssignSDDLString(DeviceInit, 
&SDDL_DEVOBJ_SYS_ALL_ADM_ALL);
 
-   if (NT_SUCCESS(status)) {
-   WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
+if (NT_SUCCESS(status)) {
+WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
 
-   // Set the device context cleanup callback.
-   // This function will be called when the WDF Device Object 
associated to the current device is destroyed
-   deviceAttributes.EvtCleanupCallback = 
netuio_evt_device_context_cleanup;
+// Set the device context cleanup callback.
+// This function will be called when the WDF Device Object associated 
to the current device is destroyed
+deviceAttributes.EvtCleanupCallback = 
netuio_evt_device_context_cleanup;
 
-   status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, 
&device);
-   }
+status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
+}
 
if (NT_SUCCESS(status)) {
// Create a device interface so that applications can find and 
talk to us.
@@ -263,7 +263,7 @@ allocate_usermemory_segment(_In_ WDFOBJECT device)
 PHYSICAL_ADDRESS highest_acceptable_address;
 PHYSICAL_ADDRESS boundary_address_multiple;
 
-lowest_acceptable_address.QuadPart = 0x0080;
+lowest_acceptable_address.QuadPart = 0x;
 highest_acceptable_address.QuadPart = 0x;
 boundary_address_multiple.QuadPart = 0;
 
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 02/22] Initial commit of UIO driver for Windows

[Narcisa Ana Maria Vasile]

From: Jason Messer 

---
 mk/exec-env/windows/netuio/netuio.sln |  24 
 mk/exec-env/windows/netuio/netuio.vcxproj | 108 ++
 .../windows/netuio/netuio.vcxproj.filters |  59 ++
 .../windows/netuio/netuio.vcxproj.user|  11 ++
 4 files changed, 202 insertions(+)
 create mode 100644 mk/exec-env/windows/netuio/netuio.sln
 create mode 100644 mk/exec-env/windows/netuio/netuio.vcxproj
 create mode 100644 mk/exec-env/windows/netuio/netuio.vcxproj.filters
 create mode 100644 mk/exec-env/windows/netuio/netuio.vcxproj.user

diff --git a/mk/exec-env/windows/netuio/netuio.sln 
b/mk/exec-env/windows/netuio/netuio.sln
new file mode 100644
index 0..15c26e6b9
--- /dev/null
+++ b/mk/exec-env/windows/netuio/netuio.sln
@@ -0,0 +1,24 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netuio", 
"netuio.vcxproj", "{66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}"
+EndProject
+Global
+   GlobalSection(SolutionConfigurationPlatforms) = preSolution
+   Debug|x64 = Debug|x64
+   Release|x64 = Release|x64
+   EndGlobalSection
+   GlobalSection(ProjectConfigurationPlatforms) = postSolution
+   {66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}.Debug|x64.ActiveCfg = 
Debug|x64
+   {66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}.Debug|x64.Build.0 = 
Debug|x64
+   {66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}.Debug|x64.Deploy.0 = 
Debug|x64
+   {66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}.Release|x64.ActiveCfg = 
Release|x64
+   {66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}.Release|x64.Build.0 = 
Release|x64
+   {66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}.Release|x64.Deploy.0 = 
Release|x64
+   EndGlobalSection
+   GlobalSection(SolutionProperties) = preSolution
+   HideSolutionNode = FALSE
+   EndGlobalSection
+EndGlobal
diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj 
b/mk/exec-env/windows/netuio/netuio.vcxproj
new file mode 100644
index 0..251b8eb95
--- /dev/null
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj
@@ -0,0 +1,108 @@
+
+http://schemas.microsoft.com/developer/msbuild/2003";>
+  
+
+  Debug
+  x64
+
+
+  Release
+  x64
+
+  
+  
+{66EC91EF-AC5B-4D1E-8314-9B3E2855CCF6}
+{497e31cb-056b-4f31-abb8-447fd55ee5a5}
+v4.5
+12.0
+Debug
+Win32
+netuio
+
$(LatestTargetPlatformVersion)
+  
+  
+  
+
+
+true
+WindowsKernelModeDriver10.0
+Driver
+KMDF
+Desktop
+  
+  
+
+
+false
+WindowsKernelModeDriver10.0
+Driver
+KMDF
+Desktop
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+DbgengKernelDebugger
+
$(SolutionDir)..\..\..\..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
+
$(SolutionDir)..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
+  
+  
+DbgengKernelDebugger
+
$(SolutionDir)..\..\..\..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
+
$(SolutionDir)..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
+  
+  
+
+  false
+  true
+  trace.h
+  true
+  false
+
+
+  0.6.0.2
+
+  
+  
+
+  false
+  true
+  trace.h
+  true
+  false
+
+
+  0.6.0.2
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+
+
+
+
+  
+  
+
+
+
+  
+  
+  
+  
+
\ No newline at end of file
diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj.filters 
b/mk/exec-env/windows/netuio/netuio.vcxproj.filters
new file mode 100644
index 0..72a397d7c
--- /dev/null
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj.filters
@@ -0,0 +1,59 @@
+
+http://schemas.microsoft.com/developer/msbuild/2003";>
+  
+
+  
{4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+  cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+  
{93995380-89BD-4b04-88EB-625FBE52EBFB}
+  h;hpp;hxx;hm;inl;inc;xsd
+
+
+  
{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+  
rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+  
{8E41214B-6785-4CFE-B992-037D68949A14}
+  inf;inv;inx;mof;mc;
+
+  
+  
+
+  Driver Files
+
+  
+  
+
+  Resource Files
+
+  
+  
+
+  Header Files
+
+
+  Header Files
+
+
+  Header Files
+
+
+  Header Files
+
+
+  Header Files
+
+  
+  
+
+  Source Files
+
+
+  Source Files
+
+
+  Source Files
+
+  
+
\ No newline at end of file
diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj.user 
b/mk/exec-env/windows/netuio/netuio.vcxproj.user
new file mode 100644
index 0..771ce8681
--- /dev/null
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj.user
@@ -0,0 +1,11 @@
+
+http://schemas.microsoft

[dpdk-dev] [PATCH 10/22] uio: move SDDL string to INF on Windows

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 kernel/windows/netuio/netuio.inf   |  7 +++
 kernel/windows/netuio/netuio_dev.c | 15 +--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index 0453b371a..b1696cc50 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -62,6 +62,13 @@ CopyFiles=Drivers_Dir
 [Drivers_Dir]
 netuio.sys
 
+[netuio_Device.NT.HW]
+AddReg=Device.HW.Registry
+
+[Device.HW.Registry]
+; Ensure that only administrators can access our device object.
+HKR,,Security,,"D:P(A;;GA;;;SY)(A;;GA;;;BA)"
+
 ;-- Service installation
 [netuio_Device.NT.Services]
 AddService = netuio,%SPSVCINST_ASSOCSERVICE%, netuio_Service_Inst
diff --git a/kernel/windows/netuio/netuio_dev.c 
b/kernel/windows/netuio/netuio_dev.c
index f5d41cb65..a1fe447f7 100644
--- a/kernel/windows/netuio/netuio_dev.c
+++ b/kernel/windows/netuio/netuio_dev.c
@@ -33,18 +33,13 @@ netuio_create_device(_Inout_ PWDFDEVICE_INIT DeviceInit)
 
 PAGED_CODE();
 
-// Ensure that only administrators can access our device object.
-status = WdfDeviceInitAssignSDDLString(DeviceInit, 
&SDDL_DEVOBJ_SYS_ALL_ADM_ALL);
+WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
 
-if (NT_SUCCESS(status)) {
-WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
-
-// Set the device context cleanup callback.
-// This function will be called when the WDF Device Object associated 
to the current device is destroyed
-deviceAttributes.EvtCleanupCallback = 
netuio_evt_device_context_cleanup;
+// Set the device context cleanup callback.
+// This function will be called when the WDF Device Object associated to 
the current device is destroyed
+deviceAttributes.EvtCleanupCallback = netuio_evt_device_context_cleanup;
 
-status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
-}
+status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
 
if (NT_SUCCESS(status)) {
// Create a device interface so that applications can find and 
talk to us.
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 04/22] Windows DPDK libraries and applications have now been updated to the latest public release v18.08, of the main DPDK source.

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 mk/exec-env/windows/netuio/netuio.vcxproj | 20 +--
 .../windows/netuio/netuio.vcxproj.filters | 20 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj 
b/mk/exec-env/windows/netuio/netuio.vcxproj
index 9e769b5d0..b6564e4e7 100644
--- a/mk/exec-env/windows/netuio/netuio.vcxproj
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj
@@ -85,22 +85,22 @@
 
   
   
-
+
   
   
-
+
   
   
-
-
-
-
-
+
+
+
+
+
   
   
-
-
-
+
+
+
   
   
   
diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj.filters 
b/mk/exec-env/windows/netuio/netuio.vcxproj.filters
index 72a397d7c..a21f9ad99 100644
--- a/mk/exec-env/windows/netuio/netuio.vcxproj.filters
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj.filters
@@ -19,40 +19,40 @@
 
   
   
-
+
   Driver Files
 
   
   
-
+
   Resource Files
 
   
   
-
+
   Header Files
 
-
+
   Header Files
 
-
+
   Header Files
 
-
+
   Header Files
 
-
+
   Header Files
 
   
   
-
+
   Source Files
 
-
+
   Source Files
 
-
+
   Source Files
 
   
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 14/22] uio: Use local time when verifying INF DriverVer

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

Signed-off-by: Narcisa Vasile 
Reported-by: Dmitry Kozlyuk 
---
 mk/exec-env/windows/netuio/netuio.vcxproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj 
b/mk/exec-env/windows/netuio/netuio.vcxproj
index b6b11e49a..60058fcd6 100644
--- a/mk/exec-env/windows/netuio/netuio.vcxproj
+++ b/mk/exec-env/windows/netuio/netuio.vcxproj
@@ -51,11 +51,13 @@
 DbgengKernelDebugger
 
$(SolutionDir)..\..\..\..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
 
$(SolutionDir)..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
+true
   
   
 DbgengKernelDebugger
 
$(SolutionDir)..\..\..\..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
 
$(SolutionDir)..\$(Platform)\$(ConfigurationName)\$(MSBuildProjectName)\
+true
   
   
 
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 13/22] Update .gitignore and create .gitattributes

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

Add build folders and .vs/ to .gitignore.
Create .gitattributes to handle line endings correctly.

Signed-off-by: Narcisa Vasile 
Reported-by: Dmitry Kozlyuk 
---
 .gitattributes | 4 
 .gitignore | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0..13482db3d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
diff --git a/.gitignore b/.gitignore
index e69de29bb..543281e8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+x64/
+.vs/
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 11/22] Updated Source and Project files to use Clang toolset

[Narcisa Ana Maria Vasile]

From: Anand Rawat 

Updated the code for using LLVM toolset. The code still uses
msbuild and VS2017. Some header files and windows specific
utility functions are removed due to conflicts with Clang
intrinsic functions. Project files have been updated to use
LLVM and additional project settings for Clang.

Change-Id: I274de21379287c664e072f58e94271c654afe603
Signed-off-by: Anand Rawat 
---
 kernel/windows/netuio/netuio_queue.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/windows/netuio/netuio_queue.c 
b/kernel/windows/netuio/netuio_queue.c
index 929192880..760b4a7e5 100644
--- a/kernel/windows/netuio/netuio_queue.c
+++ b/kernel/windows/netuio/netuio_queue.c
@@ -156,8 +156,8 @@ netuio_evt_IO_device_control(_In_ WDFQUEUE Queue, _In_ 
WDFREQUEST Request,
 break;
 }
 
-// Zero out the physically contiguous block
-RtlZeroMemory(netuio_contextdata->dpdk_seg.mem.virt_addr, 
netuio_contextdata->dpdk_seg.mem.size);
+   // Zero out the physically contiguous block
+   RtlZeroMemory(netuio_contextdata->dpdk_seg.mem.virt_addr, 
netuio_contextdata->dpdk_seg.mem.size);
 
 // Return relevant data to the caller
 status = WdfRequestRetrieveOutputBuffer(Request, sizeof(struct 
dpdk_private_info), &output_buf, &output_buf_size);
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 09/22] doc: remove embedded buffer from Windows UIO ioctl

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 kernel/windows/netuio/netuio_interface.h |  9 -
 kernel/windows/netuio/netuio_queue.c | 43 ++--
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/kernel/windows/netuio/netuio_interface.h 
b/kernel/windows/netuio/netuio_interface.h
index b86bf5d3f..f84ee895c 100644
--- a/kernel/windows/netuio/netuio_interface.h
+++ b/kernel/windows/netuio/netuio_interface.h
@@ -59,9 +59,16 @@ struct dpdk_private_info
 struct dpdk_pci_config_io
 {
 struct dev_addr dev_addr;
-PVOID   buf;
 UINT32  offset;
 enum pci_io op;
+UINT32  access_size; // 1, 2, 4, or 8 bytes
+
+union dpdk_pci_config_io_data {
+UINT8  u8;
+UINT16 u16;
+UINT32 u32;
+UINT64 u64;
+} data;
 };
 
 #pragma pack(pop)
diff --git a/kernel/windows/netuio/netuio_queue.c 
b/kernel/windows/netuio/netuio_queue.c
index 312d4b682..929192880 100644
--- a/kernel/windows/netuio/netuio_queue.c
+++ b/kernel/windows/netuio/netuio_queue.c
@@ -11,22 +11,23 @@
 #pragma alloc_text (PAGE, netuio_queue_initialize)
 #endif
 
-VOID netuio_read_PCI_config(PNETUIO_CONTEXT_DATA netuio_contextdata, ULONG 
offset, PVOID buffer)
+VOID netuio_read_PCI_config(PNETUIO_CONTEXT_DATA netuio_contextdata, ULONG 
offset, UINT32 access_size, _Out_ UINT64 *output)
 {
+*output = 0;
 
netuio_contextdata->bus_interface.GetBusData(netuio_contextdata->bus_interface.Context,
  PCI_WHICHSPACE_CONFIG,
- buffer,
+ output,
  offset,
- sizeof(UINT32));
+ access_size);
 }
 
-VOID netuio_write_PCI_config(PNETUIO_CONTEXT_DATA netuio_contextdata, ULONG 
offset, PVOID buffer)
+VOID netuio_write_PCI_config(PNETUIO_CONTEXT_DATA netuio_contextdata, ULONG 
offset, UINT32 access_size, union dpdk_pci_config_io_data const *input)
 {
 
netuio_contextdata->bus_interface.SetBusData(netuio_contextdata->bus_interface.Context,
  PCI_WHICHSPACE_CONFIG,
- buffer,
+ (PVOID)input,
  offset,
- sizeof(UINT32));
+ access_size);
 }
 
 static NTSTATUS
@@ -180,6 +181,15 @@ netuio_evt_IO_device_control(_In_ WDFQUEUE Queue, _In_ 
WDFREQUEST Request,
 }
 
 struct dpdk_pci_config_io *dpdk_pci_io_input = (struct 
dpdk_pci_config_io *)input_buf;
+
+if (dpdk_pci_io_input->access_size != 1 &&
+dpdk_pci_io_input->access_size != 2 &&
+dpdk_pci_io_input->access_size != 4 &&
+dpdk_pci_io_input->access_size != 8) {
+status = STATUS_INVALID_PARAMETER;
+break;
+}
+
 // Ensure that the B:D:F match - otherwise, fail the IOCTL
 if ((netuio_contextdata->addr.bus_num != 
dpdk_pci_io_input->dev_addr.bus_num) ||
 (netuio_contextdata->addr.dev_num != 
dpdk_pci_io_input->dev_addr.dev_num) ||
@@ -188,7 +198,7 @@ netuio_evt_IO_device_control(_In_ WDFQUEUE Queue, _In_ 
WDFREQUEST Request,
 break;
 }
 // Retrieve output buffer
-status = WdfRequestRetrieveOutputBuffer(Request, sizeof(UINT32), 
&output_buf, &output_buf_size);
+status = WdfRequestRetrieveOutputBuffer(Request, sizeof(UINT64), 
&output_buf, &output_buf_size);
 if (!NT_SUCCESS(status)) {
 status = STATUS_INVALID_BUFFER_SIZE;
 break;
@@ -196,13 +206,24 @@ netuio_evt_IO_device_control(_In_ WDFQUEUE Queue, _In_ 
WDFREQUEST Request,
 ASSERT(output_buf_size == OutputBufferLength);
 
 if (dpdk_pci_io_input->op == PCI_IO_READ) {
-netuio_read_PCI_config(netuio_contextdata, 
dpdk_pci_io_input->offset, output_buf);
-bytes_returned = output_buf_size;
+netuio_read_PCI_config(netuio_contextdata,
+   dpdk_pci_io_input->offset,
+   dpdk_pci_io_input->access_size,
+   (UINT64*)output_buf);
+
+bytes_returned = sizeof(UINT64);
 }
-else {
-netuio_write_PCI_config(netuio_contextdata, 
dpdk_pci_io_input->offset, dpdk_pci_io_input->buf);
+else if (dpdk_pci_io_input->op == PCI_IO_WRITE) {
+netuio_write_PCI_config(netuio_contextdata,
+dpdk_pci_io_input->offset,
+dpdk_pci_io_input->access_size,
+ 

[dpdk-dev] [PATCH 07/22] doc: change the Windows UIO driver's default security descriptor to admin only

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 kernel/windows/netuio/netuio_dev.c | 54 +-
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/kernel/windows/netuio/netuio_dev.c 
b/kernel/windows/netuio/netuio_dev.c
index 10ff5f903..4d8b9430d 100644
--- a/kernel/windows/netuio/netuio_dev.c
+++ b/kernel/windows/netuio/netuio_dev.c
@@ -32,37 +32,43 @@ netuio_create_device(_Inout_ PWDFDEVICE_INIT DeviceInit)
 NTSTATUS status;
 
 PAGED_CODE();
-WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
 
-// Set the device context cleanup callback.
-// This function will be called when the WDF Device Object associated to 
the current device is destroyed
-deviceAttributes.EvtCleanupCallback = netuio_evt_device_context_cleanup;
+   // Ensure that only administrators can access our device object.
+   status = WdfDeviceInitAssignSDDLString(DeviceInit, 
&SDDL_DEVOBJ_SYS_ALL_ADM_ALL);
 
-status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
+   if (NT_SUCCESS(status)) {
+   WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
 
-if (NT_SUCCESS(status)) {
-// Create a device interface so that applications can find and talk to 
us.
-status = WdfDeviceCreateDeviceInterface(device, 
&GUID_DEVINTERFACE_netUIO, NULL);
+   // Set the device context cleanup callback.
+   // This function will be called when the WDF Device Object 
associated to the current device is destroyed
+   deviceAttributes.EvtCleanupCallback = 
netuio_evt_device_context_cleanup;
 
-if (NT_SUCCESS(status)) {
-// Retrieve and store PCI information
-status = get_pci_device_info(device);
-}
+   status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, 
&device);
+   }
 
-if (NT_SUCCESS(status)) {
-// Create a symbolic link name for user-space access
-status = create_device_specific_symbolic_link(device);
-}
+   if (NT_SUCCESS(status)) {
+   // Create a device interface so that applications can find and 
talk to us.
+   status = WdfDeviceCreateDeviceInterface(device, 
&GUID_DEVINTERFACE_netUIO, NULL);
+   }
 
-if (NT_SUCCESS(status)) {
-// Initialize the I/O Package and any Queues
-status = netuio_queue_initialize(device);
-}
+if (NT_SUCCESS(status)) {
+// Retrieve and store PCI information
+status = get_pci_device_info(device);
+}
 
-if (NT_SUCCESS(status)) {
-// Allocate physically contiguous memory for user process use. 
We'll map it later
-status = allocate_usermemory_segment(device);
-}
+if (NT_SUCCESS(status)) {
+// Create a symbolic link name for user-space access
+status = create_device_specific_symbolic_link(device);
+}
+
+if (NT_SUCCESS(status)) {
+// Initialize the I/O Package and any Queues
+status = netuio_queue_initialize(device);
+}
+
+if (NT_SUCCESS(status)) {
+// Allocate physically contiguous memory for user process use. We'll 
map it later
+status = allocate_usermemory_segment(device);
 }
 
 return status;
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 12/22] uio: Fix 64 bit BARs mapping

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 kernel/windows/netuio/netuio.inf |  12 +-
 kernel/windows/netuio/netuio_dev.c   | 181 +--
 kernel/windows/netuio/netuio_dev.h   |  15 +-
 kernel/windows/netuio/netuio_drv.c   |  43 +++---
 kernel/windows/netuio/netuio_drv.h   |   1 +
 kernel/windows/netuio/netuio_interface.h |  10 +-
 kernel/windows/netuio/netuio_queue.c | 176 ++
 kernel/windows/netuio/netuio_queue.h |   2 +
 8 files changed, 297 insertions(+), 143 deletions(-)

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index b1696cc50..4c4d5e047 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -38,7 +38,7 @@
 Signature="$WINDOWS NT$"
 Class=Net
 ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
-Provider=%ManufacturerName%
+Provider=%Intel%
 CatalogFile=netuio.cat
 DriverVer=
 
@@ -47,7 +47,8 @@ DriverVer=
 ;*
 
 [Manufacturer]
-%ManufacturerName%=Standard,NT$ARCH$
+%Intel%=Standard,NT$ARCH$
+%Broadcom%=Broadcom,NT$ARCH$
 
 [Standard.NT$ARCH$]
 %F1583.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_1583
@@ -56,6 +57,9 @@ DriverVer=
 %F37D0.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_37D0
 %F153B.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_153B
 
+[Broadcom.NT$ARCH$]
+%F16D7.netuio.Description%=netuio_Device, PCI\VEN_14E4&DEV_16D7
+
 [netuio_Device.NT]
 CopyFiles=Drivers_Dir
 
@@ -113,7 +117,8 @@ KmdfLibraryVersion = $KMDFVERSION$
 
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x0002
-ManufacturerName="Intel"
+Intel = "Intel"
+Broadcom = "Broadcom Corporation"
 ClassName = "Intel(R) DPDK netUIO Driver"
 DiskName = "DPDK netUIO Installation Disk"
 F1583.netuio.Description = "DPDK netUIO for Intel(R) Ethernet Converged 
Network Adapter XL710-Q2"
@@ -121,5 +126,6 @@ F158A.netuio.Description = "DPDK netUIO for Intel(R) 
Ethernet Network Adapter XX
 F158B.netuio.Description = "DPDK netUIO for Intel(R) Ethernet Network Adapter 
XXV710-DA1"
 F37D0.netuio.Description = "DPDK netUIO for Intel(R) Ethernet Connection X722"
 F153B.netuio.Description = "DPDK netUIO for Intel(R) Ethernet Connection 
I217-V"
+F16D7.netuio.Description = "DPDK netUIO for Broadcom P225p NetXtreme-E 
Dual-port 10Gb/25Gb Ethernet PCIe Adapter"
 netuio.DeviceDesc = "netuio Device"
 netuio.SVCDESC = "netuio Service"
diff --git a/kernel/windows/netuio/netuio_dev.c 
b/kernel/windows/netuio/netuio_dev.c
index a1fe447f7..3b5c95e84 100644
--- a/kernel/windows/netuio/netuio_dev.c
+++ b/kernel/windows/netuio/netuio_dev.c
@@ -27,16 +27,28 @@ Return Value:
 NTSTATUS
 netuio_create_device(_Inout_ PWDFDEVICE_INIT DeviceInit)
 {
-WDF_OBJECT_ATTRIBUTES deviceAttributes;
-WDFDEVICE device = NULL;
 NTSTATUS status;
+WDFDEVICE device = NULL;
+
+WDF_OBJECT_ATTRIBUTES deviceAttributes;
+WDF_PNPPOWER_EVENT_CALLBACKS pnpPowerCallbacks;
+WDF_FILEOBJECT_CONFIG fileConfig;
 
 PAGED_CODE();
 
-WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
+// Register PnP power management callbacks
+WDF_PNPPOWER_EVENT_CALLBACKS_INIT(&pnpPowerCallbacks);
+pnpPowerCallbacks.EvtDevicePrepareHardware = netuio_evt_prepare_hw;
+pnpPowerCallbacks.EvtDeviceReleaseHardware = netuio_evt_release_hw;
+WdfDeviceInitSetPnpPowerEventCallbacks(DeviceInit, &pnpPowerCallbacks);
+
+// Register callbacks for when a HANDLE is opened or closed.
+WDF_FILEOBJECT_CONFIG_INIT(&fileConfig, WDF_NO_EVENT_CALLBACK, 
WDF_NO_EVENT_CALLBACK, netuio_evt_file_cleanup);
+WdfDeviceInitSetFileObjectConfig(DeviceInit, &fileConfig, 
WDF_NO_OBJECT_ATTRIBUTES);
 
 // Set the device context cleanup callback.
 // This function will be called when the WDF Device Object associated to 
the current device is destroyed
+WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
 deviceAttributes.EvtCleanupCallback = netuio_evt_device_context_cleanup;
 
 status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
@@ -88,63 +100,112 @@ netuio_map_hw_resources(_In_ WDFDEVICE Device, _In_ 
WDFCMRESLIST Resources, _In_
 {
 UNREFERENCED_PARAMETER(Resources);
 
-NTSTATUS status = STATUS_SUCCESS;
+NTSTATUS status;
 
 PNETUIO_CONTEXT_DATA  netuio_contextdata;
 netuio_contextdata = netuio_get_context_data(Device);
 
-if (!netuio_contextdata)
+if (!netuio_contextdata) {
 return STATUS_UNSUCCESSFUL;
+}
 
-PCM_PARTIAL_RESOURCE_DESCRIPTOR descriptor;
-UINT8 bar_index = 0;
+PCI_COMMON_HEADER pci_config = {0};
+ULONG bytes_returned;
 
-// Collect device BAR resources from the ResourcesTranslated object
-for (ULONG idx = 0; idx < WdfCmResourceListGetCount(ResourcesTranslated); 
idx++) {
-descriptor = WdfCmResourceListGetDescriptor(ResourcesTranslated, idx);
-if (!descriptor) {
-status = STATUS_DEVICE_CONFIGURATION_ERROR;
-   

[dpdk-dev] [PATCH 15/22] uio: Remove co-installers section from inf

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

Co-installers are no longer needed.

Signed-off-by: Narcisa Vasile 
Reported-by: Dmitry Kozlyuk 
---
 kernel/windows/netuio/netuio.inf | 16 
 1 file changed, 16 deletions(-)

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index 4c4d5e047..35fe7c85c 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -85,30 +85,14 @@ StartType  = 3   ; SERVICE_DEMAND_START
 ErrorControl   = 1   ; SERVICE_ERROR_NORMAL
 ServiceBinary  = %12%\netuio.sys
 
-;
-;--- netuio_Device Coinstaller installation --
-;
-
 [DestinationDirs]
 DefaultDestDir = 12
-netuio_Device_CoInstaller_CopyFiles = 11
-
-[netuio_Device.NT.CoInstallers]
-AddReg=netuio_Device_CoInstaller_AddReg
-CopyFiles=netuio_Device_CoInstaller_CopyFiles
-
-[netuio_Device_CoInstaller_AddReg]
-HKR,,CoInstallers32,0x0001, 
"WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
-
-[netuio_Device_CoInstaller_CopyFiles]
-WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll
 
 [SourceDisksNames]
 1 = %DiskName%,,,""
 
 [SourceDisksFiles]
 netuio.sys  = 1,,
-WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll=1 ; make sure the number matches 
with SourceDisksNames
 
 [netuio_Device.NT.Wdf]
 KmdfService =  netuio, netuio_wdfsect
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 18/22] uio: Change the device setup class to a custom one

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

The netuio driver doesn't meet the necessary criteria to be in the
Net class. Update Class to a custom defined value.

Signed-off-by: Narcisa Vasile 
Reported-by: Dmitry Kozlyuk 
---
 kernel/windows/netuio/netuio.inf | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index 35fe7c85c..4f0dae114 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -36,12 +36,19 @@
 
 [Version]
 Signature="$WINDOWS NT$"
-Class=Net
-ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
+Class=%ClassName%
+ClassGuid={78912BC1-CB8E-4B28-A329-F322EBADBE0F}
 Provider=%Intel%
 CatalogFile=netuio.cat
 DriverVer=
 
+[ClassInstall32]
+Addreg=netuioClassReg
+
+[netuioClassReg]
+HKR,,,0,%ClassName%
+HKR,,Icon,,-5
+
 ;*
 ; Install Section
 ;*
@@ -103,7 +110,7 @@ KmdfLibraryVersion = $KMDFVERSION$
 SPSVCINST_ASSOCSERVICE= 0x0002
 Intel = "Intel"
 Broadcom = "Broadcom Corporation"
-ClassName = "Intel(R) DPDK netUIO Driver"
+ClassName = "Windows UIO"
 DiskName = "DPDK netUIO Installation Disk"
 F1583.netuio.Description = "DPDK netUIO for Intel(R) Ethernet Converged 
Network Adapter XL710-Q2"
 F158A.netuio.Description = "DPDK netUIO for Intel(R) Ethernet Network Adapter 
XXV710 for 25GbE backplane"
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 19/22] Enable DMA remapping through INF directive

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

---
 kernel/windows/netuio/netuio.inf | 4 
 1 file changed, 4 insertions(+)

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index 4f0dae114..419da53d3 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -91,6 +91,7 @@ ServiceType= 1   ; SERVICE_KERNEL_DRIVER
 StartType  = 3   ; SERVICE_DEMAND_START
 ErrorControl   = 1   ; SERVICE_ERROR_NORMAL
 ServiceBinary  = %12%\netuio.sys
+AddReg = DMAr.reg
 
 [DestinationDirs]
 DefaultDestDir = 12
@@ -120,3 +121,6 @@ F153B.netuio.Description = "DPDK netUIO for Intel(R) 
Ethernet Connection I217-V"
 F16D7.netuio.Description = "DPDK netUIO for Broadcom P225p NetXtreme-E 
Dual-port 10Gb/25Gb Ethernet PCIe Adapter"
 netuio.DeviceDesc = "netuio Device"
 netuio.SVCDESC = "netuio Service"
+
+[DMAr.reg]
+HKR,Parameters,DmaRemappingCompatible,0x00010001,1
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 16/22] uio: Wrap call into try/except block

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

MmMapLockedPagesSpecifyCache can raise an exception when
it cannot map the specified pages.

Signed-off-by: Narcisa Vasile 
Reported-by: Dmitry Kozlyuk 
---
 kernel/windows/netuio/netuio_queue.c | 36 ++--
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/kernel/windows/netuio/netuio_queue.c 
b/kernel/windows/netuio/netuio_queue.c
index 9c7ff7d06..c2bc998dc 100644
--- a/kernel/windows/netuio/netuio_queue.c
+++ b/kernel/windows/netuio/netuio_queue.c
@@ -53,13 +53,18 @@ netuio_map_address_into_user_process(_In_ 
PNETUIO_CONTEXT_DATA netuio_contextdat
 
 // Map the scratch memory regions to the user's process context
 MmBuildMdlForNonPagedPool(netuio_contextdata->dpdk_seg.mdl);
-netuio_contextdata->dpdk_seg.mem.user_mapped_virt_addr =
-MmMapLockedPagesSpecifyCache(
-netuio_contextdata->dpdk_seg.mdl, UserMode, MmCached,
-NULL, FALSE, (NormalPagePriority | MdlMappingNoExecute));
+__try {
+netuio_contextdata->dpdk_seg.mem.user_mapped_virt_addr =
+MmMapLockedPagesSpecifyCache(netuio_contextdata->dpdk_seg.mdl, 
UserMode,
+ MmCached, NULL, FALSE, 
NormalPagePriority);
 
-if (netuio_contextdata->dpdk_seg.mem.user_mapped_virt_addr == NULL) {
-status = STATUS_INSUFFICIENT_RESOURCES;
+if (netuio_contextdata->dpdk_seg.mem.user_mapped_virt_addr == NULL) {
+status = STATUS_INSUFFICIENT_RESOURCES;
+goto end;
+}
+}
+__except (EXCEPTION_EXECUTE_HANDLER) {
+status = GetExceptionCode();
 goto end;
 }
 
@@ -70,13 +75,18 @@ netuio_map_address_into_user_process(_In_ 
PNETUIO_CONTEXT_DATA netuio_contextdat
 }
 
 MmBuildMdlForNonPagedPool(netuio_contextdata->dpdk_hw[idx].mdl);
-netuio_contextdata->dpdk_hw[idx].mem.user_mapped_virt_addr =
-MmMapLockedPagesSpecifyCache(
-netuio_contextdata->dpdk_hw[idx].mdl, UserMode, MmCached,
-NULL, FALSE, (NormalPagePriority | MdlMappingNoExecute));
-
-if (netuio_contextdata->dpdk_hw[idx].mem.user_mapped_virt_addr == 
NULL) {
-status = STATUS_INSUFFICIENT_RESOURCES;
+__try {
+netuio_contextdata->dpdk_hw[idx].mem.user_mapped_virt_addr =
+
MmMapLockedPagesSpecifyCache(netuio_contextdata->dpdk_hw[idx].mdl, UserMode,
+ MmCached, NULL, FALSE, 
NormalPagePriority);
+
+if (netuio_contextdata->dpdk_hw[idx].mem.user_mapped_virt_addr == 
NULL) {
+status = STATUS_INSUFFICIENT_RESOURCES;
+goto end;
+}
+}
+__except (EXCEPTION_EXECUTE_HANDLER) {
+status = GetExceptionCode();
 goto end;
 }
 }
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 17/22] uio: Use request handler that guarantees execution in correct context

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

Use EvtIoInCallerContext to assure the requests are handled in the
right user thread context. If the request does not need to be handled in
a specific context, send it back to framework.

Signed-off-by: Narcisa Vasile 
Reported-by: Dmitry Kozlyuk 
---
 kernel/windows/netuio/netuio_dev.c   |   1 +
 kernel/windows/netuio/netuio_dev.h   |   1 -
 kernel/windows/netuio/netuio_queue.c | 242 ---
 kernel/windows/netuio/netuio_queue.h |   2 +
 4 files changed, 145 insertions(+), 101 deletions(-)

diff --git a/kernel/windows/netuio/netuio_dev.c 
b/kernel/windows/netuio/netuio_dev.c
index 3b5c95e84..e4e4570bc 100644
--- a/kernel/windows/netuio/netuio_dev.c
+++ b/kernel/windows/netuio/netuio_dev.c
@@ -50,6 +50,7 @@ netuio_create_device(_Inout_ PWDFDEVICE_INIT DeviceInit)
 // This function will be called when the WDF Device Object associated to 
the current device is destroyed
 WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&deviceAttributes, 
NETUIO_CONTEXT_DATA);
 deviceAttributes.EvtCleanupCallback = netuio_evt_device_context_cleanup;
+WdfDeviceInitSetIoInCallerContextCallback(DeviceInit, 
netuio_evt_IO_in_caller_context);
 
 status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
 
diff --git a/kernel/windows/netuio/netuio_dev.h 
b/kernel/windows/netuio/netuio_dev.h
index 59956720e..6a9b1ff82 100644
--- a/kernel/windows/netuio/netuio_dev.h
+++ b/kernel/windows/netuio/netuio_dev.h
@@ -58,7 +58,6 @@ static NTSTATUS create_device_specific_symbolic_link(_In_ 
WDFOBJECT device);
 static NTSTATUS allocate_usermemory_segment(_In_ WDFOBJECT device);
 static VOID free_usermemory_segment(_In_ WDFOBJECT device);
 
-
 EXTERN_C_END
 
 #endif // NETUIO_DEV_H
diff --git a/kernel/windows/netuio/netuio_queue.c 
b/kernel/windows/netuio/netuio_queue.c
index c2bc998dc..7714a4d3a 100644
--- a/kernel/windows/netuio/netuio_queue.c
+++ b/kernel/windows/netuio/netuio_queue.c
@@ -168,135 +168,177 @@ netuio_queue_initialize(_In_ WDFDEVICE Device)
 
 /*
 Routine Description:
-This event is invoked when the framework receives IRP_MJ_DEVICE_CONTROL 
request.
+This routine is invoked to preprocess an I/O request before being placed 
into a queue.
+It is guaranteed that it executes in the context of the process that 
generated the request.
 
 Return Value:
 None
  */
+_Use_decl_annotations_
 VOID
-netuio_evt_IO_device_control(_In_ WDFQUEUE Queue, _In_ WDFREQUEST Request,
-  _In_ size_t OutputBufferLength, _In_ size_t 
InputBufferLength,
-  _In_ ULONG IoControlCode)
+netuio_evt_IO_in_caller_context(
+IN WDFDEVICE  Device,
+IN WDFREQUEST Request
+)
 {
-UNREFERENCED_PARAMETER(OutputBufferLength);
-UNREFERENCED_PARAMETER(InputBufferLength);
-
+WDF_REQUEST_PARAMETERS params = { 0 };
 NTSTATUS status = STATUS_SUCCESS;
 PVOIDinput_buf = NULL, output_buf = NULL;
 size_t   input_buf_size, output_buf_size;
 size_t  bytes_returned = 0;
+PNETUIO_CONTEXT_DATA  netuio_contextdata = NULL;
 
-WDFDEVICE device = WdfIoQueueGetDevice(Queue);
+netuio_contextdata = netuio_get_context_data(Device);
 
-PNETUIO_CONTEXT_DATA  netuio_contextdata;
-netuio_contextdata = netuio_get_context_data(device);
+WDF_REQUEST_PARAMETERS_INIT(¶ms);
+WdfRequestGetParameters(Request, ¶ms);
 
-switch (IoControlCode) {
-case IOCTL_NETUIO_MAP_HW_INTO_USERMODE:
-// First retrieve the input buffer and see if it matches our device
-status = WdfRequestRetrieveInputBuffer(Request, sizeof(struct 
dpdk_private_info), &input_buf, &input_buf_size);
-if (!NT_SUCCESS(status)) {
-status = STATUS_INVALID_BUFFER_SIZE;
-break;
-}
+// We only need to be in the context of the process that initiated the 
request
+//when we need to map memory to userspace. Otherwise, send the request 
back to framework.
+if (!((params.Type == WdfRequestTypeDeviceControl) &&
+(params.Parameters.DeviceIoControl.IoControlCode == 
IOCTL_NETUIO_MAP_HW_INTO_USERMODE)))
+{
+status = WdfDeviceEnqueueRequest(Device, Request);
 
-struct dpdk_private_info *dpdk_pvt_info = (struct dpdk_private_info 
*)input_buf;
-// Ensure that the B:D:F match - otherwise, fail the IOCTL
-if ((netuio_contextdata->addr.bus_num != 
dpdk_pvt_info->dev_addr.bus_num) ||
-(netuio_contextdata->addr.dev_num != 
dpdk_pvt_info->dev_addr.dev_num) ||
-(netuio_contextdata->addr.func_num != 
dpdk_pvt_info->dev_addr.func_num)) {
-status = STATUS_NOT_SAME_DEVICE;
-break;
+if (!NT_SUCCESS(status))
+{
+WdfRequestCompleteWithInformation(Request, status, bytes_returned);
 }
+return;
+}
 
-if (netuio_contextdata->dpdk_seg.mem.user_mapped_virt_addr != NULL) {
-status = STATUS_ALREADY_COMMITTED;
-break;
-}
+// Firs

[dpdk-dev] [PATCH 22/22] Move all files under windows folder

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

---
 {kernel => windows/netuio/kernel}/README_NetUIO.rst |   0
 .../netuio/kernel}/windows/netuio/netuio.inf|   0
 .../netuio/kernel}/windows/netuio/netuio.rc | Bin
 .../netuio/kernel}/windows/netuio/netuio_dev.c  |   0
 .../netuio/kernel}/windows/netuio/netuio_dev.h  |   0
 .../netuio/kernel}/windows/netuio/netuio_drv.c  |   0
 .../netuio/kernel}/windows/netuio/netuio_drv.h  |   0
 .../kernel}/windows/netuio/netuio_interface.h   |   0
 .../netuio/kernel}/windows/netuio/netuio_queue.c|   0
 .../netuio/kernel}/windows/netuio/netuio_queue.h|   0
 .../netuio/kernel}/windows/netuio/resource.h|   0
 .../netuio/mk}/exec-env/windows/netuio/netuio.sln   |   0
 .../mk}/exec-env/windows/netuio/netuio.vcxproj  |   0
 .../exec-env/windows/netuio/netuio.vcxproj.filters  |   0
 .../mk}/exec-env/windows/netuio/netuio.vcxproj.user |   0
 15 files changed, 0 insertions(+), 0 deletions(-)
 rename {kernel => windows/netuio/kernel}/README_NetUIO.rst (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio.inf (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio.rc (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_dev.c (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_dev.h (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_drv.c (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_drv.h (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_interface.h 
(100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_queue.c (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/netuio_queue.h (100%)
 rename {kernel => windows/netuio/kernel}/windows/netuio/resource.h (100%)
 rename {mk => windows/netuio/mk}/exec-env/windows/netuio/netuio.sln (100%)
 rename {mk => windows/netuio/mk}/exec-env/windows/netuio/netuio.vcxproj (100%)
 rename {mk => 
windows/netuio/mk}/exec-env/windows/netuio/netuio.vcxproj.filters (100%)
 rename {mk => windows/netuio/mk}/exec-env/windows/netuio/netuio.vcxproj.user 
(100%)

diff --git a/kernel/README_NetUIO.rst b/windows/netuio/kernel/README_NetUIO.rst
similarity index 100%
rename from kernel/README_NetUIO.rst
rename to windows/netuio/kernel/README_NetUIO.rst
diff --git a/kernel/windows/netuio/netuio.inf 
b/windows/netuio/kernel/windows/netuio/netuio.inf
similarity index 100%
rename from kernel/windows/netuio/netuio.inf
rename to windows/netuio/kernel/windows/netuio/netuio.inf
diff --git a/kernel/windows/netuio/netuio.rc 
b/windows/netuio/kernel/windows/netuio/netuio.rc
similarity index 100%
rename from kernel/windows/netuio/netuio.rc
rename to windows/netuio/kernel/windows/netuio/netuio.rc
diff --git a/kernel/windows/netuio/netuio_dev.c 
b/windows/netuio/kernel/windows/netuio/netuio_dev.c
similarity index 100%
rename from kernel/windows/netuio/netuio_dev.c
rename to windows/netuio/kernel/windows/netuio/netuio_dev.c
diff --git a/kernel/windows/netuio/netuio_dev.h 
b/windows/netuio/kernel/windows/netuio/netuio_dev.h
similarity index 100%
rename from kernel/windows/netuio/netuio_dev.h
rename to windows/netuio/kernel/windows/netuio/netuio_dev.h
diff --git a/kernel/windows/netuio/netuio_drv.c 
b/windows/netuio/kernel/windows/netuio/netuio_drv.c
similarity index 100%
rename from kernel/windows/netuio/netuio_drv.c
rename to windows/netuio/kernel/windows/netuio/netuio_drv.c
diff --git a/kernel/windows/netuio/netuio_drv.h 
b/windows/netuio/kernel/windows/netuio/netuio_drv.h
similarity index 100%
rename from kernel/windows/netuio/netuio_drv.h
rename to windows/netuio/kernel/windows/netuio/netuio_drv.h
diff --git a/kernel/windows/netuio/netuio_interface.h 
b/windows/netuio/kernel/windows/netuio/netuio_interface.h
similarity index 100%
rename from kernel/windows/netuio/netuio_interface.h
rename to windows/netuio/kernel/windows/netuio/netuio_interface.h
diff --git a/kernel/windows/netuio/netuio_queue.c 
b/windows/netuio/kernel/windows/netuio/netuio_queue.c
similarity index 100%
rename from kernel/windows/netuio/netuio_queue.c
rename to windows/netuio/kernel/windows/netuio/netuio_queue.c
diff --git a/kernel/windows/netuio/netuio_queue.h 
b/windows/netuio/kernel/windows/netuio/netuio_queue.h
similarity index 100%
rename from kernel/windows/netuio/netuio_queue.h
rename to windows/netuio/kernel/windows/netuio/netuio_queue.h
diff --git a/kernel/windows/netuio/resource.h 
b/windows/netuio/kernel/windows/netuio/resource.h
similarity index 100%
rename from kernel/windows/netuio/resource.h
rename to windows/netuio/kernel/windows/netuio/resource.h
diff --git a/mk/exec-env/windows/netuio/netuio.sln 
b/windows/netuio/mk/exec-env/windows/netuio/netuio.sln
similarity index 100%
rename from mk/exec-env/windows/netuio/netuio.sln
rename to windows/netuio/mk/exec-env/windows/netuio/netuio.sln
diff --git a/mk/exec-env/windows/netuio/netuio.vcxproj 
b/windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj
simil

[dpdk-dev] [PATCH 06/22] Windows DPDK libraries and applications have now been updated to the latest public release v18.08, of the main DPDK source.

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

---
 kernel/windows/netuio/netuio.inf | 118 +
 kernel/windows/netuio/netuio.rc  | Bin 0 -> 4772 bytes
 kernel/windows/netuio/netuio_dev.c   | 306 +++
 kernel/windows/netuio/netuio_dev.h   |  65 +
 kernel/windows/netuio/netuio_drv.c   | 142 +++
 kernel/windows/netuio/netuio_drv.h   |  33 +++
 kernel/windows/netuio/netuio_interface.h |  69 +
 kernel/windows/netuio/netuio_queue.c | 271 
 kernel/windows/netuio/netuio_queue.h |  30 +++
 kernel/windows/netuio/resource.h |  14 ++
 10 files changed, 1048 insertions(+)
 create mode 100644 kernel/windows/netuio/netuio.inf
 create mode 100644 kernel/windows/netuio/netuio.rc
 create mode 100644 kernel/windows/netuio/netuio_dev.c
 create mode 100644 kernel/windows/netuio/netuio_dev.h
 create mode 100644 kernel/windows/netuio/netuio_drv.c
 create mode 100644 kernel/windows/netuio/netuio_drv.h
 create mode 100644 kernel/windows/netuio/netuio_interface.h
 create mode 100644 kernel/windows/netuio/netuio_queue.c
 create mode 100644 kernel/windows/netuio/netuio_queue.h
 create mode 100644 kernel/windows/netuio/resource.h

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
new file mode 100644
index 0..0453b371a
--- /dev/null
+++ b/kernel/windows/netuio/netuio.inf
@@ -0,0 +1,118 @@
+;
+;   BSD LICENSE
+;
+;   Copyright(c) 2010-2018 Intel Corporation. All rights reserved.
+;   All rights reserved.
+;
+;   Redistribution and use in source and binary forms, with or without
+;   modification, are permitted provided that the following conditions
+;   are met:
+;
+; * Redistributions of source code must retain the above copyright
+;   notice, this list of conditions and the following disclaimer.
+; * 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.
+; * Neither the name of Intel Corporation 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 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+;   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+;   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+;   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+;   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;
+;
+; netuio.inf
+;
+
+[Version]
+Signature="$WINDOWS NT$"
+Class=Net
+ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
+Provider=%ManufacturerName%
+CatalogFile=netuio.cat
+DriverVer=
+
+;*
+; Install Section
+;*
+
+[Manufacturer]
+%ManufacturerName%=Standard,NT$ARCH$
+
+[Standard.NT$ARCH$]
+%F1583.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_1583
+%F158A.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_158A   ; 
I40E_DEV_ID_25G_B
+%F158B.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_158B   ; 
I40E_DEV_ID_25G_SFP28
+%F37D0.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_37D0
+%F153B.netuio.Description%=netuio_Device, PCI\VEN_8086&DEV_153B
+
+[netuio_Device.NT]
+CopyFiles=Drivers_Dir
+
+[Drivers_Dir]
+netuio.sys
+
+;-- Service installation
+[netuio_Device.NT.Services]
+AddService = netuio,%SPSVCINST_ASSOCSERVICE%, netuio_Service_Inst
+
+; -- netuio driver install sections
+[netuio_Service_Inst]
+DisplayName= %netuio.SVCDESC%
+ServiceType= 1   ; SERVICE_KERNEL_DRIVER
+StartType  = 3   ; SERVICE_DEMAND_START
+ErrorControl   = 1   ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %12%\netuio.sys
+
+;
+;--- netuio_Device Coinstaller installation --
+;
+
+[DestinationDirs]
+DefaultDestDir = 12
+netuio_Device_CoInstaller_CopyFiles = 11
+
+[netuio_Device.NT.CoInstallers]
+AddReg=netuio_Device_CoInstaller_AddReg
+CopyFiles=netuio_Device_CoInstaller_CopyFiles
+
+[netuio_Device_CoInstaller_AddReg]
+HKR,,CoInstallers32,0x0001, 
"WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
+
+[netuio_Device_CoInstaller_CopyFiles]
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll
+
+[SourceDisksNames]
+1 = %DiskName%,,,""
+
+[SourceDisksFiles]
+netuio.sys  = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll=1 ; make sure

[dpdk-dev] [PATCH 21/22] doc: updating REAME for NetUIO driver

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

Signed-off-by: Harini Ramakrishnan 
---
 kernel/README_NetUIO.rst | 63 
 1 file changed, 63 insertions(+)
 create mode 100644 kernel/README_NetUIO.rst

diff --git a/kernel/README_NetUIO.rst b/kernel/README_NetUIO.rst
new file mode 100644
index 0..9b21a4a8b
--- /dev/null
+++ b/kernel/README_NetUIO.rst
@@ -0,0 +1,63 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2020 Microsoft Corporation.
+
+Compiling the NetUIO Driver from Source
+===
+
+Operating System
+
+
+The NetUIO source has been validated against the following operating systems:
+
+* Windows Server 2016
+* Windows Server 2019
+
+Hardware Requirements
+~
+The NetUIO driver has been validated using the following network adapters on 
the Windows platform:
+
+*
+*
+
+Software Requirements
+~
+
+* Install Microsoft Visual Studio 2017 or Visual Stuido Studio 2019 Enterprise 
from https://visualstudio.microsoft.com/downloads/ 
+   * During installation ensure following components are selected:
+   Windows 10 SDK (10.0.15063.0) 
+   Windows 10 SDK (10.0.17763.0)
+   Windows Drivers Kit
+   
+* Install WDK for Windows 10 (10.0.17763.1) from 
https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk 
+
+Building the NetUIO Driver
+--
+Follow the steps below to build the NetUIO driver and install the driver for 
the network adapter. 
+
+* Clone the dpdk-kmods repository: git clone git://dpdk.org/dpdk-kmods
+* Navigate to \dpdk-kmods\windows\netuio\mk\exec-env\windows\netuio
+* Load netuio.sln in Microsoft Visual Studio 2017 or 2019
+* Choose Release as the configuration mode and Build the solution
+* The resultant output files can be found in 
\dpdk-kmods\windows\netuio\x64\Release\netuio
+ 
+Installing netuio.sys Driver for development
+
+NOTE: In a development environment, NetUIO driver can be loaded by enabling 
test-signing. 
+Please implement adequate precautionary measures before installing a 
test-signed driver, replacing a signed-driver.
+
+To ensure test-signed kernel-mode drivers can load on Windows, enable 
test-signing, using the following BCDEdit command.
+
+C:\windows\system32>Bcdedit.exe -set TESTSIGNING ON
+
+Windows displays the text “Test Mode” to remind users the system has 
test-signing enabled. 
+Refer to the MSDN documentation on how to Test-Sign a Driver Package.
+ 
+To procure a WHQL signed NetUIO driver for Windows, please reach out to 
dpdk...@microsoft.com
+
+* Go to Device Manager -> Network Adapters.
+* Right Click on target network adapter -> Select Update Driver.
+* Select “Browse my computer for driver software”.
+* In the resultant Window, select “Let me pick from a list of available 
drivers on my computer”.
+* Select “DPDK netUIO for Network Adapter” from the list of drivers.
+* The NetUIO.sys driver is successfully installed.
+ 
\ No newline at end of file
-- 
2.23.0.vfs.1.1.63.g5a5ad7f

[dpdk-dev] [PATCH 20/22] license: update headers with BSD 3-clause license:

[Narcisa Ana Maria Vasile]

From: Harini Ramakrishnan 

Signed-off-by: Harini Ramakrishnan 
---
 kernel/windows/netuio/netuio.inf |   3 +-
 kernel/windows/netuio/netuio.rc  | Bin 4772 -> 8098 bytes
 kernel/windows/netuio/netuio_dev.c   |  32 +++--
 kernel/windows/netuio/netuio_dev.h   |  32 +++--
 kernel/windows/netuio/netuio_drv.c   |  34 ---
 kernel/windows/netuio/netuio_drv.h   |  32 +++--
 kernel/windows/netuio/netuio_interface.h |  34 ---
 kernel/windows/netuio/netuio_queue.c |  34 ---
 kernel/windows/netuio/netuio_queue.h |  34 ---
 9 files changed, 208 insertions(+), 27 deletions(-)

diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index 419da53d3..9ccc59f8c 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -1,8 +1,7 @@
 ;
 ;   BSD LICENSE
 ;
-;   Copyright(c) 2010-2018 Intel Corporation. All rights reserved.
-;   All rights reserved.
+;   Copyright (c) Microsoft Corporation. All rights reserved
 ;
 ;   Redistribution and use in source and binary forms, with or without
 ;   modification, are permitted provided that the following conditions
diff --git a/kernel/windows/netuio/netuio.rc b/kernel/windows/netuio/netuio.rc
index 
4b0b176e6284fcfa65662f7ea6b3b1b36fb85a6d..63908e5bf29bb3de0cf1e768049b1ad501639363
 100644
GIT binary patch
literal 8098
zcmdU!TW{M&5QX=-K>q`)yd-JhOK#}pNtR^CsBF2q*a;B8h;OL@TQVfMZh-#ww&$DC
zn50Anv6BZE1VwVWJA3BLWrwSO|5;5>)A#AS^lQrO*hsz9)LlDmr$%a}T|KvEJ&OGr
zX_T(gr!-FI>0|mMO*Q6mI!;e?-BH`I-i*>j=b62u|5zjV{h*d}-3`-NT~oN9p=jZl*bg8kMOHDVgRQ>K8oM>V0f&(dWqCeo*@-
z^*J+)m+JdWPd9oum42DE=FiBPmYBO#j}!Gi(|KIb5h=(9#g%@?>C$9Qbq~TTwTz_Y
zxt_d*`QRwCnHdKrSQ;6gp%~9J2MjV}usJE=i8(JNb((&uU=WKx)%iIlu?04q=Z@LI
zn@Jlu1}!>Hh1|JD3*LW7N9v0e9dp@hiazBYm`SUV>4cSF4@uZL69aDVz*NOSZu>w`
z#U8v(#NmbEg`=^&aURW=u;bcR`_Mc)ZtD{<<{lUb|34ggB+c`LNJI6{k|P@qA0
z+P3L(DrA}RVpT44zeSgM8F>sbQ#ne*=iQTwsF{P2FhgECGBlpg$Qx6k$kav-@V<@~
z1kM~8i7XS(?sp)_EOz0#m|X*lU(YoENV6B?FY@_~FnLA`i+DaHOOWG^CE4?!&rP-m
z*NuMR0954TJReRpGS&pQYSFg+^hWDZPa}G%lQvU79cbO?YGul1?R$Faq2T-k@RZl?Veh?>anG^zS`cXt!@3gCcCcHj*;};RS)`Zq=D`_y6=^;LrwF82UIm(
zV=PzZZKb!G4}?AIhXi`>sFk(VF}fCA8{N0oo@KmkNolCxKzO*{vR22E>A53JMShUD
zqq9Gg3t}>7X#XYiW*W1pF*}mc)$DI(sOsWi+c5V{v(R+Y=G(p1aMM^SqN+>Uo}_ez
zgKAd14z
z3<|f&GHc^OV1rvYXxo!(>GsCXAO?Fwcwii)Rc#Hu!85@P;%6oM^~41-n2C4pKdqU!
zz|K2sEh2`w-^HWL^pW7HYgAnxgXd9`eJfw`2*Zl#i*4Kn?lnENQ#)emzV7kFOei`!
znuf%&gSu;RN_E+@y0dM509uzdP3>emxT)G55Xt
ztp~v&nFo)`y{|0IHTAqy&IDEVCURP`1<3FVatqdRDdZAIb)fe!4=?x}PjI)TXRg5j
z+SF$nW9iU5vW@dshc@%If$@DE(7eIJHS`YPTmV|B!iXX
z!7G5LY1Lv6e5*RDzgPCP8ckHiP>W!vA9ZA^yIHrW6sXU=T4xRBGYqME37i|~>4V=ZM~SlJUJL>O77lMZF4mT`rTwq=z=y?>|p
z+|b*$?n6&7JiH^&#g&|~$Z@$Afd}IGt$vHy4ZnD8ub*{^D4@Aa)@Iok`#EEbBCp(Mj;d@^o9*JbhkCxLrT5A|@8!{+`*W1b5WTo3
zqPx!X$nvr8Yy~QEL{+|7^tQ0k!^$c}G$7P6}g*4;z%
zF1`&IO@$Y4V1#x?XS$<~i)u6aWb(OZ>9tO-uV#I{zHKVnsRYYXGx@ytX2jZ@^i9hy
zTf)GXKu@vH41c8;S|!@n7q2|KT{p;XE!7JHMM)WFF3BaV-;QS|gq_vT_g^dY_r1!q
zxehSMbr4#A0RZyEQRqQx<9(o7AaOAtf?cCu5gstS8@F
zXDyGNKkrS2&2BbU@SSdt!294VM{nR;QziadC)Za?EK#k0usIe!z6R#mb`7rOH6zKM
z$R3kB$#09Vk0u!o%Ddx%e(??UPs8ew=hA6C{baTetjjIGA}ho{E?r^v|86E~?V5ez
z-S-4n?xaP>?EFy@ou%*^o{GNtwQTK~hr~|iye*oVjVh4uLw5F=jc>qH(~192t_%&H
zmdRVG9&@ieF!b!E-rUiKWmMH3xIXhfJaAbq$ZL-9#l@C#j@g%%ETG

Re: [dpdk-dev] [PATCH v3 2/7] app/proc-info: eliminate useless borders

[Varghese, Vipin]

snipped
> >
> > snipped
> > >
> > > 15/07/2020 23:22, Stephen Hemminger:
> > > > Printing extra borders does not improve readability, and is just
> > > > unnecessary. Putting TSC hz in header also makes no sense here.
> > >
> > > The CPU frequency on headers!
> > > OK to remove :)
> > >
> >
> > The rational of having Time Stamp Counter as the header for port info and
> stats, is to account for each iteration for an average `packets per second`. 
> That
> is using `watch -d -n 1 ./dpdk-procinfo -- --xstats | grep -v ": 0"`.
> >
> > But if there better way to do this or add as new feature, +1 to remove.
> 
> Proc info should just use standard clock for its updates, not TSC?

Can you please explain the rationale behind the (syscall for time) and not TSC?

Re: [dpdk-dev] [PATCH v3 2/7] app/proc-info: eliminate useless borders

[Varghese, Vipin]

snipped
> 
> snipped
> > >
> > > snipped
> > > >
> > > > 15/07/2020 23:22, Stephen Hemminger:
> > > > > Printing extra borders does not improve readability, and is just
> > > > > unnecessary. Putting TSC hz in header also makes no sense here.
> > > >
> > > > The CPU frequency on headers!
> > > > OK to remove :)
> > > >
> > >
> > > The rational of having Time Stamp Counter as the header for port
> > > info and
> > stats, is to account for each iteration for an average `packets per
> > second`. That is using `watch -d -n 1 ./dpdk-procinfo -- --xstats | grep -v 
> > ": 0"`.
> > >
> > > But if there better way to do this or add as new feature, +1 to remove.
> >
> > Proc info should just use standard clock for its updates, not TSC?
> 
> Can you please explain the rationale behind the (syscall for time) and not 
> TSC?

Looking forward for the patch with clock change too.

Re: [dpdk-dev] [PATCH v3] net/virtio: fix wrong variable assignment in helper macro

[Xia, Chenbo]

> -Original Message-
> From: Vipul Ashri 
> Sent: Friday, August 14, 2020 12:22 AM
> To: dev@dpdk.org
> Cc: Xia, Chenbo ; vipul.as...@oracle.com;
> edwin.le...@oracle.com; sta...@dpdk.org; Wang, Zhihong
> ; maxime.coque...@redhat.com
> Subject: [PATCH v3] net/virtio: fix wrong variable assignment in helper
> macro
> 
> Inside Macro ASSIGN_UNLESS_EQUAL(var, val), assignment to var is always
> failing as assignment done using var_ having local scope only.
> This leads to TX packets not going out and found broken due to cleanup
> malfunctioning. This patch fixes the wrong variable assignment.
> 
> Fixes: 57f90f894588 ("net/virtio: reuse packed ring functions")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Vipul Ashri 
> ---
>  drivers/net/virtio/virtqueue.h | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtqueue.h
> b/drivers/net/virtio/virtqueue.h
> index 105a9c00c..20c95471e 100644
> --- a/drivers/net/virtio/virtqueue.h
> +++ b/drivers/net/virtio/virtqueue.h
> @@ -607,10 +607,8 @@ virtqueue_notify(struct virtqueue *vq)
> 
>  /* avoid write operation when necessary, to lessen cache issues */
>  #define ASSIGN_UNLESS_EQUAL(var, val) do {   \
> - typeof(var) var_ = (var);   \
> - typeof(val) val_ = (val);   \
> - if ((var_) != (val_))   \
> - (var_) = (val_);\
> + if ((var) != (val)) \
> + (var) = (val);  \
>  } while (0)
> 
>  #define virtqueue_clear_net_hdr(hdr) do {\
> --
> 2.28.0.windows.1

Reviewed-by: Chenbo Xia 

Re: [dpdk-dev] [PATCH v6 4/5] ci: add aarch64 -> aarch32 cross compiling jobs

[Ruifeng Wang]

> -Original Message-
> From: dev  On Behalf Of Juraj Linke?
> Sent: Thursday, August 13, 2020 5:21 PM
> To: bruce.richard...@intel.com; acon...@redhat.com;
> maicolgabr...@hotmail.com
> Cc: juraj.lin...@pantheon.tech; dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v6 4/5] ci: add aarch64 -> aarch32 cross compiling
> jobs
> 
> Add two jobs (static and shared libs), both building on aarch64 and producing
> 32-bit arm binaries executable on armv8-a, but not armv7.
> Do not run tests in these jobs.
> 
> Signed-off-by: Juraj Linkeš 
> ---
>  .ci/linux-build.sh |  7 ++-
>  .travis.yml| 19 +++
>  2 files changed, 25 insertions(+), 1 deletion(-)
> 
Hi Juraj,

This patch has apply issue.
Can you rebase and send a new version?

Thanks.
/Ruifeng

> diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 
> d079801d7..c042b065c
> 100755
> --- a/.ci/linux-build.sh
> +++ b/.ci/linux-build.sh
> @@ -33,6 +33,11 @@ if [ "$AARCH64" = "1" ]; then
>  OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_gcc"
>  fi
> 
> +if [ "$AARCH32" = "1" ]; then
> +# convert the arch specifier
> +OPTS="$OPTS --cross-file config/arm/arm32_armv8a_linux_gcc"
> +fi
> +
>  if [ "$BUILD_DOCS" = "1" ]; then
>  OPTS="$OPTS -Denable_docs=true"
>  fi
> @@ -53,7 +58,7 @@ OPTS="$OPTS --buildtype=debugoptimized"
>  meson build --werror $OPTS
>  ninja -C build
> 
> -if [ "$AARCH64" != "1" ]; then
> +if file build/app/dpdk-testpmd | sed 's/-/_/g' | grep -q "$(uname -m)";
> +then
>  devtools/test-null.sh
>  fi
> 
> diff --git a/.travis.yml b/.travis.yml
> index 14f812423..966b657a7 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -21,6 +21,10 @@ _aarch64_packages: &aarch64_packages
>- *required_packages
>- [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-
> gnu]
> 
> +_arm_32b_packages: &arm_32b_packages
> +  - *required_packages
> +  - [gcc-arm-linux-gnueabihf, libc6-dev-armhf-cross,
> +pkg-config-arm-linux-gnueabihf]
> +
>  _libabigail_build_packages: &libabigail_build_packages
>- [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
> 
> @@ -124,6 +128,21 @@ jobs:
>  packages:
>- *required_packages
>- *libabigail_build_packages
> +  # aarch64 cross-compiling aarch32 jobs
> +  - env: DEF_LIB="shared" AARCH32=1
> +arch: arm64
> +compiler: gcc
> +addons:
> +  apt:
> +packages:
> +  - *arm_32b_packages
> +  - env: DEF_LIB="static" AARCH32=1
> +arch: arm64
> +compiler: gcc
> +addons:
> +  apt:
> +packages:
> +  - *arm_32b_packages
># aarch64 clang jobs
>- env: DEF_LIB="static"
>  arch: arm64
> --
> 2.20.1

Re: [dpdk-dev] [dpdk-dev, 1/3] rte_interrupts: add rte_eal_intr_exit to shut down IRQ thread

[Bly, Mike]

Has anyone created a dev-ticket to run this discussion to ground? I see below 
thread went stale in 2016...



Is there a "better approach" to integrating rte_eal_intr_exit() 
support/concepts into our applications?



-Mike



From: "Liang, Cunming" 

To: Thomas Monjalon 

Cc: Matthew Hall , "dev@dpdk.org" 

Subject: Re: [dpdk-dev] [dpdk-dev, 1/3] rte_interrupts: add rte_eal_intr_exit 
to shut down IRQ 
thread

Date: Mon, 11 Jul 2016 04:07:29 +

Message-ID: 
 
(raw)

In-Reply-To: 
<7816883.NtLY7W8fN8@xps13>



Hi Thomas,



Base on the previous conversation, at least it requires v2 to reword some 
comments.



> > >> 2. I propose to add addition comments on rte_epoll_wait() API

> > >> description. For any signal, it causes an error return, user needs

> > >> to handle.

> > > Agreed.



In addition, one conversion is not close.



> > >> the default termination handler

> > > I am not so experienced with this "default termination handler". Can

> someone

> > > clarify what it is so I could comment better about it?

> > For example, you're handling SIGINT. After finishing your necessary app

> > cleanup, then 'signal(SIGINT, SIG_DFL); raise(SIGINT);'.

> > The default signal handler can terminate the interrupt thread.



> > >> 1. Can you explain and add patch comments why default signal handler

> > >> is not good enough to terminate app.

> > > Yes if someone call tell me more about what it is so I can check it.



Thanks,

Cunming



> -Original Message-

> From: Thomas Monjalon [mailto:thomas.monja...@6wind.com]

> Sent: Saturday, July 09, 2016 1:36 AM

> To: Liang, Cunming 

> Cc: Matthew Hall ; dev@dpdk.org

> Subject: Re: [dpdk-dev,1/3] rte_interrupts: add rte_eal_intr_exit to shut down

> IRQ thread

>

> Cunming, what is the status of this patchset, please?

>

> 2016-03-23 11:24, Liang, Cunming:

> > Hi Mattew,

> >

> > Thank you for your time.

> >

> > On 3/22/2016 3:39 PM, Matthew Hall wrote:

> > > On Mon, Mar 21, 2016 at 03:58:44PM +0800, Liang, Cunming wrote:

> > >> the default termination handler

> > > I am not so experienced with this "default termination handler". Can

> someone

> > > clarify what it is so I could comment better about it?

> > For example, you're handling SIGINT. After finishing your necessary app

> > cleanup, then 'signal(SIGINT, SIG_DFL); raise(SIGINT);'.

> > The default signal handler can terminate the interrupt thread.

> >

> > >

> > >> If EINTR is caused by some non-term purpose signals, are you going

> > >> to exit the interrupt thread any way?

> > > We should discuss what makes sense here. I'm just trying to get some 
> > > things

> > > working and finding EINTR was getting eaten and causing infinite looping.

> > SIGINT/SIGTERM causes EINTR return, while SIGUSR1 also can cause the

> > EINTR return. For the dedicated EAL interrupt thread, it won't be

> > expected to exit for all kinds of the cause.

> > On this view, I'm in favor of your patch which cancel the interrupt

> > thread, but don't directly return by the EINTR.

> >

> > >

> > >> Without setting 'PTHREAD_CREATE_DETACHED' won't cause the infinite

> > >> loop. However by using pthread_cancel to terminate the thread,

> > >> indeed it's necessary to set 'PTHREAD_CREATE_DETACHED'.

> > > My general understanding is that PTHREAD_CREATE_DETACHED should be

> used for

> > > any thread, which should not keep a process open by itself if it is 
> > > executing,

> > > i.e. a "daemon thread". I believe the interrupt thread qualifies as such a

> > > thread if I have understood everything right (which is hard to promise 
> > > when

> > > you only work in DPDK in spare time).

> > >

> > >> It looks like 'pthread_cancel' is the right way and I saw it

> > >> continue keeps current EINTR handling in EAL interrupt thread.

> > > It is one option. Depending what makes the most sense.

> > >

> > >> 1. Can you explain and add patch comments why default signal handler

> > >> is not good enough to terminate app.

> > > Yes if someone call tell me more about what it is so I can check it.

> > >

> > >> 2. I propose to add addition comments on rte_epoll_wait() API

> > >> description. For any signal, it causes an error return, user needs

> > >> to handle.

> > > Agreed.

> > >

> > >> 3. Will you do a favorite to add 'PTHREAD_CREATE_DETACHED' to all

> > >> EAL pthread too.

> > > As a spare time developer I am a bit conservative about too large of a 
> > > scope

> > > and messing with code for other threads or features I didn't personally 
> > > use or

> > > test. This is because I don't have the same QA resources as Intel / 6WIND 
> > > /

> > > etc.. Some help from a full time developer would be great here.

> > All right, reasonable to 

Re: [dpdk-dev] [PATCH v3 2/7] app/proc-info: eliminate useless borders

[Stephen Hemminger]

On Fri, 14 Aug 2020 01:14:40 +
"Varghese, Vipin"  wrote:

> snipped
> > 
> > snipped  
> > > >
> > > > snipped  
> > > > >
> > > > > 15/07/2020 23:22, Stephen Hemminger:  
> > > > > > Printing extra borders does not improve readability, and is just
> > > > > > unnecessary. Putting TSC hz in header also makes no sense here.  
> > > > >
> > > > > The CPU frequency on headers!
> > > > > OK to remove :)
> > > > >  
> > > >
> > > > The rational of having Time Stamp Counter as the header for port
> > > > info and  
> > > stats, is to account for each iteration for an average `packets per
> > > second`. That is using `watch -d -n 1 ./dpdk-procinfo -- --xstats | grep 
> > > -v ": 0"`.  
> > > >
> > > > But if there better way to do this or add as new feature, +1 to remove. 
> > > >  
> > >
> > > Proc info should just use standard clock for its updates, not TSC?  
> > 
> > Can you please explain the rationale behind the (syscall for time) and not 
> > TSC?  
> 
> Looking forward for the patch with clock change too.

There is no part of what proc-info is show with xstats that displays or uses 
tsc directly.
Do you have a driver that is putting TSC information in xstats?

Re: [dpdk-dev] [EXT] Re: [PATCH v2 1/2] ethdev: add level support for RSS offload types

[Kiran Kumar Kokkilagadda]

From: Ajit Khaparde 
Sent: Saturday, August 8, 2020 8:10 PM
To: Kiran Kumar Kokkilagadda 
Cc: Andrew Rybchenko ; Ferruh Yigit 
; Thomas Monjalon ; 
beilei.x...@intel.com; ch...@att.com; cloud.wangxiao...@huawei.com; 
cristian.dumitre...@intel.com; dev@dpdk.org; gr...@u256.net; 
hemant.agra...@nxp.com; humi...@huawei.com; hyon...@cisco.com; 
jasvinder.si...@intel.com; Jerin Jacob Kollanukkaran ; 
jia@intel.com; jingjing...@intel.com; johnd...@cisco.com; 
keith.wi...@intel.com; Liron Himi ; ma...@mellanox.com; 
Nithin Kumar Dabilpuram ; or...@mellanox.com; 
qi.z.zh...@intel.com; qiming.y...@intel.com; rahul.lakkire...@chelsio.com; 
Rasesh Mody ; rosen...@intel.com; sachin.sax...@nxp.com; 
shah...@mellanox.com; Shahed Shaikh ; 
somnath.ko...@broadcom.com; viachesl...@mellanox.com; wei.zh...@intel.com; 
xavier.hu...@huawei.com; xuanziya...@huawei.com; yisen.zhu...@huawei.com; 
zhouguoy...@huawei.com
Subject: [EXT] Re: [dpdk-dev][PATCH v2 1/2] ethdev: add level support for RSS 
offload types

External Email

On Sat, Aug 8, 2020 at 7:36 AM 
mailto:kirankum...@marvell.com>> wrote:
From: Kiran Kumar K mailto:kirankum...@marvell.com>>

This patch reserves 2 bits as input selection to select Inner and
outer layers for RSS computation. It is combined with existing
ETH_RSS_* to choose Inner or outer layers for L2, L3 and L4.
How do you plan to use this? Do you need to make any changes to testpmd?

I will update in the next version.


This functionality already exists in rte_flow through level parameter in
RSS action configuration rte_flow_action_rss.

Signed-off-by: Kiran Kumar K 
mailto:kirankum...@marvell.com>>
---
v2 changes:
* Reserved bit 50 & 51

 lib/librte_ethdev/rte_ethdev.h | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index d29930fd8..28184cc85 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -552,6 +552,33 @@ struct rte_eth_rss_conf {
 #define RTE_ETH_RSS_L3_PRE64  (1ULL << 53)
 #define RTE_ETH_RSS_L3_PRE96  (1ULL << 52)

+/*
+ * We use the following macros to combine with the above layers to choose
+ * inner and outer layers or both for RSS computation.
+ * Note: Default is 0: inner layers, 1: outer layers, 2: both
+ * bit 50 and 51 are reserved for this.
+ */
+
+/**
+ * Level 0, It basically stands for the innermost encapsulation level RSS
+ * can be performed on according to PMD and device capabilities.
+ */
+#define ETH_RSS_LEVEL_INNER(0ULL << 50)
+/**
+ * Level 1, It basically stands for the outermost encapsulation level RSS
+ * can be performed on according to PMD and device capabilities.
+ */
+#define ETH_RSS_LEVEL_OUTER(1ULL << 50)
+/**
+ * Level 2, It basically stands for the both inner and outermost
+ * encapsulation level RSS can be performed on according to PMD and
+ * device capabilities.
+ */
+#define ETH_RSS_LEVEL_INNER_OUTER  (2ULL << 50)
+#define ETH_RSS_LEVEL_MASK(3ULL << 50)
+
+#define ETH_RSS_LEVEL(rss_hf) ((rss_hf & ETH_RSS_LEVEL_MASK) >> 50)
+
 /**
  * For input set change of hash filter, if SRC_ONLY and DST_ONLY of
  * the same level are used simultaneously, it is the same case as
--
2.25.1

[dpdk-dev] [RFC PATCH] config: remap flags used for Arm platforms

[Ruifeng Wang]

Flags are used to distinguish different platform architectures.
These flags can be used to pick different code paths for different
architectures at compile time.
For Arm platforms, there are 3 flags in use: RTE_ARCH_ARM,
RTE_ARCH_ARMv7 and RTE_ARCH_ARM64.
RTE_ARCH_ARM64 is used to flag 64-bit aarch64 platforms,
while RTE_ARCH_ARM & RTE_ARCH_ARMv7 are used to flag 32-bit platforms.
RTE_ARCH_ARMv7 is for ARMv7 platforms as its name suggested.

The issue is that flag name RTE_ARCH_ARM is unclear and could cause
confusion. No info about platform word length is included in the name.
To make the flag names more clear, a naming scheme is proposed.

  RTE_ARCH_ARM
  |
  +RTE_ARCH_ARM32
  ||
  |+RTE_ARCH_ARMv7
  ||
  |+RTE_ARCH_ARMv8_AARCH32
  |
  +RTE_ARCH_ARM64

RTE_ARCH_ARM32 will be used for 32-bit Arm platforms.
It includes RTE_ARCH_ARMv7 and RTE_ARCH_ARMv8_AARCH32.
RTE_ARCH_ARMv7 is for ARMv7 platforms.
RTE_ARCH_ARMv8_AARCH32 is for aarch32 state on aarch64 platforms.
RTE_ARCH_ARM64 is for 64-bit Arm platforms.
RTE_ARCH_ARM will be used for all Arm platforms, including RTE_ARCH_ARM32
and RTE_ARCH_ARM64.

To fit into the new naming scheme, current usage of RTE_ARCH_ARM in
project code is mapped to RTE_ARCH_ARM32.

Suggested-by: Honnappa Nagarahalli 
Signed-off-by: Ruifeng Wang 
Reviewed-by: Phil Yang 
---
 app/test/test_cpuflags.c | 2 +-
 app/test/test_xmmt_ops.h | 2 +-
 config/arm/meson.build   | 2 +-
 config/defconfig_arm-armv7a-linuxapp-gcc | 2 +-
 drivers/bus/fslmc/qbman/qbman_sys_decl.h | 2 +-
 drivers/common/dpaax/compat.h| 2 +-
 drivers/net/i40e/Makefile| 2 +-
 drivers/net/ixgbe/Makefile   | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx.h   | 4 ++--
 drivers/net/virtio/Makefile  | 2 +-
 drivers/net/virtio/virtio_ethdev.c   | 2 +-
 lib/librte_acl/Makefile  | 2 +-
 lib/librte_acl/meson.build   | 2 +-
 lib/librte_acl/rte_acl.c | 4 ++--
 lib/librte_eal/arm/include/rte_vect.h| 4 ++--
 lib/librte_eal/common/eal_internal_cfg.h | 2 +-
 lib/librte_lpm/Makefile  | 2 +-
 lib/librte_lpm/rte_lpm.h | 2 +-
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/test/test_cpuflags.c b/app/test/test_cpuflags.c
index 06718631f..bf9851393 100644
--- a/app/test/test_cpuflags.c
+++ b/app/test/test_cpuflags.c
@@ -86,7 +86,7 @@ test_cpuflags(void)
CHECK_FOR_FLAG(RTE_CPUFLAG_ICACHE_SNOOP);
 #endif
 
-#if defined(RTE_ARCH_ARM)
+#if defined(RTE_ARCH_ARM32)
printf("Check for NEON:\t\t");
CHECK_FOR_FLAG(RTE_CPUFLAG_NEON);
 #endif
diff --git a/app/test/test_xmmt_ops.h b/app/test/test_xmmt_ops.h
index 8bcf0b261..1bf6e 100644
--- a/app/test/test_xmmt_ops.h
+++ b/app/test/test_xmmt_ops.h
@@ -7,7 +7,7 @@
 
 #include 
 
-#if defined(RTE_ARCH_ARM) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_ARM32) || defined(RTE_ARCH_ARM64)
 
 /* vect_* abstraction implementation using NEON */
 
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 8728051d5..62ee2d108 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -132,7 +132,7 @@ dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
 
 if not dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
-   dpdk_conf.set('RTE_ARCH_ARM', 1)
+   dpdk_conf.set('RTE_ARCH_ARM32', 1)
dpdk_conf.set('RTE_ARCH_ARMv7', 1)
# the minimum architecture supported, armv7-a, needs the following,
# mk/machine/armv7a/rte.vars.mk sets it too
diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc 
b/config/defconfig_arm-armv7a-linuxapp-gcc
index ac9112086..b1a1f8524 100644
--- a/config/defconfig_arm-armv7a-linuxapp-gcc
+++ b/config/defconfig_arm-armv7a-linuxapp-gcc
@@ -6,7 +6,7 @@
 CONFIG_RTE_MACHINE="armv7a"
 
 CONFIG_RTE_ARCH="arm"
-CONFIG_RTE_ARCH_ARM=y
+CONFIG_RTE_ARCH_ARM32=y
 CONFIG_RTE_ARCH_ARMv7=y
 CONFIG_RTE_ARCH_ARM_TUNE="cortex-a9"
 
diff --git a/drivers/bus/fslmc/qbman/qbman_sys_decl.h 
b/drivers/bus/fslmc/qbman/qbman_sys_decl.h
index a29f5b469..e17cbaefe 100644
--- a/drivers/bus/fslmc/qbman/qbman_sys_decl.h
+++ b/drivers/bus/fslmc/qbman/qbman_sys_decl.h
@@ -32,7 +32,7 @@ static inline void prefetch_for_store(void *p)
 {
asm volatile("prfm pstl1keep, [%0, #0]" : : "r" (p));
 }
-#elif defined(RTE_ARCH_ARM)
+#elif defined(RTE_ARCH_ARM32)
 #define dcbz(p) memset(p, 0, 64)
 #define lwsync() { asm volatile("dmb st" : : : "memory"); }
 #define dcbf(p)RTE_SET_USED(p)
diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h
index 6793cb256..6ac8a7ea3 100644
--- a/drivers/common/dpaax/compat.h
+++ b/drivers/common/dpaax/compat.h
@@ -163,7 +163,7 @@ static inline void out_be32(volatile void *__p, u32 val)
asm volatile("prfm pldl1keep, [%0, #64]" : : "r" (p));  \