From: Harry van Haaren <harry.van.haaren@intel.com>
To: dev@dpdk.org
Cc: junx.w.zhou@intel.com, maox.jiang@intel.com,
Harry van Haaren <harry.van.haaren@intel.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH] examples/eventdev_pipeline: fix 32-bit coremask logic
Date: Tue, 16 Jun 2020 17:56:03 +0100 [thread overview]
Message-ID: <20200616165603.61456-1-harry.van.haaren@intel.com> (raw)
This commit fixes a bug in 32-bit environments when a core mask greater
than 32-bits is requested. The fix is to convert the bitmask logic to
64 bits, aligning 64 and 32 bit implementations.
Fixes: adb5d548 ("examples/eventdev_pipeline_sw_pmd: add sample app")
Cc: stable@dpdk.org
Reported-by: Jun Zhou <junx.w.zhou@intel.com>
Suggested-by: Mao Jiang <maox.jiang@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---
examples/eventdev_pipeline/main.c | 10 +++++-----
examples/eventdev_pipeline/pipeline_common.h | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c
index 21958269f..4ac582153 100644
--- a/examples/eventdev_pipeline/main.c
+++ b/examples/eventdev_pipeline/main.c
@@ -81,7 +81,7 @@ parse_coremask(const char *coremask)
val = xdigit2val(c);
for (j = 0; j < BITS_HEX && idx < MAX_NUM_CORE; j++, idx++) {
if ((1 << j) & val) {
- mask |= (1UL << idx);
+ mask |= (1ULL << idx);
count++;
}
}
@@ -232,10 +232,10 @@ parse_app_args(int argc, char **argv)
usage();
for (i = 0; i < MAX_NUM_CORE; i++) {
- fdata->rx_core[i] = !!(rx_lcore_mask & (1UL << i));
- fdata->tx_core[i] = !!(tx_lcore_mask & (1UL << i));
- fdata->sched_core[i] = !!(sched_lcore_mask & (1UL << i));
- fdata->worker_core[i] = !!(worker_lcore_mask & (1UL << i));
+ fdata->rx_core[i] = !!(rx_lcore_mask & (1ULL << i));
+ fdata->tx_core[i] = !!(tx_lcore_mask & (1ULL << i));
+ fdata->sched_core[i] = !!(sched_lcore_mask & (1ULL << i));
+ fdata->worker_core[i] = !!(worker_lcore_mask & (1ULL << i));
if (fdata->worker_core[i])
cdata.num_workers++;
diff --git a/examples/eventdev_pipeline/pipeline_common.h b/examples/eventdev_pipeline/pipeline_common.h
index c7245f7f0..6a4287602 100644
--- a/examples/eventdev_pipeline/pipeline_common.h
+++ b/examples/eventdev_pipeline/pipeline_common.h
@@ -51,10 +51,10 @@ struct fastpath_data {
bool rx_single;
bool tx_single;
bool sched_single;
- unsigned int rx_core[MAX_NUM_CORE];
- unsigned int tx_core[MAX_NUM_CORE];
- unsigned int sched_core[MAX_NUM_CORE];
- unsigned int worker_core[MAX_NUM_CORE];
+ uint64_t rx_core[MAX_NUM_CORE];
+ uint64_t tx_core[MAX_NUM_CORE];
+ uint64_t sched_core[MAX_NUM_CORE];
+ uint64_t worker_core[MAX_NUM_CORE];
struct setup_data cap;
} __rte_cache_aligned;
--
2.17.1
next reply other threads:[~2020-06-16 16:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 16:56 Harry van Haaren [this message]
2020-06-29 16:39 ` Jerin Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200616165603.61456-1-harry.van.haaren@intel.com \
--to=harry.van.haaren@intel.com \
--cc=dev@dpdk.org \
--cc=junx.w.zhou@intel.com \
--cc=maox.jiang@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).