From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, kuba@kernel.org
Cc: bjorn.andersson@linaro.org, evgreen@chromium.org,
cpratapa@codeaurora.org, subashab@codeaurora.org,
elder@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next 10/11] net: ipa: flag duplicate memory regions
Date: Wed, 9 Jun 2021 17:35:02 -0500 [thread overview]
Message-ID: <20210609223503.2649114-11-elder@linaro.org> (raw)
In-Reply-To: <20210609223503.2649114-1-elder@linaro.org>
Add a test in ipa_mem_valid() to ensure no memory region is defined
more than once, using a bitmap to record each defined memory region.
Skip over undefined regions when checking (we can have any number of
those).
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/net/ipa/ipa_mem.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c
index e5ca6a2ac626a..7b79aeb5f68fc 100644
--- a/drivers/net/ipa/ipa_mem.c
+++ b/drivers/net/ipa/ipa_mem.c
@@ -217,6 +217,7 @@ static bool ipa_mem_valid_one(struct ipa *ipa, const struct ipa_mem *mem)
/* Verify each defined memory region is valid. */
static bool ipa_mem_valid(struct ipa *ipa, const struct ipa_mem_data *mem_data)
{
+ DECLARE_BITMAP(regions, IPA_MEM_COUNT) = { };
struct device *dev = &ipa->pdev->dev;
enum ipa_mem_id mem_id;
@@ -229,6 +230,14 @@ static bool ipa_mem_valid(struct ipa *ipa, const struct ipa_mem_data *mem_data)
for (mem_id = 0; mem_id < mem_data->local_count; mem_id++) {
const struct ipa_mem *mem = &mem_data->local[mem_id];
+ if (mem_id == IPA_MEM_UNDEFINED)
+ continue;
+
+ if (__test_and_set_bit(mem->id, regions)) {
+ dev_err(dev, "duplicate memory region %u\n", mem->id);
+ return false;
+ }
+
/* Defined regions have non-zero size and/or canary count */
if (mem->size || mem->canary_count) {
if (ipa_mem_valid_one(ipa, mem))
--
2.27.0
next prev parent reply other threads:[~2021-06-09 22:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 22:34 [PATCH net-next 00/11] net: ipa: memory region rework, part 1 Alex Elder
2021-06-09 22:34 ` [PATCH net-next 01/11] net: ipa: define IPA_MEM_END_MARKER Alex Elder
2021-06-09 22:34 ` [PATCH net-next 02/11] net: ipa: store memory region id in descriptor Alex Elder
2021-06-09 22:34 ` [PATCH net-next 03/11] net: ipa: validate memory regions unconditionally Alex Elder
2021-06-09 22:34 ` [PATCH net-next 04/11] net: ipa: separate memory validation from initialization Alex Elder
2021-06-09 22:34 ` [PATCH net-next 05/11] net: ipa: separate region range check from other validation Alex Elder
2021-06-09 22:34 ` [PATCH net-next 06/11] net: ipa: validate memory regions at init time Alex Elder
2021-06-09 22:34 ` [PATCH net-next 07/11] net: ipa: pass memory configuration data to ipa_mem_valid() Alex Elder
2021-06-09 22:35 ` [PATCH net-next 08/11] net: ipa: introduce ipa_mem_id_optional() Alex Elder
2021-06-09 22:35 ` [PATCH net-next 09/11] net: ipa: validate memory regions based on version Alex Elder
2021-06-09 22:35 ` Alex Elder [this message]
2021-06-09 22:35 ` [PATCH net-next 11/11] net: ipa: use bitmap to check for missing regions Alex Elder
2021-06-09 23:10 ` [PATCH net-next 00/11] net: ipa: memory region rework, part 1 patchwork-bot+netdevbpf
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=20210609223503.2649114-11-elder@linaro.org \
--to=elder@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=cpratapa@codeaurora.org \
--cc=davem@davemloft.net \
--cc=elder@kernel.org \
--cc=evgreen@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=subashab@codeaurora.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
all inboxes | Powered by JetHome®