Re: [dpdk-dev] [EXT] [PATCH v3 1/5] net/qede: fix minsize build

[Rasesh Mody]

> From: Devendra Singh Rawat 
> Sent: Monday, August 9, 2021 10:46 AM
> 
> 
> 
> -Original Message-
> From: Thomas Monjalon 
> Sent: Sunday, August 8, 2021 6:22 PM
> To: dev@dpdk.org
> Cc: bruce.richard...@intel.com; david.march...@redhat.com; Rasesh
> Mody ; Devendra Singh Rawat
> 
> Subject: [EXT] [PATCH v3 1/5] net/qede: fix minsize build
> 
> External Email
> 
> --
> Error occurs when configuring meson with --buildtype=minsize with GCC
> 11.1.0:
> 
> In function ‘__internal_ram_wr_relaxed’,
> inlined from ‘internal_ram_wr’ at ecore_int_api.h:166:2,
> inlined from ‘qede_update_rx_prod.constprop’ at qede_rxtx.c:736:2:
> drivers/net/qede/base/bcm_osal.h:136:9: error:
> ‘rx_prods’ is used uninitialized [-Werror=uninitialized]
> | rte_write32_relaxed((_val), (_reg_addr))
> | ^~~~
> ecore_int_api.h:151:17: note: in expansion of macro
> ‘DIRECT_REG_WR_RELAXED’
> | DIRECT_REG_WR_RELAXED(p_hwfn, &((u32 OSAL_IOMEM
> *)addr)[i],
> | ^
> drivers/net/qede/qede_rxtx.c: In function
> ‘qede_update_rx_prod.constprop’:
> drivers/net/qede/qede_rxtx.c:724:33: note: ‘rx_prods’ declared here
> | struct eth_rx_prod_data rx_prods = { 0 };
> | ^~~~
> 
> Signed-off-by: Thomas Monjalon 
Acked-by: Rasesh Mody 

> ---
>  drivers/net/qede/qede_rxtx.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
> index 298f4e3e42..35cde561ba 100644
> --- a/drivers/net/qede/qede_rxtx.c
> +++ b/drivers/net/qede/qede_rxtx.c
> @@ -721,9 +721,10 @@ qede_update_rx_prod(__rte_unused struct
> qede_dev *edev,  {
>   uint16_t bd_prod = ecore_chain_get_prod_idx(&rxq->rx_bd_ring);
>   uint16_t cqe_prod = ecore_chain_get_prod_idx(&rxq-
> >rx_comp_ring);
> - struct eth_rx_prod_data rx_prods = { 0 };
> + struct eth_rx_prod_data rx_prods;
> 
>   /* Update producers */
> + memset(&rx_prods, 0, sizeof(rx_prods));
>   rx_prods.bd_prod = rte_cpu_to_le_16(bd_prod);
>   rx_prods.cqe_prod = rte_cpu_to_le_16(cqe_prod);
> 
> --
> 2.31.1
> 
> ACKed.
> 
> Thanks,
> Devendra

Re: [dpdk-dev] [dpdk-stable] [PATCH v2 1/2] devtools: fix version pattern for fix search

[Xueming(Steven) Li]

Hi,

> -Original Message-
> From: Thomas Monjalon 
> Sent: Sunday, August 8, 2021 7:15 PM
> To: Xueming(Steven) Li 
> Cc: dev@dpdk.org; sta...@dpdk.org; Christian Ehrhardt 
> ; david.march...@redhat.com; Luca
> Boccassi 
> Subject: Re: [dpdk-stable] [PATCH v2 1/2] devtools: fix version pattern for 
> fix search
> 
> 30/06/2021 08:34, Xueming Li:
> > When scanning fixes from current(HEAD) branch, local tags were
> > included and reported as version. For example:
> >   $ git tag --contains  --merged
> >   20.11_backport_202010506   // user tag
> >   v20.11
> >   v20.11.1
> >
> > This patch matches DPDK officail version pattern in search, selects
> > the most early tag. Official tag pattern: "v."
> >
> > Fixes: 752d8e097ec1 ("scripts: show fixes with release version of
> > bug")
> > Cc: Thomas Monjalon 
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Xueming Li 
> > Reviewed-by: Christian Ehrhardt 
> > ---
> >  devtools/git-log-fixes.sh | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
> > index 210c8dcf25..153ba5b438 100755
> > --- a/devtools/git-log-fixes.sh
> > +++ b/devtools/git-log-fixes.sh
> > @@ -38,12 +38,13 @@ range="$*"
> >  # get major release version of a commit  commit_version () # 
> > {
> > +   local VER="v*.*"
> 
> Which tag is it supposed to match? What would not be matched?
> What about something like v19.11.8 ?
> What about the above example 20.11_backport_202010506?

It matches any tag version like started with "v" and a "." in the middle.
So v19.11.8 matches as at least one "." in the middle.
20.11_backport_202010506 can't match since it not started with "v"

> 
> > # use current branch as history reference
> > local refbranch=$(git rev-parse --abbrev-ref HEAD)
> > -   local tag=$( (git tag -l --contains $1 --merged $refbranch 2>&- ||
> > +   local tag=$( (git tag -l "$VER" --contains $1 --sort=creatordate 
> > --merged $refbranch 2>&- ||
> 
> Why adding "--sort=creatordate" ?
> It is not mentioned in the commit log.

Mentioned a little bit: "select the most early tag"
By default git output tag in alpha order, this makes v19.11 appears earlier 
than v2.x, that's wrong.

> 
> > # tag --merged option has been introduced in git 2.7.0
> > # below is a fallback in case of old git version
> > -   for t in $(git tag -l --contains $1) ; do
> > +   for t in $(git tag -l "$VER" --contains $1) ; do
> > git branch $refbranch --contains $t |
> > sed "s,.\+,$t,"
> > done) |
> 
> 
> 
> 
> 

Re: [dpdk-dev] [WARNING: UNSCANNABLE EXTRACTION FAILED][WARNING: UNSCANNABLE EXTRACTION FAILED] [PATCH v6] doc: mtr: add API walk through

[Dumitrescu, Cristian]

> -Original Message-
> From: jer...@marvell.com 
> Sent: Saturday, August 7, 2021 9:21 AM
> To: Dumitrescu, Cristian ; Thomas Monjalon
> ; Yigit, Ferruh ; Andrew
> Rybchenko 
> Cc: dev@dpdk.org; arybche...@solarflare.com; l...@nvidia.com;
> ajit.khapa...@broadcom.com; Singh, Jasvinder
> ; ma...@nvidia.com; Jerin Jacob
> 
> Subject: [WARNING: UNSCANNABLE EXTRACTION FAILED][WARNING:
> UNSCANNABLE EXTRACTION FAILED][dpdk-dev] [PATCH v6] doc: mtr: add
> API walk through
> 
> From: Jerin Jacob 
> 
> Added a diagram to document meter library components
> and added text for steps performed by the application to
> configure the traffic meter and policing library.
> 
> Signed-off-by: Jerin Jacob 
> ---
> 
> v2: Fix long lines in svg file to avoid patch apply issue
> v3: Fix all Thomas's comments at
> http://patches.dpdk.org/project/dpdk/patch/20210804113410.3604616-1-
> jer...@marvell.com/
> v4: Fix all Cristian's commentss at
> http://patches.dpdk.org/project/dpdk/patch/20210805101046.4091894-1-
> jer...@marvell.com/
> v5: Fix version number in the patch
> v6: Fix all Cristian's comments t
> http://patches.dpdk.org/project/dpdk/patch/20210806094518.807965-1-
> jer...@marvell.com/
> 
>  .../prog_guide/img/rte_mtr_meter_chaining.svg | 1600
> +
>  .../traffic_metering_and_policing.rst |   41 +
>  lib/ethdev/rte_mtr.h  |4 +-
>  3 files changed, 1643 insertions(+), 2 deletions(-)
>  create mode 100644
> doc/guides/prog_guide/img/rte_mtr_meter_chaining.svg
> 

Acked-by: Cristian Dumitrescu 

[dpdk-dev] 20.11.3 patches review and test

[luca . boccassi]

Hi all,

Here is a list of patches targeted for stable release 20.11.3.

The planned date for the final release is August 23rd.

Please help with testing and validation of your use cases and report
any issues/results with reply-all to this mail. For the final release
the fixes and reported validations will be added to the release notes.

A release candidate tarball can be found at:

https://dpdk.org/browse/dpdk-stable/tag/?id=v20.11.3-rc1

These patches are located at branch 20.11 of dpdk-stable repo:
https://dpdk.org/browse/dpdk-stable/

Thanks.

Luca Boccassi

---
Abhinandan Gujjar (1):
  test/crypto: fix mempool size for session-less

Ajit Khaparde (3):
  doc: fix default burst size in testpmd
  net/bnxt: fix Rx interrupt setting
  net/bnxt: fix ring allocation and free

Akhil Goyal (1):
  crypto/octeontx: fix freeing after device release

Alexander Kozyrev (1):
  net/mlx5: fix threshold for mbuf replenishment in MPRQ

Anoob Joseph (1):
  crypto/octeontx2: fix IPsec session member overlap

Arek Kusztal (1):
  crypto/qat: disable asymmetric crypto on GEN3

Asaf Penso (1):
  net/mlx5: fix flow engine type in function name

Beilei Xing (2):
  net/iavf: fix scalar Rx
  net/i40e: fix flow director input set conflict

Bing Zhao (1):
  net/mlx5: fix queue leaking in hairpin auto bind check

Chenbo Xia (1):
  net/virtio: fix default duplex mode

Cheng Jiang (1):
  net/virtio: fix refill order in packed ring datapath

Chengchang Tang (2):
  net/hns3: fix VLAN strip log
  net/hns3: fix residual MAC address entry

Chenglian Sun (1):
  examples/l2fwd: fix [no-]mac-updating options

Chengwen Feng (3):
  net/hns3: fix Arm SVE build with GCC 8.3
  net/hns3: fix filter parsing comment
  net/hns3: fix flow rule list in multi-process

Christian Ehrhardt (1):
  vfio: add stdbool include

Ciara Power (1):
  cryptodev: fix freeing after device release

Dana Vardi (5):
  crypto/mvsam: fix AES-GCM session parameters
  crypto/mvsam: fix session data reset
  crypto/mvsam: fix options parsing
  net/mvpp2: fix port speed overflow
  net/mvpp2: fix configured state dependency

Dapeng Yu (8):
  net/ice: fix default RSS key generation
  net/i40e: fix use after free in FDIR release
  net/i40e: fix multi-process shared data
  net/ixgbe: fix flow entry access after freeing
  net/softnic: fix connection memory leak
  net/softnic: fix memory leak in arguments parsing
  net/softnic: fix null dereference in arguments parsing
  net/softnic: fix memory leak as profile is freed

David Christensen (1):
  bus/pci: fix IOVA as VA support for PowerNV

David Hunt (1):
  distributor: fix 128-bit write alignment

David Marchand (6):
  malloc: fix size annotation for NUMA-aware realloc
  bus/pci: fix leak for unbound devices
  drivers/net: fix memzone allocations for DMA memory
  ipc: stop mp control thread on cleanup
  net/ice: fix memzone leak when firmware is missing
  net/octeontx/base: fix debug build with clang

Dmitry Kozlyuk (6):
  doc: add limitation for ConnectX-4 with L2 in mlx5 guide
  doc: fix build on Windows with Meson 0.58
  net/mlx5: fix Rx/Tx queue checks
  net/mlx5: fix indirect action modify rollback
  eal/windows: cleanup virt2phys handle
  bus: clarify log for non-NUMA-aware devices

Feifei Wang (2):
  crypto/qat: fix Arm build with special memcpy
  net/mlx5: fix r/w lock usage in DMA unmap

Ferruh Yigit (2):
  kni: fix crash on userspace VA for segmented packets
  app/testpmd: fix help string for port reset

Gaoxiang Liu (1):
  net/virtio: fix interrupt handle leak

Ghalem Boudour (1):
  net/ena: enable multi-segment in Tx offload flags

Gregory Etelson (5):
  net/mlx5: fix RSS pattern expansion
  net/mlx5: fix pattern expansion in RSS flow rules
  net/mlx5: fix representor interrupt handler
  app/testpmd: fix Tx checksum calculation for tunnel
  app/testpmd: fix IPv4 checksum

Guoyang Zhou (3):
  net/hinic: increase protection of the VLAN
  net/hinic/base: fix LRO
  net/hinic: fix MTU consistency with firmware

Haiyue Wang (1):
  net/iavf: fix RSS key access out of bound

Hemant Agrawal (1):
  bus/dpaa: fix freeing in FMAN interface destructor

Henry Nadeau (1):
  doc: fix spelling

Hongbo Zheng (4):
  graph: fix memory leak in stats
  graph: fix null dereference in stats
  net/hns3: increase VF reset retry maximum
  net/hns3: fix timing of clearing interrupt source

Huisong Li (7):
  net/hns3: fix delay for waiting to stop Rx/Tx
  net/hns3: fix fake queue rollback
  net/hns3: fix maximum queues on configuration failure
  app/testpmd: change port link speed without stopping all
  net/hns3: fix Tx prepare after stop
  sched: fix profile allocation failure handling
  sched: rework configuration failure handling

Ivan Il

Re: [dpdk-dev] [dpdk-stable] [PATCH v4] app/testpmd: fix testpmd doesn't show RSS hash offload

[Ferruh Yigit]

On 7/22/2021 12:03 PM, Andrew Rybchenko wrote:
> On 7/19/21 7:18 PM, Ferruh Yigit wrote:
>> On 7/19/2021 10:55 AM, Wang, Jie1X wrote:
>>>
>>>
 -Original Message-
 From: Yigit, Ferruh 
 Sent: Friday, July 16, 2021 4:52 PM
 To: Li, Xiaoyun ; Wang, Jie1X ;
 dev@dpdk.org
 Cc: andrew.rybche...@oktetlabs.ru; sta...@dpdk.org
 Subject: Re: [dpdk-stable] [PATCH v4] app/testpmd: fix testpmd doesn't show
 RSS hash offload

 On 7/16/2021 9:30 AM, Li, Xiaoyun wrote:
>> -Original Message-
>> From: stable  On Behalf Of Li, Xiaoyun
>> Sent: Thursday, July 15, 2021 12:54
>> To: Wang, Jie1X ; dev@dpdk.org
>> Cc: andrew.rybche...@oktetlabs.ru; sta...@dpdk.org
>> Subject: Re: [dpdk-stable] [PATCH v4] app/testpmd: fix testpmd
>> doesn't show RSS hash offload
>>
>>> -Original Message-
>>> From: Wang, Jie1X 
>>> Sent: Thursday, July 15, 2021 19:57
>>> To: dev@dpdk.org
>>> Cc: Li, Xiaoyun ;
>>> andrew.rybche...@oktetlabs.ru; Wang, Jie1X ;
>>> sta...@dpdk.org
>>> Subject: [PATCH v4] app/testpmd: fix testpmd doesn't show RSS hash
>>> offload
>>>
>>> The driver may change offloads info into dev->data->dev_conf in
>>> dev_configure which may cause port->dev_conf and port->rx_conf
>>> contain
>> outdated values.
>>>
>>> This patch updates the offloads info if it changes to fix this issue.
>>>
>>> Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
>>> Cc: sta...@dpdk.org
>>>
>>> Signed-off-by: Jie Wang 
>>> ---
>>> v4: delete the whitespace at the end of the line.
>>> v3:
>>>   - check and update the "offloads" of "port->dev_conf.rx/txmode".
>>>   - update the commit log.
>>> v2: copy "rx/txmode.offloads", instead of copying the entire struct
>>> "dev->data-
 dev_conf.rx/txmode".
>>> ---
>>>   app/test-pmd/testpmd.c | 27 +++
>>>   1 file changed, 27 insertions(+)
>>
>> Acked-by: Xiaoyun Li 
>
> Although I gave my ack, app shouldn't touch rte_eth_devices which this 
> patch
 does. Usually, testpmd should only call function like
 eth_dev_info_get_print_err().
> But dev_info doesn't contain the info dev->data->dev_conf which the driver
 modifies.
>
> Probably we need a better fix.
>

 Agree, an application accessing directly to 'rte_eth_devices' is sign of
 something
 missing/wrong.

 In this case there is no way for application to know what is the configured
 offload settings per port and queue. Which is missing part I think.

 As you said normally we get data from PMD mainly via 
 'rte_eth_dev_info_get()',
 which is an overloaded function, it provides many different things, like 
 driver
 default values, limitations, current config/status, capabilities etc...

 So I think we can do a few things:
 1) Add current offload configuration to 'rte_eth_dev_info_get()', so
 application
 can get it and use it.
 The advantage is this API already called many places, many times, so there 
 is a
 big chance that application already have this information when it needs.
 Disadvantage is, as mentioned above the API already big and messy, making 
 it
 bigger makes more error prone and makes easier to break ABI.

>>> I prefer to choose the 1st suggestion.
>>>
>>> Normally PMD gets data via 'rte_eth_dev_info_get()'. When we add offloads
>>> configuration
>>> to it, we can get offloads as same as getting other info.
>>>
>>
>> Most probably it is easier to implement 1), I see your point but as said 
>> before
>> I think 'rte_eth_dev_info_get()' is already messy and I am worried to make it
>> even bigger.
> 
> IMHO, (1) is not an option.
> 
>> I prefer option 2).
> 
> I'm not sure that API function for each config parameter is an option as
> well. We should find a balance. May be I'd add something like
> rte_eth_dev_get_conf(uint16_t port_id, const struct rte_eth_conf **conf)
> which returns a pointer to up-to-date configuration. I.e. option (3).
> 

That is option 3, that can work too.

> The tricky part here is to ensure that all specific API which modifies
> various bits of the configuration updates dev_conf.
> 

They have to, aren't they? Otherwise there is no where to record the current
config for PMD too.

>>
>> @Thomas, @Andrew, what do you think?
>>
>>
 2) Add a new API to get configured offload information, so a specific API
 for it.

 3) Get a more generic API to get configured config (dev_conf) which will 
 cover
 offloads too.
 Disadvantage can be leaking out too many internal config to user
 unintentionally.
> 
> I don't understand it. dev_conf is provided by user on
> rte_eth_dev_configure().

Yes but application doesn't provide all config, my concern was if some internal
config should be hidden from app

Re: [dpdk-dev] [PATCH 21.11 v2 0/3] eal: add memory pre-allocation from existing files

[Dmitry Kozlyuk]

2021-07-16 14:08 (UTC+0300), Dmitry Kozlyuk:
> Hugepage allocation from the system takes time, resulting in slow
> startup or sporadic delays later. Most of the time spent in kernel
> is zero-filling memory for security reasons, which may be irrelevant
> in a controlled environment. The bottleneck is memory access speed,
> so for speeduup the amount of memory cleared must be reduced.
> We propose a new EAL option --mem-file FILE1,FILE2,... to quickly
> allocate dirty pages from existing files and clean it as necessary.
> A new malloc_perf_autotest is provided to estimate the impact.
> More details are explained in relevant patches.
> 
> v2: fix CI failures

Hi Anatoly, could you review please?

Re: [dpdk-dev] [PATCH v3 3/5] vdpa/mlx5: fix minsize build

[Matan Azrad]

From: Thomas Monjalon
> Error occurs when configuring meson with --buildtype=minsize with GCC
> 11.1.0:
> 
> drivers/vdpa/mlx5/mlx5_vdpa_mem.c: In function
> ‘mlx5_vdpa_mem_register’:
> drivers/vdpa/mlx5/mlx5_vdpa_mem.c:183:24: error:
> initialization of ‘uint64_t’ {aka ‘long unsigned int’} from ‘void *’
> makes integer from pointer without a cast [-Werror=int-conversion]
> | uint64_t gcd = NULL;
> |^~~~
> drivers/vdpa/mlx5/mlx5_vdpa_mem.c:244:75: error:
> ‘mode’ may be used uninitialized in this function [-Werror=maybe-
> uninitialized]
> | klm_size = mode == MLX5_MKC_ACCESS_MODE_KLM ?
> |~~
> |   KLM_SIZE_MAX_ALIGN(empty_region_sz) : gcd;
> |
> | ^
> 
> Signed-off-by: Thomas Monjalon 
Acked-by: Matan Azrad 

Thanks

[dpdk-dev] [PATCH] eal: allow hugetlbfs sub-directories

[John Levon]

get_hugepage_dir() was implemented in such a way that a --huge-dir
option had to exactly match the mountpoint, but there's no reason for
this restriction: DPDK might not be the only user of hugepages, and
shouldn't assume it owns an entire mountpoint. For example, if I have
/dev/hugepages/myapp, and /dev/hugepages/dpdk, I should be able to
specify:

--huge-dir=/dev/hugepages/dpdk/

and have DPDK only use that sub-directory.

Fix the implementation to allow a sub-directory within a suitable
hugetlbfs mountpoint to be specified, preferring the closest match.

Signed-off-by: John Levon 
---
v2: prefer closer matches
v3: checkpatch fixes
v4: fix docs, added tests

 app/test/test_eal_flags.c | 116 --
 doc/guides/linux_gsg/linux_eal_parameters.rst |   3 +-
 lib/eal/linux/eal_hugepage_info.c |  83 +
 3 files changed, 138 insertions(+), 64 deletions(-)

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index b4880ee802..1d18a0ba8f 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -14,8 +14,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -800,6 +801,9 @@ static int
 test_misc_flags(void)
 {
char hugepath[PATH_MAX] = {0};
+   char hugepath_dir[PATH_MAX] = {0};
+   char hugepath_dir2[PATH_MAX] = {0};
+   char hugepath_dir3[PATH_MAX] = {0};
 #ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
@@ -810,6 +814,7 @@ test_misc_flags(void)
FILE * hugedir_handle = NULL;
char line[PATH_MAX] = {0};
unsigned i, isempty = 1;
+
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
@@ -849,6 +854,20 @@ test_misc_flags(void)
}
 #endif
 
+   snprintf(hugepath_dir, sizeof(hugepath_dir), "%s/dpdk.missing", 
hugepath);
+   snprintf(hugepath_dir2, sizeof(hugepath_dir2), "%s/dpdk.dir", hugepath);
+
+   if (mkdir(hugepath_dir2, 0700) != 0 && errno != EEXIST) {
+   printf("Error - failed to mkdir(%s)\n", hugepath_dir2);
+   return -1;
+   }
+
+   snprintf(hugepath_dir3, sizeof(hugepath_dir3), "%s/dpdk.dir/sub", 
hugepath);
+
+   if (mkdir(hugepath_dir3, 0700) != 0 && errno != EEXIST) {
+   printf("Error - failed to mkdir(%s)\n", hugepath_dir3);
+   goto fail;
+   }
 
/* check that some general flags don't prevent things from working.
 * All cases, apart from the first, app should run.
@@ -881,60 +900,66 @@ test_misc_flags(void)
/* With invalid --huge-dir */
const char *argv9[] = {prgname, "-m", DEFAULT_MEM_SIZE,
"--file-prefix=hugedir", "--huge-dir", "invalid"};
+   /* With invalid --huge-dir sub-directory */
+   const char *argv10[] = {prgname, "-m", DEFAULT_MEM_SIZE,
+   "--file-prefix=hugedir", "--huge-dir", hugepath_dir};
+   /* With valid --huge-dir sub-directory */
+   const char *argv11[] = {prgname, "-m", DEFAULT_MEM_SIZE,
+   "--file-prefix=hugedir", "--huge-dir", hugepath_dir2};
/* Secondary process with invalid --huge-dir (should run as flag has no
 * effect on secondary processes) */
-   const char *argv10[] = {prgname, prefix, mp_flag,
+   const char *argv12[] = {prgname, prefix, mp_flag,
"--huge-dir", "invalid"};
 
/* try running with base-virtaddr param */
-   const char *argv11[] = {prgname, "--file-prefix=virtaddr",
+   const char *argv13[] = {prgname, "--file-prefix=virtaddr",
"--base-virtaddr=0x12345678"};
 
/* try running with --vfio-intr INTx flag */
-   const char *argv12[] = {prgname, "--file-prefix=intr",
+   const char *argv14[] = {prgname, "--file-prefix=intr",
"--vfio-intr=legacy"};
 
/* try running with --vfio-intr MSI flag */
-   const char *argv13[] = {prgname, "--file-prefix=intr",
+   const char *argv15[] = {prgname, "--file-prefix=intr",
"--vfio-intr=msi"};
 
/* try running with --vfio-intr MSI-X flag */
-   const char *argv14[] = {prgname, "--file-prefix=intr",
+   const char *argv16[] = {prgname, "--file-prefix=intr",
"--vfio-intr=msix"};
 
/* try running with --vfio-intr invalid flag */
-   const char *argv15[] = {prgname, "--file-prefix=intr",
+   const char *argv17[] = {prgname, "--file-prefix=intr",
"--vfio-intr=invalid"};
 
/* With process type as auto-detect */
-   const char * const argv16[] = {prgname, "--file-prefix=auto",
+   const char * const argv18[] = {prgname, "--file-prefix=auto",
"--proc-type=auto"};
 
/* With process type as auto-de

Re: [dpdk-dev] [dpdk-stable] [PATCH v2 2/2] devtools: fix patches missing if range newer than HEAD

[Xueming(Steven) Li]

> -Original Message-
> From: Thomas Monjalon 
> Sent: Sunday, August 8, 2021 7:25 PM
> To: Xueming(Steven) Li 
> Cc: dev@dpdk.org; sta...@dpdk.org; Christian Ehrhardt 
> ; bl...@debian.org;
> ktray...@redhat.com; david.march...@redhat.com
> Subject: Re: [dpdk-stable] [PATCH v2 2/2] devtools: fix patches missing if 
> range newer than HEAD
> 
> 30/06/2021 08:34, Xueming Li:
> > Current fix scan scripts scanned specified range in HEAD branch.
> 
> I cannot parse the above sentence.

The scripts scans patches and try to get patch version info from current branch.

> 
> > When users ran it in an earlier branch, few patches were scanned due
> > to the fixes in the range are newer and not merged to HEAD branch.
> 
> You mean some patches were not scanned?

Scanned but failed to retrieve correct version info. 

> 
> >
> > This patch introduces optional  argument, default to HEAD if
> > not specified. Checks the  specified in parameter must being
> > merged in .
> 
> Cannot parse either.
> 
> > Fixes: 752d8e097ec1 ("scripts: show fixes with release version of
> > bug")
> > Cc: Thomas Monjalon 
> > Cc: sta...@dpdk.org
> > Cc: Christian Ehrhardt 
> >
> > Signed-off-by: Xueming Li 
> [...]
> > -   echo "usage: $(basename $0) [-h] "
> > +   echo "usage: $(basename $0) [-h]  []"
> [...]
> > -range="$*"
> > +range="$1"
> 
> I think it breaks passing range in multiple parameters without quotes.
> But it is not really a problem.
> 
> > +branch="$2"
> > +
> > +[ -n "$branch" ] || branch="HEAD"
> > +refbranch=$(git rev-parse --abbrev-ref $branch)
> 
> Why this line is needed? A comment may help.

OK

> If $branch is not used anymore, we can overwrite it instead of introducing 
> one more variable $refbranch.

$branch will be used in function commit_version().

>
> > +range_last=$(git log --oneline $range |head -n1|cut -d' ' -f1)
> 
> spaces missing around pipes.
> You can avoid "head" and "cut" by providing the right options to git.

Yes, rev-parse will do this efficiently.

> 
> > +if ! git branch -a --contains $range_last |grep -q -e " $refbranch$" -e " 
> > remotes/$refbranch$"; then
> > +   echo "range $range not included by branch $refbranch"
> > +   exit 1
> > +fi
> >
> >  # get major release version of a commit  commit_version () # 
> > {
> > local VER="v*.*"
> > # use current branch as history reference
> > -   local refbranch=$(git rev-parse --abbrev-ref HEAD)
> 
> You move a line but not its comment above.
> 

Re: [dpdk-dev] [PATCH v2] app/testpmd: flowgen support ip and udp fields

[Singh, Aman Deep]

Hi Wang,

On 8/9/2021 12:22 PM, Zhihong Wang wrote:

This patch aims to:
  1. Add flexibility by supporting IP & UDP src/dst fields
  2. Improve multi-core performance by using per-core vars

v2: fix assigning ip header cksum

Signed-off-by: Zhihong Wang 
---
  


From defination of flowgen as per the documentation-

 *

   |flowgen|: Multi-flow generation mode. Originates a number of flows
   (with varying destination IP addresses), and terminate receive traffic.

So changing the src IP address may not fit the defination of a source 
generating real traffic.


I would like to check this part further.

[dpdk-dev] [PATCH v9 0/2] devtools: scripts to count and track symbols

[Ray Kinsella]

Scripts to count and track the lifecycle of DPDK symbols.

The symbol-tool script reports on the growth of symbols over releases
and list expired symbols. The notify-symbol-maintainers script
consumes the input from symbol-tool and generates email notifications
of expired symbols.

v2: reworked to fix pylint errors
v3: sent with the correct in-reply-to
v4: fix typos picked up by the CI
v5: fix terminal_size & directory args
v6: added list-expired, to list expired experimental symbols
v7: fix typo in comments
v8: added tool to notify maintainers of expired symbols
v9: removed hardcoded emails addressed and script names

Ray Kinsella (2):
  devtools: script to track symbols over releases
  devtools: script to send notifications of expired symbols

 devtools/notify-symbol-maintainers.py | 234 +++
 devtools/symbol-tool.py   | 402 ++
 2 files changed, 636 insertions(+)
 create mode 100755 devtools/notify-symbol-maintainers.py
 create mode 100755 devtools/symbol-tool.py

-- 
2.26.2

[dpdk-dev] [PATCH v9 1/2] devtools: script to track symbols over releases

[Ray Kinsella]

This script tracks the growth of stable and experimental symbols
over releases since v19.11. The script has the ability to
count the added symbols between two dpdk releases, and to
list experimental symbols present in two dpdk releases
(expired symbols).

example usages:

Count symbols added since v19.11
$ devtools/symbol-tool.py count-symbols

Count symbols added since v20.11
$ devtools/symbol-tool.py count-symbols --releases v20.11,v21.05

List experimental symbols present in v20.11 and v21.05
$ devtools/symbol-tool.py list-expired --releases v20.11,v21.05

List experimental symbols in libraries only, present since v19.11
$ devtools/symbol-tool.py list-expired --directory lib

Signed-off-by: Ray Kinsella 
---
 devtools/symbol-tool.py | 402 
 1 file changed, 402 insertions(+)
 create mode 100755 devtools/symbol-tool.py

diff --git a/devtools/symbol-tool.py b/devtools/symbol-tool.py
new file mode 100755
index 00..4a357579dc
--- /dev/null
+++ b/devtools/symbol-tool.py
@@ -0,0 +1,402 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+'''Tool to count or list symbols in each DPDK release'''
+from pathlib import Path
+import sys
+import os
+import subprocess
+import argparse
+from argparse import RawTextHelpFormatter
+import re
+import datetime
+try:
+from parsley import makeGrammar
+except ImportError:
+print('This script uses the package Parsley to parse C Mapfiles.\n'
+  'This can be installed with \"pip install parsley".')
+sys.exit()
+
+DESCRIPTION = '''
+This script tracks the growth of stable and experimental symbols
+over releases since v19.11. The script has the ability to
+count the added symbols between two dpdk releases, and to
+list experimental symbols present in two dpdk releases
+(expired symbols).
+
+example usages:
+
+Count symbols added since v19.11
+$ {s} count-symbols
+
+Count symbols added since v20.11
+$ {s} count-symbols --releases v20.11,v21.05
+
+List experimental symbols present in v20.11 and v21.05
+$ {s} list-expired --releases v20.11,v21.05
+
+List experimental symbols in libraries only, present since v19.11
+$ {s} list-expired --directory lib
+'''
+
+MAP_GRAMMAR = r"""
+
+ws = (' ' | '\r' | '\n' | '\t')*
+
+ABI_VER = ({})
+DPDK_VER = ('DPDK_' ABI_VER)
+ABI_NAME = ('INTERNAL' | 'EXPERIMENTAL' | DPDK_VER)
+comment = '#' (~'\n' anything)+ '\n'
+symbol = (~(';' | '}}' | '#') anything )+:c ';' -> ''.join(c)
+global = 'global:'
+local = 'local: *;'
+symbols = comment* symbol:s ws comment* -> s
+
+abi = (abi_section+):m -> dict(m)
+abi_section = (ws ABI_NAME:e ws '{{' ws global* (~local ws symbols)*:s ws 
local* ws '}}' ws DPDK_VER* ';' ws) -> (e,s)
+"""
+
+def get_abi_versions():
+'''Returns a string of possible dpdk abi versions'''
+
+year = datetime.date.today().year - 2000
+tags = " |".join(['\'{}\''.format(i) \
+ for i in reversed(range(21, year + 1)) ])
+tags  = tags + ' | \'20.0.1\' | \'20.0\' | \'20\''
+
+return tags
+
+def get_dpdk_releases():
+'''Returns a list of dpdk release tags names  since v19.11'''
+
+year = datetime.date.today().year - 2000
+year_range = "|".join("{}".format(i) for i in range(19,year + 1))
+pattern = re.compile(r'^\"v(' +  year_range + r')\.\d{2}\"$')
+
+cmd = ['git', 'for-each-ref', '--sort=taggerdate', '--format', '"%(tag)"']
+try:
+result = subprocess.run(cmd, \
+stdout=subprocess.PIPE, \
+stderr=subprocess.PIPE,
+check=True)
+except subprocess.CalledProcessError:
+print("Failed to interogate git for release tags")
+sys.exit()
+
+
+tags = result.stdout.decode('utf-8').split('\n')
+
+# find the non-rcs between now and v19.11
+tags = [ tag.replace('\"','') \
+ for tag in reversed(tags) \
+ if pattern.match(tag) ][:-3]
+
+return tags
+
+def fix_directory_name(path):
+'''Prepend librte to the source directory name'''
+mapfilepath1 = str(path.parent.name)
+mapfilepath2 = str(path.parents[1])
+mapfilepath = mapfilepath2 + '/librte_' + mapfilepath1
+
+return mapfilepath
+
+def directory_renamed(path, rel):
+'''Fix removal of the librte_ from the directory names'''
+
+mapfilepath = fix_directory_name(path)
+tagfile = '{}:{}/{}'.format(rel, mapfilepath,  path.name)
+
+try:
+result = subprocess.run(['git', 'show', tagfile], \
+stdout=subprocess.PIPE, \
+stderr=subprocess.PIPE,
+check=True)
+except subprocess.CalledProcessError:
+result = None
+
+return result
+
+def mapfile_renamed(path, rel):
+'''Fix renaming of the map file'''
+newfile = None
+
+result = subprocess.run(['git', 'ls-tree', \
+ rel, str(path.parent) + '/']

[dpdk-dev] [PATCH v9 2/2] devtools: script to send notifications of expired symbols

[Ray Kinsella]

Use this script with the output of the DPDK symbol tool, to notify
maintainers of expired symbols by email. You need to define the environment
variable DPDK_GETMAINTAINER_PATH for this tool to work.

Use terminal output to review the emails before sending.
e.g.
$ devtools/symbol-tool.py list-expired --format-output csv \
| DPDK_GETMAINTAINER_PATH=/get_maintainer.pl \
devtools/notify_expired_symbols.py --format-output terminal

Then use email output to send the emails to the maintainers.
e.g.
$ devtools/symbol-tool.py list-expired --format-output csv \
| DPDK_GETMAINTAINER_PATH=/get_maintainer.pl \
devtools/notify_expired_symbols.py --format-output email \
--smtp-server  --sender  \
--password 

Signed-off-by: Ray Kinsella 
---
 devtools/notify-symbol-maintainers.py | 234 ++
 1 file changed, 234 insertions(+)
 create mode 100755 devtools/notify-symbol-maintainers.py

diff --git a/devtools/notify-symbol-maintainers.py 
b/devtools/notify-symbol-maintainers.py
new file mode 100755
index 00..a6c27b067c
--- /dev/null
+++ b/devtools/notify-symbol-maintainers.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+'''Tool to notify maintainers of expired symbols'''
+import smtplib
+import ssl
+import sys
+import subprocess
+import argparse
+from argparse import RawTextHelpFormatter
+import time
+from email.message import EmailMessage
+
+DESCRIPTION = '''
+Use this script with the output of the DPDK symbol tool, to notify maintainers
+of expired symbols by email. You need to define the environment variable
+DPDK_GETMAINTAINER_PATH, for this tool to work.
+
+Use terminal output to review the emails before sending.
+e.g.
+$ devtools/symbol-tool.py list-expired --format-output csv \\
+| DPDK_GETMAINTAINER_PATH=/get_maintainer.pl \\
+{s} --format-output terminal
+
+Then use email output to send the emails to the maintainers.
+e.g.
+$ devtools/symbol-tool.py list-expired --format-output csv \\
+| DPDK_GETMAINTAINER_PATH=/get_maintainer.pl \\
+{s} --format-output email \\
+--smtp-server  --sender  --password 
+'''
+
+EMAIL_TEMPLATE = '''Hi there,
+
+Please note the symbols listed below have expired. In line with the DPDK ABI
+policy, they should be scheduled for removal, in the next DPDK release.
+
+For more information, please see the DPDK ABI Policy, section 3.5.3.
+https://doc.dpdk.org/guides/contributing/abi_policy.html
+
+Thanks,
+
+The DPDK Symbol Bot
+
+'''
+
+ABI_POLICY = 'doc/guides/contributing/abi_policy.rst'
+get_maintainer = ['devtools/get-maintainer.sh', \
+  '--email', '-f']
+
+def _get_maintainers(libpath):
+'''Get the maintainers for given library'''
+try:
+cmd = get_maintainer + [libpath]
+result = subprocess.run(cmd, \
+stdout=subprocess.PIPE, \
+stderr=subprocess.PIPE,
+check=True)
+except subprocess.CalledProcessError:
+return None
+
+if result is None:
+return None
+
+email = result.stdout.decode('utf-8')
+if email == '':
+return None
+
+email = list(filter(None,email.split('\n')))
+return email
+
+default_maintainers = _get_maintainers(ABI_POLICY)
+
+def get_maintainers(libpath):
+'''Get the maintainers for given library'''
+maintainers=_get_maintainers(libpath)
+
+if maintainers is None:
+maintainers = default_maintainers
+
+return maintainers
+
+def get_message(library, symbols):
+'''Build email message from symbols, config and maintainers'''
+message = {}
+maintainers = get_maintainers(library)
+
+message['To'] = maintainers
+if maintainers != default_maintainers:
+message['CC'] = default_maintainers
+
+message['Subject'] = 'Expired symbols in {}\n'.format(library)
+
+body = EMAIL_TEMPLATE
+for sym in symbols:
+body += ('{}\n'.format(sym))
+
+message['Body'] = body
+
+return message
+
+class OutputEmail():
+'''Format the output for email'''
+def __init__(self, config):
+self.config = config
+
+self.terminal = OutputTerminal(config)
+context = ssl.create_default_context()
+
+# Try to log in to server and send email
+try:
+self.server = smtplib.SMTP(config['smtp_server'], 587)
+self.server.starttls(context=context) # Secure the connection
+self.server.login(config['sender'], config['password'])
+except Exception as exception:
+print(exception)
+raise exception
+
+def message(self,message):
+'''send email'''
+self.terminal.message(message)
+
+msg = EmailMessage()
+msg.set_content(message.pop('Body'))
+
+for key in message.keys():
+msg[key] = message[key]
+
+msg['From'] = self.config['sender']
+msg['Reply-To'] = 'no-re...@dpdk.org'
+
+self.server.s

[dpdk-dev] [PATCH v1] doc: fix CI typo warnings

[Ray Kinsella]

Fix documentation typos that are generating spurious CI warnings.

Signed-off-by: Ray Kinsella 
---
 doc/guides/sample_app_ug/ioat.rst| 2 +-
 doc/guides/sample_app_ug/vmdq_forwarding.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/sample_app_ug/ioat.rst 
b/doc/guides/sample_app_ug/ioat.rst
index ee0a627b06..b364be3b5d 100644
--- a/doc/guides/sample_app_ug/ioat.rst
+++ b/doc/guides/sample_app_ug/ioat.rst
@@ -236,7 +236,7 @@ function in order to start processing for each lcore:
 .. literalinclude:: ../../../examples/ioat/ioatfwd.c
 :language: c
 :start-after: Start processing for each lcore. 8<
-:end-before: >8 End of starting to processfor each lcore.
+:end-before: >8 End of starting to process for each lcore.
 :dedent: 0
 
 The function launches Rx/Tx processing functions on configured lcores
diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst 
b/doc/guides/sample_app_ug/vmdq_forwarding.rst
index ae1b5660df..ed28525a15 100644
--- a/doc/guides/sample_app_ug/vmdq_forwarding.rst
+++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst
@@ -103,7 +103,7 @@ the MAC of VMDq pool 2 on port 1 is 52:54:00:12:01:02.
 
 .. literalinclude:: ../../../examples/vmdq/main.c
 :language: c
-:start-after: Building correct configruration for vdmq. 8<
+:start-after: Building correct configuration for vdmq. 8<
 :end-before: >8 End of get_eth_conf.
 
 Once the network port has been initialized using the correct VMDq values,
-- 
2.26.2

Re: [dpdk-dev] [PATCH] doc: abstract the behaviour of rte_ctrl_thread_create

[Honnappa Nagarahalli]

> 
> 30/07/2021 23:44, Honnappa Nagarahalli:
> > The current expected behaviour of the function rte_ctrl_thread_create
> > is rigid which makes the implementation of the function complex.
> > Make the expected behaviour abstract to allow for simplified
> > implementation.
> >
> > With this change, the calls to pthread_setaffinity_np can be moved to
> > the control thread. This will avoid the use of pthread_barrier_wait
> > and simplify the synchronization mechanism between
> > rte_ctrl_thread_create and the calling thread.
> >
> > Signed-off-by: Honnappa Nagarahalli 
> > ---
> > +* eal: The expected behaviour of the function
> > +``rte_ctrl_thread_create``
> > +  abstracted to allow for simplified implementation. The new
> > +behaviour is
> > +  as follows:
> > +  Creates a control thread with the given name. The affinity of the
> > +new
> > +  thread is based on the CPU affinity retrieved at the time
> > +rte_eal_init()
> > +  was called, the dataplane and service lcores are then excluded.
> 
> I don't understand what is different of the current API:
>  * Wrapper to pthread_create(), pthread_setname_np() and
>  * pthread_setaffinity_np(). The affinity of the new thread is based
>  * on the CPU affinity retrieved at the time rte_eal_init() was called,
>  * the dataplane and service lcores are then excluded.
My concern is for the word "Wrapper". I am not sure how much we are bound by 
that to keep the code as a "wrapper".
The new patch does not change the high level behavior.

Are you saying you are ok with the patch without the deprecation notice?

> 
> Anyway, there is not enough meaningful acks.
> 

[dpdk-dev] [Bug 785] rte_pktmbuf_alloc fails with a segmentation fault but rte_pktmbuf_pool_create returns valid data

[bugzilla]

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

Bug ID: 785
   Summary: rte_pktmbuf_alloc fails with a segmentation fault but
rte_pktmbuf_pool_create returns valid data
   Product: DPDK
   Version: 20.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: core
  Assignee: dev@dpdk.org
  Reporter: brydon_gib...@dell.com
  Target Milestone: ---

(backtrace below) mbuf_pool is valid, and there is sufficient memory onboard,
yet __mempool_generic_get (from rte_pktmbuf_alloc) fails because cache points
to invalid memory. There doesn't seem to be any way of detecting that something
is wrong because pool_create returns perfectly good data.

Backtrace:
Program received signal SIGSEGV, Segmentation fault.
0x00402735 in __mempool_generic_get (cache=0x2f6e69622f77735f, n=1,
obj_table=0x7fffe0d8, mp=0x7fffe6db) at
/usr/local/include/rte_mempool.h:1417
1417if (unlikely(cache == NULL || n >= cache->size))
(gdb) bt full
#0  0x00402735 in __mempool_generic_get (cache=0x2f6e69622f77735f, n=1,
obj_table=0x7fffe0d8, mp=0x7fffe6db) at
/usr/local/include/rte_mempool.h:1417
ret = 0
len = 4294960256
index = 32767
cache_objs = 0x0
#1  rte_mempool_generic_get (cache=0x2f6e69622f77735f, n=1,
obj_table=0x7fffe0d8, mp=0x7fffe6db) at
/usr/local/include/rte_mempool.h:1491
ret = 0
#2  rte_mempool_get_bulk (n=1, obj_table=0x7fffe0d8, mp=0x7fffe6db) at
/usr/local/include/rte_mempool.h:1526
cache = 0x2f6e69622f77735f
#3  rte_mempool_get (obj_p=0x7fffe0d8, mp=0x7fffe6db) at
/usr/local/include/rte_mempool.h:1552
No locals.
#4  rte_mbuf_raw_alloc (mp=0x7fffe6db) at /usr/local/include/rte_mbuf.h:590
m = 0x1656380
#5  0x00402cd2 in rte_pktmbuf_alloc (mp=0x7fffe6db) at
/usr/local/include/rte_mbuf.h:895
m = 0x770e5d4d <__GI_rewind+109>
#6  0x0040798e in getAndMbufData (argstring=0x7a9935 "-f",
einf=0x7fffe480) at cmdParser.c:73
fd = 0x1656380
fsize = 0
readSize = 5
data = 0x1651f20 ""
argv = {0x4095f0 "progname", 0x7a9935 "-f", 0x7a9938 "test.txt", 0x0}
argc = 3
opt = -1
myBuf = 1
total_mbufs = 0
bufToUse = 0x7fffe70a

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

Re: [dpdk-dev] [PATCH] eal: allow hugetlbfs sub-directories

[Jerin Jacob]

On Mon, Aug 9, 2021 at 4:54 PM John Levon  wrote:
>
> get_hugepage_dir() was implemented in such a way that a --huge-dir
> option had to exactly match the mountpoint, but there's no reason for
> this restriction: DPDK might not be the only user of hugepages, and
> shouldn't assume it owns an entire mountpoint. For example, if I have
> /dev/hugepages/myapp, and /dev/hugepages/dpdk, I should be able to
> specify:
>
> --huge-dir=/dev/hugepages/dpdk/
>
> and have DPDK only use that sub-directory.
>
> Fix the implementation to allow a sub-directory within a suitable
> hugetlbfs mountpoint to be specified, preferring the closest match.
>
> Signed-off-by: John Levon 

Cool feature.
Could you add to the release note as well when this patch gets merged
https://patches.dpdk.org/project/dpdk/patch/20210808192658.284547-1-tho...@monjalon.net/

> ---
> v2: prefer closer matches
> v3: checkpatch fixes
> v4: fix docs, added tests
>
>  app/test/test_eal_flags.c | 116 --
>  doc/guides/linux_gsg/linux_eal_parameters.rst |   3 +-
>  lib/eal/linux/eal_hugepage_info.c |  83 +
>  3 files changed, 138 insertions(+), 64 deletions(-)
>
> diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
> index b4880ee802..1d18a0ba8f 100644
> --- a/app/test/test_eal_flags.c
> +++ b/app/test/test_eal_flags.c
> @@ -14,8 +14,9 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
> +#include 
> +#include 
>  #include 
>  #include 
>
> @@ -800,6 +801,9 @@ static int
>  test_misc_flags(void)
>  {
> char hugepath[PATH_MAX] = {0};
> +   char hugepath_dir[PATH_MAX] = {0};
> +   char hugepath_dir2[PATH_MAX] = {0};
> +   char hugepath_dir3[PATH_MAX] = {0};
>  #ifdef RTE_EXEC_ENV_FREEBSD
> /* BSD target doesn't support prefixes at this point */
> const char * prefix = "";
> @@ -810,6 +814,7 @@ test_misc_flags(void)
> FILE * hugedir_handle = NULL;
> char line[PATH_MAX] = {0};
> unsigned i, isempty = 1;
> +
> if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
> printf("Error - unable to get current prefix!\n");
> return -1;
> @@ -849,6 +854,20 @@ test_misc_flags(void)
> }
>  #endif
>
> +   snprintf(hugepath_dir, sizeof(hugepath_dir), "%s/dpdk.missing", 
> hugepath);
> +   snprintf(hugepath_dir2, sizeof(hugepath_dir2), "%s/dpdk.dir", 
> hugepath);
> +
> +   if (mkdir(hugepath_dir2, 0700) != 0 && errno != EEXIST) {
> +   printf("Error - failed to mkdir(%s)\n", hugepath_dir2);
> +   return -1;
> +   }
> +
> +   snprintf(hugepath_dir3, sizeof(hugepath_dir3), "%s/dpdk.dir/sub", 
> hugepath);
> +
> +   if (mkdir(hugepath_dir3, 0700) != 0 && errno != EEXIST) {
> +   printf("Error - failed to mkdir(%s)\n", hugepath_dir3);
> +   goto fail;
> +   }
>
> /* check that some general flags don't prevent things from working.
>  * All cases, apart from the first, app should run.
> @@ -881,60 +900,66 @@ test_misc_flags(void)
> /* With invalid --huge-dir */
> const char *argv9[] = {prgname, "-m", DEFAULT_MEM_SIZE,
> "--file-prefix=hugedir", "--huge-dir", "invalid"};
> +   /* With invalid --huge-dir sub-directory */
> +   const char *argv10[] = {prgname, "-m", DEFAULT_MEM_SIZE,
> +   "--file-prefix=hugedir", "--huge-dir", hugepath_dir};
> +   /* With valid --huge-dir sub-directory */
> +   const char *argv11[] = {prgname, "-m", DEFAULT_MEM_SIZE,
> +   "--file-prefix=hugedir", "--huge-dir", hugepath_dir2};
> /* Secondary process with invalid --huge-dir (should run as flag has 
> no
>  * effect on secondary processes) */
> -   const char *argv10[] = {prgname, prefix, mp_flag,
> +   const char *argv12[] = {prgname, prefix, mp_flag,
> "--huge-dir", "invalid"};
>
> /* try running with base-virtaddr param */
> -   const char *argv11[] = {prgname, "--file-prefix=virtaddr",
> +   const char *argv13[] = {prgname, "--file-prefix=virtaddr",
> "--base-virtaddr=0x12345678"};
>
> /* try running with --vfio-intr INTx flag */
> -   const char *argv12[] = {prgname, "--file-prefix=intr",
> +   const char *argv14[] = {prgname, "--file-prefix=intr",
> "--vfio-intr=legacy"};
>
> /* try running with --vfio-intr MSI flag */
> -   const char *argv13[] = {prgname, "--file-prefix=intr",
> +   const char *argv15[] = {prgname, "--file-prefix=intr",
> "--vfio-intr=msi"};
>
> /* try running with --vfio-intr MSI-X flag */
> -   const char *argv14[] = {prgname, "--file-prefix=intr",
> +   const char *argv16[] = {prgname, "--file-prefix=intr",
> "--vfio-intr=msix"};
>
> /* try running with --vfio-intr invalid flag */
> 

Re: [dpdk-dev] [PATCH v1] ethdev: introduce shared Rx queue

[Jerin Jacob]

On Mon, Aug 9, 2021 at 5:18 PM Xueming Li  wrote:
>
> In current DPDK framework, each RX queue is pre-loaded with mbufs for
> incoming packets. When number of representors scale out in a switch
> domain, the memory consumption became significant. Most important,
> polling all ports leads to high cache miss, high latency and low
> throughput.
>
> This patch introduces shared RX queue. Ports with same configuration in
> a switch domain could share RX queue set by specifying sharing group.
> Polling any queue using same shared RX queue receives packets from all
> member ports. Source port is identified by mbuf->port.
>
> Port queue number in a shared group should be identical. Queue index is
> 1:1 mapped in shared group.
>
> Share RX queue is supposed to be polled on same thread.
>
> Multiple groups is supported by group ID.

Is this offload specific to the representor? If so can this name be
changed specifically to representor?
If it is for a generic case, how the flow ordering will be maintained?

>
> Signed-off-by: Xueming Li 
> ---
>  doc/guides/nics/features.rst| 11 +++
>  doc/guides/nics/features/default.ini|  1 +
>  doc/guides/prog_guide/switch_representation.rst | 10 ++
>  lib/ethdev/rte_ethdev.c |  1 +
>  lib/ethdev/rte_ethdev.h |  7 +++
>  5 files changed, 30 insertions(+)
>
> diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
> index a96e12d155..2e2a9b1554 100644
> --- a/doc/guides/nics/features.rst
> +++ b/doc/guides/nics/features.rst
> @@ -624,6 +624,17 @@ Supports inner packet L4 checksum.
>``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CKSUM``.
>
>
> +.. _nic_features_shared_rx_queue:
> +
> +Shared Rx queue
> +---
> +
> +Supports shared Rx queue for ports in same switch domain.
> +
> +* **[uses] rte_eth_rxconf,rte_eth_rxmode**: 
> ``offloads:RTE_ETH_RX_OFFLOAD_SHARED_RXQ``.
> +* **[provides] mbuf**: ``mbuf.port``.
> +
> +
>  .. _nic_features_packet_type_parsing:
>
>  Packet type parsing
> diff --git a/doc/guides/nics/features/default.ini 
> b/doc/guides/nics/features/default.ini
> index 754184ddd4..ebeb4c1851 100644
> --- a/doc/guides/nics/features/default.ini
> +++ b/doc/guides/nics/features/default.ini
> @@ -19,6 +19,7 @@ Free Tx mbuf on demand =
>  Queue start/stop =
>  Runtime Rx queue setup =
>  Runtime Tx queue setup =
> +Shared Rx queue  =
>  Burst mode info  =
>  Power mgmt address monitor =
>  MTU update   =
> diff --git a/doc/guides/prog_guide/switch_representation.rst 
> b/doc/guides/prog_guide/switch_representation.rst
> index ff6aa91c80..45bf5a3a10 100644
> --- a/doc/guides/prog_guide/switch_representation.rst
> +++ b/doc/guides/prog_guide/switch_representation.rst
> @@ -123,6 +123,16 @@ thought as a software "patch panel" front-end for 
> applications.
>  .. [1] `Ethernet switch device driver model (switchdev)
> `_
>
> +- Memory usage of representors is huge when number of representor grows,
> +  because PMD always allocate mbuf for each descriptor of Rx queue.
> +  Polling the large number of ports brings more CPU load, cache miss and
> +  latency. Shared Rx queue can be used to share Rx queue between PF and
> +  representors in same switch domain. ``RTE_ETH_RX_OFFLOAD_SHARED_RXQ``
> +  is present in Rx offloading capability of device info. Setting the
> +  offloading flag in device Rx mode or Rx queue configuration to enable
> +  shared Rx queue. Polling any member port of shared Rx queue can return
> +  packets of all ports in group, port ID is saved in ``mbuf.port``.
> +
>  Basic SR-IOV
>  
>
> diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
> index 9d95cd11e1..1361ff759a 100644
> --- a/lib/ethdev/rte_ethdev.c
> +++ b/lib/ethdev/rte_ethdev.c
> @@ -127,6 +127,7 @@ static const struct {
> RTE_RX_OFFLOAD_BIT2STR(OUTER_UDP_CKSUM),
> RTE_RX_OFFLOAD_BIT2STR(RSS_HASH),
> RTE_ETH_RX_OFFLOAD_BIT2STR(BUFFER_SPLIT),
> +   RTE_ETH_RX_OFFLOAD_BIT2STR(SHARED_RXQ),
>  };
>
>  #undef RTE_RX_OFFLOAD_BIT2STR
> diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
> index d2b27c351f..a578c9db9d 100644
> --- a/lib/ethdev/rte_ethdev.h
> +++ b/lib/ethdev/rte_ethdev.h
> @@ -1047,6 +1047,7 @@ struct rte_eth_rxconf {
> uint8_t rx_drop_en; /**< Drop packets if no descriptors are 
> available. */
> uint8_t rx_deferred_start; /**< Do not start queue with 
> rte_eth_dev_start(). */
> uint16_t rx_nseg; /**< Number of descriptions in rx_seg array. */
> +   uint32_t shared_group; /**< Shared port group index in switch domain. 
> */
> /**
>  * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags.
>  * Only offloads set on rx_queue_offload_capa or rx_offload_capa
> @@ -1373,6 +1374,12 @@ struct rte_eth_conf {
>  #define DEV_RX_OFFLOAD_OUT

Re: [dpdk-dev] [RFC] ethdev: change queue release callback

[Singh, Aman Deep]

Hi Xueming,

On 7/28/2021 1:10 PM, Andrew Rybchenko wrote:

On 7/27/21 6:41 AM, Xueming Li wrote:

To align with other eth device queue configuration callbacks, change RX
and TX queue release callback API parameter from queue object to device
and queue index.

Signed-off-by: Xueming Li 


In fact, there is no strong reasons to do it, but I think it is a nice
cleanup to use (dev + queue index) on control path.

Hopefully it will not result in any regressions.


Combined there are 100+ API's for Rx/Tx queue_release that need to be 
modified for it.


I believe all regression possibilities here will be caught, in 
compilation phase itself.

Re: [dpdk-dev] [PATCH v1] doc: fix CI typo warnings

[Aaron Conole]

Ray Kinsella  writes:

> Fix documentation typos that are generating spurious CI warnings.
>
> Signed-off-by: Ray Kinsella 
> ---

Looks like there are still a few errors.  Ex:

ioat: end-before not used anywhere

deprecation.rst: 'inplace' should probably be 'in place'
deprecation.rst: 'esn' -> probably needs a way to exempt this particular
'word' / line, because it is a function name.  I'm surprised it is even
considered.

Is it possible to spin a v2 with these fixes?

>  doc/guides/sample_app_ug/ioat.rst| 2 +-
>  doc/guides/sample_app_ug/vmdq_forwarding.rst | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/doc/guides/sample_app_ug/ioat.rst 
> b/doc/guides/sample_app_ug/ioat.rst
> index ee0a627b06..b364be3b5d 100644
> --- a/doc/guides/sample_app_ug/ioat.rst
> +++ b/doc/guides/sample_app_ug/ioat.rst
> @@ -236,7 +236,7 @@ function in order to start processing for each lcore:
>  .. literalinclude:: ../../../examples/ioat/ioatfwd.c
>  :language: c
>  :start-after: Start processing for each lcore. 8<
> -:end-before: >8 End of starting to processfor each lcore.
> +:end-before: >8 End of starting to process for each lcore.
>  :dedent: 0
>  
>  The function launches Rx/Tx processing functions on configured lcores
> diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst 
> b/doc/guides/sample_app_ug/vmdq_forwarding.rst
> index ae1b5660df..ed28525a15 100644
> --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst
> +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst
> @@ -103,7 +103,7 @@ the MAC of VMDq pool 2 on port 1 is 52:54:00:12:01:02.
>  
>  .. literalinclude:: ../../../examples/vmdq/main.c
>  :language: c
> -:start-after: Building correct configruration for vdmq. 8<
> +:start-after: Building correct configuration for vdmq. 8<
>  :end-before: >8 End of get_eth_conf.
>  
>  Once the network port has been initialized using the correct VMDq values,

Re: [dpdk-dev] [PATCH v2] app/testpmd: flowgen support ip and udp fields

[Ferruh Yigit]

On 8/9/2021 7:52 AM, Zhihong Wang wrote:
> This patch aims to:
>  1. Add flexibility by supporting IP & UDP src/dst fields

What is the reason/"use case" of this flexibility?

>  2. Improve multi-core performance by using per-core vars>

On multi core this also has syncronization problem, OK to make it per-core. Do
you have any observed performance difference, if so how much is it?

And can you please separate this to its own patch? This can be before ip/udp 
update.

> v2: fix assigning ip header cksum
> 

+1 to update, can you please make it as seperate patch?

So overall this can be a patchset with 4 patches:
1- Fix retry logic (nb_rx -> nb_pkt)
2- Use 'rte_ipv4_cksum()' API (instead of static 'ip_sum()')
3- User per-core varible (for 'next_flow')
4- Support ip/udp src/dst variaty of packets

> Signed-off-by: Zhihong Wang 
> ---
>  app/test-pmd/flowgen.c | 137 
> +++--
>  1 file changed, 86 insertions(+), 51 deletions(-)
> 

<...>

> @@ -185,30 +193,57 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
>   }
>   pkts_burst[nb_pkt] = pkt;
>  
> - next_flow = (next_flow + 1) % cfg_n_flows;
> + if (++next_udp_dst < cfg_n_udp_dst)
> + continue;
> + next_udp_dst = 0;
> + if (++next_udp_src < cfg_n_udp_src)
> + continue;
> + next_udp_src = 0;
> + if (++next_ip_dst < cfg_n_ip_dst)
> + continue;
> + next_ip_dst = 0;
> + if (++next_ip_src < cfg_n_ip_src)
> + continue;
> + next_ip_src = 0;

What is the logic here, can you please clarifiy the packet generation logic both
in a comment here and in the commit log?

>   }
>  
>   nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_pkt);
>   /*
>* Retry if necessary
>*/
> - if (unlikely(nb_tx < nb_rx) && fs->retry_enabled) {
> + if (unlikely(nb_tx < nb_pkt) && fs->retry_enabled) {
>   retry = 0;
> - while (nb_tx < nb_rx && retry++ < burst_tx_retry_num) {
> + while (nb_tx < nb_pkt && retry++ < burst_tx_retry_num) {
>   rte_delay_us(burst_tx_delay_time);
>   nb_tx += rte_eth_tx_burst(fs->tx_port, fs->tx_queue,
> - &pkts_burst[nb_tx], nb_rx - nb_tx);
> + &pkts_burst[nb_tx], nb_pkt - nb_tx);
>   }

+1 to this fix, thanks for it. But can you please make a seperate patch for
this, with proper 'Fixes:' tag etc..

>   }
> - fs->tx_packets += nb_tx;
>  
>   inc_tx_burst_stats(fs, nb_tx);
> - if (unlikely(nb_tx < nb_pkt)) {
> - /* Back out the flow counter. */
> - next_flow -= (nb_pkt - nb_tx);
> - while (next_flow < 0)
> - next_flow += cfg_n_flows;
> + fs->tx_packets += nb_tx;
> + /* Catch up flow idx by actual sent. */
> + for (i = 0; i < nb_tx; ++i) {
> + RTE_PER_LCORE(_next_udp_dst) = RTE_PER_LCORE(_next_udp_dst) + 1;
> + if (RTE_PER_LCORE(_next_udp_dst) < cfg_n_udp_dst)
> + continue;
> + RTE_PER_LCORE(_next_udp_dst) = 0;
> + RTE_PER_LCORE(_next_udp_src) = RTE_PER_LCORE(_next_udp_src) + 1;
> + if (RTE_PER_LCORE(_next_udp_src) < cfg_n_udp_src)
> + continue;
> + RTE_PER_LCORE(_next_udp_src) = 0;
> + RTE_PER_LCORE(_next_ip_dst) = RTE_PER_LCORE(_next_ip_dst) + 1;
> + if (RTE_PER_LCORE(_next_ip_dst) < cfg_n_ip_dst)
> + continue;
> + RTE_PER_LCORE(_next_ip_dst) = 0;
> + RTE_PER_LCORE(_next_ip_src) = RTE_PER_LCORE(_next_ip_src) + 1;
> + if (RTE_PER_LCORE(_next_ip_src) < cfg_n_ip_src)
> + continue;
> + RTE_PER_LCORE(_next_ip_src) = 0;
> + }

Why per-core variables are not used in forward function, but local variables
(like 'next_ip_src' etc..) used? Is it for the performance, if so what is the
impact?

And why not directly assign from local variables to per-core variables, but have
above catch up loop?

Re: [dpdk-dev] [RFC] ethdev: change queue release callback

[Ferruh Yigit]

On 8/9/2021 3:39 PM, Singh, Aman Deep wrote:
> Hi Xueming,
> 
> On 7/28/2021 1:10 PM, Andrew Rybchenko wrote:
>> On 7/27/21 6:41 AM, Xueming Li wrote:
>>> To align with other eth device queue configuration callbacks, change RX
>>> and TX queue release callback API parameter from queue object to device
>>> and queue index.
>>>
>>> Signed-off-by: Xueming Li 
>>
>> In fact, there is no strong reasons to do it, but I think it is a nice
>> cleanup to use (dev + queue index) on control path.
>>
>> Hopefully it will not result in any regressions.
> 
> Combined there are 100+ API's for Rx/Tx queue_release that need to be modified
> for it.
> 
> I believe all regression possibilities here will be caught, in compilation 
> phase
> itself.
> 

Same here, it is a good cleanup but there is no strong reason for it.

Since it is all internal, there is no ABI restriction on the patch, and v21.11
will be full ABI break patches, to not cause conflicts with this change, what
would you think to have it on v22.02?

[dpdk-dev] [PATCH v1] ethdev: introduce shared Rx queue

[Xueming Li]

In current DPDK framework, each RX queue is pre-loaded with mbufs for
incoming packets. When number of representors scale out in a switch
domain, the memory consumption became significant. Most important,
polling all ports leads to high cache miss, high latency and low
throughput.

This patch introduces shared RX queue. Ports with same configuration in
a switch domain could share RX queue set by specifying sharing group.
Polling any queue using same shared RX queue receives packets from all
member ports. Source port is identified by mbuf->port.

Port queue number in a shared group should be identical. Queue index is
1:1 mapped in shared group.

Share RX queue is supposed to be polled on same thread.

Multiple groups is supported by group ID.

Signed-off-by: Xueming Li 
---
 doc/guides/nics/features.rst| 11 +++
 doc/guides/nics/features/default.ini|  1 +
 doc/guides/prog_guide/switch_representation.rst | 10 ++
 lib/ethdev/rte_ethdev.c |  1 +
 lib/ethdev/rte_ethdev.h |  7 +++
 5 files changed, 30 insertions(+)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index a96e12d155..2e2a9b1554 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -624,6 +624,17 @@ Supports inner packet L4 checksum.
   ``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CKSUM``.
 
 
+.. _nic_features_shared_rx_queue:
+
+Shared Rx queue
+---
+
+Supports shared Rx queue for ports in same switch domain.
+
+* **[uses] rte_eth_rxconf,rte_eth_rxmode**: 
``offloads:RTE_ETH_RX_OFFLOAD_SHARED_RXQ``.
+* **[provides] mbuf**: ``mbuf.port``.
+
+
 .. _nic_features_packet_type_parsing:
 
 Packet type parsing
diff --git a/doc/guides/nics/features/default.ini 
b/doc/guides/nics/features/default.ini
index 754184ddd4..ebeb4c1851 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -19,6 +19,7 @@ Free Tx mbuf on demand =
 Queue start/stop =
 Runtime Rx queue setup =
 Runtime Tx queue setup =
+Shared Rx queue  =
 Burst mode info  =
 Power mgmt address monitor =
 MTU update   =
diff --git a/doc/guides/prog_guide/switch_representation.rst 
b/doc/guides/prog_guide/switch_representation.rst
index ff6aa91c80..45bf5a3a10 100644
--- a/doc/guides/prog_guide/switch_representation.rst
+++ b/doc/guides/prog_guide/switch_representation.rst
@@ -123,6 +123,16 @@ thought as a software "patch panel" front-end for 
applications.
 .. [1] `Ethernet switch device driver model (switchdev)
`_
 
+- Memory usage of representors is huge when number of representor grows,
+  because PMD always allocate mbuf for each descriptor of Rx queue.
+  Polling the large number of ports brings more CPU load, cache miss and
+  latency. Shared Rx queue can be used to share Rx queue between PF and
+  representors in same switch domain. ``RTE_ETH_RX_OFFLOAD_SHARED_RXQ``
+  is present in Rx offloading capability of device info. Setting the
+  offloading flag in device Rx mode or Rx queue configuration to enable
+  shared Rx queue. Polling any member port of shared Rx queue can return
+  packets of all ports in group, port ID is saved in ``mbuf.port``.
+
 Basic SR-IOV
 
 
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 9d95cd11e1..1361ff759a 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -127,6 +127,7 @@ static const struct {
RTE_RX_OFFLOAD_BIT2STR(OUTER_UDP_CKSUM),
RTE_RX_OFFLOAD_BIT2STR(RSS_HASH),
RTE_ETH_RX_OFFLOAD_BIT2STR(BUFFER_SPLIT),
+   RTE_ETH_RX_OFFLOAD_BIT2STR(SHARED_RXQ),
 };
 
 #undef RTE_RX_OFFLOAD_BIT2STR
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index d2b27c351f..a578c9db9d 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -1047,6 +1047,7 @@ struct rte_eth_rxconf {
uint8_t rx_drop_en; /**< Drop packets if no descriptors are available. 
*/
uint8_t rx_deferred_start; /**< Do not start queue with 
rte_eth_dev_start(). */
uint16_t rx_nseg; /**< Number of descriptions in rx_seg array. */
+   uint32_t shared_group; /**< Shared port group index in switch domain. */
/**
 * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags.
 * Only offloads set on rx_queue_offload_capa or rx_offload_capa
@@ -1373,6 +1374,12 @@ struct rte_eth_conf {
 #define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM  0x0004
 #define DEV_RX_OFFLOAD_RSS_HASH0x0008
 #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT 0x0010
+/**
+ * Rx queue is shared among ports in same switch domain to save memory,
+ * avoid polling each port. Any port in group can be used to receive packets.
+ * Real source port number saved in mbuf->port field.
+ */
+#define RTE_ETH_RX_OFFLOAD_SHARED_RXQ   0x0020
 
 #define DEV_RX_OFFLOAD_CHECKSUM (DE

Re: [dpdk-dev] [PATCH v2] bus/vmbus: Fix crash when handling packets in secondary process

[Jonathan Erb]

Would it be possible to resolve the lack of subchannels in secondary 
processes as follows:



1. Create the following function in vmbus_uio.c to obtain the count of 
subchannels created by the primary:


int vmbus_uio_get_num_subchan(struct vmbus_channel *primary)
{

    const struct rte_vmbus_device *dev = primary->device;
    char chan_path[PATH_MAX];
    struct dirent *ent;
    DIR *chan_dir;
    int err;
    int subchan_cnt = 0;

    snprintf(chan_path, sizeof(chan_path),
         "%s/%s/channels",
         SYSFS_VMBUS_DEVICES, dev->device.name);

    chan_dir = opendir(chan_path);
    if (!chan_dir) {
        VMBUS_LOG(ERR, "cannot open %s: %s",
              chan_path, strerror(errno));
        return 0;
    }

    while ((ent = readdir(chan_dir))) {
        unsigned long relid, subid, monid;
        char *endp;

        if (ent->d_name[0] == '.')
            continue;

        errno = 0;
        relid = strtoul(ent->d_name, &endp, 0);
        if (*endp || errno != 0 || relid > UINT16_MAX) {
            VMBUS_LOG(NOTICE, "not a valid channel relid: %s",
                  ent->d_name);
            continue;
        }
        subchan_cnt++;
    }

    closedir(chan_dir);
    //Less one for primary channel
    return subchan_cnt - 1;

}


2. Then change the bottom of vmbus_uio_map_secondary() to be simply:

    /* fd is not needed in secondary process, close it */
    close(fd);

    if (vmbus_chan_create(dev, dev->relid, 0,
                    dev->monitor_id, &dev->primary)) {
        VMBUS_LOG(ERR, "cannot create primary channel");
        return -1;
    }

    int subchannels_cnt = vmbus_uio_get_num_subchan(dev->primary);
    for (i = 0; i < subchannels_cnt; i++) {
        if(vmbus_uio_get_subchan(dev->primary, &chan))
            return -1;
STAILQ_INSERT_TAIL(&dev->primary->subchannel_list, chan, next);
    }
    return 0;
}


In this way the secondary processes detect the number of subchannels 
created by the primary, then perform their own mappings as needed. All 
this can occur before rte_eal_init has completed.



Jonathan



On 7/26/21 6:16 PM, Long Li wrote:

Subject: [PATCH v2] bus/vmbus: Fix crash when handling packets in
secondary process

Have secondary processes construct their own copy of primary channel with
own mappings.

Remove vmbus_channel primary ptr from struct mapped_vmbus_resource
as its not used.

Populate virtual memory address "addr" in struct rte_mem_resource for
secondary processes as netvsc will attempt to reference it thus causing a
crash. It was initialized for primary processes but not for secondary.
Cc: sta...@dpdk.org

Signed-off-by: Jonathan Erb 
---
v2:
* Remove unnecessary check for NULL pointer before call to rte_free() per
reviwer comment.

  drivers/bus/vmbus/private.h  |  1 -
  drivers/bus/vmbus/vmbus_channel.c|  4 +---
  drivers/bus/vmbus/vmbus_common_uio.c | 14 +-
  3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/bus/vmbus/private.h b/drivers/bus/vmbus/private.h
index 528d60a42f..746212bd5f 100644
--- a/drivers/bus/vmbus/private.h
+++ b/drivers/bus/vmbus/private.h
@@ -42,7 +42,6 @@ struct mapped_vmbus_resource {

rte_uuid_t id;
int nb_maps;
-   struct vmbus_channel *primary;
struct vmbus_map maps[VMBUS_MAX_RESOURCE];
char path[PATH_MAX];
  };
diff --git a/drivers/bus/vmbus/vmbus_channel.c
b/drivers/bus/vmbus/vmbus_channel.c
index f67f1c438a..119b9b367e 100644
--- a/drivers/bus/vmbus/vmbus_channel.c
+++ b/drivers/bus/vmbus/vmbus_channel.c
@@ -351,10 +351,8 @@ int rte_vmbus_chan_open(struct rte_vmbus_device
*device,

err = vmbus_chan_create(device, device->relid, 0,
device->monitor_id, new_chan);
-   if (!err) {
+   if (!err)
device->primary = *new_chan;
-   uio_res->primary = *new_chan;
-   }

return err;
  }
diff --git a/drivers/bus/vmbus/vmbus_common_uio.c
b/drivers/bus/vmbus/vmbus_common_uio.c
index 8582e32c1d..83c56b6fa2 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -69,8 +69,10 @@ vmbus_uio_map_secondary(struct rte_vmbus_device
*dev)
 fd, offset,
 uio_res->maps[i].size, 0);

-   if (mapaddr == uio_res->maps[i].addr)
+   if (mapaddr == uio_res->maps[i].addr) {
+   dev->resource[i].addr = mapaddr;
continue;   /* successful map */
+   }

if (mapaddr == MAP_FAILED)
VMBUS_LOG(ERR,
@@ -88,9 +90,9 @@ vmbus_uio_map_secondary(struct rte_vmbus_device
*dev)
/* fd is not needed in secondary process, close it */
close(fd);

-   dev->primary = uio_res->primary;
-   if (!dev->primary) {
-   VMBUS_LOG(ERR, "missing primary channel");
+   if (vmbus_chan_create(dev, dev->relid, 0,
+

Re: [dpdk-dev] [PATCH v1] ethdev: introduce shared Rx queue

[Xueming(Steven) Li]

Hi,

> -Original Message-
> From: Jerin Jacob 
> Sent: Monday, August 9, 2021 9:51 PM
> To: Xueming(Steven) Li 
> Cc: dpdk-dev ; Ferruh Yigit ; 
> NBU-Contact-Thomas Monjalon ;
> Andrew Rybchenko 
> Subject: Re: [dpdk-dev] [PATCH v1] ethdev: introduce shared Rx queue
> 
> On Mon, Aug 9, 2021 at 5:18 PM Xueming Li  wrote:
> >
> > In current DPDK framework, each RX queue is pre-loaded with mbufs for
> > incoming packets. When number of representors scale out in a switch
> > domain, the memory consumption became significant. Most important,
> > polling all ports leads to high cache miss, high latency and low
> > throughput.
> >
> > This patch introduces shared RX queue. Ports with same configuration
> > in a switch domain could share RX queue set by specifying sharing group.
> > Polling any queue using same shared RX queue receives packets from all
> > member ports. Source port is identified by mbuf->port.
> >
> > Port queue number in a shared group should be identical. Queue index
> > is
> > 1:1 mapped in shared group.
> >
> > Share RX queue is supposed to be polled on same thread.
> >
> > Multiple groups is supported by group ID.
> 
> Is this offload specific to the representor? If so can this name be changed 
> specifically to representor?

Yes, PF and representor in switch domain could take advantage.

> If it is for a generic case, how the flow ordering will be maintained?

Not quite sure that I understood your question. The control path of is almost 
same as before,
PF and representor port still needed, rte flows not impacted.
Queues still needed for each member port, descriptors(mbuf) will be supplied 
from shared Rx queue
in my PMD implementation.

> 
> >
> > Signed-off-by: Xueming Li 
> > ---
> >  doc/guides/nics/features.rst| 11 +++
> >  doc/guides/nics/features/default.ini|  1 +
> >  doc/guides/prog_guide/switch_representation.rst | 10 ++
> >  lib/ethdev/rte_ethdev.c |  1 +
> >  lib/ethdev/rte_ethdev.h |  7 +++
> >  5 files changed, 30 insertions(+)
> >
> > diff --git a/doc/guides/nics/features.rst
> > b/doc/guides/nics/features.rst index a96e12d155..2e2a9b1554 100644
> > --- a/doc/guides/nics/features.rst
> > +++ b/doc/guides/nics/features.rst
> > @@ -624,6 +624,17 @@ Supports inner packet L4 checksum.
> >``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CKSUM``.
> >
> >
> > +.. _nic_features_shared_rx_queue:
> > +
> > +Shared Rx queue
> > +---
> > +
> > +Supports shared Rx queue for ports in same switch domain.
> > +
> > +* **[uses] rte_eth_rxconf,rte_eth_rxmode**: 
> > ``offloads:RTE_ETH_RX_OFFLOAD_SHARED_RXQ``.
> > +* **[provides] mbuf**: ``mbuf.port``.
> > +
> > +
> >  .. _nic_features_packet_type_parsing:
> >
> >  Packet type parsing
> > diff --git a/doc/guides/nics/features/default.ini
> > b/doc/guides/nics/features/default.ini
> > index 754184ddd4..ebeb4c1851 100644
> > --- a/doc/guides/nics/features/default.ini
> > +++ b/doc/guides/nics/features/default.ini
> > @@ -19,6 +19,7 @@ Free Tx mbuf on demand =
> >  Queue start/stop =
> >  Runtime Rx queue setup =
> >  Runtime Tx queue setup =
> > +Shared Rx queue  =
> >  Burst mode info  =
> >  Power mgmt address monitor =
> >  MTU update   =
> > diff --git a/doc/guides/prog_guide/switch_representation.rst
> > b/doc/guides/prog_guide/switch_representation.rst
> > index ff6aa91c80..45bf5a3a10 100644
> > --- a/doc/guides/prog_guide/switch_representation.rst
> > +++ b/doc/guides/prog_guide/switch_representation.rst
> > @@ -123,6 +123,16 @@ thought as a software "patch panel" front-end for 
> > applications.
> >  .. [1] `Ethernet switch device driver model (switchdev)
> >
> > `_
> >
> > +- Memory usage of representors is huge when number of representor
> > +grows,
> > +  because PMD always allocate mbuf for each descriptor of Rx queue.
> > +  Polling the large number of ports brings more CPU load, cache miss
> > +and
> > +  latency. Shared Rx queue can be used to share Rx queue between PF
> > +and
> > +  representors in same switch domain.
> > +``RTE_ETH_RX_OFFLOAD_SHARED_RXQ``
> > +  is present in Rx offloading capability of device info. Setting the
> > +  offloading flag in device Rx mode or Rx queue configuration to
> > +enable
> > +  shared Rx queue. Polling any member port of shared Rx queue can
> > +return
> > +  packets of all ports in group, port ID is saved in ``mbuf.port``.
> > +
> >  Basic SR-IOV
> >  
> >
> > diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index
> > 9d95cd11e1..1361ff759a 100644
> > --- a/lib/ethdev/rte_ethdev.c
> > +++ b/lib/ethdev/rte_ethdev.c
> > @@ -127,6 +127,7 @@ static const struct {
> > RTE_RX_OFFLOAD_BIT2STR(OUTER_UDP_CKSUM),
> > RTE_RX_OFFLOAD_BIT2STR(RSS_HASH),
> > RTE_ETH_RX_OFFLOAD_BIT2STR(BUFFER_SPLIT),
> > +   RTE_ETH_RX_OFFLOA

[dpdk-dev] [PATCH] net/mlx5: fix matching on eCPRI

[Dmitry Kozlyuk]

When an ETH or VLAN flow item directly preceding ECPRI (i. e. a pattern
for eCPRI over Ethernet) did not specify the eCPRI protocol, matches
were not restricted to eCPRI traffic. For example, "eth / ecpri / end"
pattern behaved as "eth / end". Implicitly add Ethernet type condition,
so that "eth / ecpri / end" behaves as "eth type is 0xAEFE / end".

Fixes: daa38a8924a0 ("net/mlx5: add flow translation of eCPRI header")
Cc: bi...@nvidia.com
Cc: sta...@dpdk.org

Signed-off-by: Dmitry Kozlyuk 
---
 drivers/net/mlx5/mlx5_flow_dv.c | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 31d857030f..5bb6d89a3f 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9976,12 +9976,13 @@ flow_dv_translate_item_gtp_psc(void *matcher, void *key,
  *   Flow matcher value.
  * @param[in] item
  *   Flow pattern to translate.
- * @param[in] samples
- *   Sample IDs to be used in the matching.
+ * @param[in] last_item
+ *   Last item flags.
  */
 static void
 flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
-void *key, const struct rte_flow_item *item)
+void *key, const struct rte_flow_item *item,
+uint64_t last_item)
 {
struct mlx5_priv *priv = dev->data->dev_private;
const struct rte_flow_item_ecpri *ecpri_m = item->mask;
@@ -9994,6 +9995,22 @@ flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, 
void *matcher,
void *dw_m;
void *dw_v;
 
+   /*
+* In case of eCPRI over Ethernet, if EtherType is not specified,
+* match on eCPRI EtherType implicitly.
+*/
+   if (last_item & MLX5_FLOW_LAYER_OUTER_L2) {
+   void *hdrs_m, *hdrs_v, *l2m, *l2v;
+
+   hdrs_m = MLX5_ADDR_OF(fte_match_param, matcher, outer_headers);
+   hdrs_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers);
+   l2m = MLX5_ADDR_OF(fte_match_set_lyr_2_4, hdrs_m, ethertype);
+   l2v = MLX5_ADDR_OF(fte_match_set_lyr_2_4, hdrs_v, ethertype);
+   if (*(uint16_t *)l2m == 0 && *(uint16_t *)l2v == 0) {
+   *(uint16_t *)l2m = UINT16_MAX;
+   *(uint16_t *)l2v = RTE_BE16(RTE_ETHER_TYPE_ECPRI);
+   }
+   }
if (!ecpri_v)
return;
if (!ecpri_m)
@@ -13474,7 +13491,8 @@ flow_dv_translate(struct rte_eth_dev *dev,
"cannot create eCPRI parser");
}
flow_dv_translate_item_ecpri(dev, match_mask,
-match_value, items);
+match_value, items,
+last_item);
/* No other protocol should follow eCPRI layer. */
last_item = MLX5_FLOW_LAYER_ECPRI;
break;
-- 
2.25.1

[dpdk-dev] [PATCH 00/28] ice: base code update

[Qi Zhang]

Summary:

1. Add new module to support 1588 timesync / PTP.
2. Couple FDIR / RSS enhancement to support GRE tunnel and GTPU
3. Support l3/ l4 checksum RSS

Qi Zhang (28):
  net/ice/base: add 1588 capability probe
  net/ice/base: add low level functions for device clock control
  net/ice/base: add ethertype IPv6 check for dummy packet
  net/ice/base: change dummy packets with VLAN
  net/ice/base: add timestamp masks
  net/ice/base: add clock initialization function
  net/ice/base: add accessors to get/set the time reference
  net/ice/base: print human-friendly PHY types
  net/ice/base: implement Vernier calibration logic for E822 devices
  net/ice/base: clarify comments on checking PFC mode
  net/ice/base: add support for starting PHY in bypass mode
  net/ice/base: add E810T check function
  net/ice/base: implement firmware debug dump
  net/ice/base: add new AQ description
  net/ice/base: refine MAC rule adding
  net/ice/base: support TC nodes PIR configuration
  net/ice/base: support FDIR for GRE tunnel packet
  net/ice/base: support RSS for GRE tunnel packet
  net/ice/base: support FDIR for GTPU EH inner IPv6
  net/ice/base: support RSS for GTPoGRE
  net/ice/base: enable NVM update reset capabilities
  net/ice/base: support FDIR for GTPoGRE
  net/ice/base: add RSS support for IPv4/L4 checksum
  net/ice/base: enable jumbo frame support during HW init
  net/ice/base: support FDIR for GTPU UL/DL with QFI fields
  net/ice/base: rename and add a setter function
  net/ice/base: correct spellling of word data
  net/ice/base: update Max TCAM/PTG Per Profile

 drivers/net/ice/base/ice_adminq_cmd.h|   28 +
 drivers/net/ice/base/ice_cgu_regs.h  |  117 +
 drivers/net/ice/base/ice_common.c|  513 +++-
 drivers/net/ice/base/ice_common.h|   21 +
 drivers/net/ice/base/ice_controlq.c  |   52 +-
 drivers/net/ice/base/ice_controlq.h  |2 +
 drivers/net/ice/base/ice_dcb.c   |9 +-
 drivers/net/ice/base/ice_devids.h|1 +
 drivers/net/ice/base/ice_fdir.c  | 2387 ++-
 drivers/net/ice/base/ice_fdir.h  |   14 +
 drivers/net/ice/base/ice_flex_pipe.c |6 +
 drivers/net/ice/base/ice_flex_type.h |   52 +-
 drivers/net/ice/base/ice_flow.c  |  231 +-
 drivers/net/ice/base/ice_flow.h  |   10 +
 drivers/net/ice/base/ice_lan_tx_rx.h |8 +
 drivers/net/ice/base/ice_protocol_type.h |4 +-
 drivers/net/ice/base/ice_ptp_consts.h|  376 +++
 drivers/net/ice/base/ice_ptp_hw.c| 3452 ++
 drivers/net/ice/base/ice_ptp_hw.h|  473 +++
 drivers/net/ice/base/ice_sched.c |3 +
 drivers/net/ice/base/ice_switch.c|  172 +-
 drivers/net/ice/base/ice_type.h  |  231 +-
 drivers/net/ice/base/meson.build |1 +
 23 files changed, 7892 insertions(+), 271 deletions(-)
 create mode 100644 drivers/net/ice/base/ice_cgu_regs.h
 create mode 100644 drivers/net/ice/base/ice_ptp_consts.h
 create mode 100644 drivers/net/ice/base/ice_ptp_hw.c
 create mode 100644 drivers/net/ice/base/ice_ptp_hw.h

-- 
2.26.2

[dpdk-dev] [PATCH 01/28] net/ice/base: add 1588 capability probe

[Qi Zhang]

Parse 1588 timesync capability during device capability probing.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_adminq_cmd.h |   1 +
 drivers/net/ice/base/ice_common.c | 111 ++
 drivers/net/ice/base/ice_type.h   |  72 +
 3 files changed, 184 insertions(+)

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h 
b/drivers/net/ice/base/ice_adminq_cmd.h
index 861f5a39b6..8fc0340c0d 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -108,6 +108,7 @@ struct ice_aqc_list_caps_elem {
 #define ICE_AQC_CAPS_TXQS  0x0042
 #define ICE_AQC_CAPS_MSIX  0x0043
 #define ICE_AQC_CAPS_FD0x0045
+#define ICE_AQC_CAPS_1588  0x0046
 #define ICE_AQC_CAPS_MAX_MTU   0x0047
 #define ICE_AQC_CAPS_IWARP 0x0051
 #define ICE_AQC_CAPS_PCIE_RESET_AVOIDANCE  0x0076
diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 51fca7b166..185b900290 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -2086,6 +2086,60 @@ ice_parse_vsi_func_caps(struct ice_hw *hw, struct 
ice_hw_func_caps *func_p,
  func_p->guar_num_vsi);
 }
 
+/**
+ * ice_parse_1588_func_caps - Parse ICE_AQC_CAPS_1588 function caps
+ * @hw: pointer to the HW struct
+ * @func_p: pointer to function capabilities structure
+ * @cap: pointer to the capability element to parse
+ *
+ * Extract function capabilities for ICE_AQC_CAPS_1588.
+ */
+static void
+ice_parse_1588_func_caps(struct ice_hw *hw, struct ice_hw_func_caps *func_p,
+struct ice_aqc_list_caps_elem *cap)
+{
+   struct ice_ts_func_info *info = &func_p->ts_func_info;
+   u32 number = LE32_TO_CPU(cap->number);
+
+   info->ena = ((number & ICE_TS_FUNC_ENA_M) != 0);
+   func_p->common_cap.ieee_1588 = info->ena;
+
+   info->src_tmr_owned = ((number & ICE_TS_SRC_TMR_OWND_M) != 0);
+   info->tmr_ena = ((number & ICE_TS_TMR_ENA_M) != 0);
+   info->tmr_index_owned = ((number & ICE_TS_TMR_IDX_OWND_M) != 0);
+   info->tmr_index_assoc = ((number & ICE_TS_TMR_IDX_ASSOC_M) != 0);
+
+   info->clk_freq = (number & ICE_TS_CLK_FREQ_M) >> ICE_TS_CLK_FREQ_S;
+   info->clk_src = ((number & ICE_TS_CLK_SRC_M) != 0);
+
+   if (info->clk_freq < NUM_ICE_TIME_REF_FREQ) {
+   info->time_ref = (enum ice_time_ref_freq)info->clk_freq;
+   } else {
+   /* Unknown clock frequency, so assume a (probably incorrect)
+* default to avoid out-of-bounds look ups of frequency
+* related information.
+*/
+   ice_debug(hw, ICE_DBG_INIT, "1588 func caps: unknown clock 
frequency %u\n",
+ info->clk_freq);
+   info->time_ref = ICE_TIME_REF_FREQ_25_000;
+   }
+
+   ice_debug(hw, ICE_DBG_INIT, "func caps: ieee_1588 = %u\n",
+ func_p->common_cap.ieee_1588);
+   ice_debug(hw, ICE_DBG_INIT, "func caps: src_tmr_owned = %u\n",
+ info->src_tmr_owned);
+   ice_debug(hw, ICE_DBG_INIT, "func caps: tmr_ena = %u\n",
+ info->tmr_ena);
+   ice_debug(hw, ICE_DBG_INIT, "func caps: tmr_index_owned = %u\n",
+ info->tmr_index_owned);
+   ice_debug(hw, ICE_DBG_INIT, "func caps: tmr_index_assoc = %u\n",
+ info->tmr_index_assoc);
+   ice_debug(hw, ICE_DBG_INIT, "func caps: clk_freq = %u\n",
+ info->clk_freq);
+   ice_debug(hw, ICE_DBG_INIT, "func caps: clk_src = %u\n",
+ info->clk_src);
+}
+
 /**
  * ice_parse_fdir_func_caps - Parse ICE_AQC_CAPS_FD function caps
  * @hw: pointer to the HW struct
@@ -2151,6 +2205,9 @@ ice_parse_func_caps(struct ice_hw *hw, struct 
ice_hw_func_caps *func_p,
case ICE_AQC_CAPS_VSI:
ice_parse_vsi_func_caps(hw, func_p, &cap_resp[i]);
break;
+   case ICE_AQC_CAPS_1588:
+   ice_parse_1588_func_caps(hw, func_p, &cap_resp[i]);
+   break;
case ICE_AQC_CAPS_FD:
ice_parse_fdir_func_caps(hw, func_p);
break;
@@ -2204,6 +2261,57 @@ ice_parse_vsi_dev_caps(struct ice_hw *hw, struct 
ice_hw_dev_caps *dev_p,
  dev_p->num_vsi_allocd_to_host);
 }
 
+/**
+ * ice_parse_1588_dev_caps - Parse ICE_AQC_CAPS_1588 device caps
+ * @hw: pointer to the HW struct
+ * @dev_p: pointer to device capabilities structure
+ * @cap: capability element to parse
+ *
+ * Parse ICE_AQC_CAPS_1588 for device capabilities.
+ */
+static void
+ice_parse_1588_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p,
+   struct ice_aqc_list_caps_elem *cap)
+{
+   st

[dpdk-dev] [PATCH 02/28] net/ice/base: add low level functions for device clock control

[Qi Zhang]

The ice hardware supports exposing a hardware clock for high precision
timestamping. This is primarily intended for accelerating the Precision
Time Protocol.

Add several low level functions intended to be used as the basis for
enabling the device clock, and ensuring that the port timers are
synchronized properly.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_adminq_cmd.h |1 +
 drivers/net/ice/base/ice_common.c |  143 ++
 drivers/net/ice/base/ice_common.h |   11 +
 drivers/net/ice/base/ice_controlq.c   |   52 +-
 drivers/net/ice/base/ice_controlq.h   |2 +
 drivers/net/ice/base/ice_ptp_consts.h |   86 ++
 drivers/net/ice/base/ice_ptp_hw.c | 2023 +
 drivers/net/ice/base/ice_ptp_hw.h |  376 +
 drivers/net/ice/base/ice_type.h   |3 +
 drivers/net/ice/base/meson.build  |1 +
 10 files changed, 2697 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ice/base/ice_ptp_consts.h
 create mode 100644 drivers/net/ice/base/ice_ptp_hw.c
 create mode 100644 drivers/net/ice/base/ice_ptp_hw.h

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h 
b/drivers/net/ice/base/ice_adminq_cmd.h
index 8fc0340c0d..74c4e8f120 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -3077,6 +3077,7 @@ enum ice_adminq_opc {
ice_aqc_opc_set_event_mask  = 0x0613,
ice_aqc_opc_set_mac_lb  = 0x0620,
ice_aqc_opc_get_link_topo   = 0x06E0,
+   ice_aqc_opc_get_link_topo_pin   = 0x06E1,
ice_aqc_opc_read_i2c= 0x06E2,
ice_aqc_opc_write_i2c   = 0x06E3,
ice_aqc_opc_set_port_id_led = 0x06E9,
diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 185b900290..e8d66aad6b 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -64,6 +64,28 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)
return ICE_SUCCESS;
 }
 
+/**
+ * ice_is_generic_mac
+ * @hw: pointer to the hardware structure
+ *
+ * returns true if mac_type is ICE_MAC_GENERIC, false if not
+ */
+bool ice_is_generic_mac(struct ice_hw *hw)
+{
+   return hw->mac_type == ICE_MAC_GENERIC;
+}
+
+/**
+ * ice_is_e810
+ * @hw: pointer to the hardware structure
+ *
+ * returns true if the device is E810 based, false if not.
+ */
+bool ice_is_e810(struct ice_hw *hw)
+{
+   return hw->mac_type == ICE_MAC_E810;
+}
+
 /**
  * ice_clear_pf_cfg - Clear PF configuration
  * @hw: pointer to the hardware structure
@@ -1350,6 +1372,127 @@ ice_clear_tx_drbell_q_ctx(struct ice_hw *hw, u32 
tx_drbell_q_index)
return ICE_SUCCESS;
 }
 
+/* Sideband Queue command wrappers */
+
+/**
+ * ice_get_sbq - returns the right control queue to use for sideband
+ * @hw: pointer to the hardware structure
+ */
+static struct ice_ctl_q_info *ice_get_sbq(struct ice_hw *hw)
+{
+   if (!ice_is_generic_mac(hw))
+   return &hw->adminq;
+   return &hw->sbq;
+}
+
+/**
+ * ice_sbq_send_cmd - send Sideband Queue command to Sideband Queue
+ * @hw: pointer to the HW struct
+ * @desc: descriptor describing the command
+ * @buf: buffer to use for indirect commands (NULL for direct commands)
+ * @buf_size: size of buffer for indirect commands (0 for direct commands)
+ * @cd: pointer to command details structure
+ */
+static enum ice_status
+ice_sbq_send_cmd(struct ice_hw *hw, struct ice_sbq_cmd_desc *desc,
+void *buf, u16 buf_size, struct ice_sq_cd *cd)
+{
+   return ice_sq_send_cmd(hw, ice_get_sbq(hw), (struct ice_aq_desc *)desc,
+  buf, buf_size, cd);
+}
+
+/**
+ * ice_sbq_send_cmd_nolock - send Sideband Queue command to Sideband Queue
+ *   but do not lock sq_lock
+ * @hw: pointer to the HW struct
+ * @desc: descriptor describing the command
+ * @buf: buffer to use for indirect commands (NULL for direct commands)
+ * @buf_size: size of buffer for indirect commands (0 for direct commands)
+ * @cd: pointer to command details structure
+ */
+static enum ice_status
+ice_sbq_send_cmd_nolock(struct ice_hw *hw, struct ice_sbq_cmd_desc *desc,
+   void *buf, u16 buf_size, struct ice_sq_cd *cd)
+{
+   return ice_sq_send_cmd_nolock(hw, ice_get_sbq(hw),
+ (struct ice_aq_desc *)desc, buf,
+ buf_size, cd);
+}
+
+/**
+ * ice_sbq_rw_reg_lp - Fill Sideband Queue command, with lock parameter
+ * @hw: pointer to the HW struct
+ * @in: message info to be filled in descriptor
+ * @lock: true to lock the sq_lock (the usual case); false if the sq_lock has
+ *already been locked at a higher level
+ */
+enum ice_status ice_sbq_rw_reg_lp(struct ice_hw *hw,
+ struct ice_sbq_msg_input *in, bool loc

[dpdk-dev] [PATCH 03/28] net/ice/base: add ethertype IPv6 check for dummy packet

[Qi Zhang]

In order to support switch rule for ethertype filter
with ipv6 ethertype id, it has to check ethertype and
then find a proper dummy packet. There was a silent
assumption that packet is ipv4, unless src or dst ipv6
address is specified in a flow.

Signed-off-by: Grzegorz Nitka 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_switch.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index 5926635088..4a829859f4 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -10,9 +10,9 @@
 #define ICE_ETH_ETHTYPE_OFFSET 12
 #define ICE_ETH_VLAN_TCI_OFFSET14
 #define ICE_MAX_VLAN_ID0xFFF
+#define ICE_IPV6_ETHER_ID  0x86DD
 #define ICE_IPV4_NVGRE_PROTO_ID0x002F
 #define ICE_PPP_IPV6_PROTO_ID  0x0057
-#define ICE_IPV6_ETHER_ID  0x86DD
 #define ICE_TCP_PROTO_ID   0x06
 #define ICE_GTPU_PROFILE   24
 #define ICE_ETH_P_8021Q0x8100
@@ -7889,6 +7889,12 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, 
u16 lkups_cnt,
ipv6 = true;
else if (lkups[i].type == ICE_VLAN_OFOS)
vlan = true;
+   else if (lkups[i].type == ICE_ETYPE_OL &&
+lkups[i].h_u.ethertype.ethtype_id ==
+   CPU_TO_BE16(ICE_IPV6_ETHER_ID) &&
+lkups[i].m_u.ethertype.ethtype_id ==
+   CPU_TO_BE16(0x))
+   ipv6 = true;
else if (lkups[i].type == ICE_IPV4_OFOS &&
 lkups[i].h_u.ipv4_hdr.protocol ==
ICE_IPV4_NVGRE_PROTO_ID &&
@@ -7901,12 +7907,6 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, 
u16 lkups_cnt,
 lkups[i].m_u.pppoe_hdr.ppp_prot_id ==
0x)
ipv6 = true;
-   else if (lkups[i].type == ICE_ETYPE_OL &&
-lkups[i].h_u.ethertype.ethtype_id ==
-   CPU_TO_BE16(ICE_IPV6_ETHER_ID) &&
-lkups[i].m_u.ethertype.ethtype_id ==
-   0x)
-   ipv6 = true;
else if (lkups[i].type == ICE_IPV4_IL &&
 lkups[i].h_u.ipv4_hdr.protocol ==
ICE_TCP_PROTO_ID &&
-- 
2.26.2

[dpdk-dev] [PATCH 04/28] net/ice/base: change dummy packets with VLAN

[Qi Zhang]

Ethertype was traded as VLAN tpid in dummy packets with VLAN.
This led to a problem when user wanted to add filter for VLAN and
ethertype.

Change ice_vlan_hdr to reflect correct order of VLAN fields in
packets (VLAN tpid, VLAN id). Correct all dummy packets with VLAN.
Move VLAN fields before ethertype and change offsets. Leave values
from dummy packets unchanged as they fit to new VLAN layout.

Order of offsets in ice_prot_ext_tbl_entry for VLAN protocol should
reflect order of fields in ice_vlan_hdr. However, hardware doesn't
support matching on all tpid. This should be done by matching on
packet flags. There is no FV word with protocol for VLAN and offset
2. Because of that, adding vlan tpid with not zero mask will lead
to error in creating recipe.

Signed-off-by: Michal Swiatkowski 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_protocol_type.h |   2 +-
 drivers/net/ice/base/ice_switch.c| 148 +++
 2 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/drivers/net/ice/base/ice_protocol_type.h 
b/drivers/net/ice/base/ice_protocol_type.h
index d1d266ffd2..220ff3b773 100644
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -245,8 +245,8 @@ struct ice_ether_vlan_hdr {
 };
 
 struct ice_vlan_hdr {
-   __be16 vlan;
__be16 type;
+   __be16 vlan;
 };
 
 struct ice_ipv4_hdr {
diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index 4a829859f4..0b2347ba3a 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -260,8 +260,8 @@ static const u8 dummy_udp_packet[] = {
 /* offset info for MAC + VLAN + IPv4 + UDP dummy packet */
 static const struct ice_dummy_pkt_offsets dummy_vlan_udp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
-   { ICE_ETYPE_OL, 12 },
-   { ICE_VLAN_OFOS,14 },
+   { ICE_VLAN_OFOS,12 },
+   { ICE_ETYPE_OL, 16 },
{ ICE_IPV4_OFOS,18 },
{ ICE_UDP_ILOS, 38 },
{ ICE_PROTOCOL_LAST,0 },
@@ -273,9 +273,9 @@ static const u8 dummy_vlan_udp_packet[] = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
 
-   0x81, 0x00, /* ICE_ETYPE_OL 12 */
+   0x81, 0x00, 0x00, 0x00, /* ICE_VLAN_OFOS 12 */
 
-   0x00, 0x00, 0x08, 0x00, /* ICE_VLAN_OFOS 14 */
+   0x08, 0x00, /* ICE_ETYPE_OL 16 */
 
0x45, 0x00, 0x00, 0x1c, /* ICE_IPV4_OFOS 18 */
0x00, 0x01, 0x00, 0x00,
@@ -343,8 +343,8 @@ static const u8 dummy_mpls_packet[] = {
 /* offset info for MAC + VLAN (C-tag, 802.1Q) + IPv4 + TCP dummy packet */
 static const struct ice_dummy_pkt_offsets dummy_vlan_tcp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
-   { ICE_ETYPE_OL, 12 },
-   { ICE_VLAN_OFOS,14 },
+   { ICE_VLAN_OFOS,12 },
+   { ICE_ETYPE_OL, 16 },
{ ICE_IPV4_OFOS,18 },
{ ICE_TCP_IL,   38 },
{ ICE_PROTOCOL_LAST,0 },
@@ -356,9 +356,9 @@ static const u8 dummy_vlan_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
 
-   0x81, 0x00, /* ICE_ETYPE_OL 12 */
+   0x81, 0x00, 0x00, 0x00, /* ICE_VLAN_OFOS 12 */
 
-   0x00, 0x00, 0x08, 0x00, /* ICE_VLAN_OFOS 14 */
+   0x08, 0x00, /* ICE_ETYPE_OL 16 */
 
0x45, 0x00, 0x00, 0x28, /* ICE_IPV4_OFOS 18 */
0x00, 0x01, 0x00, 0x00,
@@ -414,8 +414,8 @@ static const u8 dummy_tcp_ipv6_packet[] = {
 static const struct ice_dummy_pkt_offsets
 dummy_vlan_tcp_ipv6_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
-   { ICE_ETYPE_OL, 12 },
-   { ICE_VLAN_OFOS,14 },
+   { ICE_VLAN_OFOS,12 },
+   { ICE_ETYPE_OL, 16 },
{ ICE_IPV6_OFOS,18 },
{ ICE_TCP_IL,   58 },
{ ICE_PROTOCOL_LAST,0 },
@@ -427,9 +427,9 @@ static const u8 dummy_vlan_tcp_ipv6_packet[] = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
 
-   0x81, 0x00, /* ICE_ETYPE_OL 12 */
+   0x81, 0x00, 0x00, 0x00, /* ICE_VLAN_OFOS 12 */
 
-   0x00, 0x00, 0x86, 0xDD, /* ICE_VLAN_OFOS 14 */
+   0x86, 0xDD, /* ICE_ETYPE_OL 16 */
 
0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_OFOS 18 */
0x00, 0x14, 0x06, 0x00, /* Next header is TCP */
@@ -492,8 +492,8 @@ static const u8 dummy_udp_ipv6_packet[] = {
 static const struct ice_dummy_pkt_offsets
 dummy_vlan_udp_ipv6_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
-   { ICE_ETYPE_OL, 12 },
-   { ICE_VLAN_OFOS,14 },
+   { ICE_VLAN_OFOS,12 },
+   { ICE_ETYPE_OL, 16 },
{ ICE_IPV6_OFOS,18 },
{ ICE_UDP_ILOS, 58 },
{ ICE_PROTOCOL_LAST,0 },
@@ -505,9 +505,9 @@ static const u8 dummy_vlan_udp_ipv6_packet[] = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,

[dpdk-dev] [PATCH 05/28] net/ice/base: add timestamp masks

[Qi Zhang]

Adding macros for shift and masking of the lower timestamp work in the
Rx flex descriptor. The LSB of the timestamp-low word indicates the
validity of the timestamp while the rest 7 bits contain the timestamp.

Signed-off-by: Vignesh Sridhar 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_lan_tx_rx.h | 8 
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/ice/base/ice_lan_tx_rx.h 
b/drivers/net/ice/base/ice_lan_tx_rx.h
index 696c6a30ae..4255e9963e 100644
--- a/drivers/net/ice/base/ice_lan_tx_rx.h
+++ b/drivers/net/ice/base/ice_lan_tx_rx.h
@@ -879,6 +879,14 @@ enum ice_rx_flex_desc_exstat_bits {
ICE_RX_FLEX_DESC_EXSTAT_OVERSIZE_S = 3,
 };
 
+/* For ice_32b_rx_flex_desc.ts_low:
+ * [0]: Timestamp-low validity bit
+ * [1:7]: Timestamp-low value
+ */
+#define ICE_RX_FLEX_DESC_TS_L_VALID_S  0x01
+#define ICE_RX_FLEX_DESC_TS_L_VALID_M  ICE_RX_FLEX_DESC_TS_L_VALID_S
+#define ICE_RX_FLEX_DESC_TS_L_M0xFE
+
 #define ICE_RXQ_CTX_SIZE_DWORDS8
 #define ICE_RXQ_CTX_SZ (ICE_RXQ_CTX_SIZE_DWORDS * sizeof(u32))
 #define ICE_TX_CMPLTNQ_CTX_SIZE_DWORDS 22
-- 
2.26.2

[dpdk-dev] [PATCH 06/28] net/ice/base: add clock initialization function

[Qi Zhang]

Before the device PTP hardware clock can be initialized, some steps must
be taken by the driver. This includes writing some registers and
initializing the PHY.

Some of these steps are distinct depending on the device type (E810 or
E822). Additionally, a future change will introduce more steps for E822
devices to program the Clock Generation Unit.

Introduce ice_ptp_init_phc as well as device-specific sub-functions for
e810 and e822 devices.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_cgu_regs.h   | 117 +
 drivers/net/ice/base/ice_ptp_consts.h |  74 ++
 drivers/net/ice/base/ice_ptp_hw.c | 348 +-
 drivers/net/ice/base/ice_ptp_hw.h |  24 ++
 4 files changed, 562 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ice/base/ice_cgu_regs.h

diff --git a/drivers/net/ice/base/ice_cgu_regs.h 
b/drivers/net/ice/base/ice_cgu_regs.h
new file mode 100644
index 00..6751481e83
--- /dev/null
+++ b/drivers/net/ice/base/ice_cgu_regs.h
@@ -0,0 +1,117 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2001-2021 Intel Corporation
+ */
+
+#ifndef _ICE_CGU_REGS_H_
+#define _ICE_CGU_REGS_H_
+
+#define NAC_CGU_DWORD9 0x24
+union nac_cgu_dword9 {
+   struct {
+   u32 time_ref_freq_sel : 3;
+   u32 clk_eref1_en : 1;
+   u32 clk_eref0_en : 1;
+   u32 time_ref_en : 1;
+   u32 time_sync_en : 1;
+   u32 one_pps_out_en : 1;
+   u32 clk_ref_synce_en : 1;
+   u32 clk_synce1_en : 1;
+   u32 clk_synce0_en : 1;
+   u32 net_clk_ref1_en : 1;
+   u32 net_clk_ref0_en : 1;
+   u32 clk_synce1_amp : 2;
+   u32 misc6 : 1;
+   u32 clk_synce0_amp : 2;
+   u32 one_pps_out_amp : 2;
+   u32 misc24 : 12;
+   } field;
+   u32 val;
+};
+
+#define NAC_CGU_DWORD19 0x4c
+union nac_cgu_dword19 {
+   struct {
+   u32 tspll_fbdiv_intgr : 8;
+   u32 fdpll_ulck_thr : 5;
+   u32 misc15 : 3;
+   u32 tspll_ndivratio : 4;
+   u32 tspll_iref_ndivratio : 3;
+   u32 misc19 : 1;
+   u32 japll_ndivratio : 4;
+   u32 japll_iref_ndivratio : 3;
+   u32 misc27 : 1;
+   } field;
+   u32 val;
+};
+
+#define NAC_CGU_DWORD22 0x58
+union nac_cgu_dword22 {
+   struct {
+   u32 fdpll_frac_div_out_nc : 2;
+   u32 fdpll_lock_int_for : 1;
+   u32 synce_hdov_int_for : 1;
+   u32 synce_lock_int_for : 1;
+   u32 fdpll_phlead_slip_nc : 1;
+   u32 fdpll_acc1_ovfl_nc : 1;
+   u32 fdpll_acc2_ovfl_nc : 1;
+   u32 synce_status_nc : 6;
+   u32 fdpll_acc1f_ovfl : 1;
+   u32 misc18 : 1;
+   u32 fdpllclk_div : 4;
+   u32 time1588clk_div : 4;
+   u32 synceclk_div : 4;
+   u32 synceclk_sel_div2 : 1;
+   u32 fdpllclk_sel_div2 : 1;
+   u32 time1588clk_sel_div2 : 1;
+   u32 misc3 : 1;
+   } field;
+   u32 val;
+};
+
+#define NAC_CGU_DWORD24 0x60
+union nac_cgu_dword24 {
+   struct {
+   u32 tspll_fbdiv_frac : 22;
+   u32 misc20 : 2;
+   u32 ts_pll_enable : 1;
+   u32 time_sync_tspll_align_sel : 1;
+   u32 ext_synce_sel : 1;
+   u32 ref1588_ck_div : 4;
+   u32 time_ref_sel : 1;
+   } field;
+   u32 val;
+};
+
+#define TSPLL_CNTR_BIST_SETTINGS 0x344
+union tspll_cntr_bist_settings {
+   struct {
+   u32 i_irefgen_settling_time_cntr_7_0 : 8;
+   u32 i_irefgen_settling_time_ro_standby_1_0 : 2;
+   u32 reserved195 : 5;
+   u32 i_plllock_sel_0 : 1;
+   u32 i_plllock_sel_1 : 1;
+   u32 i_plllock_cnt_6_0 : 7;
+   u32 i_plllock_cnt_10_7 : 4;
+   u32 reserved200 : 4;
+   } field;
+   u32 val;
+};
+
+#define TSPLL_RO_BWM_LF 0x370
+union tspll_ro_bwm_lf {
+   struct {
+   u32 bw_freqov_high_cri_7_0 : 8;
+   u32 bw_freqov_high_cri_9_8 : 2;
+   u32 biascaldone_cri : 1;
+   u32 plllock_gain_tran_cri : 1;
+   u32 plllock_true_lock_cri : 1;
+   u32 pllunlock_flag_cri : 1;
+   u32 afcerr_cri : 1;
+   u32 afcdone_cri : 1;
+   u32 feedfwrdgain_cal_cri_7_0 : 8;
+   u32 m2fbdivmod_cri_7_0 : 8;
+   } field;
+   u32 val;
+};
+
+#endif /* _ICE_CGU_REGS_H_ */
diff --git a/drivers/net/ice/base/ice_ptp_consts.h 
b/drivers/net/ice/base/ice_ptp_consts.h
index 2bd338c88c..4583dd42ff 100644
--- a/drivers/net/ice/base/ice_ptp_consts.h
+++ b/drivers/net/ice/base/ice_ptp_consts.h
@@ -83,4 +83,78 @@ const struct ice_time_ref_info_e822 
e822_time_ref[NUM_ICE_TIME_REF_FREQ

[dpdk-dev] [PATCH 07/28] net/ice/base: add accessors to get/set the time reference

[Qi Zhang]

The E822 device clock might come from a variety of different sources,
called TIME_REFs. The firmware reports the current TIME_REF as part of
its function capabilities, which the driver caches when it loads.

Add an accessor function to look up the current TIME_REF from the
capabilities. This reduces line length significantly and also avoids
a tight coupling to the capabilities structure.

In some cases, TIME_REF might change at run time. This can occur in the
event that the CGU registers are updated. When this happens, its
possible that the capabilities structure can be out of date until the
capabilities are re-read.

Add an setter function to update the TIME_REF when this occurs. The
driver can call this function after updating the CGU to ensure that the
TIME_REF in the capabilities structure is up to date, without needing to
re-read the entire capabilities from firmware.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_ptp_hw.h | 25 +
 1 file changed, 25 insertions(+)

diff --git a/drivers/net/ice/base/ice_ptp_hw.h 
b/drivers/net/ice/base/ice_ptp_hw.h
index eb0e410ed8..ad2349f60a 100644
--- a/drivers/net/ice/base/ice_ptp_hw.h
+++ b/drivers/net/ice/base/ice_ptp_hw.h
@@ -124,6 +124,31 @@ enum ice_status
 ice_cfg_cgu_pll_e822(struct ice_hw *hw, enum ice_time_ref_freq clk_freq,
 enum ice_clk_src clk_src);
 
+/**
+ * ice_e822_time_ref - Get the current TIME_REF from capabilities
+ * @hw: pointer to the HW structure
+ *
+ * Returns the current TIME_REF from the capabilities structure.
+ */
+static inline enum ice_time_ref_freq ice_e822_time_ref(struct ice_hw *hw)
+{
+   return hw->func_caps.ts_func_info.time_ref;
+}
+
+/**
+ * ice_set_e822_time_ref - Set new TIME_REF
+ * @hw: pointer to the HW structure
+ * @time_ref: new TIME_REF to set
+ *
+ * Update the TIME_REF in the capabilities structure in response to some
+ * change, such as an update to the CGU registers.
+ */
+static inline void
+ice_set_e822_time_ref(struct ice_hw *hw, enum ice_time_ref_freq time_ref)
+{
+   hw->func_caps.ts_func_info.time_ref = time_ref;
+}
+
 static inline u64 ice_e822_pll_freq(enum ice_time_ref_freq time_ref)
 {
return e822_time_ref[time_ref].pll_freq;
-- 
2.26.2

[dpdk-dev] [PATCH 08/28] net/ice/base: print human-friendly PHY types

[Qi Zhang]

Add functions to print PHY types in human-friendly form

Signed-off-by: Anirudh Venkataramanan 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 164 ++
 1 file changed, 146 insertions(+), 18 deletions(-)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index e8d66aad6b..2447d15b87 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -11,6 +11,120 @@
 
 #define ICE_PF_RESET_WAIT_COUNT300
 
+/**
+ * dump_phy_type - helper function that prints PHY type strings
+ * @hw: pointer to the HW structure
+ * @phy: 64 bit PHY type to decipher
+ * @i: bit index within phy
+ * @phy_string: string corresponding to bit i in phy
+ * @prefix: prefix string to differentiate multiple dumps
+ */
+static void
+dump_phy_type(struct ice_hw *hw, u64 phy, u8 i, const char *phy_string,
+ const char *prefix)
+{
+   if (phy & BIT_ULL(i))
+   ice_debug(hw, ICE_DBG_PHY, "%s: bit(%d): %s\n", prefix, i,
+ phy_string);
+}
+
+/**
+ * ice_dump_phy_type_low - helper function to dump phy_type_low
+ * @hw: pointer to the HW structure
+ * @low: 64 bit value for phy_type_low
+ * @prefix: prefix string to differentiate multiple dumps
+ */
+static void
+ice_dump_phy_type_low(struct ice_hw *hw, u64 low, const char *prefix)
+{
+   ice_debug(hw, ICE_DBG_PHY, "%s: phy_type_low: 0x%016llx\n", prefix,
+ (unsigned long long)low);
+
+   dump_phy_type(hw, low, 0, "100BASE_TX", prefix);
+   dump_phy_type(hw, low, 1, "100M_SGMII", prefix);
+   dump_phy_type(hw, low, 2, "1000BASE_T", prefix);
+   dump_phy_type(hw, low, 3, "1000BASE_SX", prefix);
+   dump_phy_type(hw, low, 4, "1000BASE_LX", prefix);
+   dump_phy_type(hw, low, 5, "1000BASE_KX", prefix);
+   dump_phy_type(hw, low, 6, "1G_SGMII", prefix);
+   dump_phy_type(hw, low, 7, "2500BASE_T", prefix);
+   dump_phy_type(hw, low, 8, "2500BASE_X", prefix);
+   dump_phy_type(hw, low, 9, "2500BASE_KX", prefix);
+   dump_phy_type(hw, low, 10, "5GBASE_T", prefix);
+   dump_phy_type(hw, low, 11, "5GBASE_KR", prefix);
+   dump_phy_type(hw, low, 12, "10GBASE_T", prefix);
+   dump_phy_type(hw, low, 13, "10G_SFI_DA", prefix);
+   dump_phy_type(hw, low, 14, "10GBASE_SR", prefix);
+   dump_phy_type(hw, low, 15, "10GBASE_LR", prefix);
+   dump_phy_type(hw, low, 16, "10GBASE_KR_CR1", prefix);
+   dump_phy_type(hw, low, 17, "10G_SFI_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 18, "10G_SFI_C2C", prefix);
+   dump_phy_type(hw, low, 19, "25GBASE_T", prefix);
+   dump_phy_type(hw, low, 20, "25GBASE_CR", prefix);
+   dump_phy_type(hw, low, 21, "25GBASE_CR_S", prefix);
+   dump_phy_type(hw, low, 22, "25GBASE_CR1", prefix);
+   dump_phy_type(hw, low, 23, "25GBASE_SR", prefix);
+   dump_phy_type(hw, low, 24, "25GBASE_LR", prefix);
+   dump_phy_type(hw, low, 25, "25GBASE_KR", prefix);
+   dump_phy_type(hw, low, 26, "25GBASE_KR_S", prefix);
+   dump_phy_type(hw, low, 27, "25GBASE_KR1", prefix);
+   dump_phy_type(hw, low, 28, "25G_AUI_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 29, "25G_AUI_C2C", prefix);
+   dump_phy_type(hw, low, 30, "40GBASE_CR4", prefix);
+   dump_phy_type(hw, low, 31, "40GBASE_SR4", prefix);
+   dump_phy_type(hw, low, 32, "40GBASE_LR4", prefix);
+   dump_phy_type(hw, low, 33, "40GBASE_KR4", prefix);
+   dump_phy_type(hw, low, 34, "40G_XLAUI_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 35, "40G_XLAUI", prefix);
+   dump_phy_type(hw, low, 36, "50GBASE_CR2", prefix);
+   dump_phy_type(hw, low, 37, "50GBASE_SR2", prefix);
+   dump_phy_type(hw, low, 38, "50GBASE_LR2", prefix);
+   dump_phy_type(hw, low, 39, "50GBASE_KR2", prefix);
+   dump_phy_type(hw, low, 40, "50G_LAUI2_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 41, "50G_LAUI2", prefix);
+   dump_phy_type(hw, low, 42, "50G_AUI2_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 43, "50G_AUI2", prefix);
+   dump_phy_type(hw, low, 44, "50GBASE_CP", prefix);
+   dump_phy_type(hw, low, 45, "50GBASE_SR", prefix);
+   dump_phy_type(hw, low, 46, "50GBASE_FR", prefix);
+   dump_phy_type(hw, low, 47, "50GBASE_LR", prefix);
+   dump_phy_type(hw, low, 48, "50GBASE_KR_PAM4", prefix);
+   dump_phy_type(hw, low, 49, "50G_AUI1_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 50, "50G_AUI1", prefix);
+   dump_phy_type(hw, low, 51, "100GBASE_CR4", prefix);
+   dump_phy_type(hw, low, 52, "100GBASE_SR4", prefix);
+   dump_phy_type(hw, low, 53, "100GBASE_LR4", prefix);
+   dump_phy_type(hw, low, 54, "100GBASE_KR4", prefix);
+   dump_phy_type(hw, low, 55, "100G_CAUI4_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 56, "100G_CAUI4", prefix);
+   dump_phy_type(hw, low, 57, "100G_AUI4_AOC_ACC", prefix);
+   dump_phy_type(hw, low, 58, "100G_AUI4", prefix);
+   dum

[dpdk-dev] [PATCH 09/28] net/ice/base: implement Vernier calibration logic for E822 devices

[Qi Zhang]

Move the implementation of Vernier calibration from Linux core ice_ptp.c
into the shared ice_ptp_hw.c file.

This implementation was recently refactored in Linux, so the move should
be verbatim with the latest Linux code that we had implemented.

This includes a new constant table with pre-determined values based on
link speed, new functions to aide in reading the multi-register values
from the PHY, functions to program the PAR/PCS conversion ratios, and
the UIX conversion ratios, functions to program the total Tx and Rx
offset after vernier calibration in the hardware completes, and finally
a function to start and stop the PHY timestamping block.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_ptp_consts.h | 216 ++
 drivers/net/ice/base/ice_ptp_hw.c | 999 ++
 drivers/net/ice/base/ice_ptp_hw.h |  47 ++
 3 files changed, 1262 insertions(+)

diff --git a/drivers/net/ice/base/ice_ptp_consts.h 
b/drivers/net/ice/base/ice_ptp_consts.h
index 4583dd42ff..32eb60ab48 100644
--- a/drivers/net/ice/base/ice_ptp_consts.h
+++ b/drivers/net/ice/base/ice_ptp_consts.h
@@ -157,4 +157,220 @@ const struct ice_cgu_pll_params_e822 
e822_cgu_params[NUM_ICE_TIME_REF_FREQ] = {
},
 };
 
+/* struct ice_vernier_info_e822
+ *
+ * E822 hardware calibrates the delay of the timestamp indication from the
+ * actual packet transmission or reception during the initialization of the
+ * PHY. To do this, the hardware mechanism uses some conversions between the
+ * various clocks within the PHY block. This table defines constants used to
+ * calculate the correct conversion ratios in the PHY registers.
+ *
+ * Many of the values relate to the PAR/PCS clock conversion registers. For
+ * these registers, a value of 0 means that the associated register is not
+ * used by this link speed, and that the register should be cleared by writing
+ * 0. Other values specify the clock frequency in Hz.
+ */
+const struct ice_vernier_info_e822 e822_vernier[NUM_ICE_PTP_LNK_SPD] = {
+   /* ICE_PTP_LNK_SPD_1G */
+   {
+   /* tx_par_clk */
+   3125, /* 31.25 MHz */
+   /* rx_par_clk */
+   3125, /* 31.25 MHz */
+   /* tx_pcs_clk */
+   12500, /* 125 MHz */
+   /* rx_pcs_clk */
+   12500, /* 125 MHz */
+   /* tx_desk_rsgb_par */
+   0, /* unused */
+   /* rx_desk_rsgb_par */
+   0, /* unused */
+   /* tx_desk_rsgb_pcs */
+   0, /* unused */
+   /* rx_desk_rsgb_pcs */
+   0, /* unused */
+   /* tx_fixed_delay */
+   25140,
+   /* pmd_adj_divisor */
+   1000,
+   /* rx_fixed_delay */
+   17372,
+   },
+   /* ICE_PTP_LNK_SPD_10G */
+   {
+   /* tx_par_clk */
+   257812500, /* 257.8125 MHz */
+   /* rx_par_clk */
+   257812500, /* 257.8125 MHz */
+   /* tx_pcs_clk */
+   15625, /* 156.25 MHz */
+   /* rx_pcs_clk */
+   15625, /* 156.25 MHz */
+   /* tx_desk_rsgb_par */
+   0, /* unused */
+   /* rx_desk_rsgb_par */
+   0, /* unused */
+   /* tx_desk_rsgb_pcs */
+   0, /* unused */
+   /* rx_desk_rsgb_pcs */
+   0, /* unused */
+   /* tx_fixed_delay */
+   6938,
+   /* pmd_adj_divisor */
+   8250,
+   /* rx_fixed_delay */
+   6212,
+   },
+   /* ICE_PTP_LNK_SPD_25G */
+   {
+   /* tx_par_clk */
+   644531250, /* 644.53125 MHZ */
+   /* rx_par_clk */
+   644531250, /* 644.53125 MHz */
+   /* tx_pcs_clk */
+   390625000, /* 390.625 MHz */
+   /* rx_pcs_clk */
+   390625000, /* 390.625 MHz */
+   /* tx_desk_rsgb_par */
+   0, /* unused */
+   /* rx_desk_rsgb_par */
+   0, /* unused */
+   /* tx_desk_rsgb_pcs */
+   0, /* unused */
+   /* rx_desk_rsgb_pcs */
+   0, /* unused */
+   /* tx_fixed_delay */
+   2778,
+   /* pmd_adj_divisor */
+   20625,
+   /* rx_fixed_delay */
+   2491,
+   },
+   /* ICE_PTP_LNK_SPD_25G_RS */
+   {
+   /* tx_par_clk */
+   0, /* unused */
+   /* rx_par_clk */
+   0, /* unused */
+   /* tx_pcs_clk */
+   0, /* unused */
+   /* rx_pcs_clk */
+   0, /* unused */
+   /* tx_desk_rsgb_par */
+   161132812, /* 162.1328125 MHz Reed Solomon gearbox */
+   /* rx_desk_rsgb_par */
+

[dpdk-dev] [PATCH 10/28] net/ice/base: clarify comments on checking PFC mode

[Qi Zhang]

Rework the comment around checking PFC mode to make it clear why we are
checking the mode after sending the command.

Signed-off-by: Tony Nguyen 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_dcb.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ice/base/ice_dcb.c b/drivers/net/ice/base/ice_dcb.c
index 9c9675f6ef..cb6c5ba182 100644
--- a/drivers/net/ice/base/ice_dcb.c
+++ b/drivers/net/ice/base/ice_dcb.c
@@ -764,11 +764,10 @@ ice_aq_set_pfc_mode(struct ice_hw *hw, u8 pfc_mode, 
struct ice_sq_cd *cd)
if (status)
return status;
 
-   /* The spec isn't clear about whether the FW will return an error code
-* if the PFC mode requested by the driver was not set. The spec just
-* says that the FW will write the PFC mode set back into cmd->pfc_mode,
-* so after the AQ has been executed, check if cmd->pfc_mode is what was
-* requested.
+   /* FW will write the PFC mode set back into cmd->pfc_mode, but if DCB is
+* disabled, FW will write back 0 to cmd->pfc_mode. After the AQ has
+* been executed, check if cmd->pfc_mode is what was requested. If not,
+* return an error.
 */
if (cmd->pfc_mode != pfc_mode)
return ICE_ERR_NOT_SUPPORTED;
-- 
2.26.2

[dpdk-dev] [PATCH 11/28] net/ice/base: add support for starting PHY in bypass mode

[Qi Zhang]

After starting the timestamping block, hardware begins calculating
precise offsets through a process of vernier calibration. This process
measures the effective phase offset of the various internal clocks used
in the PHY.

Once hardware completes these measurements, the P_REG_TX_OV_STATUS and
P_REG_RX_OV_STATUS registers are updated to indicate that the hardware
offset measurements are done.

This process does not happen immediately, but requires that at least one
packet be sent or received in order for the offset in that direction to
be calculated.

This poses a problem in some setups, because software expects the first
packet sent to be timestamped. This most often occurs if the clock time
is set by an application during startup. This set time command triggers
a PHY restart. Because of this, the timestamping block is reset, and
timestamps are not enabled until vernier calibration is complete. Since
this process won't complete until at least one packet is sent through
the PHY, timestamps of the very first packet sent will not be obtained.

This can result in the application failing due to missing timestamps.

To avoid this, allow starting the PHY in bypass mode. This mode enables
timestamps immediately, and skips adding the precise offset measurement.
This reduces the accuracy of the timestamp slightly, but ensures that we
get a reasonable value for the first packet.

The driver can continue monitoring the P_REG_TX_OV_STATUS and
P_REG_RX_OV_STATUS registers and exit bypass mode once the total
calibration is completed. In this way, once calibration is complete, the
timestamps will have the precise offset, but we do not break
applications which expect to be able to timestamp immediately.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_ptp_hw.c | 84 +++
 drivers/net/ice/base/ice_ptp_hw.h |  1 +
 2 files changed, 85 insertions(+)

diff --git a/drivers/net/ice/base/ice_ptp_hw.c 
b/drivers/net/ice/base/ice_ptp_hw.c
index bf6889029a..8ea75538fa 100644
--- a/drivers/net/ice/base/ice_ptp_hw.c
+++ b/drivers/net/ice/base/ice_ptp_hw.c
@@ -2572,6 +2572,90 @@ ice_start_phy_timer_e822(struct ice_hw *hw, u8 port, 
bool bypass)
return ICE_SUCCESS;
 }
 
+/**
+ * ice_phy_exit_bypass_e822 - Exit bypass mode, after vernier calculations
+ * @hw: pointer to the HW struct
+ * @port: the PHY port to configure
+ *
+ * After hardware finishes vernier calculations for the Tx and Rx offset, this
+ * function can be used to exit bypass mode by updating the total Tx and Rx
+ * offsets, and then disabling bypass. This will enable hardware to include
+ * the more precise offset calibrations, increasing precision of the generated
+ * timestamps.
+ *
+ * This cannot be done until hardware has measured the offsets, which requires
+ * waiting until at least one packet has been sent and received by the device.
+ */
+enum ice_status ice_phy_exit_bypass_e822(struct ice_hw *hw, u8 port)
+{
+   enum ice_status status;
+   u32 val;
+
+   status = ice_read_phy_reg_e822(hw, port, P_REG_TX_OV_STATUS, &val);
+   if (status) {
+   ice_debug(hw, ICE_DBG_PTP, "Failed to read TX_OV_STATUS for 
port %u, status %d\n",
+ port, status);
+   return status;
+   }
+
+   if (!(val & P_REG_TX_OV_STATUS_OV_M)) {
+   ice_debug(hw, ICE_DBG_PTP, "Tx offset is not yet valid for port 
%u\n",
+ port);
+   return ICE_ERR_NOT_READY;
+   }
+
+   status = ice_read_phy_reg_e822(hw, port, P_REG_RX_OV_STATUS, &val);
+   if (status) {
+   ice_debug(hw, ICE_DBG_PTP, "Failed to read RX_OV_STATUS for 
port %u, status %d\n",
+ port, status);
+   return status;
+   }
+
+   if (!(val & P_REG_TX_OV_STATUS_OV_M)) {
+   ice_debug(hw, ICE_DBG_PTP, "Rx offset is not yet valid for port 
%u\n",
+ port);
+   return ICE_ERR_NOT_READY;
+   }
+
+   status = ice_phy_cfg_tx_offset_e822(hw, port);
+   if (status) {
+   ice_debug(hw, ICE_DBG_PTP, "Failed to program total Tx offset 
for port %u, status %d\n",
+ port, status);
+   return status;
+   }
+
+   status = ice_phy_cfg_rx_offset_e822(hw, port);
+   if (status) {
+   ice_debug(hw, ICE_DBG_PTP, "Failed to program total Rx offset 
for port %u, status %d\n",
+ port, status);
+   return status;
+   }
+
+   /* Exit bypass mode now that the offset has been updated */
+   status = ice_read_phy_reg_e822(hw, port, P_REG_PS, &val);
+   if (status) {
+   ice_debug(hw, ICE_DBG_PTP, "Failed to read P_REG_PS for port 
%u, status %d\n",
+ port, status);
+   return status;
+   }
+
+   if (!(val & P_REG_PS_BYPASS_MODE_M))
+   ice_debug(hw, ICE_DBG_PTP, "Por

[dpdk-dev] [PATCH 12/28] net/ice/base: add E810T check function

[Qi Zhang]

Add function ice_is_e810t() to be able to distinguish if hardware is E810T
based or not.

Signed-off-by: Michal Michalik 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 12 
 drivers/net/ice/base/ice_common.h |  1 +
 drivers/net/ice/base/ice_devids.h |  1 +
 3 files changed, 14 insertions(+)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 2447d15b87..9cfff8930e 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -200,6 +200,18 @@ bool ice_is_e810(struct ice_hw *hw)
return hw->mac_type == ICE_MAC_E810;
 }
 
+/**
+ * ice_is_e810t
+ * @hw: pointer to the hardware structure
+ *
+ * returns true if the device is E810T based, false if not.
+ */
+bool ice_is_e810t(struct ice_hw *hw)
+{
+   return (hw->device_id == ICE_DEV_ID_E810C_SFP &&
+   hw->subsystem_device_id == ICE_SUBDEV_ID_E810T);
+}
+
 /**
  * ice_clear_pf_cfg - Clear PF configuration
  * @hw: pointer to the hardware structure
diff --git a/drivers/net/ice/base/ice_common.h 
b/drivers/net/ice/base/ice_common.h
index de7592ba13..a18cccd8cb 100644
--- a/drivers/net/ice/base/ice_common.h
+++ b/drivers/net/ice/base/ice_common.h
@@ -237,6 +237,7 @@ enum ice_fw_modes ice_get_fw_mode(struct ice_hw *hw);
 void ice_print_rollback_msg(struct ice_hw *hw);
 bool ice_is_generic_mac(struct ice_hw *hw);
 bool ice_is_e810(struct ice_hw *hw);
+bool ice_is_e810t(struct ice_hw *hw);
 enum ice_status
 ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,
 struct ice_aqc_txsched_elem_data *buf);
diff --git a/drivers/net/ice/base/ice_devids.h 
b/drivers/net/ice/base/ice_devids.h
index b4cdddc8e7..18397f1925 100644
--- a/drivers/net/ice/base/ice_devids.h
+++ b/drivers/net/ice/base/ice_devids.h
@@ -22,6 +22,7 @@
 #define ICE_DEV_ID_E810C_QSFP  0x1592
 /* Intel(R) Ethernet Controller E810-C for SFP */
 #define ICE_DEV_ID_E810C_SFP   0x1593
+#define ICE_SUBDEV_ID_E810T0x000E
 /* Intel(R) Ethernet Controller E810-XXV for backplane */
 #define ICE_DEV_ID_E810_XXV_BACKPLANE  0x1599
 /* Intel(R) Ethernet Controller E810-XXV for QSFP */
-- 
2.26.2

[dpdk-dev] [PATCH 13/28] net/ice/base: implement firmware debug dump

[Qi Zhang]

Basic implementation of FW Debug Dump.

Signed-off-by: Marcin Domagala 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_adminq_cmd.h | 25 ++
 drivers/net/ice/base/ice_common.c | 50 +++
 drivers/net/ice/base/ice_common.h |  6 
 3 files changed, 81 insertions(+)

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h 
b/drivers/net/ice/base/ice_adminq_cmd.h
index 74c4e8f120..7205fc6fbe 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -2720,6 +2720,27 @@ struct ice_aqc_event_lan_overflow {
u8 reserved[8];
 };
 
+/* Debug Dump Internal Data (indirect 0xFF08) */
+struct ice_aqc_debug_dump_internals {
+   u8 cluster_id;
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_SW 0
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_ACL1
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_TXSCHED2
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_PROFILES   3
+/* EMP_DRAM only dumpable in device debug mode */
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_EMP_DRAM   4
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_LINK   5
+/* AUX_REGS only dumpable in device debug mode */
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_AUX_REGS   6
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_DCB7
+#define ICE_AQC_DBG_DUMP_CLUSTER_ID_L2P8
+   u8 reserved;
+   __le16 table_id; /* Used only for non-memory clusters */
+   __le32 idx; /* In table entries for tables, in bytes for memory */
+   __le32 addr_high;
+   __le32 addr_low;
+};
+
 /* Set Health Status (direct 0xFF20) */
 struct ice_aqc_set_health_status_config {
u8 event_source;
@@ -2894,6 +2915,7 @@ struct ice_aq_desc {
struct ice_aqc_download_pkg download_pkg;
struct ice_aqc_get_pkg_info_list get_pkg_info_list;
struct ice_aqc_driver_shared_params drv_shared_params;
+   struct ice_aqc_debug_dump_internals debug_dump;
struct ice_aqc_set_mac_lb set_mac_lb;
struct ice_aqc_alloc_free_res_cmd sw_res_ctrl;
struct ice_aqc_get_res_alloc get_res;
@@ -3161,6 +3183,9 @@ enum ice_adminq_opc {
/* Standalone Commands/Events */
ice_aqc_opc_event_lan_overflow  = 0x1001,
 
+   /* debug commands */
+   ice_aqc_opc_debug_dump_internals= 0xFF08,
+
/* SystemDiagnostic commands */
ice_aqc_opc_set_health_status_config= 0xFF20,
ice_aqc_opc_get_supported_health_status_codes   = 0xFF21,
diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 9cfff8930e..e98145bf3f 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -4517,6 +4517,56 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx,
return ICE_SUCCESS;
 }
 
+/**
+ * ice_aq_get_internal_data
+ * @hw: pointer to the hardware structure
+ * @cluster_id: specific cluster to dump
+ * @table_id: table ID within cluster
+ * @start: index of line in the block to read
+ * @buf: dump buffer
+ * @buf_size: dump buffer size
+ * @ret_buf_size: return buffer size (returned by FW)
+ * @ret_next_table: next block to read (returned by FW)
+ * @ret_next_index: next index to read (returned by FW)
+ * @cd: pointer to command details structure
+ *
+ * Get internal FW/HW data (0xFF08) for debug purposes.
+ */
+enum ice_status
+ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id,
+u32 start, void *buf, u16 buf_size, u16 *ret_buf_size,
+u16 *ret_next_table, u32 *ret_next_index,
+struct ice_sq_cd *cd)
+{
+   struct ice_aqc_debug_dump_internals *cmd;
+   struct ice_aq_desc desc;
+   enum ice_status status;
+
+   cmd = &desc.params.debug_dump;
+
+   if (buf_size == 0 || !buf)
+   return ICE_ERR_PARAM;
+
+   ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_debug_dump_internals);
+
+   cmd->cluster_id = cluster_id;
+   cmd->table_id = CPU_TO_LE16(table_id);
+   cmd->idx = CPU_TO_LE32(start);
+
+   status = ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);
+
+   if (!status) {
+   if (ret_buf_size)
+   *ret_buf_size = LE16_TO_CPU(desc.datalen);
+   if (ret_next_table)
+   *ret_next_table = LE16_TO_CPU(cmd->table_id);
+   if (ret_next_index)
+   *ret_next_index = LE32_TO_CPU(cmd->idx);
+   }
+
+   return status;
+}
+
 /**
  * ice_read_byte - read context byte into struct
  * @src_ctx:  the context structure to read from
diff --git a/drivers/net/ice/base/ice_common.h 
b/drivers/net/ice/base/ice_common.h
index a18cccd8cb..770db8f40c 100644
--- a/drivers/net/ice/base/ice_common.h
+++ b/drivers/net/ice/base/ice_common.h
@@ -64,6 +64,12 @@ enum ice_status ice_get_caps(struct ice_hw *hw);
 
 void ice_set_safe_mode_caps(struct ice_hw *hw);
 
+enum ice_status
+ice_aq_get_intern

[dpdk-dev] [PATCH 14/28] net/ice/base: add new AQ description

[Qi Zhang]

Add ice_aqc_sw_gpio struct to ice_aq_desc
This change allows us to do SW_GPIO AQ cmd transactions
over ice_aq_send_cmd() interface.

Signed-off-by: Siddaraju DH 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_adminq_cmd.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h 
b/drivers/net/ice/base/ice_adminq_cmd.h
index 7205fc6fbe..e9d6fcc3ad 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -2860,6 +2860,7 @@ struct ice_aq_desc {
struct ice_aqc_i2c read_write_i2c;
struct ice_aqc_read_i2c_resp read_i2c_resp;
struct ice_aqc_gpio read_write_gpio;
+   struct ice_aqc_sw_gpio sw_read_write_gpio;
struct ice_aqc_sff_eeprom read_write_sff_param;
struct ice_aqc_set_port_id_led set_port_id_led;
struct ice_aqc_get_sw_cfg get_sw_conf;
-- 
2.26.2

[dpdk-dev] [PATCH 15/28] net/ice/base: refine MAC rule adding

[Qi Zhang]

Move replay_pre_init function to interface.
Add further MAC rules, despite unicast address is already on list.

Signed-off-by: Marcin Domagala 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 2 +-
 drivers/net/ice/base/ice_common.h | 2 ++
 drivers/net/ice/base/ice_switch.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index e98145bf3f..a77bf32b1c 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -5069,7 +5069,7 @@ static bool ice_is_main_vsi(struct ice_hw *hw, u16 
vsi_handle)
  *
  * Initializes required config data for VSI, FD, ACL, and RSS before replay.
  */
-static enum ice_status
+enum ice_status
 ice_replay_pre_init(struct ice_hw *hw, struct ice_switch_info *sw)
 {
enum ice_status status;
diff --git a/drivers/net/ice/base/ice_common.h 
b/drivers/net/ice/base/ice_common.h
index 770db8f40c..ac6b487347 100644
--- a/drivers/net/ice/base/ice_common.h
+++ b/drivers/net/ice/base/ice_common.h
@@ -221,6 +221,8 @@ enum ice_status
 ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,
u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,
struct ice_sq_cd *cd);
+enum ice_status
+ice_replay_pre_init(struct ice_hw *hw, struct ice_switch_info *sw);
 enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);
 void ice_replay_post(struct ice_hw *hw);
 struct ice_q_ctx *
diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index 0b2347ba3a..2d8904d2c3 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4730,7 +4730,7 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE 
*m_list,
if (ice_find_rule_entry(rule_head,
&m_list_itr->fltr_info)) {
ice_release_lock(rule_lock);
-   return ICE_ERR_ALREADY_EXISTS;
+   continue;
}
ice_release_lock(rule_lock);
num_unicast++;
-- 
2.26.2

[dpdk-dev] [PATCH 16/28] net/ice/base: support TC nodes PIR configuration

[Qi Zhang]

TC nodes CIR configuration is not supported. In order to configure PIR,
the corresponding adminq command should not include the flag for CIR.
Since the TC node info has this flag by default, it is supposed to delete
this flag for TC nodes before sending the adminq command.

Signed-off-by: Ting Xu 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_sched.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c
index 544648cb84..2620892c9e 100644
--- a/drivers/net/ice/base/ice_sched.c
+++ b/drivers/net/ice/base/ice_sched.c
@@ -2945,6 +2945,9 @@ ice_sched_update_elem(struct ice_hw *hw, struct 
ice_sched_node *node,
u16 num_elems = 1;
 
buf = *info;
+   /* For TC nodes, CIR config is not supported */
+   if (node->info.data.elem_type == ICE_AQC_ELEM_TYPE_TC)
+   buf.data.valid_sections &= ~ICE_AQC_ELEM_VALID_CIR;
/* Parent TEID is reserved field in this aq call */
buf.parent_teid = 0;
/* Element type is reserved field in this aq call */
-- 
2.26.2

[dpdk-dev] [PATCH 17/28] net/ice/base: support FDIR for GRE tunnel packet

[Qi Zhang]

Support IPV4_GRE and IPV6_GRE with inner IPV4/IPV6/UDP/TCP for
FDIR.

Signed-off-by: Wenjun Wu 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_fdir.c | 361 
 drivers/net/ice/base/ice_fdir.h |   2 +
 drivers/net/ice/base/ice_type.h |  14 ++
 3 files changed, 377 insertions(+)

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index 2e4770061d..e5ad0f298b 100644
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -537,6 +537,183 @@ static const u8 ice_fdir_ipv4_frag_pkt[] = {
0x00, 0x00
 };
 
+/* IPV4 GRE INNER IPV4 */
+static const u8 ice_fdir_ipv4_gre4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x2e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x9e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x16, 0x00, 0x01, 0x00, 0x00, 0x40, 0x00,
+   0x7c, 0xe5, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gre4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x36, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x96, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x1e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0xcc, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+   0x01, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gre4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x8a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x2a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x06,
+   0x7c, 0xcb, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+   0x20, 0x00, 0x91, 0xde, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE INNER IPV6 */
+static const u8 ice_fdir_ipv6_gre4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x8a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+   0x00, 0x00, 0x00, 0x02, 0x3b, 0x40, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gre4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x82, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+   0x00, 0x00, 0x00, 0x0a, 0x11, 0x40, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x0a, 0xff, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gre4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x76, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
+   0x00, 0x00, 0x00, 0x16, 0x06, 0x40, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x8f, 0xdf,
+   0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV6 GRE INNER IPV4 */
+static const u8 ice_fdir_ipv4_gre6_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
+   0x00, 0x00, 0x00, 0x18, 0x2F, 0x40, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+   0x08, 0x00, 0x45, 0x00, 0x00, 0x14, 0x00, 0x01,
+   0x00, 0x00, 0x40, 0x00, 0x7A, 0xEA, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gre6_pkt[] = {
+   

[dpdk-dev] [PATCH 18/28] net/ice/base: support RSS for GRE tunnel packet

[Qi Zhang]

Support RSS of inner headers for GRE tunnel packet.

Signed-off-by: Wenjun Wu 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_flow.c | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index b336275d0c..5b26d6c8b2 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -257,7 +257,7 @@ static const u32 ice_ptypes_ipv4_ofos[] = {
  * includes IPV4 other PTYPEs
  */
 static const u32 ice_ptypes_ipv4_ofos_all[] = {
-   0x1D80, 0x24000800, 0x, 0x,
+   0x1D80, 0x27BF7800, 0x, 0x,
0x, 0x0155, 0x, 0x,
0x, 0x000FC000, 0x83E0FAA0, 0x0101,
0x03FFD500, 0x, 0x, 0x,
@@ -297,7 +297,7 @@ static const u32 ice_ptypes_ipv6_ofos[] = {
  * includes IPV6 other PTYPEs
  */
 static const u32 ice_ptypes_ipv6_ofos_all[] = {
-   0x, 0x, 0x7600, 0x10002000,
+   0x, 0x, 0x7600, 0x1EFDE000,
0x, 0x02AA, 0x, 0x,
0x, 0x03F0, 0x7C1F0540, 0x0206,
0xFC002A00, 0x003F, 0x, 0x,
@@ -807,7 +807,7 @@ struct ice_flow_prof_params {
ICE_FLOW_SEG_HDR_ESP | ICE_FLOW_SEG_HDR_AH | \
ICE_FLOW_SEG_HDR_NAT_T_ESP | ICE_FLOW_SEG_HDR_GTPU_NON_IP | \
ICE_FLOW_SEG_HDR_ECPRI_TP0 | ICE_FLOW_SEG_HDR_UDP_ECPRI_TP0 | \
-   ICE_FLOW_SEG_HDR_L2TPV2 | ICE_FLOW_SEG_HDR_PPP)
+   ICE_FLOW_SEG_HDR_L2TPV2 | ICE_FLOW_SEG_HDR_PPP | ICE_FLOW_SEG_HDR_GRE)
 
 #define ICE_FLOW_SEG_HDRS_L2_MASK  \
(ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_VLAN)
@@ -1024,11 +1024,9 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params 
*params)
ice_and_bitmap(params->ptypes, params->ptypes, src,
   ICE_FLOW_PTYPE_MAX);
} else if (hdrs & ICE_FLOW_SEG_HDR_GRE) {
-   if (!i) {
-   src = (const ice_bitmap_t *)ice_ptypes_gre_of;
-   ice_and_bitmap(params->ptypes, params->ptypes,
-  src, ICE_FLOW_PTYPE_MAX);
-   }
+   src = (const ice_bitmap_t *)ice_ptypes_gre_of;
+   ice_and_bitmap(params->ptypes, params->ptypes, src,
+  ICE_FLOW_PTYPE_MAX);
} else if (hdrs & ICE_FLOW_SEG_HDR_GTPC) {
src = (const ice_bitmap_t *)ice_ptypes_gtpc;
ice_and_bitmap(params->ptypes, params->ptypes,
-- 
2.26.2

[dpdk-dev] [PATCH 19/28] net/ice/base: support FDIR for GTPU EH inner IPv6

[Qi Zhang]

Supuport FDIR filtering for IPV4_GTPU_EH_IPV6 with inner
IPV6/UDP/TCP fields matching.

Signed-off-by: Junfeng Guo 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_fdir.c | 352 ++--
 drivers/net/ice/base/ice_type.h |  23 ++-
 2 files changed, 309 insertions(+), 66 deletions(-)

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index e5ad0f298b..ae512e5695 100644
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -97,6 +97,54 @@ static const u8 ice_fdir_tcp4_gtpu4_pkt[] = {
0x00, 0x00, 0x00, 0x00,
 };
 
+static const u8 ice_fdir_ipv6_gtpu4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x4c, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x38,
+   0x24, 0x42, 0x30, 0xff, 0x00, 0x28, 0x00, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x54, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x40,
+   0x4e, 0x3d, 0x30, 0xff, 0x00, 0x30, 0x00, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08,
+   0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+   0xff, 0xdc, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4e,
+   0x59, 0x08, 0x30, 0xff, 0x00, 0x3e, 0x00, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16,
+   0x06, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+   0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
 static const u8 ice_fdir_ipv4_gtpu4_eh_pkt[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
@@ -140,6 +188,57 @@ static const u8 ice_fdir_tcp4_gtpu4_eh_pkt[] = {
0x00, 0x00, 0x00, 0x00,
 };
 
+static const u8 ice_fdir_ipv6_gtpu4_eh_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x42,
+   0x1e, 0x9d, 0x34, 0xff, 0x00, 0x32, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+   0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_eh_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x5e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x8c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4a,
+   0x48, 0x9a, 0x34, 0xff, 0x00, 0x3a, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x01, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+   0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+   0xff, 0xd8, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_eh_pkt[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x6a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x80, 0x7f, 0x00, 

[dpdk-dev] [PATCH 20/28] net/ice/base: support RSS for GTPoGRE

[Qi Zhang]

Support RSS for GTPoGRE inner fields hash.

Signed-off-by: Junfeng Guo 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_flow.c | 8 
 drivers/net/ice/base/ice_flow.h | 4 
 2 files changed, 12 insertions(+)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 5b26d6c8b2..e41082b6ba 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -3483,6 +3483,14 @@ ice_flow_set_rss_seg_info(struct ice_flow_seg_info 
*segs, u8 seg_cnt,
segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 |
   ICE_FLOW_SEG_HDR_IPV_FRAG |
   ICE_FLOW_SEG_HDR_IPV_OTHER;
+   else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE)
+   segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 |
+  ICE_FLOW_SEG_HDR_GRE |
+  ICE_FLOW_SEG_HDR_IPV_OTHER;
+   else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE)
+   segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 |
+  ICE_FLOW_SEG_HDR_GRE |
+  ICE_FLOW_SEG_HDR_IPV_OTHER;
 
if (seg->hdrs & ~ICE_FLOW_RSS_SEG_HDR_VAL_MASKS &
~ICE_FLOW_RSS_HDRS_INNER_MASK & ~ICE_FLOW_SEG_HDR_IPV_OTHER &
diff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h
index 878c79d19e..39408c5634 100644
--- a/drivers/net/ice/base/ice_flow.h
+++ b/drivers/net/ice/base/ice_flow.h
@@ -348,6 +348,10 @@ enum ice_rss_cfg_hdr_type {
/* take inner headers as inputset for packet with outer ipv6. */
ICE_RSS_INNER_HEADERS_W_OUTER_IPV6,
/* take outer headers first then inner headers as inputset */
+   /* take inner as inputset for GTPoGRE with outer ipv4 + gre. */
+   ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE,
+   /* take inner as inputset for GTPoGRE with outer ipv6 + gre. */
+   ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE,
ICE_RSS_ANY_HEADERS
 };
 
-- 
2.26.2

[dpdk-dev] [PATCH 21/28] net/ice/base: enable NVM update reset capabilities

[Qi Zhang]

Add logic to parse capabilities relating to the firmware update reset
requirements. This includes both capability 0x76, which informs the
driver if the firmware can sometimes skip PCIe resets, and 0x77, which
informs the driver if the firmware might potentially restrict EMP
resets.

For capability 0x76, if the number is 1, the firmware will report the
required reset level for a given update as part of its response to the
last command sent to program the NVM bank. (Otherwise, if the firmware
does not support this capability then it will always send a 0 in the
field of the response).

For capability 0x77, if the number is 1, the firmware will report when
EMP reset is available as part of the response to the command for
switching flash banks. (Otherwise, if the firmware does not support this
capability, it will always send a 0 in the field of the response
message).

These capabilities are required to implement immediate firmware
activation. If the capabilities are set, software can read the response
data and determine what reset level is required to activate the firmware
image. If only an EMP reset is required, and if the EMP reset is not
restricted by firmware, then the driver can issue an EMP reset to
immediately activate the new firmware.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 12 
 drivers/net/ice/base/ice_type.h   |  4 
 2 files changed, 16 insertions(+)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index a77bf32b1c..2744c3d119 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -2281,6 +2281,18 @@ ice_parse_common_caps(struct ice_hw *hw, struct 
ice_hw_common_caps *caps,
ice_debug(hw, ICE_DBG_INIT, "%s: max_mtu = %d\n",
  prefix, caps->max_mtu);
break;
+   case ICE_AQC_CAPS_PCIE_RESET_AVOIDANCE:
+   caps->pcie_reset_avoidance = (number > 0);
+   ice_debug(hw, ICE_DBG_INIT,
+ "%s: pcie_reset_avoidance = %d\n", prefix,
+ caps->pcie_reset_avoidance);
+   break;
+   case ICE_AQC_CAPS_POST_UPDATE_RESET_RESTRICT:
+   caps->reset_restrict_support = (number == 1);
+   ice_debug(hw, ICE_DBG_INIT,
+ "%s: reset_restrict_support = %d\n", prefix,
+ caps->reset_restrict_support);
+   break;
case ICE_AQC_CAPS_EXT_TOPO_DEV_IMG0:
case ICE_AQC_CAPS_EXT_TOPO_DEV_IMG1:
case ICE_AQC_CAPS_EXT_TOPO_DEV_IMG2:
diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index b76404f085..6ae39a345b 100644
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -480,6 +480,10 @@ struct ice_hw_common_caps {
 #define ICE_NVM_MGMT_SEC_REV_DISABLED  BIT(0)
 #define ICE_NVM_MGMT_UPDATE_DISABLED   BIT(1)
 #define ICE_NVM_MGMT_UNIFIED_UPD_SUPPORT   BIT(3)
+   /* PCIe reset avoidance */
+   bool pcie_reset_avoidance; /* false: not supported, true: supported */
+   /* Post update reset restriction */
+   bool reset_restrict_support; /* false: not supported, true: supported */
 
/* External topology device images within the NVM */
 #define ICE_EXT_TOPO_DEV_IMG_COUNT 4
-- 
2.26.2

[dpdk-dev] [PATCH 22/28] net/ice/base: support FDIR for GTPoGRE

[Qi Zhang]

Enable Flow Director filtering for GTPoGRE inner/outer fields
matching.

Signed-off-by: Junfeng Guo 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_fdir.c  | 1532 ++
 drivers/net/ice/base/ice_fdir.h  |   12 +
 drivers/net/ice/base/ice_flex_pipe.c |6 +
 drivers/net/ice/base/ice_flex_type.h |   48 +
 drivers/net/ice/base/ice_flow.c  |  184 ++-
 drivers/net/ice/base/ice_protocol_type.h |2 +
 drivers/net/ice/base/ice_type.h  |  112 ++
 7 files changed, 1888 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index ae512e5695..d50f54a979 100644
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -867,6 +867,966 @@ static const u8 ice_fdir_tcp6_gre6_pkt[] = {
0x20, 0x00, 0x8F, 0xE1, 0x00, 0x00, 0x00, 0x00,
 };
 
+/* IPV4 GRE IPV4 GTPU IPV4 */
+static const u8 ice_fdir_ipv4_gtpu4_gre4_pkt[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x52, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x7a, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x3a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0xb0, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x26,
+   0xbf, 0xba, 0x30, 0xff, 0x00, 0x16, 0x00, 0x00,
+   0x00, 0x00, 0x45, 0x00, 0x00, 0x16, 0x00, 0x01,
+   0x00, 0x00, 0x40, 0x00, 0x7c, 0xe5, 0x7f, 0x00,
+   0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp4_gtpu4_gre4_pkt[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x5a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x72, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0xa8, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x2e,
+   0xbd, 0xc0, 0x30, 0xff, 0x00, 0x1e, 0x00, 0x00,
+   0x00, 0x00, 0x45, 0x00, 0x00, 0x1e, 0x00, 0x01,
+   0x00, 0x00, 0x40, 0x11, 0x7c, 0xcc, 0x7f, 0x00,
+   0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x35,
+   0x00, 0x35, 0x00, 0x0a, 0x01, 0x6e, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp4_gtpu4_gre4_pkt[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x66, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x66, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x4e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x9c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x3a,
+   0xbd, 0x9d, 0x30, 0xff, 0x00, 0x2a, 0x00, 0x00,
+   0x00, 0x00, 0x45, 0x00, 0x00, 0x2a, 0x00, 0x01,
+   0x00, 0x00, 0x40, 0x06, 0x7c, 0xcb, 0x7f, 0x00,
+   0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x14,
+   0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x50, 0x02, 0x20, 0x00, 0x91, 0x7a,
+   0x00, 0x00, 0x00, 0x00,
+};
+
+/* IPV4 GRE IPV4 GTPU IPV6 */
+static const u8 ice_fdir_ipv6_gtpu4_gre4_pkt[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x66, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x66, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x4e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x9c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x3a,
+   0x24, 0x3a, 0x30, 0xff, 0x00, 0x2a, 0x00, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x02,
+   0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_gre4_pkt[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x6e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x2f,
+   0x7c, 0x5e, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+   0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+   0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,
+   0x00, 0x01, 0x08, 0x68, 0x08, 0x68, 0x00, 0x42,
+   0x4e, 0x37, 0x30, 0xff, 0x00, 0x32, 0x00, 0x00,
+   0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0a,
+   0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   

[dpdk-dev] [PATCH 23/28] net/ice/base: add RSS support for IPv4/L4 checksum

[Qi Zhang]

The IPv4/TCP/UDP/SCTP header checksum fields are defined in this
patch and can be used as RSS input sets.

Signed-off-by: Alvin Zhang 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_flow.c | 17 +
 drivers/net/ice/base/ice_flow.h |  4 
 2 files changed, 21 insertions(+)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 0b7d087c83..470548331b 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -15,6 +15,10 @@
 #define ICE_FLOW_FLD_SZ_IPV6_PRE64_ADDR8
 #define ICE_FLOW_FLD_SZ_IPV4_ID2
 #define ICE_FLOW_FLD_SZ_IPV6_ID4
+#define ICE_FLOW_FLD_SZ_IP_CHKSUM  2
+#define ICE_FLOW_FLD_SZ_TCP_CHKSUM 2
+#define ICE_FLOW_FLD_SZ_UDP_CHKSUM 2
+#define ICE_FLOW_FLD_SZ_SCTP_CHKSUM4
 #define ICE_FLOW_FLD_SZ_IP_DSCP1
 #define ICE_FLOW_FLD_SZ_IP_TTL 1
 #define ICE_FLOW_FLD_SZ_IP_PROT1
@@ -98,6 +102,8 @@ struct ice_flow_field_info 
ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV6, 8, ICE_FLOW_FLD_SZ_IPV6_ADDR),
/* ICE_FLOW_FIELD_IDX_IPV6_DA */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV6, 24, ICE_FLOW_FLD_SZ_IPV6_ADDR),
+   /* ICE_FLOW_FIELD_IDX_IPV4_CHKSUM */
+   ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV4, 10, ICE_FLOW_FLD_SZ_IP_CHKSUM),
/* ICE_FLOW_FIELD_IDX_IPV4_FRAG */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV_FRAG, 4,
  ICE_FLOW_FLD_SZ_IPV4_ID),
@@ -137,6 +143,13 @@ struct ice_flow_field_info 
ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_SCTP, 2, ICE_FLOW_FLD_SZ_PORT),
/* ICE_FLOW_FIELD_IDX_TCP_FLAGS */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_TCP, 13, ICE_FLOW_FLD_SZ_TCP_FLAGS),
+   /* ICE_FLOW_FIELD_IDX_TCP_CHKSUM */
+   ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_TCP, 16, ICE_FLOW_FLD_SZ_TCP_CHKSUM),
+   /* ICE_FLOW_FIELD_IDX_UDP_CHKSUM */
+   ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_UDP, 6, ICE_FLOW_FLD_SZ_UDP_CHKSUM),
+   /* ICE_FLOW_FIELD_IDX_SCTP_CHKSUM */
+   ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_SCTP, 8,
+ ICE_FLOW_FLD_SZ_SCTP_CHKSUM),
/* ARP */
/* ICE_FLOW_FIELD_IDX_ARP_SIP */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_ARP, 14, ICE_FLOW_FLD_SZ_IPV4_ADDR),
@@ -1410,6 +1423,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct 
ice_flow_prof_params *params,
break;
case ICE_FLOW_FIELD_IDX_IPV4_SA:
case ICE_FLOW_FIELD_IDX_IPV4_DA:
+   case ICE_FLOW_FIELD_IDX_IPV4_CHKSUM:
prot_id = seg == 0 ? ICE_PROT_IPV4_OF_OR_S : ICE_PROT_IPV4_IL;
if (params->prof->segs[0].hdrs & ICE_FLOW_SEG_HDR_GRE &&
params->prof->segs[1].hdrs & ICE_FLOW_SEG_HDR_GTPU &&
@@ -1439,14 +1453,17 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct 
ice_flow_prof_params *params,
case ICE_FLOW_FIELD_IDX_TCP_SRC_PORT:
case ICE_FLOW_FIELD_IDX_TCP_DST_PORT:
case ICE_FLOW_FIELD_IDX_TCP_FLAGS:
+   case ICE_FLOW_FIELD_IDX_TCP_CHKSUM:
prot_id = ICE_PROT_TCP_IL;
break;
case ICE_FLOW_FIELD_IDX_UDP_SRC_PORT:
case ICE_FLOW_FIELD_IDX_UDP_DST_PORT:
+   case ICE_FLOW_FIELD_IDX_UDP_CHKSUM:
prot_id = ICE_PROT_UDP_IL_OR_S;
break;
case ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT:
case ICE_FLOW_FIELD_IDX_SCTP_DST_PORT:
+   case ICE_FLOW_FIELD_IDX_SCTP_CHKSUM:
prot_id = ICE_PROT_SCTP_IL;
break;
case ICE_FLOW_FIELD_IDX_VXLAN_VNI:
diff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h
index 39408c5634..92beb75db8 100644
--- a/drivers/net/ice/base/ice_flow.h
+++ b/drivers/net/ice/base/ice_flow.h
@@ -228,6 +228,7 @@ enum ice_flow_field {
ICE_FLOW_FIELD_IDX_IPV4_DA,
ICE_FLOW_FIELD_IDX_IPV6_SA,
ICE_FLOW_FIELD_IDX_IPV6_DA,
+   ICE_FLOW_FIELD_IDX_IPV4_CHKSUM,
ICE_FLOW_FIELD_IDX_IPV4_ID,
ICE_FLOW_FIELD_IDX_IPV6_ID,
ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA,
@@ -244,6 +245,9 @@ enum ice_flow_field {
ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT,
ICE_FLOW_FIELD_IDX_SCTP_DST_PORT,
ICE_FLOW_FIELD_IDX_TCP_FLAGS,
+   ICE_FLOW_FIELD_IDX_TCP_CHKSUM,
+   ICE_FLOW_FIELD_IDX_UDP_CHKSUM,
+   ICE_FLOW_FIELD_IDX_SCTP_CHKSUM,
/* ARP */
ICE_FLOW_FIELD_IDX_ARP_SIP,
ICE_FLOW_FIELD_IDX_ARP_DIP,
-- 
2.26.2

[dpdk-dev] [PATCH 24/28] net/ice/base: enable jumbo frame support during HW init

[Qi Zhang]

Call ice_aq_set_mac_cfg in ice_hw_init to enable jumbo frame support.

Signed-off-by: Anirudh Venkataramanan 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 2744c3d119..ad9df0d3a2 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -994,6 +994,12 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
 
if (status)
goto err_unroll_fltr_mgmt_struct;
+
+   /* enable jumbo frame support at MAC level */
+   status = ice_aq_set_mac_cfg(hw, ICE_AQ_SET_MAC_FRAME_SIZE_MAX, NULL);
+   if (status)
+   goto err_unroll_fltr_mgmt_struct;
+
/* Obtain counter base index which would be used by flow director */
status = ice_alloc_fd_res_cntr(hw, &hw->fd_ctr_base);
if (status)
-- 
2.26.2

[dpdk-dev] [PATCH 25/28] net/ice/base: support FDIR for GTPU UL/DL with QFI fields

[Qi Zhang]

Enable Flow Director filtering for GTPU UL/DL QFI field matching.

Signed-off-by: Junfeng Guo 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_flow.c | 8 
 drivers/net/ice/base/ice_flow.h | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 470548331b..96d54b494d 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -185,9 +185,15 @@ struct ice_flow_field_info 
ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
/* ICE_FLOW_FIELD_IDX_GTPU_UP_TEID */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_GTPU_UP, 12,
  ICE_FLOW_FLD_SZ_GTP_TEID),
+   /* ICE_FLOW_FIELD_IDX_GTPU_UP_QFI */
+   ICE_FLOW_FLD_INFO_MSK(ICE_FLOW_SEG_HDR_GTPU_UP, 22,
+ ICE_FLOW_FLD_SZ_GTP_QFI, 0x3f00),
/* ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_GTPU_DWN, 12,
  ICE_FLOW_FLD_SZ_GTP_TEID),
+   /* ICE_FLOW_FIELD_IDX_GTPU_DWN_QFI */
+   ICE_FLOW_FLD_INFO_MSK(ICE_FLOW_SEG_HDR_GTPU_DWN, 22,
+ ICE_FLOW_FLD_SZ_GTP_QFI, 0x3f00),
/* PPPOE */
/* ICE_FLOW_FIELD_IDX_PPPOE_SESS_ID */
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_PPPOE, 2,
@@ -1473,6 +1479,8 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct 
ice_flow_prof_params *params,
case ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID:
case ICE_FLOW_FIELD_IDX_GTPU_EH_TEID:
case ICE_FLOW_FIELD_IDX_GTPU_EH_QFI:
+   case ICE_FLOW_FIELD_IDX_GTPU_UP_QFI:
+   case ICE_FLOW_FIELD_IDX_GTPU_DWN_QFI:
/* GTP is accessed through UDP OF protocol */
prot_id = ICE_PROT_UDP_OF;
break;
diff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h
index 92beb75db8..371d960066 100644
--- a/drivers/net/ice/base/ice_flow.h
+++ b/drivers/net/ice/base/ice_flow.h
@@ -268,8 +268,10 @@ enum ice_flow_field {
ICE_FLOW_FIELD_IDX_GTPU_EH_QFI,
/* GTPU_UP */
ICE_FLOW_FIELD_IDX_GTPU_UP_TEID,
+   ICE_FLOW_FIELD_IDX_GTPU_UP_QFI,
/* GTPU_DWN */
ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID,
+   ICE_FLOW_FIELD_IDX_GTPU_DWN_QFI,
/* PPPOE */
ICE_FLOW_FIELD_IDX_PPPOE_SESS_ID,
/* PFCP */
-- 
2.26.2

[dpdk-dev] [PATCH 26/28] net/ice/base: rename and add a setter function

[Qi Zhang]

Rename ucast_shared to umac_shared, as "umac" is a more widely
used shorthand for "unicast MAC".

Also add a helper function to set this flag. This helper is
expected to be called by core drivers.

Signed-off-by: Anirudh Venkataramanan 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 11 +++
 drivers/net/ice/base/ice_common.h |  1 +
 drivers/net/ice/base/ice_switch.c |  8 
 drivers/net/ice/base/ice_type.h   |  3 ++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index ad9df0d3a2..9c6649b6c5 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -864,6 +864,17 @@ void ice_print_rollback_msg(struct ice_hw *hw)
 nvm_str, hw->fw_maj_ver, hw->fw_min_ver);
 }
 
+/**
+ * ice_set_umac_shared
+ * @hw: pointer to the hw struct
+ *
+ * Set boolean flag to allow unicast MAC sharing
+ */
+void ice_set_umac_shared(struct ice_hw *hw)
+{
+   hw->umac_shared = true;
+}
+
 /**
  * ice_init_hw - main hardware initialization routine
  * @hw: pointer to the hardware structure
diff --git a/drivers/net/ice/base/ice_common.h 
b/drivers/net/ice/base/ice_common.h
index ac6b487347..e84308444d 100644
--- a/drivers/net/ice/base/ice_common.h
+++ b/drivers/net/ice/base/ice_common.h
@@ -23,6 +23,7 @@ enum ice_fw_modes {
 
 enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw);
 void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw);
+void ice_set_umac_shared(struct ice_hw *hw);
 enum ice_status ice_init_hw(struct ice_hw *hw);
 void ice_deinit_hw(struct ice_hw *hw);
 enum ice_status ice_check_reset(struct ice_hw *hw);
diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index 2d8904d2c3..9179f66c20 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4681,7 +4681,7 @@ ice_aq_get_res_descs(struct ice_hw *hw, u16 num_entries,
  * @sw: pointer to switch info struct for which function add rule
  * @lport: logic port number on which function add rule
  *
- * IMPORTANT: When the ucast_shared flag is set to false and m_list has
+ * IMPORTANT: When the umac_shared flag is set to false and m_list has
  * multiple unicast addresses, the function assumes that all the
  * addresses are unique in a given add_mac call. It doesn't
  * check for duplicates in this case, removing duplicates from a given
@@ -4724,7 +4724,7 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE 
*m_list,
if (m_list_itr->fltr_info.lkup_type != ICE_SW_LKUP_MAC ||
IS_ZERO_ETHER_ADDR(add))
return ICE_ERR_PARAM;
-   if (IS_UNICAST_ETHER_ADDR(add) && !hw->ucast_shared) {
+   if (IS_UNICAST_ETHER_ADDR(add) && !hw->umac_shared) {
/* Don't overwrite the unicast address */
ice_acquire_lock(rule_lock);
if (ice_find_rule_entry(rule_head,
@@ -4735,7 +4735,7 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE 
*m_list,
ice_release_lock(rule_lock);
num_unicast++;
} else if (IS_MULTICAST_ETHER_ADDR(add) ||
-  (IS_UNICAST_ETHER_ADDR(add) && hw->ucast_shared)) {
+  (IS_UNICAST_ETHER_ADDR(add) && hw->umac_shared)) {
m_list_itr->status =
ice_add_rule_internal(hw, recp_list, lport,
  m_list_itr);
@@ -5424,7 +5424,7 @@ ice_remove_mac_rule(struct ice_hw *hw, struct 
LIST_HEAD_TYPE *m_list,
 
list_itr->fltr_info.fwd_id.hw_vsi_id =
ice_get_hw_vsi_num(hw, vsi_handle);
-   if (IS_UNICAST_ETHER_ADDR(add) && !hw->ucast_shared) {
+   if (IS_UNICAST_ETHER_ADDR(add) && !hw->umac_shared) {
/* Don't remove the unicast address that belongs to
 * another VSI on the switch, since it is not being
 * shared...
diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index 4e33d14c6d..56ee628f10 100644
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -1194,7 +1194,8 @@ struct ice_hw {
/* INTRL granularity in 1 us */
u8 intrl_gran;
 
-   u8 ucast_shared;/* true if VSIs can share unicast addr */
+   /* true if VSIs can share unicast MAC addr */
+   u8 umac_shared;
 
 #define ICE_PHY_PER_NAC1
 #define ICE_MAX_QUAD   2
-- 
2.26.2

[dpdk-dev] [PATCH 27/28] net/ice/base: correct spellling of word data

[Qi Zhang]

Correct spelling of word data instead of date.

Signed-off-by: Kevin Scott 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 9c6649b6c5..641859f752 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -3528,7 +3528,7 @@ ice_phy_caps_equals_cfg(struct ice_aqc_get_phy_caps_data 
*phy_caps,
 /**
  * ice_copy_phy_caps_to_cfg - Copy PHY ability data to configuration data
  * @pi: port information structure
- * @caps: PHY ability structure to copy date from
+ * @caps: PHY ability structure to copy data from
  * @cfg: PHY configuration structure to copy data to
  *
  * Helper function to copy AQC PHY get ability data to PHY set configuration
-- 
2.26.2

[dpdk-dev] [PATCH 28/28] net/ice/base: update Max TCAM/PTG Per Profile

[Qi Zhang]

For GTPoGRE protocol in AVF FDIR/RSS, the number of associated PTGs
of one Profile may exceeds the defined ICE_MAX_PTG_PER_PROFILE and
ICE_MAX_TCAM_PER_PROFILE. In those cases, some PTGs may be missed,
and therefore, the related and received packets will not have hash
values. Thus, this patch updated the ICE_MAX_PTG_PER_PROFILE and
ICE_MAX_TCAM_PER_PROFILE to a larger number 64.

Signed-off-by: Junfeng Guo 
Signed-off-by: Qi Zhang 
---
 drivers/net/ice/base/ice_flex_type.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/base/ice_flex_type.h 
b/drivers/net/ice/base/ice_flex_type.h
index eb8290713b..247b85a192 100644
--- a/drivers/net/ice/base/ice_flex_type.h
+++ b/drivers/net/ice/base/ice_flex_type.h
@@ -804,8 +804,8 @@ struct ice_ptg_ptype {
u8 ptg;
 };
 
-#define ICE_MAX_TCAM_PER_PROFILE   32
-#define ICE_MAX_PTG_PER_PROFILE32
+#define ICE_MAX_TCAM_PER_PROFILE   64
+#define ICE_MAX_PTG_PER_PROFILE64
 
 struct ice_prof_map {
struct LIST_ENTRY_TYPE list;
-- 
2.26.2

Re: [dpdk-dev] [PATCH v1 0/4] fix note error

[Zhang, Qi Z]

> -Original Message-
> From: dev  On Behalf Of Feifei Wang
> Sent: Friday, July 23, 2021 11:11 AM
> Cc: dev@dpdk.org; n...@arm.com; Feifei Wang 
> Subject: [dpdk-dev] [PATCH v1 0/4] fix note error
> 
> Fix drivers/net note error and do some optimization for i40e NEON path.
> 
> Feifei Wang (4):
>   drivers/net: remove redundant phrases
>   drivers/net: fix note error for Rx vector
>   net/i40e: reorder Rx NEON code for better readability
>   net/i40e: change code order to reduce L1 cache misses
> 
>  drivers/net/fm10k/fm10k_rxtx_vec.c   |   6 +-
>  drivers/net/i40e/i40e_rxtx_vec_altivec.c |  10 +--
>  drivers/net/i40e/i40e_rxtx_vec_neon.c| 101 ++-
>  drivers/net/i40e/i40e_rxtx_vec_sse.c |   6 +-
>  drivers/net/iavf/iavf_rxtx_vec_sse.c |  12 +--
>  drivers/net/ice/ice_rxtx_vec_sse.c   |   6 +-
>  drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c   |   6 +-
>  7 files changed, 68 insertions(+), 79 deletions(-)
> 
> --
> 2.25.1

Applied to dpdk-next-net-intel.

Thanks
Qi

Re: [dpdk-dev] [PATCH v1] net/ice: fix the reversed priority of DCF switch rule

[Zhang, Qi Z]

> -Original Message-
> From: Wu, Wenjun1 
> Sent: Monday, August 2, 2021 3:25 PM
> To: dev@dpdk.org; Yang, Qiming ; Zhang, Qi Z
> ; Zhang, Yuying 
> Cc: Wu, Wenjun1 
> Subject: [PATCH v1] net/ice: fix the reversed priority of DCF switch rule
> 
> This patch fixes the reversed priority of DCF switch rule. Priority 0 and 1 
> are
> supported, and priority 0 should be the highest priority.
> 
> Fixes: 2321e34c23b3 ("net/ice: support flow priority for DCF switch filter")
> 
> Signed-off-by: Wenjun Wu 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

Re: [dpdk-dev] [PATCH 01/28] net/ice/base: add 1588 capability probe

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 01/28] net/ice/base: add 1588 capability probe
> 
> Parse 1588 timesync capability during device capability probing.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_adminq_cmd.h |   1 +
>  drivers/net/ice/base/ice_common.c | 111
> ++
>  drivers/net/ice/base/ice_type.h   |  72 +
>  3 files changed, 184 insertions(+)
> 
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 02/28] net/ice/base: add low level functions for device clock control

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 02/28] net/ice/base: add low level functions for device
> clock control
> 
> The ice hardware supports exposing a hardware clock for high precision
> timestamping. This is primarily intended for accelerating the Precision
> Time Protocol.
> 
> Add several low level functions intended to be used as the basis for
> enabling the device clock, and ensuring that the port timers are
> synchronized properly.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_adminq_cmd.h |1 +
>  drivers/net/ice/base/ice_common.c |  143 ++
>  drivers/net/ice/base/ice_common.h |   11 +
>  drivers/net/ice/base/ice_controlq.c   |   52 +-
>  drivers/net/ice/base/ice_controlq.h   |2 +
>  drivers/net/ice/base/ice_ptp_consts.h |   86 ++
>  drivers/net/ice/base/ice_ptp_hw.c | 2023
> +
>  drivers/net/ice/base/ice_ptp_hw.h |  376 +
>  drivers/net/ice/base/ice_type.h   |3 +
>  drivers/net/ice/base/meson.build  |1 +
>  10 files changed, 2697 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/net/ice/base/ice_ptp_consts.h
>  create mode 100644 drivers/net/ice/base/ice_ptp_hw.c
>  create mode 100644 drivers/net/ice/base/ice_ptp_hw.h
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 03/28] net/ice/base: add ethertype IPv6 check for dummy packet

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Nitka, Grzegorz 
> Subject: [PATCH 03/28] net/ice/base: add ethertype IPv6 check for
> dummy packet
> 
> In order to support switch rule for ethertype filter
> with ipv6 ethertype id, it has to check ethertype and
> then find a proper dummy packet. There was a silent
> assumption that packet is ipv4, unless src or dst ipv6
> address is specified in a flow.
> 
> Signed-off-by: Grzegorz Nitka 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_switch.c | 14 +++---
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 04/28] net/ice/base: change dummy packets with VLAN

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Swiatkowski, Michal
> 
> Subject: [PATCH 04/28] net/ice/base: change dummy packets with VLAN
> 
> Ethertype was traded as VLAN tpid in dummy packets with VLAN.
> This led to a problem when user wanted to add filter for VLAN and
> ethertype.
> 
> Change ice_vlan_hdr to reflect correct order of VLAN fields in
> packets (VLAN tpid, VLAN id). Correct all dummy packets with VLAN.
> Move VLAN fields before ethertype and change offsets. Leave values
> from dummy packets unchanged as they fit to new VLAN layout.
> 
> Order of offsets in ice_prot_ext_tbl_entry for VLAN protocol should
> reflect order of fields in ice_vlan_hdr. However, hardware doesn't
> support matching on all tpid. This should be done by matching on
> packet flags. There is no FV word with protocol for VLAN and offset
> 2. Because of that, adding vlan tpid with not zero mask will lead
> to error in creating recipe.
> 
> Signed-off-by: Michal Swiatkowski 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_protocol_type.h |   2 +-
>  drivers/net/ice/base/ice_switch.c| 148 +++
>  2 files changed, 73 insertions(+), 77 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 05/28] net/ice/base: add timestamp masks

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Sridhar, Vignesh 
> Subject: [PATCH 05/28] net/ice/base: add timestamp masks
> 
> Adding macros for shift and masking of the lower timestamp work in the
> Rx flex descriptor. The LSB of the timestamp-low word indicates the
> validity of the timestamp while the rest 7 bits contain the timestamp.
> 
> Signed-off-by: Vignesh Sridhar 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_lan_tx_rx.h | 8 
>  1 file changed, 8 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 06/28] net/ice/base: add clock initialization function

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 06/28] net/ice/base: add clock initialization function
> 
> Before the device PTP hardware clock can be initialized, some steps must
> be taken by the driver. This includes writing some registers and
> initializing the PHY.
> 
> Some of these steps are distinct depending on the device type (E810 or
> E822). Additionally, a future change will introduce more steps for E822
> devices to program the Clock Generation Unit.
> 
> Introduce ice_ptp_init_phc as well as device-specific sub-functions for
> e810 and e822 devices.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_cgu_regs.h   | 117 +
>  drivers/net/ice/base/ice_ptp_consts.h |  74 ++
>  drivers/net/ice/base/ice_ptp_hw.c | 348
> +-
>  drivers/net/ice/base/ice_ptp_hw.h |  24 ++
>  4 files changed, 562 insertions(+), 1 deletion(-)
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 07/28] net/ice/base: add accessors to get/set the time reference

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 07/28] net/ice/base: add accessors to get/set the time
> reference
> 
> The E822 device clock might come from a variety of different sources,
> called TIME_REFs. The firmware reports the current TIME_REF as part of
> its function capabilities, which the driver caches when it loads.
> 
> Add an accessor function to look up the current TIME_REF from the
> capabilities. This reduces line length significantly and also avoids
> a tight coupling to the capabilities structure.
> 
> In some cases, TIME_REF might change at run time. This can occur in the
> event that the CGU registers are updated. When this happens, its
> possible that the capabilities structure can be out of date until the
> capabilities are re-read.
> 
> Add an setter function to update the TIME_REF when this occurs. The
> driver can call this function after updating the CGU to ensure that the
> TIME_REF in the capabilities structure is up to date, without needing to
> re-read the entire capabilities from firmware.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_ptp_hw.h | 25 +
>  1 file changed, 25 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 08/28] net/ice/base: print human-friendly PHY types

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Venkataramanan, Anirudh
> 
> Subject: [PATCH 08/28] net/ice/base: print human-friendly PHY types
> 
> Add functions to print PHY types in human-friendly form
> 
> Signed-off-by: Anirudh Venkataramanan
> 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 164
> ++
>  1 file changed, 146 insertions(+), 18 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 09/28] net/ice/base: implement Vernier calibration logic for E822 devices

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 09/28] net/ice/base: implement Vernier calibration logic
> for E822 devices
> 
> Move the implementation of Vernier calibration from Linux core ice_ptp.c
> into the shared ice_ptp_hw.c file.
> 
> This implementation was recently refactored in Linux, so the move should
> be verbatim with the latest Linux code that we had implemented.
> 
> This includes a new constant table with pre-determined values based on
> link speed, new functions to aide in reading the multi-register values
> from the PHY, functions to program the PAR/PCS conversion ratios, and
> the UIX conversion ratios, functions to program the total Tx and Rx
> offset after vernier calibration in the hardware completes, and finally
> a function to start and stop the PHY timestamping block.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_ptp_consts.h | 216 ++
>  drivers/net/ice/base/ice_ptp_hw.c | 999
> ++
>  drivers/net/ice/base/ice_ptp_hw.h |  47 ++
>  3 files changed, 1262 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 10/28] net/ice/base: clarify comments on checking PFC mode

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Nguyen, Anthony L
> 
> Subject: [PATCH 10/28] net/ice/base: clarify comments on checking PFC
> mode
> 
> Rework the comment around checking PFC mode to make it clear why we
> are
> checking the mode after sending the command.
> 
> Signed-off-by: Tony Nguyen 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_dcb.c | 9 -
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 11/28] net/ice/base: add support for starting PHY in bypass mode

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 11/28] net/ice/base: add support for starting PHY in
> bypass mode
> 
> After starting the timestamping block, hardware begins calculating
> precise offsets through a process of vernier calibration. This process
> measures the effective phase offset of the various internal clocks used
> in the PHY.
> 
> Once hardware completes these measurements, the
> P_REG_TX_OV_STATUS and
> P_REG_RX_OV_STATUS registers are updated to indicate that the
> hardware
> offset measurements are done.
> 
> This process does not happen immediately, but requires that at least one
> packet be sent or received in order for the offset in that direction to
> be calculated.
> 
> This poses a problem in some setups, because software expects the first
> packet sent to be timestamped. This most often occurs if the clock time
> is set by an application during startup. This set time command triggers
> a PHY restart. Because of this, the timestamping block is reset, and
> timestamps are not enabled until vernier calibration is complete. Since
> this process won't complete until at least one packet is sent through
> the PHY, timestamps of the very first packet sent will not be obtained.
> 
> This can result in the application failing due to missing timestamps.
> 
> To avoid this, allow starting the PHY in bypass mode. This mode enables
> timestamps immediately, and skips adding the precise offset
> measurement.
> This reduces the accuracy of the timestamp slightly, but ensures that we
> get a reasonable value for the first packet.
> 
> The driver can continue monitoring the P_REG_TX_OV_STATUS and
> P_REG_RX_OV_STATUS registers and exit bypass mode once the total
> calibration is completed. In this way, once calibration is complete, the
> timestamps will have the precise offset, but we do not break
> applications which expect to be able to timestamp immediately.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_ptp_hw.c | 84
> +++
>  drivers/net/ice/base/ice_ptp_hw.h |  1 +
>  2 files changed, 85 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 12/28] net/ice/base: add E810T check function

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Michalik, Michal 
> Subject: [PATCH 12/28] net/ice/base: add E810T check function
> 
> Add function ice_is_e810t() to be able to distinguish if hardware is E810T
> based or not.
> 
> Signed-off-by: Michal Michalik 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 12 
>  drivers/net/ice/base/ice_common.h |  1 +
>  drivers/net/ice/base/ice_devids.h |  1 +
>  3 files changed, 14 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 13/28] net/ice/base: implement firmware debug dump

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Domagala, MarcinX
> 
> Subject: [PATCH 13/28] net/ice/base: implement firmware debug dump
> 
> Basic implementation of FW Debug Dump.
> 
> Signed-off-by: Marcin Domagala 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_adminq_cmd.h | 25 ++
>  drivers/net/ice/base/ice_common.c | 50
> +++
>  drivers/net/ice/base/ice_common.h |  6 
>  3 files changed, 81 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 14/28] net/ice/base: add new AQ description

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; D H, Siddaraju 
> Subject: [PATCH 14/28] net/ice/base: add new AQ description
> 
> Add ice_aqc_sw_gpio struct to ice_aq_desc
> This change allows us to do SW_GPIO AQ cmd transactions
> over ice_aq_send_cmd() interface.
> 
> Signed-off-by: Siddaraju DH 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_adminq_cmd.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 15/28] net/ice/base: refine MAC rule adding

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Domagala, MarcinX
> 
> Subject: [PATCH 15/28] net/ice/base: refine MAC rule adding
> 
> Move replay_pre_init function to interface.
> Add further MAC rules, despite unicast address is already on list.
> 
> Signed-off-by: Marcin Domagala 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 2 +-
>  drivers/net/ice/base/ice_common.h | 2 ++
>  drivers/net/ice/base/ice_switch.c | 2 +-
>  3 files changed, 4 insertions(+), 2 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 16/28] net/ice/base: support TC nodes PIR configuration

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Xu, Ting 
> Subject: [PATCH 16/28] net/ice/base: support TC nodes PIR configuration
> 
> TC nodes CIR configuration is not supported. In order to configure PIR,
> the corresponding adminq command should not include the flag for CIR.
> Since the TC node info has this flag by default, it is supposed to delete
> this flag for TC nodes before sending the adminq command.
> 
> Signed-off-by: Ting Xu 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_sched.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 17/28] net/ice/base: support FDIR for GRE tunnel packet

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:51
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Wu, Wenjun1 
> Subject: [PATCH 17/28] net/ice/base: support FDIR for GRE tunnel packet
> 
> Support IPV4_GRE and IPV6_GRE with inner IPV4/IPV6/UDP/TCP for
> FDIR.
> 
> Signed-off-by: Wenjun Wu 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_fdir.c | 361
> 
>  drivers/net/ice/base/ice_fdir.h |   2 +
>  drivers/net/ice/base/ice_type.h |  14 ++
>  3 files changed, 377 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 18/28] net/ice/base: support RSS for GRE tunnel packet

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Wu, Wenjun1 
> Subject: [PATCH 18/28] net/ice/base: support RSS for GRE tunnel packet
> 
> Support RSS of inner headers for GRE tunnel packet.
> 
> Signed-off-by: Wenjun Wu 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_flow.c | 14 ++
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 19/28] net/ice/base: support FDIR for GTPU EH inner IPv6

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> 
> Subject: [PATCH 19/28] net/ice/base: support FDIR for GTPU EH inner
> IPv6
> 
> Supuport FDIR filtering for IPV4_GTPU_EH_IPV6 with inner
> IPV6/UDP/TCP fields matching.
> 
> Signed-off-by: Junfeng Guo 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_fdir.c | 352 ++-
> -
>  drivers/net/ice/base/ice_type.h |  23 ++-
>  2 files changed, 309 insertions(+), 66 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 20/28] net/ice/base: support RSS for GTPoGRE

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> 
> Subject: [PATCH 20/28] net/ice/base: support RSS for GTPoGRE
> 
> Support RSS for GTPoGRE inner fields hash.
> 
> Signed-off-by: Junfeng Guo 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_flow.c | 8 
>  drivers/net/ice/base/ice_flow.h | 4 
>  2 files changed, 12 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 21/28] net/ice/base: enable NVM update reset capabilities

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Keller, Jacob E 
> Subject: [PATCH 21/28] net/ice/base: enable NVM update reset
> capabilities
> 
> Add logic to parse capabilities relating to the firmware update reset
> requirements. This includes both capability 0x76, which informs the
> driver if the firmware can sometimes skip PCIe resets, and 0x77, which
> informs the driver if the firmware might potentially restrict EMP
> resets.
> 
> For capability 0x76, if the number is 1, the firmware will report the
> required reset level for a given update as part of its response to the
> last command sent to program the NVM bank. (Otherwise, if the firmware
> does not support this capability then it will always send a 0 in the
> field of the response).
> 
> For capability 0x77, if the number is 1, the firmware will report when
> EMP reset is available as part of the response to the command for
> switching flash banks. (Otherwise, if the firmware does not support this
> capability, it will always send a 0 in the field of the response
> message).
> 
> These capabilities are required to implement immediate firmware
> activation. If the capabilities are set, software can read the response
> data and determine what reset level is required to activate the firmware
> image. If only an EMP reset is required, and if the EMP reset is not
> restricted by firmware, then the driver can issue an EMP reset to
> immediately activate the new firmware.
> 
> Signed-off-by: Jacob Keller 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 12 
>  drivers/net/ice/base/ice_type.h   |  4 
>  2 files changed, 16 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 22/28] net/ice/base: support FDIR for GTPoGRE

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> 
> Subject: [PATCH 22/28] net/ice/base: support FDIR for GTPoGRE
> 
> Enable Flow Director filtering for GTPoGRE inner/outer fields
> matching.
> 
> Signed-off-by: Junfeng Guo 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_fdir.c  | 1532 ++
>  drivers/net/ice/base/ice_fdir.h  |   12 +
>  drivers/net/ice/base/ice_flex_pipe.c |6 +
>  drivers/net/ice/base/ice_flex_type.h |   48 +
>  drivers/net/ice/base/ice_flow.c  |  184 ++-
>  drivers/net/ice/base/ice_protocol_type.h |2 +
>  drivers/net/ice/base/ice_type.h  |  112 ++
>  7 files changed, 1888 insertions(+), 8 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 23/28] net/ice/base: add RSS support for IPv4/L4 checksum

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Zhang, AlvinX 
> Subject: [PATCH 23/28] net/ice/base: add RSS support for IPv4/L4
> checksum
> 
> The IPv4/TCP/UDP/SCTP header checksum fields are defined in this
> patch and can be used as RSS input sets.
> 
> Signed-off-by: Alvin Zhang 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_flow.c | 17 +
>  drivers/net/ice/base/ice_flow.h |  4 
>  2 files changed, 21 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 24/28] net/ice/base: enable jumbo frame support during HW init

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Venkataramanan, Anirudh
> 
> Subject: [PATCH 24/28] net/ice/base: enable jumbo frame support during
> HW init
> 
> Call ice_aq_set_mac_cfg in ice_hw_init to enable jumbo frame support.
> 
> Signed-off-by: Anirudh Venkataramanan
> 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 6 ++
>  1 file changed, 6 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 25/28] net/ice/base: support FDIR for GTPU UL/DL with QFI fields

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> 
> Subject: [PATCH 25/28] net/ice/base: support FDIR for GTPU UL/DL with
> QFI fields
> 
> Enable Flow Director filtering for GTPU UL/DL QFI field matching.
> 
> Signed-off-by: Junfeng Guo 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_flow.c | 8 
>  drivers/net/ice/base/ice_flow.h | 2 ++
>  2 files changed, 10 insertions(+)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 26/28] net/ice/base: rename and add a setter function

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Venkataramanan, Anirudh
> 
> Subject: [PATCH 26/28] net/ice/base: rename and add a setter function
> 
> Rename ucast_shared to umac_shared, as "umac" is a more widely
> used shorthand for "unicast MAC".
> 
> Also add a helper function to set this flag. This helper is
> expected to be called by core drivers.
> 
> Signed-off-by: Anirudh Venkataramanan
> 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 11 +++
>  drivers/net/ice/base/ice_common.h |  1 +
>  drivers/net/ice/base/ice_switch.c |  8 
>  drivers/net/ice/base/ice_type.h   |  3 ++-
>  4 files changed, 18 insertions(+), 5 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 27/28] net/ice/base: correct spellling of word data

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> ; Scott, Kevin C 
> Subject: [PATCH 27/28] net/ice/base: correct spellling of word data
> 
> Correct spelling of word data instead of date.
> 
> Signed-off-by: Kevin Scott 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH 28/28] net/ice/base: update Max TCAM/PTG Per Profile

[Guo, Junfeng]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 10, 2021 10:52
> To: Yang, Qiming 
> Cc: Guo, Junfeng ; dev@dpdk.org; Zhang, Qi Z
> 
> Subject: [PATCH 28/28] net/ice/base: update Max TCAM/PTG Per Profile
> 
> For GTPoGRE protocol in AVF FDIR/RSS, the number of associated PTGs
> of one Profile may exceeds the defined ICE_MAX_PTG_PER_PROFILE and
> ICE_MAX_TCAM_PER_PROFILE. In those cases, some PTGs may be missed,
> and therefore, the related and received packets will not have hash
> values. Thus, this patch updated the ICE_MAX_PTG_PER_PROFILE and
> ICE_MAX_TCAM_PER_PROFILE to a larger number 64.
> 
> Signed-off-by: Junfeng Guo 
> Signed-off-by: Qi Zhang 
> ---
>  drivers/net/ice/base/ice_flex_type.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --
> 2.26.2

Acked-by: Junfeng Guo 

Regards,
Junfeng Guo

Re: [dpdk-dev] [PATCH v1 0/2] remove redundant default RSS field for IP fragment packets

[Zhang, Qi Z]

> -Original Message-
> From: Wu, Wenjun1 
> Sent: Monday, August 2, 2021 4:35 PM
> To: dev@dpdk.org; Zhang, Qi Z 
> Cc: Wu, Wenjun1 
> Subject: [PATCH v1 0/2] remove redundant default RSS field for IP fragment
> packets
> 
> Remove redundant default RSS field for IP fragment packets, only src MAC
> address and dst MAC address are needed.
> 
> Wenjun Wu (2):
>   net/iavf: remove redundant default RSS field for IP fragment packets
>   net/ice: remove redundant default RSS field for IP fragment packets
> 
>  drivers/net/iavf/iavf_hash.c | 26 ++
> drivers/net/ice/ice_ethdev.c |  4 ++--
>  2 files changed, 4 insertions(+), 26 deletions(-)
> 
> --
> 2.25.1

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

[dpdk-dev] [PATCH v3 0/3] security: Improve inline fast path routines

[Nithin Dabilpuram]

Improvements to Inline inbound and outbound processing fast path routines
rte_security_set_pkt_metadata() and rte_security_get_userdata() to make
them inline functions and also provide mechanism for drivers to support
fast userdata and metadata access instead of driver specific per-pkt
function callbacks.

This series updates requirements of mbuf fields to be updated for outbound
inline processing.

Nithin Dabilpuram (3):
  security: enforce semantics for Tx inline processing
  security: add option for faster udata or mdata access
  examples/ipsec-secgw: update event mode inline path

v3:
- Rebased and fixed compilation issue with rte_security_get_userdata() on
  32-bit platform
- Updated l2_len on patch 3/3 only for outbound.

v2:
- Remove restrictions on rte_security_set_pkt_metadata() w.r.t pkt content
- Add inline functions for rte_security_set_pkt_metadata() and 
  rte_security_get_userdata() and also faster mdata, udata access via
  patch 2/3

 doc/guides/nics/features.rst|  2 ++
 examples/ipsec-secgw/ipsec-secgw.c  |  2 ++
 examples/ipsec-secgw/ipsec_worker.c | 41 ---
 lib/mbuf/rte_mbuf_core.h|  2 ++
 lib/security/rte_security.c |  8 +++---
 lib/security/rte_security.h | 49 ++---
 lib/security/version.map|  2 ++
 7 files changed, 84 insertions(+), 22 deletions(-)

-- 
2.8.4

[dpdk-dev] [PATCH v3 1/3] security: enforce semantics for Tx inline processing

[Nithin Dabilpuram]

Not all net PMD's/HW can parse packet and identify L2 header and
L3 header locations on Tx. This is inline with other Tx offloads
requirements such as L3 checksum, L4 checksum offload, etc,
where mbuf.l2_len, mbuf.l3_len etc, needs to be set for HW to be
able to generate checksum. Since Inline IPSec is also such a Tx
offload, some PMD's at least need mbuf.l2_len to be valid to
find L3 header and perform Outbound IPSec processing.

Hence, this patch updates documentation to enforce setting
mbuf.l2_len while setting PKT_TX_SEC_OFFLOAD in mbuf.ol_flags
for Inline IPSec Crypto / Protocol offload processing to
work on Tx.

Signed-off-by: Nithin Dabilpuram 
---
 doc/guides/nics/features.rst | 2 ++
 lib/mbuf/rte_mbuf_core.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index a96e12d..4fce8cd 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -430,6 +430,7 @@ of protocol operations. See Security library and PMD 
documentation for more deta
 
 * **[uses]   rte_eth_rxconf,rte_eth_rxmode**: 
``offloads:DEV_RX_OFFLOAD_SECURITY``,
 * **[uses]   rte_eth_txconf,rte_eth_txmode**: 
``offloads:DEV_TX_OFFLOAD_SECURITY``.
+* **[uses]   mbuf**: ``mbuf.l2_len``.
 * **[implements] rte_security_ops**: ``session_create``, ``session_update``,
   ``session_stats_get``, ``session_destroy``, ``set_pkt_metadata``, 
``capabilities_get``.
 * **[provides] rte_eth_dev_info**: 
``rx_offload_capa,rx_queue_offload_capa:DEV_RX_OFFLOAD_SECURITY``,
@@ -451,6 +452,7 @@ protocol operations. See security library and PMD 
documentation for more details
 
 * **[uses]   rte_eth_rxconf,rte_eth_rxmode**: 
``offloads:DEV_RX_OFFLOAD_SECURITY``,
 * **[uses]   rte_eth_txconf,rte_eth_txmode**: 
``offloads:DEV_TX_OFFLOAD_SECURITY``.
+* **[uses]   mbuf**: ``mbuf.l2_len``.
 * **[implements] rte_security_ops**: ``session_create``, ``session_update``,
   ``session_stats_get``, ``session_destroy``, ``set_pkt_metadata``, 
``get_userdata``,
   ``capabilities_get``.
diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
index bb38d7f..9d8e3dd 100644
--- a/lib/mbuf/rte_mbuf_core.h
+++ b/lib/mbuf/rte_mbuf_core.h
@@ -228,6 +228,8 @@ extern "C" {
 
 /**
  * Request security offload processing on the TX packet.
+ * To use Tx security offload, the user needs to fill l2_len in mbuf
+ * indicating L2 header size and where L3 header starts.
  */
 #define PKT_TX_SEC_OFFLOAD (1ULL << 43)
 
-- 
2.8.4

[dpdk-dev] [PATCH v3 2/3] security: add option for faster udata or mdata access

[Nithin Dabilpuram]

Currently rte_security_set_pkt_metadata() and rte_security_get_userdata()
methods to set pkt metadata on Inline outbound and get userdata
after Inline inbound processing is always driver specific callbacks.

For drivers that do not have much to do in the callbacks but just
to update metadata in rte_security dynamic field and get userdata
from rte_security dynamic field, having to just to PMD specific
callback is costly per packet operation. This patch provides
a mechanism to do the same in inline function and avoid function
pointer jump if a driver supports the same.

Signed-off-by: Nithin Dabilpuram 
---
 lib/security/rte_security.c |  8 
 lib/security/rte_security.h | 49 +
 lib/security/version.map|  2 ++
 3 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c
index e8116d5..fe81ed3 100644
--- a/lib/security/rte_security.c
+++ b/lib/security/rte_security.c
@@ -122,9 +122,9 @@ rte_security_session_destroy(struct rte_security_ctx 
*instance,
 }
 
 int
-rte_security_set_pkt_metadata(struct rte_security_ctx *instance,
- struct rte_security_session *sess,
- struct rte_mbuf *m, void *params)
+__rte_security_set_pkt_metadata(struct rte_security_ctx *instance,
+   struct rte_security_session *sess,
+   struct rte_mbuf *m, void *params)
 {
 #ifdef RTE_DEBUG
RTE_PTR_OR_ERR_RET(sess, -EINVAL);
@@ -137,7 +137,7 @@ rte_security_set_pkt_metadata(struct rte_security_ctx 
*instance,
 }
 
 void *
-rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md)
+__rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md)
 {
void *userdata = NULL;
 
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 88d31de..06267f6 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -71,8 +71,18 @@ struct rte_security_ctx {
/**< Pointer to security ops for the device */
uint16_t sess_cnt;
/**< Number of sessions attached to this context */
+   uint32_t flags;
+   /**< Flags for security context */
 };
 
+#define RTE_SEC_CTX_F_FAST_SET_MDATA 0x0001
+/**< Driver uses fast metadata update without using driver specific callback */
+
+#define RTE_SEC_CTX_F_FAST_GET_UDATA 0x0002
+/**< Driver provides udata using fast method without using driver specific
+ * callback.
+ */
+
 /**
  * IPSEC tunnel parameters
  *
@@ -493,6 +503,12 @@ static inline bool 
rte_security_dynfield_is_registered(void)
return rte_security_dynfield_offset >= 0;
 }
 
+/** Function to call PMD specific function pointer set_pkt_metadata() */
+__rte_experimental
+extern int __rte_security_set_pkt_metadata(struct rte_security_ctx *instance,
+  struct rte_security_session *sess,
+  struct rte_mbuf *m, void *params);
+
 /**
  *  Updates the buffer with device-specific defined metadata
  *
@@ -506,10 +522,27 @@ static inline bool 
rte_security_dynfield_is_registered(void)
  *  - On success, zero.
  *  - On failure, a negative value.
  */
-int
+static inline int
 rte_security_set_pkt_metadata(struct rte_security_ctx *instance,
  struct rte_security_session *sess,
- struct rte_mbuf *mb, void *params);
+ struct rte_mbuf *mb, void *params)
+{
+   /* Fast Path */
+   if (instance->flags & RTE_SEC_CTX_F_FAST_SET_MDATA) {
+   *rte_security_dynfield(mb) =
+   (rte_security_dynfield_t)(sess->sess_private_data);
+   return 0;
+   }
+
+   /* Jump to PMD specific function pointer */
+   return __rte_security_set_pkt_metadata(instance->device, sess, mb,
+  params);
+}
+
+/** Function to call PMD specific function pointer get_userdata() */
+__rte_experimental
+extern void *__rte_security_get_userdata(struct rte_security_ctx *instance,
+uint64_t md);
 
 /**
  * Get userdata associated with the security session. Device specific metadata
@@ -529,8 +562,16 @@ rte_security_set_pkt_metadata(struct rte_security_ctx 
*instance,
  *  - On failure, NULL
  */
 __rte_experimental
-void *
-rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md);
+static inline void *
+rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md)
+{
+   /* Fast Path */
+   if (instance->flags & RTE_SEC_CTX_F_FAST_GET_UDATA)
+   return (void *)(uintptr_t)md;
+
+   /* Jump to PMD specific function pointer */
+   return __rte_security_get_userdata(instance, md);
+}
 
 /**
  * Attach a session to a symmetric crypto operation
diff --git a/lib/security/version.map b/lib/security/version.map
index 2

[dpdk-dev] [PATCH v3 3/3] examples/ipsec-secgw: update event mode inline path

[Nithin Dabilpuram]

Update mbuf.l2_len with L2 header size for outbound
inline processing.

This patch also fixes a bug in arg parsing.

Signed-off-by: Nithin Dabilpuram 
---
 examples/ipsec-secgw/ipsec-secgw.c  |  2 ++
 examples/ipsec-secgw/ipsec_worker.c | 41 -
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/examples/ipsec-secgw/ipsec-secgw.c 
b/examples/ipsec-secgw/ipsec-secgw.c
index f252d34..7ad94cb 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1495,6 +1495,8 @@ parse_portmask(const char *portmask)
char *end = NULL;
unsigned long pm;
 
+   errno = 0;
+
/* parse hexadecimal string */
pm = strtoul(portmask, &end, 16);
if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
diff --git a/examples/ipsec-secgw/ipsec_worker.c 
b/examples/ipsec-secgw/ipsec_worker.c
index 647e22d..c545497 100644
--- a/examples/ipsec-secgw/ipsec_worker.c
+++ b/examples/ipsec-secgw/ipsec_worker.c
@@ -12,6 +12,11 @@
 #include "ipsec-secgw.h"
 #include "ipsec_worker.h"
 
+struct port_drv_mode_data {
+   struct rte_security_session *sess;
+   struct rte_security_ctx *ctx;
+};
+
 static inline enum pkt_type
 process_ipsec_get_pkt_type(struct rte_mbuf *pkt, uint8_t **nlp)
 {
@@ -60,7 +65,8 @@ ipsec_event_pre_forward(struct rte_mbuf *m, unsigned int 
port_id)
 
 static inline void
 prepare_out_sessions_tbl(struct sa_ctx *sa_out,
-   struct rte_security_session **sess_tbl, uint16_t size)
+struct port_drv_mode_data *data,
+uint16_t size)
 {
struct rte_ipsec_session *pri_sess;
struct ipsec_sa *sa;
@@ -95,9 +101,10 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out,
}
 
/* Use only first inline session found for a given port */
-   if (sess_tbl[sa->portid])
+   if (data[sa->portid].sess)
continue;
-   sess_tbl[sa->portid] = pri_sess->security.ses;
+   data[sa->portid].sess = pri_sess->security.ses;
+   data[sa->portid].ctx = pri_sess->security.ctx;
}
 }
 
@@ -356,9 +363,8 @@ process_ipsec_ev_outbound(struct ipsec_ctx *ctx, struct 
route_table *rt,
goto drop_pkt_and_exit;
}
 
-   if (sess->security.ol_flags & RTE_SECURITY_TX_OLOAD_NEED_MDATA)
-   *(struct rte_security_session **)rte_security_dynfield(pkt) =
-   sess->security.ses;
+   rte_security_set_pkt_metadata(sess->security.ctx,
+ sess->security.ses, pkt, NULL);
 
/* Mark the packet for Tx security offload */
pkt->ol_flags |= PKT_TX_SEC_OFFLOAD;
@@ -367,6 +373,9 @@ process_ipsec_ev_outbound(struct ipsec_ctx *ctx, struct 
route_table *rt,
port_id = sa->portid;
 
 send_pkt:
+   /* Provide L2 len for Outbound processing */
+   pkt->l2_len = RTE_ETHER_HDR_LEN;
+
/* Update mac addresses */
update_mac_addrs(pkt, port_id);
 
@@ -398,7 +407,7 @@ static void
 ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
uint8_t nb_links)
 {
-   struct rte_security_session *sess_tbl[RTE_MAX_ETHPORTS] = { NULL };
+   struct port_drv_mode_data data[RTE_MAX_ETHPORTS];
unsigned int nb_rx = 0;
struct rte_mbuf *pkt;
struct rte_event ev;
@@ -412,6 +421,8 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct 
eh_event_link_info *links,
return;
}
 
+   memset(&data, 0, sizeof(struct port_drv_mode_data));
+
/* Get core ID */
lcore_id = rte_lcore_id();
 
@@ -422,8 +433,8 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct 
eh_event_link_info *links,
 * Prepare security sessions table. In outbound driver mode
 * we always use first session configured for a given port
 */
-   prepare_out_sessions_tbl(socket_ctx[socket_id].sa_out, sess_tbl,
-   RTE_MAX_ETHPORTS);
+   prepare_out_sessions_tbl(socket_ctx[socket_id].sa_out, data,
+RTE_MAX_ETHPORTS);
 
RTE_LOG(INFO, IPSEC,
"Launching event mode worker (non-burst - Tx internal port - "
@@ -460,19 +471,21 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct 
eh_event_link_info *links,
 
if (!is_unprotected_port(port_id)) {
 
-   if (unlikely(!sess_tbl[port_id])) {
+   if (unlikely(!data[port_id].sess)) {
rte_pktmbuf_free(pkt);
continue;
}
 
/* Save security session */
-   if (rte_security_dynfield_is_registered())
-   *(struct rte_security_session **)
-   rte_security_dynfield(pkt) =
-   sess_t