devtools: add script to check for non inclusive naming
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/1 devtools: add script to check for non inclusive naming
Script to find words that should not be used.
Really just a wrapper around git grep command.
By default it prints matches.
Uses the word lists from Inclusive Naming Initiative see https://inclusivenaming.org/word-lists/
Examples:
$ ./devtools/check-naming-policy.sh -c app/test-compress-perf/comp_perf_test_cyclecount.c:1 uapp/test-compress-perf/comp_perf_test_throughput.c:1 app/test-compress-perf/comp_perf_test_verify.c:1 app/test/test_common.c:1 ...
$ ./devtools/check-naming-policy.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-naming-policy.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/include/generic/rte_power_intrinsics.h lib/eal/include/generic/rte_rwlock.h lib/eal/include/generic/rte_spinlock.h lib/eal/include/rte_debug.h lib/eal/include/rte_seqlock.h lib/eal/linux/eal.c lib/eal/windows/eal.c lib/eal/x86/include/rte_rtm.h lib/eal/x86/include/rte_spinlock.h lib/eal/x86/rte_power_intrinsics.c
$ ./devtools/check-inclusive-naming -h
usage: check-inclusive-naming.py [-h] [-c] [-d] [-l] [-t {0,1,2,3}]
[-x EXCLUDE] [--url URL]
[paths ...]Identify word usage not aligned with inclusive naming
positional arguments:
paths files and directory to scan
options:
-h, --help show this help message and exit -c, --count Show the nuber of lines that match -d, --debug Debug this script
-l, --files-with-matches
Show only names of files with hits
-t {0,1,2,3}, --tier {0,1,2,3}
Show non-conforming words of particular tier
-x EXCLUDE, --exclude EXCLUDE
Exclude path from scan
--url URL URL for the non-inclusive naming word list
---
v3 - use python instead of shell and rework UI
fetch list of words rather than recording them here
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 125 +++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 6 lines · On Wed, 5 Apr 2023 16:29:30 -0700 Stephen Hemminger…
Script to find words that should not be used.
Really just a wrapper around git grep command.
By default it prints matches.Uses the word lists from Inclusive Naming Initiative see https://inclusivenaming.org/word-lists/
Script still works fine, and should be considered.
BUT the inclusive naming word list on web site is no longer valid JSON, so right now it causes a JSON decode error.
PATCH 1/1 devtools: add script to check for non inclusive naming
In reply to a message not in the archiveScript to find words that should not be used.
Really just a wrapper around git grep command.
By default it prints matches.
Uses the word lists from Inclusive Naming Initiative see https://inclusivenaming.org/word-lists/
Examples:
$ ./devtools/check-naming-policy.sh -c app/test-compress-perf/comp_perf_test_cyclecount.c:1 uapp/test-compress-perf/comp_perf_test_throughput.c:1 app/test-compress-perf/comp_perf_test_verify.c:1 app/test/test_common.c:1 ...
$ ./devtools/check-naming-policy.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-naming-policy.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/include/generic/rte_power_intrinsics.h lib/eal/include/generic/rte_rwlock.h lib/eal/include/generic/rte_spinlock.h lib/eal/include/rte_debug.h lib/eal/include/rte_seqlock.h lib/eal/linux/eal.c lib/eal/windows/eal.c lib/eal/x86/include/rte_rtm.h lib/eal/x86/include/rte_spinlock.h lib/eal/x86/rte_power_intrinsics.c
$ ./devtools/check-inclusive-naming -h
usage: check-inclusive-naming.py [-h] [-c] [-d] [-l] [-t {0,1,2,3}]
[-x EXCLUDE] [--url URL]
[paths ...]Identify word usage not aligned with inclusive naming
positional arguments:
paths files and directory to scan
options:
-h, --help show this help message and exit -c, --count Show the nuber of lines that match -d, --debug Debug this script
-l, --files-with-matches
Show only names of files with hits
-t {0,1,2,3}, --tier {0,1,2,3}
Show non-conforming words of particular tier
-x EXCLUDE, --exclude EXCLUDE
Exclude path from scan
--url URL URL for the non-inclusive naming word list
---
v4 - fix python lint warnings and spelling
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 137 +++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +137 -0
137 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v4 1/1 devtools: add script to check for non inclusive naming
In reply to a message not in the archiveScript to find words that should not be used. Really just a wrapper around git grep command. By default it prints matches.
Uses the word lists from Inclusive Naming Initiative
see https://inclusivenaming.org/word-lists/
Note: the list has extra comma at end of list of elements which is not valid in basic JSON but allowed in user-friendly JSON5 (https://json5.org/) and therefore needs the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-naming-policy.sh -c app/test-compress-perf/comp_perf_test_cyclecount.c:1 uapp/test-compress-perf/comp_perf_test_throughput.c:1 app/test-compress-perf/comp_perf_test_verify.c:1 app/test/test_common.c:1 ...
$ ./devtools/check-naming-policy.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-naming-policy.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/include/generic/rte_power_intrinsics.h lib/eal/include/generic/rte_rwlock.h lib/eal/include/generic/rte_spinlock.h lib/eal/include/rte_debug.h lib/eal/include/rte_seqlock.h lib/eal/linux/eal.c lib/eal/windows/eal.c lib/eal/x86/include/rte_rtm.h lib/eal/x86/include/rte_spinlock.h lib/eal/x86/rte_power_intrinsics.c
$ ./devtools/check-inclusive-naming -h
usage: check-inclusive-naming.py [-h] [-c] [-d] [-l] [-t {0,1,2,3}]
[-x EXCLUDE] [--url URL]
[paths ...]Identify word usage not aligned with inclusive naming
positional arguments:
paths files and directory to scan
options:
-h, --help show this help message and exit -c, --count Show the nuber of lines that match -d, --debug Debug this script
-l, --files-with-matches
Show only names of files with hits
-t {0,1,2,3}, --tier {0,1,2,3}
Show non-conforming words of particular tier
-x EXCLUDE, --exclude EXCLUDE
Exclude path from scan
--url URL URL for the non-inclusive naming word list
---
v4 - use json5 package to workaround format issues with the JSON file
from inclusive naming.
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 127 +++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH v5 1/1 devtools: add script to check for non inclusive naming
In reply to a message not in the archiveScript to find words that should not be used. Really just a wrapper around git grep command. By default it prints matches.
Uses the word lists from Inclusive Naming Initiative
see https://inclusivenaming.org/word-lists/
Note: the list has extra comma at end of list of elements which is not valid in basic JSON but allowed in user-friendly JSON5 (https://json5.org/) and therefore needs the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-naming-policy.sh -c app/test-compress-perf/comp_perf_test_cyclecount.c:1 uapp/test-compress-perf/comp_perf_test_throughput.c:1 app/test-compress-perf/comp_perf_test_verify.c:1 app/test/test_common.c:1 ...
$ ./devtools/check-naming-policy.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-naming-policy.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/include/generic/rte_power_intrinsics.h lib/eal/include/generic/rte_rwlock.h lib/eal/include/generic/rte_spinlock.h lib/eal/include/rte_debug.h lib/eal/include/rte_seqlock.h lib/eal/linux/eal.c lib/eal/windows/eal.c lib/eal/x86/include/rte_rtm.h lib/eal/x86/include/rte_spinlock.h lib/eal/x86/rte_power_intrinsics.c
$ ./devtools/check-inclusive-naming -h
usage: check-inclusive-naming.py [-h] [-c] [-d] [-l] [-t {0,1,2,3}]
[-x EXCLUDE] [--url URL]
[paths ...]Identify word usage not aligned with inclusive naming
positional arguments:
paths files and directory to scan
options:
-h, --help show this help message and exit -c, --count Show the nuber of lines that match -d, --debug Debug this script
-l, --files-with-matches
Show only names of files with hits
-t {0,1,2,3}, --tier {0,1,2,3}
Show non-conforming words of particular tier
-x EXCLUDE, --exclude EXCLUDE
Exclude path from scan
--url URL URL for the non-inclusive naming word list
---
v5 - resolve spelling an python lint errors
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 127 +++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH v6 1/1 devtools: add script to check for non inclusive naming
In reply to a message not in the archiveScript to find words that should not be used. Really just a wrapper around git grep command. By default it prints matches.
Uses the word lists from Inclusive Naming Initiative
see https://inclusivenaming.org/word-lists/
Note: the list has extra comma at end of list of elements which is not valid in basic JSON but allowed in user-friendly JSON5 (https://json5.org/) and therefore needs the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-naming-policy.sh -c app/test-compress-perf/comp_perf_test_cyclecount.c:1 uapp/test-compress-perf/comp_perf_test_throughput.c:1 app/test-compress-perf/comp_perf_test_verify.c:1 app/test/test_common.c:1 ...
$ ./devtools/check-naming-policy.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-naming-policy.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/include/generic/rte_power_intrinsics.h lib/eal/include/generic/rte_rwlock.h lib/eal/include/generic/rte_spinlock.h lib/eal/include/rte_debug.h lib/eal/include/rte_seqlock.h lib/eal/linux/eal.c lib/eal/windows/eal.c lib/eal/x86/include/rte_rtm.h lib/eal/x86/include/rte_spinlock.h lib/eal/x86/rte_power_intrinsics.c
$ ./devtools/check-inclusive-naming -h
usage: check-inclusive-naming.py [-h] [-c] [-d] [-l] [-t {0,1,2,3}]
[-x EXCLUDE] [--url URL]
[paths ...]Identify word usage not aligned with inclusive naming
positional arguments:
paths files and directory to scan
options:
-h, --help show this help message and exit -c, --count Show the nuber of lines that match -d, --debug Debug this script
-l, --files-with-matches
Show only names of files with hits
-t {0,1,2,3}, --tier {0,1,2,3}
Show non-conforming words of particular tier
-x EXCLUDE, --exclude EXCLUDE
Exclude path from scan
--url URL URL for the non-inclusive naming word list
---
v6 - missed some spelling and python lint in last patch
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 127 +++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH v7 1/1 devtools: add script to check for non inclusive naming
In reply to a message not in the archiveScript to find words that should not be used. Really just a wrapper around git grep command. By default it prints matches but can also display counts.
Uses the word lists from Inclusive Naming Initiative see https://inclusivenaming.org/word-lists/
Note: the list has extra comma at end of list of elements which is not valid in basic JSON but allowed in user-friendly JSON5
(https://json5.org/) and therefore needs the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-naming-policy.sh -c app/test-compress-perf/comp_perf_test_cyclecount.c:1 uapp/test-compress-perf/comp_perf_test_throughput.c:1 app/test-compress-perf/comp_perf_test_verify.c:1 app/test/test_common.c:1 ...
$ ./devtools/check-naming-policy.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-naming-policy.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/include/generic/rte_power_intrinsics.h lib/eal/include/generic/rte_rwlock.h lib/eal/include/generic/rte_spinlock.h lib/eal/include/rte_debug.h lib/eal/include/rte_seqlock.h lib/eal/linux/eal.c lib/eal/windows/eal.c lib/eal/x86/include/rte_rtm.h lib/eal/x86/include/rte_spinlock.h lib/eal/x86/rte_power_intrinsics.c
$ ./devtools/check-inclusive-naming -h
usage: check-inclusive-naming.py [-h] [-c] [-d] [-l] [-t {0,1,2,3}]
[-x EXCLUDE] [--url URL]
[paths ...]Identify word usage not aligned with inclusive naming
positional arguments:
paths files and directory to scan
options:
-h, --help show this help message and exit -c, --count Show the number of lines that match -d, --debug Debug this script
-l, --files-with-matches
Show only names of files with hits
-t {0,1,2,3}, --tier {0,1,2,3}
Show non-conforming words of particular tier
-x EXCLUDE, --exclude EXCLUDE
Exclude path from scan
--url URL URL for the non-inclusive naming word list
---
v7 - fix typos in commit log
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 127 +++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH v8 1/1 devtools: add script to check for non inclusive naming
New script to find words that should not be used. Really just a wrapper around git grep command. By default it prints matches but can also display counts.
Uses the word lists from Inclusive Naming Initiative see https://inclusivenaming.org/word-lists/
Note: the list has extra comma at end of list of elements which is not valid in basic JSON but allowed in user-friendly JSON5
(https://json5.org/) and therefore needs the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-inclusive-naming.py -c | head -5 app/test/test_common.c:1 app/test/test_eal_flags.c:8 app/test/test_hash.c:1 app/test/test_hash_readwrite_lf_perf.c:1 app/test/test_link_bonding_mode4.c:1
$ ./devtools/check-inclusive-naming.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-inclusive-naming.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/linux/eal.c lib/eal/windows/eal.c
---
v8 - more python cleanups and update commit message
add list of allowed words (such as abort).
MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 135 +++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -89,6 +89,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +135 -0
135 lines not on this page · raw message
Signature · 1 line
2.41.0
v9 cover Use inclusive naming in DPDK
In reply to a message not in the archiveThis is a collection of patches around fixing many of the uses of non-inclusive naming in DPDK. The current tree is in pretty good shape.
The overall reduction of problematic words is significant.
Before After
app 17 0
drivers 379 331 (except base)
examples 16 0
lib 25 7
The remaining problem area is around use of the term bus master which still is present upstream in kernel. The standards bodies have already addressed this for PCI and SPI but the kernel has not caught up.
PATCH v9 1/23 devtools: add script to check for non inclusive naming
Add a new script to find words that should not be used. It is a wrapper around git grep command.
By default it prints matches but can also display counts.
Uses the word lists from Inclusive Naming Initiative see https://inclusivenaming.org/word-lists/
Note: the JSON list has extra comma at end of list of elements which is not valid in basic JSON but is allowed in user-friendly JSON5 (https://json5.org/)
To handle this the tool uses the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-inclusive-naming.py -c | head -5 app/test/test_common.c:1 app/test/test_eal_flags.c:8 app/test/test_hash.c:1 app/test/test_hash_readwrite_lf_perf.c:1 app/test/test_link_bonding_mode4.c:1
$ ./devtools/check-inclusive-naming.py lib/pcapng lib/pcapng/rte_pcapng.c: /* sanity check that is really a pcapng mbuf */
$ ./devtools/check-inclusive-naming.py -l lib/eal lib/eal/common/eal_common_memory.c lib/eal/common/eal_common_proc.c lib/eal/common/eal_common_trace.c lib/eal/common/eal_memcfg.h lib/eal/common/rte_malloc.c lib/eal/freebsd/eal.c lib/eal/linux/eal.c lib/eal/windows/eal.c
--- MAINTAINERS | 1 + devtools/check-inclusive-naming.py | 135 +++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) create mode 100755 devtools/check-inclusive-naming.py
MAINTAINERS +1 -0
@@ -88,6 +88,7 @@ F: devtools/check-doc-vs-code.sh F: devtools/check-dup-includes.sh F: devtools/check-maintainers.sh F: devtools/check-forbidden-tokens.awk +F: devtools/check-inclusive-naming.py F: devtools/check-git-log.sh F: devtools/check-spdx-tag.sh F: devtools/check-symbol-change.sh
devtools/check-inclusive-naming.py new file +135 -0
135 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v9 2/23 test: replace use of term segregate
In reply to Stephen HemmingerChange comment based on inclusive naming recommendations.
https://inclusivenaming.org/word-lists/tier-3/
--- app/test/test_hash_readwrite_lf_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
app/test/test_hash_readwrite_lf_perf.c +1 -1
@@ -397,7 +397,7 @@ generate_keys(void)for (i =2 ; i <TOTAL_INSERT ; i++) keys[i] = keys[i-1 ] + keys[i-2 ]; -/* Segregate keys into keys_no_ks and keys_ks */ +/* Separate keys into keys_no_ks and keys_ks */ for (i =0 ; i <TOTAL_INSERT ; i++) {/* Check if primary bucket has space.*/ sig = rte_hash_hash(tbl_rwc_test_param.h,
Signature · 1 line
2.43.0
Re: [PATCH v9 02/23] test: replace use of term segregate
05/02/2024 18:43, Stephen Hemminger:
Quoted 6 lines
Change comment based on inclusive naming recommendations.
https://inclusivenaming.org/word-lists/tier-3/
Signed-off-by Stephen Hemminger <[email protected]>Acked-by Tyler Retzlaff <[email protected]>
Applied individually, there is another (deferred) series for "sanity" word.
PATCH v9 3/23 examples/ptp: replace terms master and slave
In reply to Stephen HemmingerThe IEEE 1588 standard has been updated to remove the use of master-slave terminolgy. Use the terms recommended by IEEE 1588g-2022 amendment:
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
--- doc/guides/nics/bnxt.rst | 8 ++-- doc/guides/sample_app_ug/img/ptpclient.svg | 4 +- doc/guides/sample_app_ug/intro.rst | 4 +- doc/guides/sample_app_ug/ptpclient.rst | 29 ++++++------ examples/ptpclient/ptpclient.c | 54 +++++++++++----------- 5 files changed, 51 insertions(+), 48 deletions(-)
doc/guides/nics/bnxt.rst +5 -3
@@ -538,10 +538,12 @@ Time Synchronization ~~~~~~~~~~~~~~~~~~~~ System operators may run a PTP (Precision Time Protocol) client application to -synchronize the time on the NIC (and optionally, on the system) to a PTP master. +synchronize the time on the NIC (and optionally, on the system) to a +PTP timeTransmitter. -The BNXT PMD supports a PTP client application to communicate with a PTP master -clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to +The BNXT PMD supports a PTP client application to communicate with a +PTP timeTransmitter using DPDK IEEE1588 APIs. +Note that the PTP client application needs to run on PF and vector mode needs to be disabled. .. code-block:: console
doc/guides/sample_app_ug/img/ptpclient.svg +2 -2
@@ -488,7 +488,7 @@ sodipodi:role="line" id="tspan7096" x="38.764343" - y="590.47479">master</tspan></text> + y="590.47479">timeTransmitter</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:47.51625061px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -510,7 +510,7 @@ sodipodi:role="line" id="tspan7104" x="271.23392" - y="593.71478">slave</tspan></text> + y="593.71478">timeReceiver</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.3917141px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#800080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
doc/guides/sample_app_ug/intro.rst +2 -2
@@ -85,8 +85,8 @@ examples are highlighted below. * :doc:`Precision Time Protocol (PTP) client<ptpclient>`: The PTP client is another minimal implementation of a real world application. In this case the application is a PTP client that communicates with a PTP - master clock to synchronize time on a Network Interface Card (NIC) using the - IEEE1588 protocol. + timeTransmitter to synchronize time on a Network Interface Card (NIC) + using the IEEE1588 protocol. * :doc:`Quality of Service (QoS) Scheduler<qos_scheduler>`: The QoS Scheduler application demonstrates the use of DPDK to provide QoS scheduling.
doc/guides/sample_app_ug/ptpclient.rst +15 -14
@@ -5,8 +5,9 @@ PTP Client Sample Application ============================= The PTP (Precision Time Protocol) client sample application is a simple -example of using the DPDK IEEE1588 API to communicate with a PTP master clock -to synchronize the time on the NIC and, optionally, on the Linux system. +example of using the DPDK IEEE1588 API to communicate with a PTP +timeTransmitter to synchronize the time on the NIC and, optionally, +on the Linux system. Note, PTP is a time syncing protocol and cannot be used within DPDK as a time-stamping mechanism. See the following for an explanation of the protocol:
@@ -21,10 +22,10 @@ The PTP sample application is intended as a simple reference implementation of a PTP client using the DPDK IEEE1588 API. In order to keep the application simple the following assumptions are made: -* The first discovered master is the main for the session. +* The first discovered timeTransmitter is the main for the session. * Only L2 PTP packets are supported. * Only the PTP v2 protocol is supported. -* Only the slave clock is implemented. +* Only the timeReceiver clock is implemented. How the Application Works
@@ -38,12 +39,12 @@ How the Application Works The PTP synchronization in the sample application works as follows: -* Master sends *Sync* message - the slave saves it as T2. -* Master sends *Follow Up* message and sends time of T1. -* Slave sends *Delay Request* frame to PTP Master and stores T3. -* Master sends *Delay Response* T4 time which is time of received T3. +* TimeTransmitter sends *Sync* message - the TimeReceiver saves it as T2. +* TimeTransmitter sends *Follow Up* message and sends time of T1. +* TimeReceiver sends *Delay Request* frame to PTP TimeTransmitter and stores T3. +* TimeTransmitter sends *Delay Response* T4 time which is time of received T3. -The adjustment for slave can be represented as: +The adjustment for timeReceiver can be represented as: adj = -[(T2-T1)-(T4 - T3)]/2
@@ -71,8 +72,8 @@ Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. * ``-p portmask``: Hexadecimal portmask. -* ``-T 0``: Update only the PTP slave clock. -* ``-T 1``: Update the PTP slave clock and synchronize the Linux Kernel to the PTP clock. +* ``-T 0``: Update only the PTP timeReceiver clock. +* ``-T 1``: Update the PTP timeReceiver clock and synchronize the Linux Kernel to the PTP clock. Code Explanation
@@ -178,7 +179,7 @@ The forwarding loop can be interrupted and the application closed using PTP parsing ~~~~~~~~~~~ -The ``parse_ptp_frames()`` function processes PTP packets, implementing slave +The ``parse_ptp_frames()`` function processes PTP packets, implementing timeReceiver PTP IEEE1588 L2 functionality. .. literalinclude:: ../../../examples/ptpclient/ptpclient.c
@@ -187,11 +188,11 @@ PTP IEEE1588 L2 functionality. :end-before: >8 End of function processes PTP packets. There are 3 types of packets on the RX path which we must parse to create a minimal -implementation of the PTP slave client: +implementation of the PTP timeReceiver client: * SYNC packet. * FOLLOW UP packet * DELAY RESPONSE packet. When we parse the *FOLLOW UP* packet we also create and send a *DELAY_REQUEST* packet. -Also when we parse the *DELAY RESPONSE* packet, and all conditions are met we adjust the PTP slave clock. +Also when we parse the *DELAY RESPONSE* packet, and all conditions are met we adjust the PTP timeReceiver clock.
examples/ptpclient/ptpclient.c +27 -27
142 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v10 1/1 examples/ptp: replace terms master and slave
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
---
v10 - rebase to current version
doc/guides/nics/bnxt.rst | 8 ++-- doc/guides/sample_app_ug/img/ptpclient.svg | 4 +- doc/guides/sample_app_ug/intro.rst | 4 +- doc/guides/sample_app_ug/ptpclient.rst | 29 ++++++------ examples/ptpclient/ptpclient.c | 54 +++++++++++----------- 5 files changed, 51 insertions(+), 48 deletions(-)
doc/guides/nics/bnxt.rst +5 -3
@@ -538,10 +538,12 @@ Time Synchronization ~~~~~~~~~~~~~~~~~~~~ System operators may run a PTP (Precision Time Protocol) client application to -synchronize the time on the NIC (and optionally, on the system) to a PTP master. +synchronize the time on the NIC (and optionally, on the system) to a +PTP timeTransmitter. -The BNXT PMD supports a PTP client application to communicate with a PTP master -clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to +The BNXT PMD supports a PTP client application to communicate with a +PTP timeTransmitter using DPDK IEEE1588 APIs. +Note that the PTP client application needs to run on PF and vector mode needs to be disabled. .. code-block:: console
doc/guides/sample_app_ug/img/ptpclient.svg +2 -2
@@ -488,7 +488,7 @@ sodipodi:role="line" id="tspan7096" x="38.764343" - y="590.47479">master</tspan></text> + y="590.47479">timeTransmitter</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:47.51625061px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -510,7 +510,7 @@ sodipodi:role="line" id="tspan7104" x="271.23392" - y="593.71478">slave</tspan></text> + y="593.71478">timeReceiver</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.3917141px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#800080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
doc/guides/sample_app_ug/intro.rst +2 -2
@@ -85,8 +85,8 @@ examples are highlighted below. * :doc:`Precision Time Protocol (PTP) client<ptpclient>`: The PTP client is another minimal implementation of a real world application. In this case the application is a PTP client that communicates with a PTP - master clock to synchronize time on a Network Interface Card (NIC) using the - IEEE1588 protocol. + timeTransmitter to synchronize time on a Network Interface Card (NIC) + using the IEEE1588 protocol. * :doc:`Quality of Service (QoS) Scheduler<qos_scheduler>`: The QoS Scheduler application demonstrates the use of DPDK to provide QoS scheduling.
doc/guides/sample_app_ug/ptpclient.rst +15 -14
@@ -5,8 +5,9 @@ PTP Client Sample Application ============================= The PTP (Precision Time Protocol) client sample application is a simple -example of using the DPDK IEEE1588 API to communicate with a PTP master clock -to synchronize the time on the NIC and, optionally, on the Linux system. +example of using the DPDK IEEE1588 API to communicate with a PTP +timeTransmitter to synchronize the time on the NIC and, optionally, +on the Linux system. Note, PTP is a time syncing protocol and cannot be used within DPDK as a time-stamping mechanism. See the following for an explanation of the protocol:
@@ -21,10 +22,10 @@ The PTP sample application is intended as a simple reference implementation of a PTP client using the DPDK IEEE1588 API. In order to keep the application simple the following assumptions are made: -* The first discovered master is the main for the session. +* The first discovered timeTransmitter is the main for the session. * Only L2 PTP packets are supported. * Only the PTP v2 protocol is supported. -* Only the slave clock is implemented. +* Only the timeReceiver clock is implemented. How the Application Works
@@ -38,12 +39,12 @@ How the Application Works The PTP synchronization in the sample application works as follows: -* Master sends *Sync* message - the slave saves it as T2. -* Master sends *Follow Up* message and sends time of T1. -* Slave sends *Delay Request* frame to PTP Master and stores T3. -* Master sends *Delay Response* T4 time which is time of received T3. +* TimeTransmitter sends *Sync* message - the TimeReceiver saves it as T2. +* TimeTransmitter sends *Follow Up* message and sends time of T1. +* TimeReceiver sends *Delay Request* frame to PTP TimeTransmitter and stores T3. +* TimeTransmitter sends *Delay Response* T4 time which is time of received T3. -The adjustment for slave can be represented as: +The adjustment for timeReceiver can be represented as: adj = -[(T2-T1)-(T4 - T3)]/2
@@ -71,8 +72,8 @@ Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. * ``-p portmask``: Hexadecimal portmask. -* ``-T 0``: Update only the PTP slave clock. -* ``-T 1``: Update the PTP slave clock and synchronize the Linux Kernel to the PTP clock. +* ``-T 0``: Update only the PTP timeReceiver clock. +* ``-T 1``: Update the PTP timeReceiver clock and synchronize the Linux Kernel to the PTP clock. Code Explanation
@@ -178,7 +179,7 @@ The forwarding loop can be interrupted and the application closed using PTP parsing ~~~~~~~~~~~ -The ``parse_ptp_frames()`` function processes PTP packets, implementing slave +The ``parse_ptp_frames()`` function processes PTP packets, implementing timeReceiver PTP IEEE1588 L2 functionality. .. literalinclude:: ../../../examples/ptpclient/ptpclient.c
@@ -187,11 +188,11 @@ PTP IEEE1588 L2 functionality. :end-before: >8 End of function processes PTP packets. There are 3 types of packets on the RX path which we must parse to create a minimal -implementation of the PTP slave client: +implementation of the PTP timeReceiver client: * SYNC packet. * FOLLOW UP packet * DELAY RESPONSE packet. When we parse the *FOLLOW UP* packet we also create and send a *DELAY_REQUEST* packet. -Also when we parse the *DELAY RESPONSE* packet, and all conditions are met we adjust the PTP slave clock. +Also when we parse the *DELAY RESPONSE* packet, and all conditions are met we adjust the PTP timeReceiver clock.
examples/ptpclient/ptpclient.c +27 -27
142 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v10] examples/ptp: replace terms master and slave
Quoted 15 lines · On Fri, 14 Jun 2024 08:41:07 -0700 Stephen Hemminger…
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
Signed-off-by Stephen Hemminger <[email protected]>Reviewed-by Somnath Kotur <[email protected]>---
v10 - rebase to current version
Quoted 6 lines
doc/guides/nics/bnxt.rst | 8 ++-- doc/guides/sample_app_ug/img/ptpclient.svg | 4 +- doc/guides/sample_app_ug/intro.rst | 4 +- doc/guides/sample_app_ug/ptpclient.rst | 29 ++++++------ examples/ptpclient/ptpclient.c | 54 +++++++++++----------- 5 files changed, 51 insertions(+), 48 deletions(-)
This patch seems to have been lost/ignored. Could it be merged for 24.11.
Note: checkpatch complaints here are incorrect. The patch is removing terms master and slave, but checkpatch can't tell the difference.
Re: [PATCH v10] examples/ptp: replace terms master and slave
Quoted 26 lines · Stephen Hemminger
Quoted 15 lines · On Fri, 14 Jun 2024 08:41:07 -0700 Stephen Hemminger…
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
Signed-off-by Stephen Hemminger <[email protected]>Reviewed-by Somnath Kotur <[email protected]>---
v10 - rebase to current versionQuoted 6 lines
doc/guides/nics/bnxt.rst | 8 ++-- doc/guides/sample_app_ug/img/ptpclient.svg | 4 +- doc/guides/sample_app_ug/intro.rst | 4 +- doc/guides/sample_app_ug/ptpclient.rst | 29 ++++++------ examples/ptpclient/ptpclient.c | 54 +++++++++++----------- 5 files changed, 51 insertions(+), 48 deletions(-)
Quoted 4 lines
This patch seems to have been lost/ignored. Could it be merged for 24.11.
Note: checkpatch complaints here are incorrect. The patch is removing terms master and slave, but checkpatch can't tell the difference.
I thought it would be picked by dpdk-next-net since it looked like a tree-wide change.
Since its assigned to me, I will merge it in a day or so and let the set take its course.
Thanks
Ajit Khaparde
Acked-byRe: [PATCH v10] examples/ptp: replace terms master and slave
Quoted 13 lines · Ajit Khaparde
Quoted 10 lines · Stephen Hemminger
Quoted 6 lines · On Fri, 14 Jun 2024 08:41:07 -0700 Stephen Hemminger…
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
Signed-off-by Stephen Hemminger <[email protected]>Reviewed-by Somnath Kotur <[email protected]>
Patch applied to dpdk-next-net-brcm for-next-net branch.
Quoted 21 lines
Quoted 11 lines
Quoted 10 lines
---
v10 - rebase to current versiondoc/guides/nics/bnxt.rst | 8 ++-- doc/guides/sample_app_ug/img/ptpclient.svg | 4 +- doc/guides/sample_app_ug/intro.rst | 4 +- doc/guides/sample_app_ug/ptpclient.rst | 29 ++++++------ examples/ptpclient/ptpclient.c | 54 +++++++++++----------- 5 files changed, 51 insertions(+), 48 deletions(-)Quoted 4 lines
This patch seems to have been lost/ignored. Could it be merged for 24.11.
Note: checkpatch complaints here are incorrect. The patch is removing terms master and slave, but checkpatch can't tell the difference.
I thought it would be picked by dpdk-next-net since it looked like a tree-wide change.
Since its assigned to me, I will merge it in a day or so and let the set take its course.Thanks
Re: [PATCH v10] examples/ptp: replace terms master and slave
24/10/2024 04:06, Ajit Khaparde:
Quoted 15 lines
Quoted 13 lines · Ajit Khaparde
Quoted 10 lines · Stephen Hemminger
Quoted 6 lines · On Fri, 14 Jun 2024 08:41:07 -0700 Stephen Hemminger…
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
Signed-off-by Stephen Hemminger <[email protected]>Reviewed-by Somnath Kotur <[email protected]>Acked-by Ajit Khaparde <[email protected]>Patch applied to dpdk-next-net-brcm for-next-net branch.
Merged in main with some rebase effort because of a new feature merged. I have decided to avoid camelCase and inserted a space or a hyphen depending on being in doc or code, in order to be consistent with our guidelines.
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
This patch seems to have been lost/ignored. Could it be merged for 24.11.
Note: checkpatch complaints here are incorrect. The patch is removing terms master and slave, but checkpatch can't tell the difference.
I thought it would be picked by dpdk-next-net since it looked like a tree-wide change.
Since its assigned to me, I will merge it in a day or so and let the set take its course.
I don't know why it was assigned to you.
You could have re-assigned it to me.
Re: [PATCH v10] examples/ptp: replace terms master and slave
Quoted 19 lines · On Wed, 13 Nov 2024 18:33:15 +0100 Thomas Monjalon <[email protected]> wrote:
24/10/2024 04:06, Ajit Khaparde:
Quoted 18 lines
Quoted 16 lines · Ajit Khaparde
Quoted 13 lines · Stephen Hemminger
Quoted 9 lines · On Fri, 14 Jun 2024 08:41:07 -0700 Stephen Hemminger…
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Signed-off-by Stephen Hemminger <[email protected]>Reviewed-by Somnath Kotur <[email protected]>Acked-by Ajit Khaparde <[email protected]>Patch applied to dpdk-next-net-brcm for-next-net branch.
Merged in main with some rebase effort because of a new feature merged. I have decided to avoid camelCase and inserted a space or a hyphen depending on being in doc or code, in order to be consistent with our guidelines.
Ok my choice of camelCase was based on terms in current PTP spec.
Re: [PATCH v10] examples/ptp: replace terms master and slave
13/11/2024 18:52, Stephen Hemminger:
Quoted 24 lines
Quoted 21 lines · On Wed, 13 Nov 2024 18:33:15 +0100 Thomas Monjalon <[email protected]> wrote:
24/10/2024 04:06, Ajit Khaparde:
Quoted 20 lines
Quoted 18 lines · Ajit Khaparde
Quoted 15 lines · Stephen Hemminger
Quoted 11 lines · On Fri, 14 Jun 2024 08:41:07 -0700 Stephen Hemminger…
Remove one of the few remaining uses of master/slave.
The IEEE 1588 standard has been updated to remove the use of master-slave terminology. Change the sample to Use the terms recommended by IEEE 1588g-2022 amendment.
In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”.
Signed-off-by Stephen Hemminger <[email protected]>Reviewed-by Somnath Kotur <[email protected]>
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Acked-by Ajit Khaparde <[email protected]>Patch applied to dpdk-next-net-brcm for-next-net branch.
Merged in main with some rebase effort because of a new feature merged. I have decided to avoid camelCase and inserted a space or a hyphen depending on being in doc or code, in order to be consistent with our guidelines.
Ok my choice of camelCase was based on terms in current PTP spec.
Yes I got it, but I think we can deviate a little for consistency.
PATCH v9 4/23 test: remove use of word master in test_red
In reply to Stephen HemmingerNo need to use term master here.
--- app/test/test_red.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
app/test/test_red.c +1 -1
@@ -85,7 +85,7 @@ struct test_var { /**< Test variables used for testing RTE_REDuint32_t *enqueued;/**< Test operations enqueued */ }; -struct test_config {/**< Master test structure for RTE_RED */ +struct test_config {/**< Test structure for RTE_RED */ const char *ifname;/**< Interface name */ const char *msg;/**< Test message for display */ const char *htxt;/**< Header txt display for result output */
Signature · 1 line
2.43.0
Re: [PATCH v9 04/23] test: remove use of word master in test_red
05/02/2024 18:43, Stephen Hemminger:
Quoted 4 lines
No need to use term master here.
Signed-off-by Stephen Hemminger <[email protected]>Acked-by Tyler Retzlaff <[email protected]>
Applied individually, there is another (deferred) series for "sanity" word.
PATCH v9 5/23 mbuf: replace term sanity check
In reply to Stephen HemmingerReplace rte_mbuf_sanity_check() with rte_mbuf_verify() to match the similar macro RTE_VERIFY() in rte_debug.h
Good wording from discussion english.stackexchange.com:
The phrase "sanity check" is ableist language as it implies that there is something wrong with people who have mental illnesses and the word "sanity" has been used to discriminate against such people. Therefore, it should should be avoided.
--- app/test/test_mbuf.c | 28 +++++------ doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/rel_notes/deprecation.rst | 3 ++ drivers/net/avp/avp_ethdev.c | 18 +++---- drivers/net/sfc/sfc_ef100_rx.c | 6 +-- drivers/net/sfc/sfc_ef10_essb_rx.c | 4 +- drivers/net/sfc/sfc_ef10_rx.c | 4 +- drivers/net/sfc/sfc_rx.c | 2 +- examples/ipv4_multicast/main.c | 2 +- lib/mbuf/rte_mbuf.c | 23 +++++---- lib/mbuf/rte_mbuf.h | 71 +++++++++++++++------------- lib/mbuf/version.map | 1 + 12 files changed, 90 insertions(+), 76 deletions(-)
app/test/test_mbuf.c +14 -14
@@ -261,8 +261,8 @@ test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)GOTO_FAIL ("Buffer should be continuous" );memset (hdr,0x55 ,MBUF_TEST_HDR2_LEN ); -rte_mbuf_sanity_check (m,1 ); -rte_mbuf_sanity_check (m,0 ); +rte_mbuf_verify (m,1 ); +rte_mbuf_verify (m,0 );rte_pktmbuf_dump (stdout, m,0 );/* this prepend should fail */
@@ -1161,7 +1161,7 @@ test_refcnt_mbuf(void)#ifdef RTE_EXEC_ENV_WINDOWS static int -test_failing_mbuf_sanity_check (struct rte_mempool *pktmbuf_pool) +test_failing_mbuf_verify (struct rte_mempool *pktmbuf_pool) {RTE_SET_USED (pktmbuf_pool);return TEST_SKIPPED ;
@@ -1180,12 +1180,12 @@ mbuf_check_pass(struct rte_mbuf *buf) }static int -test_failing_mbuf_sanity_check (struct rte_mempool *pktmbuf_pool) +test_failing_mbuf_verify (struct rte_mempool *pktmbuf_pool) {struct rte_mbuf *buf;struct rte_mbuf badbuf; -printf ("Checking rte_mbuf_sanity_check for failure conditions\n" ); +printf ("Checking rte_mbuf_verify for failure conditions\n" );/* get a good mbuf to use to make copies */ buf =rte_pktmbuf_alloc (pktmbuf_pool);
@@ -1707,7 +1707,7 @@ test_mbuf_validate_tx_offload(const char *test_name,GOTO_FAIL ("%s: mbuf allocation failed!\n" , __func__);if (rte_pktmbuf_pkt_len (m) !=0 )GOTO_FAIL ("%s: Bad packet length\n" , __func__); -rte_mbuf_sanity_check (m,0 ); +rte_mbuf_verify (m,0 ); m->ol_flags = ol_flags; m->tso_segsz = segsize; ret =rte_validate_tx_offload (m);
@@ -1914,7 +1914,7 @@ test_pktmbuf_read(struct rte_mempool *pktmbuf_pool)GOTO_FAIL ("%s: mbuf allocation failed!\n" , __func__);if (rte_pktmbuf_pkt_len (m) !=0 )GOTO_FAIL ("%s: Bad packet length\n" , __func__); -rte_mbuf_sanity_check (m,0 ); +rte_mbuf_verify (m,0 ); data =rte_pktmbuf_append (m,MBUF_TEST_DATA_LEN2 );if (data ==NULL )
@@ -1963,7 +1963,7 @@ test_pktmbuf_read_from_offset(struct rte_mempool *pktmbuf_pool)if (rte_pktmbuf_pkt_len (m) !=0 )GOTO_FAIL ("%s: Bad packet length\n" , __func__); -rte_mbuf_sanity_check (m,0 ); +rte_mbuf_verify (m,0 );/* prepend an ethernet header */ hdr = (struct ether_hdr *)rte_pktmbuf_prepend (m, hdr_len);
@@ -2108,7 +2108,7 @@ create_packet(struct rte_mempool *pktmbuf_pool,GOTO_FAIL ("%s: mbuf allocation failed!\n" , __func__);if (rte_pktmbuf_pkt_len (pkt_seg) !=0 )GOTO_FAIL ("%s: Bad packet length\n" , __func__); -rte_mbuf_sanity_check (pkt_seg,0 ); +rte_mbuf_verify (pkt_seg,0 );/* Add header only for the first segment */ if (test_data->flags ==MBUF_HEADER && seg ==0 ) { hdr_len =sizeof (struct rte_ether_hdr );
@@ -2320,7 +2320,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)GOTO_FAIL ("%s: mbuf allocation failed!\n" , __func__);if (rte_pktmbuf_pkt_len (m) !=0 )GOTO_FAIL ("%s: Bad packet length\n" , __func__); -rte_mbuf_sanity_check (m,0 ); +rte_mbuf_verify (m,0 ); ext_buf_addr =rte_malloc ("External buffer" , buf_len,RTE_CACHE_LINE_SIZE );
@@ -2484,8 +2484,8 @@ test_pktmbuf_ext_pinned_buffer(struct rte_mempool *std_pool)GOTO_FAIL ("%s: test_pktmbuf_copy(pinned) failed\n" , __func__); -if (test_failing_mbuf_sanity_check (pinned_pool) <0 ) -GOTO_FAIL ("%s: test_failing_mbuf_sanity_check(pinned)" +if (test_failing_mbuf_verify (pinned_pool) <0 ) +GOTO_FAIL ("%s: test_failing_mbuf_verify(pinned)" " failed\n" , __func__);if (test_mbuf_linearize_check (pinned_pool) <0 )
@@ -2859,8 +2859,8 @@ test_mbuf(void) goto err; } -if (test_failing_mbuf_sanity_check (pktmbuf_pool) <0 ) { -printf ("test_failing_mbuf_sanity_check() failed\n" ); +if (test_failing_mbuf_verify (pktmbuf_pool) <0 ) { +printf ("test_failing_mbuf_verify() failed\n" ); goto err; }
doc/guides/prog_guide/mbuf_lib.rst +2 -2
@@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, -bad type, and so on). +In debug mode, the functions of the mbuf library perform consistency checks +before any operation (such as, buffer corruption, bad type, and so on). Use Cases ---------
doc/guides/rel_notes/deprecation.rst +3 -0
@@ -146,3 +146,6 @@ Deprecation Notices will be deprecated and subsequently removed in DPDK 24.11 release. Before this, the new port library API (functions rte_swx_port_*) will gradually transition from experimental to stable status. + +* mbuf: The function ``rte_mbuf_sanity_check`` is deprecated. + Use the new function ``rte_mbuf_verify`` instead.
drivers/net/avp/avp_ethdev.c +9 -9
@@ -1231,7 +1231,7 @@ _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m)#ifdef RTE_LIBRTE_AVP_DEBUG_BUFFERS static inline void -__avp_dev_buffer_sanity_check (struct avp_dev *avp,struct rte_avp_desc *buf) +__avp_dev_buffer_check (struct avp_dev *avp,struct rte_avp_desc *buf) {struct rte_avp_desc *first_buf;struct rte_avp_desc *pkt_buf;
@@ -1272,12 +1272,12 @@ __avp_dev_buffer_sanity_check(struct avp_dev *avp, struct rte_avp_desc *buf) first_buf->pkt_len, pkt_len); } -#define avp_dev_buffer_sanity_check (a, b) \ - __avp_dev_buffer_sanity_check((a), (b)) +#define avp_dev_buffer_check (a, b) \ + __avp_dev_buffer_check((a), (b))#else /* RTE_LIBRTE_AVP_DEBUG_BUFFERS */ -#define avp_dev_buffer_sanity_check (a, b) do {} while (0) +#define avp_dev_buffer_check (a, b) do {} while (0)#endif
@@ -1302,7 +1302,7 @@ avp_dev_copy_from_buffers(struct avp_dev *avp,void *pkt_data;unsigned int i; -avp_dev_buffer_sanity_check (avp, buf); +avp_dev_buffer_check (avp, buf);/* setup the first source buffer */ pkt_buf =avp_dev_translate_buffer (avp, buf);
@@ -1370,7 +1370,7 @@ avp_dev_copy_from_buffers(struct avp_dev *avp,rte_pktmbuf_pkt_len (m) = total_length; m->vlan_tci = vlan_tci; -__rte_mbuf_sanity_check (m,1 ); +__rte_mbuf_verify (m,1 );return m; }
@@ -1614,7 +1614,7 @@ avp_dev_copy_to_buffers(struct avp_dev *avp,char *pkt_data;unsigned int i; -__rte_mbuf_sanity_check (mbuf,1 ); +__rte_mbuf_verify (mbuf,1 ); m = mbuf; src_offset =0 ;
@@ -1680,7 +1680,7 @@ avp_dev_copy_to_buffers(struct avp_dev *avp, first_buf->vlan_tci = mbuf->vlan_tci; } -avp_dev_buffer_sanity_check (avp, buffers[0 ]); +avp_dev_buffer_check (avp, buffers[0 ]);return total_length; }
@@ -1798,7 +1798,7 @@ avp_xmit_scattered_pkts(void *tx_queue,#ifdef RTE_LIBRTE_AVP_DEBUG_BUFFERS for (i =0 ; i < nb_pkts; i++) -avp_dev_buffer_sanity_check (avp, tx_bufs[i]); +avp_dev_buffer_check (avp, tx_bufs[i]);#endif /* send the packets */
drivers/net/sfc/sfc_ef100_rx.c +3 -3
@@ -179,7 +179,7 @@ sfc_ef100_rx_qrefill(struct sfc_ef100_rxq *rxq)struct sfc_ef100_rx_sw_desc *rxd;rte_iova_t dma_addr; -__rte_mbuf_raw_sanity_check (m); +__rte_mbuf_raw_verify (m); dma_addr =rte_mbuf_data_iova_default (m);if (rxq->flags &SFC_EF100_RXQ_NIC_DMA_MAP ) {
@@ -551,7 +551,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq, rxq->ready_pkts--; pkt =sfc_ef100_rx_next_mbuf (rxq); -__rte_mbuf_raw_sanity_check (pkt); +__rte_mbuf_raw_verify (pkt);RTE_BUILD_BUG_ON (sizeof (pkt->rearm_data[0 ]) !=sizeof (rxq->rearm_data));
@@ -575,7 +575,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,struct rte_mbuf *seg; seg =sfc_ef100_rx_next_mbuf (rxq); -__rte_mbuf_raw_sanity_check (seg); +__rte_mbuf_raw_verify (seg); seg->data_off =RTE_PKTMBUF_HEADROOM ;
drivers/net/sfc/sfc_ef10_essb_rx.c +2 -2
@@ -125,7 +125,7 @@ sfc_ef10_essb_next_mbuf(const struct sfc_ef10_essb_rxq *rxq,struct rte_mbuf *m; m = (struct rte_mbuf *)((uintptr_t )mbuf + rxq->buf_stride); -__rte_mbuf_raw_sanity_check (m); +__rte_mbuf_raw_verify (m);return m; }
@@ -136,7 +136,7 @@ sfc_ef10_essb_mbuf_by_index(const struct sfc_ef10_essb_rxq *rxq,struct rte_mbuf *m; m = (struct rte_mbuf *)((uintptr_t )mbuf + idx * rxq->buf_stride); -__rte_mbuf_raw_sanity_check (m); +__rte_mbuf_raw_verify (m);return m; }
drivers/net/sfc/sfc_ef10_rx.c +2 -2
@@ -148,7 +148,7 @@ sfc_ef10_rx_qrefill(struct sfc_ef10_rxq *rxq)struct sfc_ef10_rx_sw_desc *rxd;rte_iova_t phys_addr; -__rte_mbuf_raw_sanity_check (m); +__rte_mbuf_raw_verify (m);SFC_ASSERT ((id & ~ptr_mask) ==0 ); rxd = &rxq->sw_ring[id];
@@ -297,7 +297,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev, rxd = &rxq->sw_ring[pending++ & ptr_mask]; m = rxd->mbuf; -__rte_mbuf_raw_sanity_check (m); +__rte_mbuf_raw_verify (m); m->data_off =RTE_PKTMBUF_HEADROOM ;rte_pktmbuf_data_len (m) = seg_len;
drivers/net/sfc/sfc_rx.c +1 -1
@@ -120,7 +120,7 @@ sfc_efx_rx_qrefill(struct sfc_efx_rxq *rxq) ++i, id = (id + 1) & rxq->ptr_mask) { m = objs[i]; -__rte_mbuf_raw_sanity_check (m); +__rte_mbuf_raw_verify (m); rxd = &rxq->sw_desc[id]; rxd->mbuf = m;
examples/ipv4_multicast/main.c +1 -1
@@ -258,7 +258,7 @@ mcast_out_pkt(struct rte_mbuf *pkt, int use_clone) hdr->pkt_len = (uint16_t )(hdr->data_len + pkt->pkt_len); hdr->nb_segs = pkt->nb_segs +1 ; -__rte_mbuf_sanity_check (hdr,1 ); +__rte_mbuf_verify (hdr,1 );return hdr; }/* >8 End of mcast_out_kt. */
lib/mbuf/rte_mbuf.c +15 -8
@@ -367,9 +367,9 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,return mp; } -/* do some sanity checks on a mbuf: panic if it fails */ +/* do some checks on a mbuf: panic if it fails */ void -rte_mbuf_sanity_check (const struct rte_mbuf *m,int is_header) +rte_mbuf_verify (const struct rte_mbuf *m,int is_header) {const char *reason;
@@ -377,6 +377,13 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)rte_panic ("%s\n" , reason); } +/* For ABI compatibility, to be removed in next release */ +void +rte_mbuf_sanity_check (const struct rte_mbuf *m,int is_header) +{ +rte_mbuf_verify (m, is_header); +} +int rte_mbuf_check (const struct rte_mbuf *m,int is_header,const char **reason) {
@@ -496,7 +503,7 @@ void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count)if (unlikely (m ==NULL ))continue ; -__rte_mbuf_sanity_check (m,1 ); +__rte_mbuf_verify (m,1 ); do { m_next = m->next;
@@ -546,7 +553,7 @@ rte_pktmbuf_clone(struct rte_mbuf *md, struct rte_mempool *mp)return NULL ; } -__rte_mbuf_sanity_check (mc,1 ); +__rte_mbuf_verify (mc,1 );return mc; }
@@ -596,7 +603,7 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp,struct rte_mbuf *mc, *m_last, **prev;/* garbage in check */ -__rte_mbuf_sanity_check (m,1 ); +__rte_mbuf_verify (m,1 );/* check for request to copy at offset past end of mbuf */ if (unlikely (off >= m->pkt_len))
@@ -660,7 +667,7 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp, }/* garbage out check */ -__rte_mbuf_sanity_check (mc,1 ); +__rte_mbuf_verify (mc,1 );return mc; }
@@ -671,7 +678,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)unsigned int len;unsigned int nb_segs; -__rte_mbuf_sanity_check (m,1 ); +__rte_mbuf_verify (m,1 );fprintf (f,"dump mbuf at %p, iova=%#" PRIx64", buf_len=%u\n" , m,rte_mbuf_iova_get (m), m->buf_len);
@@ -689,7 +696,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) nb_segs = m->nb_segs;while (m && nb_segs !=0 ) { -__rte_mbuf_sanity_check (m,0 ); +__rte_mbuf_verify (m,0 ); fprintf(f, " segment at %p, data=%p, len=%u, off=%u, refcnt=%u\n", m, rte_pktmbuf_mtod(m, void *),
lib/mbuf/rte_mbuf.h +37 -34
224 lines not on this page · raw message
lib/mbuf/version.map +1 -0
@@ -31,6 +31,7 @@ DPDK_24 { rte_mbuf_set_platform_mempool_ops; rte_mbuf_set_user_mempool_ops; rte_mbuf_user_mempool_ops; + rte_mbuf_verify; rte_pktmbuf_clone; rte_pktmbuf_copy; rte_pktmbuf_dump;
Signature · 1 line
2.43.0
PATCH v9 6/23 eal: replace use of sanity check in comments and messages
In reply to Stephen HemmingerSanity check is on the Tier 2 non-inclusive list.
Replace or remove it.
--- lib/eal/common/eal_common_memory.c | 2 +- lib/eal/common/eal_common_proc.c | 3 ++- lib/eal/common/eal_common_trace.c | 2 +- lib/eal/common/eal_memcfg.h | 2 +- lib/eal/common/rte_malloc.c | 2 +- lib/eal/freebsd/eal.c | 2 +- lib/eal/linux/eal.c | 2 +- lib/eal/windows/eal.c | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-)
lib/eal/common/eal_common_memory.c +1 -1
@@ -562,7 +562,7 @@ check_dma_mask(uint8_t maskbits, bool thread_unsafe)uint64_t mask;int ret; -/* Sanity check. We only check width can be managed with 64 bits +/* We only check width can be managed with 64 bits * variables. Indeed any higher value is likely wrong. */ if (maskbits >MAX_DMA_MASK_BITS ) { EAL_LOG(ERR, "wrong dma mask size %u (Max: %u)",
lib/eal/common/eal_common_proc.c +2 -1
@@ -309,7 +309,8 @@ read_msg(int fd, struct mp_msg_internal *m, struct sockaddr_un *s)break ; } } -/* sanity-check the response */ + +/* Check that the response is valid */ if (m->msg.num_fds <0 || m->msg.num_fds >RTE_MP_MAX_FD_NUM ) {EAL_LOG (ERR ,"invalid number of fd's received" );return -1 ;
lib/eal/common/eal_common_trace.c +1 -1
@@ -468,7 +468,7 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name,struct trace_point *tp;uint16_t sz; -/* Sanity checks of arguments */ +/* Check arguments */ if (name ==NULL || register_fn ==NULL || handle ==NULL ) {trace_err ("invalid arguments" ); rte_errno =EINVAL ;
lib/eal/common/eal_memcfg.h +1 -1
@@ -18,7 +18,7 @@* Memory configuration shared across multiple processes. */ struct rte_mem_config { -volatile uint32_t magic;/**< Magic number - sanity check. */ +volatile uint32_t magic;/**< Magic number check. */ uint32_t version;/**< Prevent secondary processes using different DPDK versions. */
lib/eal/common/rte_malloc.c +1 -1
@@ -654,7 +654,7 @@ rte_malloc_heap_destroy(const char *heap_name) ret =-1 ; goto unlock; } -/* sanity checks done, now we can destroy the heap */ +/* checks done, now we can destroy the heap */ rte_spinlock_lock (&heap->lock); ret =malloc_heap_destroy (heap);rte_spinlock_unlock (&heap->lock);
lib/eal/freebsd/eal.c +1 -1
@@ -501,7 +501,7 @@ eal_parse_args(int argc, char **argv) goto out; } -/* sanity checks */ +/* options checks */ if (eal_check_common_options (internal_conf) !=0 ) {eal_usage (prgname); ret =-1 ;
lib/eal/linux/eal.c +1 -1
@@ -803,7 +803,7 @@ eal_parse_args(int argc, char **argv) goto out; } -/* sanity checks */ +/* options checks */ if (eal_check_common_options (internal_conf) !=0 ) {eal_usage (prgname); ret =-1 ;
lib/eal/windows/eal.c +1 -1
@@ -194,7 +194,7 @@ eal_parse_args(int argc, char **argv)if (eal_adjust_config (internal_conf) !=0 )return -1 ; -/* sanity checks */ +/* options checks */ if (eal_check_common_options (internal_conf) !=0 ) {eal_usage (prgname);return -1 ;
Signature · 1 line
2.43.0
PATCH v9 7/23 test: replace use word sanity
In reply to Stephen HemmingerThe word "sanity" is on the not-allowed inclusive naming list. Replace the unnecessary usage in tests.
--- app/test/test_bitmap.c | 4 +-- app/test/test_bpf.c | 6 ++-- app/test/test_common.c | 2 +- app/test/test_distributor.c | 46 +++++++++++++++--------------- app/test/test_dmadev.c | 2 +- app/test/test_eal_flags.c | 20 ++++++------- app/test/test_hash.c | 2 +- app/test/test_interrupts.c | 9 +++--- app/test/test_link_bonding_mode4.c | 2 +- app/test/test_mbuf.c | 2 +- app/test/test_rawdev.c | 2 +- app/test/test_timer.c | 10 +++---- 12 files changed, 54 insertions(+), 53 deletions(-)
app/test/test_bitmap.c +2 -2
@@ -33,7 +33,7 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp) }if (slab1_magic != out_slab) { -printf ("Scan operation sanity failed.\n" ); +printf ("Scan operation magic number check failed.\n" );return TEST_FAILED ; }
@@ -43,7 +43,7 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp) }if (slab2_magic != out_slab) { -printf ("Scan operation sanity failed.\n" ); +printf ("Scan operation magic number check failed.\n" );return TEST_FAILED ; }
app/test/test_bpf.c +3 -3
@@ -3329,9 +3329,9 @@ test_bpf_match(pcap_t *pcap, const char *str,return ret; } -/* Basic sanity test can we match a IP packet */ +/* Basic test can we match a IP packet */ static int -test_bpf_filter_sanity (pcap_t *pcap) +test_bpf_filter_match (pcap_t *pcap) {const uint32_t plen =100 ;struct rte_mbuf mb, *m;
@@ -3463,7 +3463,7 @@ test_bpf_convert(void)return -1 ; } - rc =test_bpf_filter_sanity (pcap); + rc =test_bpf_filter_match (pcap);for (i =0 ; i <RTE_DIM (sample_filters); i++) rc |=test_bpf_filter (pcap, sample_filters[i]);
app/test/test_common.c +1 -1
@@ -19,7 +19,7 @@ {printf (x"() test failed!\n" );\return -1 ;} -/* this is really a sanity check */ +/* this is really a consistency check */ static int test_macros(int __rte_unused unused_parm) {
app/test/test_distributor.c +23 -23
177 lines not on this page · raw message
app/test/test_dmadev.c +1 -1
@@ -1087,7 +1087,7 @@ test_dma(void)parse_dma_env_var (); -/* basic sanity on dmadev infrastructure */ +/* basic validation on dmadev infrastructure */ if (test_apis () <0 )ERR_RETURN ("Error performing API tests\n" );
app/test/test_eal_flags.c +10 -10
@@ -314,7 +314,7 @@ get_number_of_sockets(void)/* * Test that the app doesn't run with invalid allow option. -* Final tests ensures it does run with valid options as sanity check (one +* Final tests ensures it does run with valid options as basic test (one * test for with Domain+BDF, second for just with BDF) */ static int
@@ -382,7 +382,7 @@ test_allow_flag(void)/* * Test that the app doesn't run with invalid blocklist option. -* Final test ensures it does run with valid options as sanity check +* Final test ensures it does run with valid options as basic check. */ static int test_invalid_b_flag (void )
@@ -429,7 +429,7 @@ test_invalid_b_flag(void)/* * Test that the app doesn't run with invalid vdev option. -* Final test ensures it does run with valid options as sanity check +* Final test ensures it does run with valid options basic check. */ static int test_invalid_vdev_flag (void )
@@ -554,7 +554,7 @@ test_missing_c_flag(void)/* bad coremask value */ const char *argv3[] = { prgname, prefix, mp_flag,"-c" ,"error" }; -/* sanity check of tests - valid coremask value */ +/* check of tests - valid coremask value */ const char *argv4[] = { prgname, prefix, mp_flag,"-c" ,"1" };/* -l flag but no corelist value */
@@ -581,7 +581,7 @@ test_missing_c_flag(void) "-l", RTE_STR(RTE_MAX_LCORE) };const char *const argv14[] = { prgname, prefix, mp_flag,"-l" ,"1-" RTE_STR (RTE_MAX_LCORE ) }; -/* sanity check test - valid corelist value */ +/* check test - valid corelist value */ const char *const argv15[] = { prgname, prefix, mp_flag,"-l" ,"1-2,3" };
@@ -613,7 +613,7 @@ test_missing_c_flag(void) "--lcores", "(4-7)=(1,3)" };const char *const argv28[] = { prgname, prefix, mp_flag,"--lcores" ,"[4-7]@(1,3)" }; -/* sanity check of tests - valid lcores value */ +/* more complex valid lcores value */ const char *const argv29[] = { prgname, prefix, mp_flag,"--lcores" ,"0-1,2@(5-7),(3-5)@(0,2),(0,6),7" };
@@ -744,7 +744,7 @@ test_main_lcore_flag(void)/* * Test that the app doesn't run with invalid -n flag option. -* Final test ensures it does run with valid options as sanity check +* Final test ensures it does run with valid options as basic check. * Since -n is not compulsory for MP, we instead use --no-huge and --no-shconf * flags. */
@@ -772,10 +772,10 @@ test_invalid_n_flag(void)/* zero is invalid */ const char *argv3[] = { prgname, prefix, no_huge, no_shconf,"-n" ,"0" }; -/* sanity test - check with good value */ +/* check with good value */ const char *argv4[] = { prgname, prefix, no_huge, no_shconf,"-n" ,"2" }; -/* sanity test - check with no -n flag */ +/* check with no -n flag */ const char *argv5[] = { prgname, prefix, no_huge, no_shconf}; if (launch_proc(argv1) == 0
@@ -977,7 +977,7 @@ test_misc_flags(void)* All cases, apart from the first, app should run. * No further testing of output done. */ -/* sanity check - failure with invalid option */ +/* failure with invalid option */ const char *argv0[] = {prgname, prefix, mp_flag,"--invalid-opt" };/* With --no-pci */
app/test/test_hash.c +1 -1
@@ -1088,7 +1088,7 @@ fbk_hash_unit_test(void) .socket_id = 0, }; -/* this is a sanity check for "same name" test +/* this is a check for "same name" test * creating this hash will check if we are actually able to create * multiple hashes with different names (instead of having just one). */
app/test/test_interrupts.c +5 -4
@@ -48,7 +48,7 @@ static union intr_pipefds pfds;* Check if the interrupt handle is valid. */ static inline int -test_interrupt_handle_sanity_check (struct rte_intr_handle *intr_handle) +test_interrupt_handle_check (struct rte_intr_handle *intr_handle) {if (!intr_handle ||rte_intr_fd_get (intr_handle) <0 )return -1 ;
@@ -164,7 +164,7 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l,#else /* to be implemented for bsd later */ static inline int -test_interrupt_handle_sanity_check (struct rte_intr_handle *intr_handle) +test_interrupt_handle_check (struct rte_intr_handle *intr_handle) {RTE_SET_USED (intr_handle);
@@ -215,7 +215,7 @@ test_interrupt_callback(void *arg)return ; } -if (test_interrupt_handle_sanity_check (intr_handle) <0 ) { +if (test_interrupt_handle_check (intr_handle) <0 ) {printf ("null or invalid intr_handle for %s\n" , __func__); flag =-1 ;return ;
@@ -241,7 +241,8 @@ static void test_interrupt_callback_1(void *arg) {struct rte_intr_handle *intr_handle = arg; -if (test_interrupt_handle_sanity_check (intr_handle) <0 ) { + +if (test_interrupt_handle_check (intr_handle) <0 ) {printf ("null or invalid intr_handle for %s\n" , __func__); flag =-1 ;return ;
app/test/test_link_bonding_mode4.c +1 -1
@@ -224,7 +224,7 @@ add_member(struct member_conf *member, uint8_t start)struct rte_ether_addr addr, addr_check;int retval; -/* Some sanity check */ +/* Some basic tests. */ RTE_VERIFY (test_params.member_ports <= member && member - test_params.member_ports < (int )RTE_DIM (test_params.member_ports));RTE_VERIFY (member->bonding ==0 );
app/test/test_mbuf.c +1 -1
@@ -1701,7 +1701,7 @@ test_mbuf_validate_tx_offload(const char *test_name,struct rte_mbuf *m =NULL ;int ret =0 ; -/* alloc a mbuf and do sanity check */ +/* alloc a mbuf and do some basic checks */ m =rte_pktmbuf_alloc (pktmbuf_pool);if (m ==NULL )GOTO_FAIL ("%s: mbuf allocation failed!\n" , __func__);
app/test/test_rawdev.c +1 -1
@@ -47,7 +47,7 @@ test_rawdev_selftests(void)int ret =0 ;int i; -/* basic sanity on rawdev infrastructure */ +/* basic check on rawdev infrastructure */ if (test_rawdev_selftest_skeleton () <0 )return -1 ;
app/test/test_timer.c +5 -5
@@ -491,11 +491,11 @@ timer_basic_main_loop(__rte_unused void *arg) }static int -timer_sanity_check (void ) +timer_check (void ) {#ifdef RTE_LIBEAL_USE_HPET if (eal_timer_source !=EAL_TIMER_HPET ) { -printf ("Not using HPET, can't sanity check timer sources\n" ); +printf ("Not using HPET, can't check timer sources\n" );return 0 ; }
@@ -539,9 +539,9 @@ test_timer(void)return TEST_SKIPPED ; } -/* sanity check our timer sources and timer config values */ -if (timer_sanity_check () <0 ) { -printf ("Timer sanity checks failed\n" ); +/* check our timer sources and timer config values */ +if (timer_check () <0 ) { +printf ("Timer checks failed\n" );return TEST_FAILED ; }
Signature · 1 line
2.43.0
PATCH v9 8/23 examples: remove term sanity
In reply to Stephen HemmingerDo not use non-inclusive terms.
--- examples/ipsec-secgw/event_helper.c | 2 +- examples/qos_sched/args.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
examples/ipsec-secgw/event_helper.c +1 -1
@@ -2100,7 +2100,7 @@ eh_launch_worker(struct eh_conf *conf, struct eh_app_worker_params *app_wrkr, goto clean_and_exit; } -/* Verify sanity of the matched worker */ +/* Verify validity of the matched worker */ if (eh_verify_match_worker (match_wrkr) !=1 ) {EH_LOG_ERR ("Failed to validate the matched worker" ); goto clean_and_exit;
examples/qos_sched/args.c +1 -1
@@ -384,7 +384,7 @@ app_parse_args(int argc, char **argv)return -1 ; } -/* sanity check for cores assignment */ +/* check for cores assignment */ for (i =0 ; i < nb_pfc; i++) {if (qos_conf[i].rx_core >=RTE_MAX_LCORE ) { RTE_LOG(ERR, APP, "pfc %u: invalid RX lcore index %u\n", i + 1,
Signature · 1 line
2.43.0
RE: [EXT] [PATCH v9 08/23] examples: remove term sanity
Quoted 3 lines
Do not use non-inclusive terms.
Signed-off-by Stephen Hemminger <[email protected]>
PATCH v9 9/23 lib: replace use of sanity check in comments and messages
In reply to Stephen HemmingerSanity check is on the Tier 2 non-inclusive list.
Replace or remove it.
--- lib/graph/graph.c | 2 +- lib/graph/graph_stats.c | 2 +- lib/graph/node.c | 2 +- lib/jobstats/rte_jobstats.c | 6 +++--- lib/metrics/rte_metrics.c | 2 +- lib/pcapng/rte_pcapng.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
lib/graph/graph.c +1 -1
@@ -344,7 +344,7 @@ rte_graph_create(const char *name, struct rte_graph_param *prm)graph_spinlock_lock (); -/* Check arguments sanity */ +/* Check argument validity */ if (prm ==NULL )SET_ERR_JMP (EINVAL , fail,"Param should not be NULL" );
lib/graph/graph_stats.c +1 -1
@@ -317,7 +317,7 @@ rte_graph_cluster_stats_create(const struct rte_graph_cluster_stats_param *prm)const char *pattern;rte_graph_t i; -/* Sanity checks */ +/* Validate arguments */ if (!rte_graph_has_stats_feature ())SET_ERR_JMP (EINVAL , fail,"Stats feature is not enabled" );
lib/graph/node.c +1 -1
@@ -68,7 +68,7 @@ __rte_node_register(const struct rte_node_register *reg)graph_spinlock_lock (); -/* Check sanity */ +/* Check argument validity */ if (reg ==NULL || reg->process ==NULL ) { rte_errno =EINVAL ; goto fail;
lib/jobstats/rte_jobstats.c +3 -3
@@ -124,7 +124,7 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job) {uint64_t now; -/* Some sanity check. */ +/* Check validity of arguments. */ if (unlikely (ctx ==NULL || job ==NULL || job->context !=NULL ))return -EINVAL ;
@@ -144,7 +144,7 @@ rte_jobstats_abort(struct rte_jobstats *job)struct rte_jobstats_context *ctx;uint64_t now, exec_time; -/* Some sanity check. */ +/* Check that arguments are valid */ if (unlikely (job ==NULL || job->context ==NULL ))return -EINVAL ;
@@ -165,7 +165,7 @@ rte_jobstats_finish(struct rte_jobstats *job, int64_t job_value)uint64_t now, exec_time;int need_update; -/* Some sanity check. */ +/* Check arguments */ if (unlikely (job ==NULL || job->context ==NULL ))return -EINVAL ;
lib/metrics/rte_metrics.c +1 -1
@@ -120,7 +120,7 @@ rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)uint16_t idx_name;uint16_t idx_base; -/* Some sanity checks */ +/* Some consistency checks */ if (cnt_names <1 || names ==NULL )return -EINVAL ;for (idx_name =0 ; idx_name < cnt_names; idx_name++)
lib/pcapng/rte_pcapng.c +1 -1
@@ -619,7 +619,7 @@ rte_pcapng_write_packets(rte_pcapng_t *self,struct pcapng_enhance_packet_block *epb;uint64_t cycles, timestamp; -/* sanity check that is really a pcapng mbuf */ +/* Check that is really a pcapng mbuf */ epb = rte_pktmbuf_mtod(m, struct pcapng_enhance_packet_block *);if (unlikely (epb->block_type !=PCAPNG_ENHANCED_PACKET_BLOCK || epb->block_length !=rte_pktmbuf_data_len (m))) {
Signature · 1 line
2.43.0
PATCH v9 10/23 doc/eventdev_pipeline: remove sanity
In reply to Stephen HemmingerThe word sanity check is unnecessary here.
--- doc/guides/gpus/cuda.rst | 2 +- doc/guides/sample_app_ug/eventdev_pipeline.rst | 2 +- doc/guides/tools/testbbdev.rst | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
doc/guides/gpus/cuda.rst +1 -1
@@ -80,7 +80,7 @@ Similarly to CUDA shared library, if the **libgdrapi.so** shared library is not installed in default locations (e.g. /usr/local/lib), you can use the variable ``GDRCOPY_PATH_L``. -As an example, to enable the CPU map feature sanity check, +As an example, to enable the CPU map feature check, run the ``app/test-gpudev`` application with: .. code-block:: console
doc/guides/sample_app_ug/eventdev_pipeline.rst +1 -1
@@ -50,7 +50,7 @@ these settings is shown below: ./<build_dir>/examples/dpdk-eventdev_pipeline -l 0,2,8-15 --vdev event_sw0 \ -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D -The application has some sanity checking built-in, so if there is a function +The application has some internal validation, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application will print an error message:
doc/guides/tools/testbbdev.rst +4 -4
@@ -9,7 +9,7 @@ dpdk-test-bbdev Application The ``dpdk-test-bbdev`` tool is a Data Plane Development Kit (DPDK) utility that allows measuring performance parameters of PMDs available in the bbdev framework. Tests available for execution are: latency, throughput, validation, -bler and sanity tests. Execution of tests can be customized using various +bler and basic functionality. Execution of tests can be customized using various parameters passed to a python running script.
@@ -97,8 +97,8 @@ Test Cases There are 7 main test cases that can be executed using testbbdev tool: -* Sanity checks [-c unittest] - - Performs sanity checks on BBDEV interface, validating basic functionality +* Functional checks [-c unittest] + - Performs checks on BBDEV interface, validating basic functionality * Validation tests [-c validation] - Performs full operation of enqueue and dequeue
@@ -232,7 +232,7 @@ vector name refer more explicitly processing specificity such as is purely read/written for external DDR, lbrm when limited buffer rate matching is expected, or crc_fail when a CRC failure is expected. They are chosen to have a good coverage across sizes and processing -parameters while still keeping their number limited as part of sanity +parameters while still keeping their number limited as part of functional regression. Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output
Signature · 1 line
2.43.0
PATCH v9 11/23 net/ring: replace use of sanity
In reply to Stephen HemmingerDon't use term sanity check
--- drivers/net/ring/rte_eth_ring.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ring/rte_eth_ring.c +2 -5
@@ -34,7 +34,7 @@ struct ring_internal_args {struct rte_ring *const *tx_queues;const unsigned int nb_tx_queues;const unsigned int numa_node; -void *addr;/* self addr for sanity check */ +void *addr;/* self addr for verification */ };enum dev_action {
@@ -606,10 +606,7 @@ static int parse_kvlist(const char *key __rte_unused, *action ='\0' ; action++; -/* -* Need to do some sanity checking here -*/ - +/* Check the command argument is valid action */ if (strcmp (action,ETH_RING_ACTION_ATTACH ) ==0 ) info->list[info->count].action =DEV_ATTACH ;else if (strcmp (action,ETH_RING_ACTION_CREATE ) ==0 )
Signature · 1 line
2.43.0
PATCH v9 12/23 net/fm10k, net/ixgbe: remove word sanity
In reply to Stephen HemmingerRemove non-inclusive term sanity from these Intel drivers.
--- drivers/net/fm10k/fm10k_ethdev.c | 2 +- drivers/net/fm10k/fm10k_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_fdir.c | 2 +- drivers/net/ixgbe/ixgbe_ipsec.c | 2 +- drivers/net/ixgbe/ixgbe_rxtx.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/fm10k/fm10k_ethdev.c +1 -1
@@ -1757,7 +1757,7 @@ mempool_element_size_valid(struct rte_mempool *mp)/* account for up to 512B of alignment */ min_size -=FM10K_RX_DATABUF_ALIGN ; -/* sanity check for overflow */ +/* check for overflow */ if (min_size > mp->elt_size)return 0 ;
drivers/net/fm10k/fm10k_rxtx.c +1 -1
@@ -647,7 +647,7 @@ fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,if (q->nb_free < mb->nb_segs)break ; -/* sanity check to make sure the mbuf is valid */ +/* check to make sure the mbuf is valid */ if ((mb->nb_segs ==0 ) || ((mb->nb_segs >1 ) && (mb->next ==NULL )))break ;
drivers/net/ixgbe/ixgbe_fdir.c +1 -1
@@ -1130,7 +1130,7 @@ ixgbe_fdir_filter_program(struct rte_eth_dev *dev,return -ENOTSUP ;/* -* Sanity check for x550. +* Check for x550. * When adding a new filter with flow type set to IPv4, * the flow director mask should be configed before, * and the L4 protocol and ports are masked.
drivers/net/ixgbe/ixgbe_ipsec.c +1 -1
@@ -615,7 +615,7 @@ ixgbe_crypto_enable_ipsec(struct rte_eth_dev *dev) rx_offloads = dev->data->dev_conf.rxmode.offloads; tx_offloads = dev->data->dev_conf.txmode.offloads; -/* sanity checks */ +/* input validation */ if (rx_offloads &RTE_ETH_RX_OFFLOAD_TCP_LRO ) {PMD_DRV_LOG (ERR ,"RSC and IPsec not supported" );return -1 ;
drivers/net/ixgbe/ixgbe_rxtx.c +1 -1
@@ -4983,7 +4983,7 @@ ixgbe_set_rsc(struct rte_eth_dev *dev)uint32_t rdrxctl;uint32_t rfctl; -/* Sanity check */ +/* Offload check */ dev->dev_ops->dev_infos_get (dev, &dev_info);if (dev_info.rx_offload_capa &RTE_ETH_RX_OFFLOAD_TCP_LRO ) rsc_capable = true;
Signature · 1 line
2.43.0
PATCH v9 13/23 net/mlx[45]: remove word sanity
In reply to Stephen HemmingerThe term "sanity" is on non-inclusive naming list. Remove it from the Nvidia drivers.
--- drivers/common/mlx5/linux/mlx5_common_os.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx4/mlx4_flow.c | 6 +++--- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- drivers/net/mlx5/mlx5_flow_hw.c | 6 ++---- drivers/net/mlx5/mlx5_rxq.c | 2 +- drivers/net/mlx5/mlx5_rxtx_vec.h | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-)
drivers/common/mlx5/linux/mlx5_common_os.c +1 -1
@@ -235,7 +235,7 @@ mlx5_get_ifname_sysfs(const char *ibdev_path, char *ifname)/** * Suffix RTE_EAL_PMD_PATH with "-glue". * -* This function performs a sanity check on RTE_EAL_PMD_PATH before +* This function performs a check on RTE_EAL_PMD_PATH before * suffixing its last component. * * @param buf[out]
drivers/net/mlx4/mlx4.c +1 -1
@@ -1216,7 +1216,7 @@ static struct rte_pci_driver mlx4_driver = {/** * Suffix RTE_EAL_PMD_PATH with "-glue". * -* This function performs a sanity check on RTE_EAL_PMD_PATH before +* This function performs a check on RTE_EAL_PMD_PATH before * suffixing its last component. * * @param buf[out]
drivers/net/mlx4/mlx4_flow.c +3 -3
@@ -514,7 +514,7 @@ mlx4_flow_merge_tcp(struct rte_flow *flow, }/** -* Perform basic sanity checks on a pattern item. +* Perform basic checks on a pattern item. * * @param[in] item * Item specification.
@@ -730,7 +730,7 @@ mlx4_flow_prepare(struct mlx4_priv *priv, goto exit_item_not_supported; proc = next;/* -* Perform basic sanity checks only once, while handle is +* Perform basic checks only once, while handle is * not allocated. */ if (flow == &temp) {
@@ -799,7 +799,7 @@ mlx4_flow_prepare(struct mlx4_priv *priv, rss_key = mlx4_rss_hash_key_default; rss_key_len =MLX4_RSS_HASH_KEY_SIZE ; } -/* Sanity checks. */ +/* Input checks. */ for (i =0 ; i < rss->queue_num; ++i)if (rss->queue[i] >=ETH_DEV (priv)->data->nb_rx_queues)
drivers/net/mlx5/mlx5_flow_dv.c +1 -1
@@ -8820,7 +8820,7 @@ flow_dv_prepare(struct rte_eth_dev *dev,#ifdef RTE_LIBRTE_MLX5_DEBUG /** -* Sanity check for match mask and value. Similar to check_valid_spec() in +* Check for match mask and value. Similar to check_valid_spec() in * kernel driver. If unmasked bit is present in value, it returns failure. * * @param match_mask
drivers/net/mlx5/mlx5_flow_hw.c +2 -4
@@ -7453,11 +7453,10 @@ flow_hw_tx_tag_regc_mask(struct rte_eth_dev *dev)struct mlx5_priv *priv = dev->data->dev_private;uint32_t mask = priv->sh->dv_regc0_mask; -/* Mask is verified during device initialization. Sanity checking here. */ +/* Mask is verified during device initialization. */ MLX5_ASSERT (mask !=0 );/* * Availability of sufficient number of bits in REG_C_0 is verified on initialization. -* Sanity checking here. */ MLX5_ASSERT (rte_popcount32 (mask) >=rte_popcount32 (priv->vport_meta_mask));return mask;
@@ -7469,12 +7468,11 @@ flow_hw_tx_tag_regc_value(struct rte_eth_dev *dev)struct mlx5_priv *priv = dev->data->dev_private;uint32_t tag; -/* Mask is verified during device initialization. Sanity checking here. */ +/* Mask is verified during device initialization. */ MLX5_ASSERT (priv->vport_meta_mask !=0 ); tag = priv->vport_meta_tag >> (rte_bsf32 (priv->vport_meta_mask));/* * Availability of sufficient number of bits in REG_C_0 is verified on initialization. -* Sanity checking here. */ MLX5_ASSERT ((tag & priv->sh->dv_regc0_mask) == tag);return tag;
drivers/net/mlx5/mlx5_rxq.c +1 -1
@@ -1442,7 +1442,7 @@ mlx5_mprq_alloc_mp(struct rte_eth_dev *dev) desc *=4 ; obj_num = desc +MLX5_MPRQ_MP_CACHE_SZ * n_ibv;/* -* rte_mempool_create_empty() has sanity check to refuse large cache +* rte_mempool_create_empty() has basic check to refuse large cache * size compared to the number of elements. * CACHE_FLUSHTHRESH_MULTIPLIER is defined in a C file, so using a * constant number 2 instead.
drivers/net/mlx5/mlx5_rxtx_vec.h +1 -1
@@ -21,7 +21,7 @@ RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)/* -* Compile time sanity check for vectorized functions. +* Compile time checks for vectorized functions. */ #define S_ASSERT_RTE_MBUF (s) \
Signature · 1 line
2.43.0
RE: [PATCH v9 13/23] net/mlx[45]: remove word sanity
Quoted 10 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, February 5, 2024 18:44
To: [email protected]
Cc: Stephen Hemminger <[email protected]>; Dariusz Sosnowski <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>; Matan Azrad <[email protected]>
Subject: [PATCH v9 13/23] net/mlx[45]: remove word sanity
Quoted 4 lines
The term "sanity" is on non-inclusive naming list. Remove it from the Nvidia drivers.
Signed-off-by Stephen Hemminger <[email protected]>
Best regards,
Dariusz Sosnowski
PATCH v9 14/23 net/sfc: remove term "sanity check"
In reply to Stephen HemmingerRemove term sanity check in comment.
--- drivers/net/sfc/sfc_dp_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/sfc/sfc_dp_rx.h +1 -1
@@ -59,7 +59,7 @@ struct sfc_dp_rx_qcreate_info {/** * Maximum number of Rx descriptors completed in one Rx event. -* Just for sanity checks if datapath would like to do. +* Checks if datapath would like to do. */ unsigned int batch_max;
Signature · 1 line
2.43.0
PATCH v9 15/23 net/ark: replace use of term sanity
In reply to Stephen HemmingerDo not use non inclusive terms.
--- drivers/net/ark/ark_ethdev.c | 8 ++++---- drivers/net/ark/ark_ethdev_rx.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/ark/ark_ethdev.c +4 -4
@@ -346,10 +346,10 @@ eth_ark_dev_init(struct rte_eth_dev *dev)ARK_PMD_LOG (NOTICE ,"Arkville HW Commit_ID: %08x\n" ,rte_be_to_cpu_32 (ark->sysctrl.t32[0x20 /4 ])); -/* If HW sanity test fails, return an error */ +/* If HW test fails, return an error */ if (ark->sysctrl.t32[4 ] !=0xcafef00d ) {ARK_PMD_LOG (ERR , -"HW Sanity test has failed, expected constant" +"HW test has failed, expected constant" " 0x%x, read 0x%x (%s)\n" ,0xcafef00d , ark->sysctrl.t32[4 ], __func__);
@@ -357,7 +357,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev) }ARK_PMD_LOG (DEBUG , -"HW Sanity test has PASSED, expected constant" +"HW test has PASSED, expected constant" " 0x%x, read 0x%x (%s)\n" ,0xcafef00d , ark->sysctrl.t32[4 ], __func__);
@@ -587,7 +587,7 @@ eth_ark_dev_start(struct rte_eth_dev *dev)rte_thread_t thread;/* Delay packet generator start allow the hardware to be ready -* This is only used for sanity checking with internal generator +* This is only used for checking with internal generator */ char tname[RTE_THREAD_INTERNAL_NAME_SIZE ];snprintf (tname,sizeof (tname),"ark-pg%d" , dev->data->port_id);
drivers/net/ark/ark_ethdev_rx.c +1 -1
@@ -283,7 +283,7 @@ eth_ark_recv_pkts(void *rx_queue, mbuf->pkt_len = meta->pkt_len; mbuf->data_len = meta->pkt_len; -if (ARK_DEBUG_CORE ) {/* debug sanity checks */ +if (ARK_DEBUG_CORE ) {/* debug checks */ if ((meta->pkt_len > (1024 *16 )) || (meta->pkt_len ==0 )) {
Signature · 1 line
2.43.0
Re: [PATCH v9 15/23] net/ark: replace use of term sanity
Quoted 36 lines · Stephen Hemminger
Do not use non inclusive terms.
Signed-off-by Stephen Hemminger <[email protected]>--- drivers/net/ark/ark_ethdev.c | 8 ++++---- drivers/net/ark/ark_ethdev_rx.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)drivers/net/ark/ark_ethdev.c +3
-3@@ -346,10 +346,10 @@ eth_ark_dev_init(struct rte_eth_dev *dev)ARK_PMD_LOG (NOTICE ,"Arkville HW Commit_ID: %08x\n" ,rte_be_to_cpu_32 (ark->sysctrl.t32[0x20 /4 ])); -/* If HW sanity test fails, return an error */ +/* If HW test fails, return an error */ if (ark->sysctrl.t32[4 ] !=0xcafef00d ) {ARK_PMD_LOG (ERR , -"HW Sanity test has failed, expected constant" +"HW test has failed, expected constant" " 0x%x, read 0x%x (%s)\n" ,0xcafef00d , ark->sysctrl.t32[4 ], __func__);@@ -357,7 +357,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev) }ARK_PMD_LOG (DEBUG , -"HW Sanity test has PASSED, expected constant" +"HW test has PASSED, expected constant" " 0x%x, read 0x%x (%s)\n" ,0xcafef00d , ark->sysctrl.t32[4 ], __func__);
drivers/net/ark/ark_ethdev.c eth_ark_dev_start(struct rte_eth_dev *dev) · line 589
Quoted 3 lines
drivers/net/ark/ark_ethdev.c +0
-0@@ -587,7 +587,7 @@ eth_ark_dev_start(struct rte_eth_dev *dev)rte_thread_t thread;/* Delay packet generator start allow the hardware to be
ready
drivers/net/ark/ark_ethdev.c eth_ark_dev_start(struct rte_eth_dev *dev) · line 590
Quoted 1 line
drivers/net/ark/ark_ethdev.c +0
-1-* This is only used for sanity checking with internal
generator
drivers/net/ark/ark_ethdev.c eth_ark_dev_start(struct rte_eth_dev *dev)
Quoted 4 lines
drivers/net/ark/ark_ethdev.c +1
-0+* This is only used for checking with internal generator */ char tname[RTE_THREAD_INTERNAL_NAME_SIZE ]; snprintf(tname, sizeof(tname), "ark-pg%d",
dev->data->port_id);
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/net/ark/ark_ethdev_rx.c
Quoted 13 lines
index
24f1c65690eb..8ac9d904e795100644drivers/net/ark/ark_ethdev_rx.c +1
-2@@ -283,7 +283,7 @@ eth_ark_recv_pkts(void *rx_queue, mbuf->pkt_len = meta->pkt_len; mbuf->data_len = meta->pkt_len; -if (ARK_DEBUG_CORE ) {/* debug sanity checks */ +if (ARK_DEBUG_CORE ) {/* debug checks */ if ((meta->pkt_len > (1024 *16 )) || (meta->pkt_len ==0 )) { --
Quoted 2 lines
2.43.0
PATCH v9 16/23 net/bnxt: replace use of term sanity
In reply to Stephen HemmingerDo not use non-inclusive terms.
--- drivers/net/bnxt/bnxt_hwrm.c | 2 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +1 -1
@@ -262,7 +262,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, done =bnxt_check_cq_hwrm_done (cpr, is_tx, is_rx, i == timeout -1 ); -/* Sanity check on the resp->resp_len */ +/* Input check on the resp->resp_len */ rte_io_rmb ();if (resp->resp_len && resp->resp_len <= bp->max_resp_len) {/* Last byte of resp contains the valid key */
drivers/net/bnxt/hsi_struct_def_dpdk.h +1 -1
@@ -55482,7 +55482,7 @@ struct hwrm_tfc_ident_alloc_output {* Requests the firmware to free a TFC resource identifier. * A resource subtype and session id are passed in. * An identifier (previously allocated) corresponding to all these is -* freed, only after various sanity checks are completed. +* freed, only after various checks are completed. */ /* hwrm_tfc_ident_free_input (size:192b/24B) */ struct hwrm_tfc_ident_free_input {
Signature · 1 line
2.43.0
PATCH v9 17/23 net/bnx2x: remove reference to sanity
In reply to Stephen HemmingerReplace "sanity check"
--- drivers/net/bnx2x/bnx2x.c | 2 +- drivers/net/bnx2x/bnx2x_stats.c | 8 ++++---- drivers/net/bnx2x/ecore_sp.c | 2 +- drivers/net/bnx2x/elink.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/bnx2x/bnx2x.c +1 -1
@@ -7820,7 +7820,7 @@ static int bnx2x_check_valid_mf_cfg(struct bnx2x_softc *sc)uint32_t ovlan2;uint8_t i, j; -/* various MF mode sanity checks... */ +/* various MF mode checks... */ if (mf_info->mf_config[SC_VN (sc)] &FUNC_MF_CFG_FUNC_HIDE ) { PMD_DRV_LOG(NOTICE, sc,
drivers/net/bnx2x/bnx2x_stats.c +4 -4
@@ -187,7 +187,7 @@ bnx2x_stats_pmf_update(struct bnx2x_softc *sc)*/ return ; } -/* sanity */ +/* input valid? */ if (!sc->port.pmf || !sc->port.port_stx) {PMD_DRV_LOG (ERR , sc,"BUG!" );return ;
@@ -237,7 +237,7 @@ bnx2x_port_stats_init(struct bnx2x_softc *sc)uint32_t mac_addr;uint32_t *stats_comp =BNX2X_SP (sc, stats_comp); -/* sanity */ +/* input valid? */ if (!sc->link_vars.link_up || !sc->port.pmf) {PMD_DRV_LOG (ERR , sc,"BUG!" );return ;
@@ -461,7 +461,7 @@ bnx2x_func_stats_init(struct bnx2x_softc *sc)struct dmae_command *dmae = &sc->stats_dmae;uint32_t *stats_comp =BNX2X_SP (sc, stats_comp); -/* sanity */ +/* input valid? */ if (!sc->func_stx) {PMD_DRV_LOG (ERR , sc,"BUG!" );return ;
@@ -1301,7 +1301,7 @@ bnx2x_port_stats_base_init(struct bnx2x_softc *sc)struct dmae_command *dmae;uint32_t *stats_comp =BNX2X_SP (sc, stats_comp); -/* sanity */ +/* input valid? */ if (!sc->port.pmf || !sc->port.port_stx) {PMD_DRV_LOG (ERR , sc,"BUG!" );return ;
drivers/net/bnx2x/ecore_sp.c +1 -1
@@ -207,7 +207,7 @@ static int ecore_exe_queue_step(struct bnx2x_softc *sc,break ; } -/* Sanity check */ +/* Argument check */ if (!cur_len)return ECORE_SUCCESS ;
drivers/net/bnx2x/elink.c +2 -2
@@ -1088,7 +1088,7 @@ static void elink_get_epio(struct bnx2x_softc *sc, uint32_t epio_pin, {uint32_t epio_mask, gp_oenable; *en =0 ; -/* Sanity check */ +/* Input check */ if (epio_pin >31 ) {ELINK_DEBUG_P1 (sc,"Invalid EPIO pin %d to get" , epio_pin);return ;
@@ -1105,7 +1105,7 @@ static void elink_set_epio(struct bnx2x_softc *sc, uint32_t epio_pin, uint32_t e {uint32_t epio_mask, gp_output, gp_oenable; -/* Sanity check */ +/* Input check */ if (epio_pin >31 ) {ELINK_DEBUG_P1 (sc,"Invalid EPIO pin %d to set" , epio_pin);return ;
Signature · 1 line
2.43.0
PATCH v9 18/23 cnxk: replace term sanity
In reply to Stephen HemmingerDo not use non-inclusive naming.
--- drivers/common/cnxk/roc_nix_tm_ops.c | 2 +- drivers/common/cnxk/roc_npa.c | 4 ++-- drivers/net/cnxk/cnxk_ethdev.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/common/cnxk/roc_nix_tm_ops.c +1 -1
@@ -527,7 +527,7 @@ roc_nix_tm_hierarchy_disable(struct roc_nix *roc_nix) node->flags &= ~NIX_TM_NODE_ENABLED ; } -/* Verify sanity of all tx queues */ +/* Verify all tx queues */ for (i =0 ; i < sq_cnt; i++) { sq = nix->sqs[i];if (!sq)
drivers/common/cnxk/roc_npa.c +2 -2
@@ -458,7 +458,7 @@ npa_aura_pool_pair_alloc(struct npa_lf *lf, const uint32_t block_size,char name[PLT_MEMZONE_NAMESIZE ];const struct plt_memzone *mz; -/* Sanity check */ +/* argument checks */ if (!lf || !block_size || !block_count || !pool || !aura || !aura_handle)return NPA_ERR_PARAM ;
@@ -1096,7 +1096,7 @@ npa_dev_init(struct npa_lf *lf, uintptr_t base, struct mbox *mbox)uint8_t aura_sz;int rc; -/* Sanity checks */ +/* Input checks */ if (!lf || !base || !mbox)return NPA_ERR_PARAM ;
drivers/net/cnxk/cnxk_ethdev.c +2 -2
@@ -636,7 +636,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid,struct rte_mempool *lpb_pool = mp;struct rte_mempool *spb_pool =NULL ; -/* Sanity checks */ +/* input checks */ if (rx_conf->rx_deferred_start ==1 ) {plt_err ("Deferred Rx start is not supported" ); goto fail;
@@ -1205,7 +1205,7 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) rc = -EINVAL ; -/* Sanity checks */ +/* baseline checks */ if (rte_eal_has_hugepages () ==0 ) {plt_err ("Huge page is not configured" ); goto fail_configure;
Signature · 1 line
2.43.0
PATCH v9 19/23 event/opdl: remove term sanity
In reply to Stephen HemmingerDon't use non-inclusive term.
--- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/opdl/opdl_evdev_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/event/opdl/opdl_evdev.c +1 -1
@@ -241,7 +241,7 @@ opdl_queue_setup(struct rte_eventdev *dev,struct opdl_evdev *device =opdl_pmd_priv (dev); -/* Extra sanity check, probably not needed */ +/* Extra check, probably not needed */ if (queue_id ==OPDL_INVALID_QID ) { PMD_DRV_LOG(ERR, "DEV_ID:[%02d] : " "Invalid queue id %u requested\n",
drivers/event/opdl/opdl_evdev_init.c +1 -1
@@ -300,7 +300,7 @@ static int opdl_add_deps(struct opdl_evdev *device,struct opdl_queue *queue_deps = &device->queue[deps_q_id];struct opdl_stage *dep_stages[OPDL_PORTS_MAX ]; -/* sanity check that all stages are for same opdl ring */ +/* check that all stages are for same opdl ring */ for (i =0 ; i < queue->nb_ports; i++) {struct opdl_ring *r =opdl_stage_get_opdl_ring (stage_for_port (queue, i));
Signature · 1 line
2.43.0
PATCH v9 20/23 net/txgbe: replace term sanity
In reply to Stephen HemmingerDon't use term sanity.
--- drivers/net/txgbe/txgbe_ipsec.c | 2 +- drivers/net/txgbe/txgbe_rxtx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/txgbe/txgbe_ipsec.c +1 -1
@@ -595,7 +595,7 @@ txgbe_crypto_enable_ipsec(struct rte_eth_dev *dev) rx_offloads = dev->data->dev_conf.rxmode.offloads; tx_offloads = dev->data->dev_conf.txmode.offloads; -/* sanity checks */ +/* offload checks */ if (rx_offloads &RTE_ETH_RX_OFFLOAD_TCP_LRO ) {PMD_DRV_LOG (ERR ,"RSC and IPsec not supported" );return -1 ;
drivers/net/txgbe/txgbe_rxtx.c +1 -1
@@ -4115,7 +4115,7 @@ txgbe_set_rsc(struct rte_eth_dev *dev)uint32_t rdrxctl;uint32_t rfctl; -/* Sanity check */ +/* Offload check */ dev->dev_ops->dev_infos_get (dev, &dev_info);if (dev_info.rx_offload_capa &RTE_ETH_RX_OFFLOAD_TCP_LRO ) rsc_capable = true;
Signature · 1 line
2.43.0
PATCH v9 21/23 net/cxgbe: remove use of term sanity
In reply to Stephen HemmingerRemove non-inclusive terminolgy.
--- drivers/net/cxgbe/cxgbe_ethdev.c | 10 ++-------- drivers/net/cxgbe/cxgbevf_main.c | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-)
drivers/net/cxgbe/cxgbe_ethdev.c +2 -8
@@ -524,10 +524,7 @@ int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, eth_dev->data->tx_queues[queue_idx] = (void *)txq; -/* Sanity Checking -* -* nb_desc should be > 1023 and <= CXGBE_MAX_RING_DESC_SIZE -*/ +/* nb_desc should be > 1023 and <= CXGBE_MAX_RING_DESC_SIZE */ temp_nb_desc = nb_desc;if (nb_desc <CXGBE_MIN_RING_DESC_SIZE ) { dev_warn(adapter, "%s: number of descriptors must be >= %d. Using default [%d]\n",
@@ -648,10 +645,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, eth_dev->data->rx_queues[queue_idx] = (void *)rxq; -/* Sanity Checking -* -* nb_desc should be > 0 and <= CXGBE_MAX_RING_DESC_SIZE -*/ +/* nb_desc should be > 0 and <= CXGBE_MAX_RING_DESC_SIZE */ temp_nb_desc = nb_desc;if (nb_desc <CXGBE_MIN_RING_DESC_SIZE ) { dev_warn(adapter, "%s: number of descriptors must be >= %d. Using default [%d]\n",
drivers/net/cxgbe/cxgbevf_main.c +2 -2
@@ -137,7 +137,7 @@ static int adap_init0vf(struct adapter *adapter)/* * Grab our Virtual Interface resource allocation, extract the -* features that we're interested in and do a bit of sanity testing on +* features that we're interested in and do a bit of testing on * what we discover. */ err =t4vf_get_vfres (adapter);
@@ -148,7 +148,7 @@ static int adap_init0vf(struct adapter *adapter) }/* -* Check for various parameter sanity issues. +* Check for various parameter issues. */ if (adapter->params.vfres.pmask ==0 ) { dev_err(adapter->pdev_dev, "no port access configured\n"
Signature · 1 line
2.43.0
PATCH v9 22/23 crypto/bcmfs: replace term sanity check
In reply to Stephen HemmingerDo not use non-inclusive naming here.
--- drivers/crypto/bcmfs/hw/bcmfs4_rm.c | 6 +++--- drivers/crypto/bcmfs/hw/bcmfs5_rm.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/crypto/bcmfs/hw/bcmfs4_rm.c +3 -3
@@ -317,7 +317,7 @@ bcmfs4_mdst_desc(uint64_t addr, unsigned int length_div_16) }static bool -bcmfs4_sanity_check (struct bcmfs_qp_message *msg) +bcmfs4_message_check (struct bcmfs_qp_message *msg) {unsigned int i =0 ;
@@ -458,8 +458,8 @@ bcmfs4_enqueue_single_request_qp(struct bcmfs_qp *qp, void *op)struct bcmfs_queue *txq = &qp->tx_q;struct bcmfs_qp_message *msg = (struct bcmfs_qp_message *)op; -/* Do sanity check on message */ -if (!bcmfs4_sanity_check (msg)) { +/* Do check on message */ +if (!bcmfs4_message_check (msg)) {BCMFS_DP_LOG (ERR ,"Invalid msg on queue %d" , qp->qpair_id);return -EIO ; }
drivers/crypto/bcmfs/hw/bcmfs5_rm.c +3 -3
@@ -293,7 +293,7 @@ bcmfs5_mdst_desc(uint64_t addr, unsigned int len_div_16) }static bool -bcmfs5_sanity_check (struct bcmfs_qp_message *msg) +bcmfs5_message_check (struct bcmfs_qp_message *msg) {unsigned int i =0 ;
@@ -389,8 +389,8 @@ bcmfs5_enqueue_single_request_qp(struct bcmfs_qp *qp, void *op)struct bcmfs_queue *txq = &qp->tx_q;struct bcmfs_qp_message *msg = (struct bcmfs_qp_message *)op; -/* Do sanity check on message */ -if (!bcmfs5_sanity_check (msg)) { +/* Do check on message */ +if (!bcmfs5_message_check (msg)) {BCMFS_DP_LOG (ERR ,"Invalid msg on queue %d" , qp->qpair_id);return -EIO ; }
Signature · 1 line
2.43.0
PATCH v9 23/23 drivers: remove use of term sanity check
In reply to Stephen HemmingerReplace non-inclusive language with better comments. Covers multiple drivers
--- drivers/bus/fslmc/qbman/qbman_sys_decl.h | 2 +- drivers/common/cnxk/roc_npa.c | 2 +- drivers/common/dpaax/caamflib/desc.h | 2 +- drivers/common/sfc_efx/base/ef10_nvram.c | 4 ++-- drivers/common/sfc_efx/base/efx_rx.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +- drivers/net/mvpp2/mrvl_qos.c | 2 +- drivers/net/nfp/nfp_flow.c | 2 +- drivers/net/qede/qede_rxtx.c | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-)
drivers/bus/fslmc/qbman/qbman_sys_decl.h +1 -1
@@ -9,7 +9,7 @@#include <compat.h> #include <fsl_qbman_base.h> -/* Sanity check */ +/* Byte order check */ #if (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__) && \ (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)#error "Unknown endianness!"
drivers/common/cnxk/roc_npa.c +1 -1
@@ -622,7 +622,7 @@ npa_aura_alloc(struct npa_lf *lf, const uint32_t block_count, int pool_id, {int rc, aura_id; -/* Sanity check */ +/* parameter check */ if (!lf || !aura || !aura_handle)return NPA_ERR_PARAM ;
drivers/common/dpaax/caamflib/desc.h +1 -1
@@ -107,7 +107,7 @@ extern enum rta_sec_era rta_sec_era;/* * ONE - should always be set. Combination of ONE (always -* set) and ZRO (always clear) forms an endianness sanity check +* set) and ZRO (always clear) forms an endianness check */ #define HDR_ONE BIT(23)#define HDR_ZRO BIT(15)
drivers/common/sfc_efx/base/ef10_nvram.c +2 -2
@@ -595,13 +595,13 @@ tlv_update_partition_len_and_cks(/* * We just modified the partition, so the total length may not be -* valid. Don't use tlv_find(), which performs some sanity checks +* valid. Don't use tlv_find(), which performs some checks * that may fail here. */ partition.data = cursor->block;memcpy (&partition.tlv_cursor, cursor,sizeof (*cursor)); header = (struct tlv_partition_header *)partition.data; -/* Sanity check. */ +/* Header check */ if (__LE_TO_CPU_32 (header->tag) !=TLV_TAG_PARTITION_HEADER ) { rc =EFAULT ; goto fail1;
drivers/common/sfc_efx/base/efx_rx.c +1 -1
@@ -930,7 +930,7 @@ efx_rx_qcreate_internal( ndescs, id, flags, eep, erp)) != 0) goto fail4; -/* Sanity check queue creation result */ +/* Check queue creation result */ if (flags &EFX_RXQ_FLAG_RSS_HASH ) {const efx_rx_prefix_layout_t *erplp = &erp->er_prefix_layout;const efx_rx_prefix_field_info_t *rss_hash_field;
drivers/dma/idxd/idxd_pci.c +1 -1
@@ -204,7 +204,7 @@ init_pci_device(struct rte_pci_device *dev, struct idxd_dmadev *idxd, goto err; } -/* sanity check device status */ +/* check device status */ if (pci->regs->gensts &GENSTS_DEV_STATE_MASK ) {/* need function-level-reset (FLR) or is enabled */ IDXD_PMD_ERR ("Device status is not disabled, cannot init" );
drivers/net/bonding/rte_eth_bond_8023ad.c +1 -1
@@ -1476,7 +1476,7 @@ bond_8023ad_setup_validate(uint16_t port_id,return -EINVAL ;if (conf !=NULL ) { -/* Basic sanity check */ +/* Basic input check */ if (conf->slow_periodic_ms == 0 || conf->fast_periodic_ms >= conf->slow_periodic_ms || conf->long_timeout_ms == 0 ||
drivers/net/mvpp2/mrvl_qos.c +1 -1
@@ -260,7 +260,7 @@ get_entry_values(const char *entry, uint8_t *tab,if (nb_rng_tokens !=2 )return -3 ; -/* Range and sanity checks. */ +/* Range and input checks. */ if (get_val_securely (rng_tokens[0 ], &token_val) <0 )return -4 ; beg = (char )token_val;
drivers/net/nfp/nfp_flow.c +1 -1
@@ -2071,7 +2071,7 @@ nfp_flow_compile_item_proc(struct nfp_flower_representor *repr,break ; } -/* Perform basic sanity checks */ +/* Perform basic checks */ ret =nfp_flow_item_check (item, proc);if (ret !=0 ) {PMD_DRV_LOG (ERR ,"nfp flow item %d check failed" , item->type);
drivers/net/qede/qede_rxtx.c +3 -3
@@ -1383,7 +1383,7 @@ qede_rx_process_tpa_end_cqe(struct qede_dev *qdev, cqe->len_list[0]);/* Update total length and frags based on end TPA */ rx_mb = rxq->tpa_info[cqe->tpa_agg_index].tpa_head; -/* TODO: Add Sanity Checks */ +/* TODO: Add more checks */ rx_mb->nb_segs = cqe->num_of_bds; rx_mb->pkt_len = cqe->total_packet_len;
@@ -2211,7 +2211,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,#ifdef RTE_LIBRTE_QEDE_DEBUG_TX static inline void -qede_mpls_tunn_tx_sanity_check (struct rte_mbuf *mbuf, +qede_mpls_tunn_tx_basic_check (struct rte_mbuf *mbuf,struct qede_tx_queue *txq) {if (((mbuf->outer_l2_len + mbuf->outer_l3_len) /2 ) >0xff )
@@ -2473,7 +2473,7 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) RTE_MBUF_F_TX_TUNNEL_MPLSINUDP) { mplsoudp_flg = true;#ifdef RTE_LIBRTE_QEDE_DEBUG_TX -qede_mpls_tunn_tx_sanity_check (mbuf, txq); +qede_mpls_tunn_tx_basic_check (mbuf, txq);#endif /* Outer L4 offset in two byte words */ tunn_l4_hdr_start_offset =
Signature · 1 line
2.43.0