From: "Rob Herring (Arm)" <robh@kernel.org>
To: Tomeu Vizoso <tomeu@tomeuvizoso.net>,
Oded Gabbay <ogabbay@kernel.org>, Frank Li <Frank.Li@nxp.com>,
Thomas Zimmermann <tzimmermann@suse.de>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 06/19] accel: ethosu: Validate secondary streams
Date: Fri, 20 Nov 2026 08:57:30 -0600 [thread overview]
Message-ID: <20261120-ethosu-fixes-v5-6-52d459acdb84@kernel.org> (raw)
In-Reply-To: <20261120-ethosu-fixes-v5-0-52d459acdb84@kernel.org>
The command-stream validator records the additional U65 scale and
weight stream addresses and the U85 weight decoder addresses, but only
checked stream 0 against its region buffer.
Check every configured secondary stream against the matching weight or
scale region before accepting a kernel operation.
Fixes: 5a5e9c0228e6 ("accel: Add Arm Ethos-U NPU driver")
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
v5:
- No changes.
v2:
- Adjust for register state tracking
---
drivers/accel/ethosu/ethosu_gem.c | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/drivers/accel/ethosu/ethosu_gem.c b/drivers/accel/ethosu/ethosu_gem.c
index 67c7cbbd39b8..af8a0c45039b 100644
--- a/drivers/accel/ethosu/ethosu_gem.c
+++ b/drivers/accel/ethosu/ethosu_gem.c
@@ -436,13 +436,17 @@ static u64 feat_matrix_length(struct ethosu_device *edev,
static int buffer_size(struct ethosu_validated_cmdstream_info *info,
struct cmd_state *st, struct buffer *buf, s8 region,
- u16 region_cmd, u16 base_cmd, u16 length_cmd)
+ u16 region_cmd, u16 base_cmd, u16 length_cmd, bool optional)
{
u64 end;
+ bool base_set = cmd_state_reg_is_set(st, base_cmd);
+ bool length_set = cmd_state_reg_is_set(st, length_cmd);
+
+ if (optional && !base_set && !length_set)
+ return 0;
if (region < 0 || !cmd_state_reg_is_set(st, region_cmd) ||
- !cmd_state_reg_is_set(st, base_cmd) ||
- !cmd_state_reg_is_set(st, length_cmd))
+ !base_set || !length_set)
return -EINVAL;
if (check_add_overflow(buf->base, (u64)buf->length, &end))
@@ -507,7 +511,20 @@ static int calc_sizes(struct drm_device *ddev,
st->weight[0].base + st->weight[0].length - 1);
if (buffer_size(info, st, &st->weight[0], st->weight[0].region,
NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT_BASE,
- NPU_SET_WEIGHT_LENGTH))
+ NPU_SET_WEIGHT_LENGTH, false))
+ return -EINVAL;
+
+ if (buffer_size(info, st, &st->weight[1], st->weight[0].region,
+ NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT1_BASE,
+ NPU_SET_WEIGHT1_LENGTH, true) ||
+ buffer_size(info, st, &st->weight[3], st->weight[0].region,
+ NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT3_BASE,
+ NPU_SET_WEIGHT3_LENGTH, true))
+ return -EINVAL;
+ if (!ethosu_is_u65(edev) &&
+ buffer_size(info, st, &st->weight[2], st->weight[0].region,
+ NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT2_BASE,
+ NPU_SET_WEIGHT2_LENGTH, true))
return -EINVAL;
}
@@ -517,7 +534,13 @@ static int calc_sizes(struct drm_device *ddev,
st->scale[0].base + st->scale[0].length - 1);
if (buffer_size(info, st, &st->scale[0], st->scale[0].region,
NPU_SET_SCALE_REGION, NPU_SET_SCALE_BASE,
- NPU_SET_SCALE_LENGTH))
+ NPU_SET_SCALE_LENGTH, false))
+ return -EINVAL;
+
+ if (ethosu_is_u65(edev) &&
+ buffer_size(info, st, &st->scale[1], st->scale[0].region,
+ NPU_SET_SCALE_REGION, NPU_SET_SCALE1_BASE,
+ NPU_SET_SCALE1_LENGTH, true))
return -EINVAL;
}
--
2.53.0
next prev parent reply other threads:[~2026-11-20 14:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 14:57 [PATCH v5 00/19] accel: ethosu: Cmd stream validation fixes Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 01/19] accel: ethosu: Prevent command stream export Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 02/19] accel: ethosu: Move DMA mode to src/dst struct Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 03/19] accel: ethosu: Track command stream register setup Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 04/19] accel: ethosu: Factor buffer bounds checks Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 05/19] accel: ethosu: Fix NHCWB16 bounds calculation Rob Herring (Arm)
2026-11-20 14:57 ` Rob Herring (Arm) [this message]
2026-11-20 14:57 ` [PATCH v5 07/19] accel: ethosu: Reject unsupported commands and params Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 08/19] accel: ethosu: Validate all feature map tiles Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 09/19] accel: ethosu: Account for feature map element size Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 10/19] accel: ethosu: Validate convolution parameter Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 11/19] accel: ethosu: Validate accumulator input Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 12/19] accel: ethosu: Restrict dynamic IFM2 weights Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 13/19] accel: ethosu: Split U65 and U85 DMA length validation Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 14/19] accel: ethosu: Validate OFM transpose Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 15/19] accel: ethosu: Validate resize operations Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 16/19] accel: ethosu: Ensure cmd stream is multiple of 4 bytes Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 17/19] accel: ethosu: Require active weight streams setup Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 18/19] accel: ethosu: Support IFM upscaling Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 19/19] accel: ethosu: Reject IFM broadcast on U65 Rob Herring (Arm)
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=20261120-ethosu-fixes-v5-6-52d459acdb84@kernel.org \
--to=robh@kernel.org \
--cc=Frank.Li@nxp.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ogabbay@kernel.org \
--cc=tomeu@tomeuvizoso.net \
--cc=tzimmermann@suse.de \
/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®